----------------------------------------------------------------------------- MANIFEST | 214 Makefile | 4 aclocal.m4 | 870 - config.guess | 82 config.sub | 606 configure |37585 +++++++++++++++++++++++--------------------- configure.in | 196 doc/CHANGES | 68 doc/CHANGES.old | 8 doc/INSTALL | 34 doc/TODO | 80 doc/WHATSNEW | 6 doc/auth.txt | 37 doc/config-anomalies | 2 doc/filtering | 2 doc/keymap.sample | 1 doc/l10n/de.po | 3190 +-- doc/l10n/de/tin.1 | 102 doc/l10n/de/tin.5 | 99 doc/l10n/en_GB.po | 3217 +-- doc/l10n/en_GB/tin.1 | 84 doc/l10n/en_GB/tin.5 | 97 doc/l10n/es.po | 3096 +-- doc/l10n/es/tin.1 | 84 doc/l10n/es/tin.5 | 97 doc/l10n/tin-man.pot | 3018 +-- doc/rcvars.txt | 2 doc/tin.1 | 62 doc/tin.5 | 100 doc/tinews.1 | 91 doc/url_handler.1 | 4 doc/w2r.1 | 2 include/autoconf.hin | 11 include/bool.h | 2 include/bugrep.h | 2 include/debug.h | 2 include/extern.h | 14 include/keymap.h | 5 include/missing_fd.h | 2 include/newsrc.h | 2 include/nntplib.h | 2 include/policy.h | 2 include/proto.h | 13 include/rfc2046.h | 2 include/stpwatch.h | 17 include/tcurses.h | 2 include/tin.h | 33 include/tinrc.h | 2 include/tnntp.h | 2 include/trace.h | 2 include/version.h | 10 libcanlock/src/canlock.c | 2 libcanlock/test/shatest.c | 17 pcre/configure.in | 2 po/da.po | 451 po/de.po | 457 po/en_GB.po | 3713 ++-- po/es.po | 447 po/et.po | 486 po/fr.po | 550 po/ru.po | 449 po/sv.po | 447 po/tin.pot | 442 po/tr.po | 456 po/zh_CN.po | 449 po/zh_TW.po | 449 src/Makefile.in | 8 src/active.c | 4 src/art.c | 183 src/attrib.c | 14 src/auth.c | 19 src/charset.c | 14 src/color.c | 2 src/config.c | 18 src/cook.c | 2 src/curses.c | 4 src/debug.c | 103 src/envarg.c | 2 src/feed.c | 2 src/filter.c | 40 src/getline.c | 4 src/global.c | 2 src/group.c | 13 src/hashstr.c | 9 src/header.c | 2 src/help.c | 5 src/inews.c | 13 src/init.c | 14 src/joinpath.c | 2 src/keymap.c | 10 src/lang.c | 20 src/list.c | 2 src/lock.c | 2 src/mail.c | 2 src/main.c | 14 src/makecfg.c | 13 src/memory.c | 19 src/mimetypes.c | 2 src/misc.c | 115 src/my_tmpfile.c | 2 src/newsrc.c | 40 src/nntplib.c | 2 src/nrctbl.c | 10 src/options_menu.c | 11 src/page.c | 33 src/pgp.c | 2 src/post.c | 138 src/prompt.c | 2 src/read.c | 13 src/refs.c | 15 src/regex.c | 2 src/rfc1524.c | 2 src/rfc2045.c | 4 src/rfc2046.c | 27 src/rfc2047.c | 2 src/save.c | 16 src/screen.c | 26 src/search.c | 17 src/select.c | 4 src/sigfile.c | 2 src/signal.c | 2 src/strftime.c | 2 src/string.c | 16 src/tags.c | 196 src/tcurses.c | 2 src/thread.c | 28 src/tincfg.tbl | 2 src/tmpfile.c | 12 src/trace.c | 2 src/version.c | 2 src/wildmat.c | 4 src/xface.c | 2 src/xref.c | 2 tin-2.4.5/po/da.gmo |binary tin-2.4.5/po/de.gmo |binary tin-2.4.5/po/en_GB.gmo |binary tin-2.4.5/po/es.gmo |binary tin-2.4.5/po/et.gmo |binary tin-2.4.5/po/fr.gmo |binary tin-2.4.5/po/ru.gmo |binary tin-2.4.5/po/sv.gmo |binary tin-2.4.5/po/tr.gmo |binary tin-2.4.5/po/zh_CN.gmo |binary tin-2.4.5/po/zh_TW.gmo |binary tools/tinews.pl | 536 tools/url_handler.pl | 4 tools/w2r.pl | 6 147 files changed, 34571 insertions(+), 29379 deletions(-) ----------------------------------------------------------------------------- diff -Nurp '--exclude=.bzr*' tin-2.4.4/MANIFEST tin-2.4.5/MANIFEST --- tin-2.4.4/MANIFEST 2019-12-24 11:00:18.000000000 +0100 +++ tin-2.4.5/MANIFEST 2020-12-24 12:47:24.639964563 +0100 @@ -1,36 +1,36 @@ -MANIFEST for tin-2.4.4 (Tue Dec 24 11:00:18 CET 2019) +MANIFEST for tin-2.4.5 (Thu Dec 24 12:47:24 CET 2020) ---------------------------------------------------- 15079 ./Makefile 8797 ./MANIFEST 1546 ./README 747 ./README.MAC 976 ./README.WIN - 197688 ./aclocal.m4 + 209607 ./aclocal.m4 1096 ./conf-tin - 48441 ./config.guess - 31609 ./config.sub - 908462 ./configure - 38801 ./configure.in + 49418 ./config.guess + 34257 ./config.sub + 952989 ./configure + 43287 ./configure.in 7123 ./install-sh 355 ./po4a.conf 1575 ./tin.spec 18847 ./doc/ABOUT-NLS - 10151 ./doc/CHANGES - 301440 ./doc/CHANGES.old + 13509 ./doc/CHANGES + 301442 ./doc/CHANGES.old 5125 ./doc/CREDITS 1305 ./doc/DEBUG_REFS - 31239 ./doc/INSTALL - 46013 ./doc/TODO - 1528 ./doc/WHATSNEW + 32090 ./doc/INSTALL + 45851 ./doc/TODO + 1779 ./doc/WHATSNEW 2618 ./doc/art_handling.txt 1701 ./doc/article.txt - 4375 ./doc/auth.txt - 3828 ./doc/config-anomalies - 12170 ./doc/filtering + 3499 ./doc/auth.txt + 3827 ./doc/config-anomalies + 12257 ./doc/filtering 35305 ./doc/good-netkeeping-seal 3805 ./doc/internals.txt 23621 ./doc/iso2asc.txt - 3888 ./doc/keymap.sample + 3907 ./doc/keymap.sample 633 ./doc/mailcap.sample 5922 ./doc/mbox.5 3365 ./doc/mime.types @@ -40,15 +40,15 @@ MANIFEST for tin-2.4.4 (Tue Dec 24 11:00 5156 ./doc/opt-case.1 6966 ./doc/plp_snprintf.3 3964 ./doc/pgp.txt - 2990 ./doc/rcvars.txt + 2988 ./doc/rcvars.txt 1525 ./doc/reading-mail.txt 4947 ./doc/umlaute.txt 4246 ./doc/umlauts.txt - 7172 ./doc/url_handler.1 - 139235 ./doc/tin.1 - 81803 ./doc/tin.5 + 7170 ./doc/url_handler.1 + 140049 ./doc/tin.1 + 84537 ./doc/tin.5 5065 ./doc/tin.defaults - 18163 ./doc/tinews.1 + 19286 ./doc/tinews.1 2419 ./doc/tools.txt 4345 ./doc/w2r.1 2196 ./doc/wildmat.3 @@ -56,97 +56,97 @@ MANIFEST for tin-2.4.4 (Tue Dec 24 11:00 3816 ./tools/metamutt 2791 ./tools/opt-case.pl 1413 ./tools/tinlock - 42935 ./tools/tinews.pl - 3792 ./tools/url_handler.pl + 47778 ./tools/tinews.pl + 3791 ./tools/url_handler.pl 1657 ./tools/url_handler.sh - 3348 ./tools/w2r.pl + 3353 ./tools/w2r.pl 1661 ./tools/expand_aliases.tgz 2697 ./include/bool.h 1886 ./include/bugrep.h 2350 ./include/debug.h - 68582 ./include/extern.h - 14171 ./include/keymap.h + 68702 ./include/extern.h + 14190 ./include/keymap.h 2992 ./include/missing_fd.h 6435 ./include/newsrc.h 9034 ./include/nntplib.h 664 ./include/plp_snprintf.h 15637 ./include/policy.h - 33344 ./include/proto.h + 33605 ./include/proto.h 5701 ./include/rfc2046.h - 3479 ./include/stpwatch.h + 3544 ./include/stpwatch.h 6062 ./include/tcurses.h - 72038 ./include/tin.h + 72513 ./include/tin.h 17549 ./include/tinrc.h 4018 ./include/tnntp.h 2366 ./include/trace.h - 2245 ./include/version.h - 35853 ./src/active.c - 89949 ./src/art.c - 78943 ./src/attrib.c - 17036 ./src/auth.c - 12838 ./src/charset.c + 2247 ./include/version.h + 35854 ./src/active.c + 90939 ./src/art.c + 79085 ./src/attrib.c + 17319 ./src/auth.c + 12887 ./src/charset.c 8781 ./src/color.c - 68075 ./src/config.c + 68426 ./src/config.c 28399 ./src/cook.c - 26443 ./src/curses.c - 11822 ./src/debug.c + 26444 ./src/curses.c + 12703 ./src/debug.c 3510 ./src/envarg.c 31013 ./src/feed.c - 59775 ./src/filter.c - 18094 ./src/getline.c + 59897 ./src/filter.c + 18095 ./src/getline.c 9172 ./src/global.c - 45016 ./src/group.c - 4002 ./src/hashstr.c + 45167 ./src/group.c + 3910 ./src/hashstr.c 8701 ./src/header.c 6252 ./src/heapsort.c - 43973 ./src/help.c - 13976 ./src/inews.c - 38411 ./src/init.c + 44023 ./src/help.c + 14093 ./src/inews.c + 38563 ./src/init.c 2537 ./src/joinpath.c - 102167 ./src/keymap.c - 139426 ./src/lang.c + 102350 ./src/keymap.c + 139575 ./src/lang.c 4486 ./src/langinfo.c 7314 ./src/list.c 6767 ./src/lock.c 17174 ./src/mail.c - 26947 ./src/main.c - 11069 ./src/makecfg.c - 14116 ./src/memory.c + 27115 ./src/main.c + 11102 ./src/makecfg.c + 14276 ./src/memory.c 5307 ./src/mimetypes.c - 95975 ./src/misc.c - 39575 ./src/newsrc.c - 55617 ./src/nntplib.c - 7949 ./src/nrctbl.c - 105928 ./src/options_menu.c - 67366 ./src/page.c + 96968 ./src/misc.c + 40342 ./src/newsrc.c + 55616 ./src/nntplib.c + 8103 ./src/nrctbl.c + 105809 ./src/options_menu.c + 67323 ./src/page.c 24140 ./src/parsdate.y 17057 ./src/plp_snprintf.c 13315 ./src/pgp.c - 153581 ./src/post.c + 155485 ./src/post.c 19003 ./src/prompt.c - 10693 ./src/read.c - 27602 ./src/refs.c + 10523 ./src/read.c + 27979 ./src/refs.c 5587 ./src/regex.c 14622 ./src/rfc1524.c - 15301 ./src/rfc2045.c - 39808 ./src/rfc2046.c + 15302 ./src/rfc2045.c + 40032 ./src/rfc2046.c 37149 ./src/rfc2047.c - 59373 ./src/save.c - 13707 ./src/screen.c - 18412 ./src/search.c - 41125 ./src/select.c + 59487 ./src/save.c + 14117 ./src/screen.c + 18666 ./src/search.c + 41127 ./src/select.c 8471 ./src/sigfile.c 14446 ./src/signal.c 7325 ./src/strftime.c - 40417 ./src/string.c - 13447 ./src/tags.c + 40546 ./src/string.c + 9697 ./src/tags.c 17681 ./src/tcurses.c - 3069 ./src/tmpfile.c + 3405 ./src/tmpfile.c 3661 ./src/my_tmpfile.c - 42023 ./src/thread.c + 42557 ./src/thread.c 2574 ./src/trace.c 5032 ./src/version.c - 5498 ./src/wildmat.c + 5492 ./src/wildmat.c 7753 ./src/xface.c 13216 ./src/xref.c 422 ./pcre/AUTHORS @@ -161,7 +161,7 @@ MANIFEST for tin-2.4.4 (Tue Dec 24 11:00 24136 ./pcre/README 6161 ./pcre/RunTest.in 278 ./pcre/config.h - 8703 ./pcre/configure.in + 8702 ./pcre/configure.in 395 ./pcre/version.sh 6369 ./pcre/dftables.c 1171 ./pcre/pcre-config.in @@ -216,8 +216,8 @@ MANIFEST for tin-2.4.4 (Tue Dec 24 11:00 108966 ./pcre/testdata/testoutput7 53056 ./pcre/testdata/testoutput8 28769 ./pcre/testdata/testoutput9 - 21855 ./include/autoconf.hin - 22537 ./src/Makefile.in + 21994 ./include/autoconf.hin + 22598 ./src/Makefile.in 10339 ./src/tincfg.tbl 1397 ./libcanlock/COPYING 608 ./libcanlock/ChangeLog @@ -230,7 +230,7 @@ MANIFEST for tin-2.4.4 (Tue Dec 24 11:00 1620 ./libcanlock/Makefile.in 2638 ./libcanlock/README 4015 ./libcanlock/src/base64.c - 11501 ./libcanlock/src/canlock.c + 11502 ./libcanlock/src/canlock.c 7518 ./libcanlock/src/hmac.c 4161 ./libcanlock/src/secret.c 12652 ./libcanlock/src/sha1.c @@ -246,7 +246,7 @@ MANIFEST for tin-2.4.4 (Tue Dec 24 11:00 8949 ./libcanlock/test/canlocktest.c 4689 ./libcanlock/test/canlocktest_legacy.c 10182 ./libcanlock/test/hkdf.c - 63533 ./libcanlock/test/shatest.c + 63613 ./libcanlock/test/shatest.c 14702 ./libcanlock/util/canlock.c 9850 ./intl/bindtextdom.c 72 ./intl/ChangeLog @@ -281,38 +281,38 @@ MANIFEST for tin-2.4.4 (Tue Dec 24 11:00 41 ./intl/VERSION 5096 ./po/Makefile.inn 544 ./po/POTFILES.in - 146153 ./po/tin.pot - 169075 ./po/da.gmo - 229206 ./po/da.po - 200376 ./po/de.gmo - 239717 ./po/de.po - 8616 ./po/en_GB.gmo - 149836 ./po/en_GB.po + 146902 ./po/tin.pot + 168735 ./po/da.gmo + 230118 ./po/da.po + 200910 ./po/de.gmo + 240697 ./po/de.po + 187442 ./po/en_GB.gmo + 226167 ./po/en_GB.po 1594 ./po/es.gmo - 174869 ./po/es.po - 188914 ./po/et.gmo - 228423 ./po/et.po - 193733 ./po/fr.gmo - 237196 ./po/fr.po - 118101 ./po/ru.gmo - 209797 ./po/ru.po - 22469 ./po/sv.gmo - 156701 ./po/sv.po - 191535 ./po/tr.gmo - 241452 ./po/tr.po - 227321 ./po/zh_CN.po - 174917 ./po/zh_CN.gmo - 226690 ./po/zh_TW.po - 175042 ./po/zh_TW.gmo - 149353 ./doc/l10n/de/tin.1 - 87440 ./doc/l10n/de/tin.5 + 175788 ./po/es.po + 189910 ./po/et.gmo + 229314 ./po/et.po + 198349 ./po/fr.gmo + 239250 ./po/fr.po + 117761 ./po/ru.gmo + 210704 ./po/ru.po + 22378 ./po/sv.gmo + 157560 ./po/sv.po + 191201 ./po/tr.gmo + 242620 ./po/tr.po + 228223 ./po/zh_CN.po + 174605 ./po/zh_CN.gmo + 227592 ./po/zh_TW.po + 174730 ./po/zh_TW.gmo + 150391 ./doc/l10n/de/tin.1 + 90190 ./doc/l10n/de/tin.5 130 ./doc/l10n/de.add - 379062 ./doc/l10n/de.po - 143012 ./doc/l10n/en_GB/tin.1 - 84369 ./doc/l10n/en_GB/tin.5 - 468763 ./doc/l10n/en_GB.po - 143092 ./doc/l10n/es/tin.1 - 84361 ./doc/l10n/es/tin.5 - 308393 ./doc/l10n/es.po - 295231 ./doc/l10n/tin-man.pot -12990603 total + 385246 ./doc/l10n/de.po + 143851 ./doc/l10n/en_GB/tin.1 + 87122 ./doc/l10n/en_GB/tin.5 + 475902 ./doc/l10n/en_GB.po + 143929 ./doc/l10n/es/tin.1 + 87113 ./doc/l10n/es/tin.5 + 313398 ./doc/l10n/es.po + 299205 ./doc/l10n/tin-man.pot +13379515 total diff -Nurp '--exclude=.bzr*' tin-2.4.4/Makefile tin-2.4.5/Makefile --- tin-2.4.4/Makefile 2019-12-24 11:00:16.000000000 +0100 +++ tin-2.4.5/Makefile 2020-12-24 12:47:22.071864533 +0100 @@ -9,9 +9,9 @@ SHELL = @SHELL@ PROJECT = tin LVER = 2 PVER = 4 -SVER = 4 +SVER = 5 VER = $(LVER).$(PVER).$(SVER) -DVER = 20191224 +DVER = 20201224 EXE = tin # directory structure diff -Nurp '--exclude=.bzr*' tin-2.4.4/aclocal.m4 tin-2.4.5/aclocal.m4 --- tin-2.4.4/aclocal.m4 2019-11-20 13:34:00.000000000 +0100 +++ tin-2.4.5/aclocal.m4 2020-12-01 07:51:13.946773388 +0100 @@ -2,7 +2,7 @@ dnl Project : tin - a Usenet reader dnl Module : aclocal.m4 dnl Author : Thomas E. Dickey dnl Created : 1995-08-24 -dnl Updated : 2019-03-12 +dnl Updated : 2020-11-30 dnl Notes : dnl dnl Copyright (c) 1995-2020 Thomas E. Dickey @@ -34,6 +34,7 @@ dnl SOFTWARE, EVEN IF ADVISED OF THE POS dnl dnl dnl Macros used in TIN auto-configuration script. +dnl https://invisible-island.net/autoconf/ dnl dnl --------------------------------------------------------------------------- dnl --------------------------------------------------------------------------- @@ -197,7 +198,7 @@ size_t iconv(); AC_SUBST(LIBICONV) ])dnl dnl --------------------------------------------------------------------------- -dnl AM_LANGINFO_CODESET version: 4 updated: 2015/04/18 08:56:57 +dnl AM_LANGINFO_CODESET version: 5 updated: 2020/03/10 18:53:47 dnl ------------------- dnl Inserted as requested by gettext 0.10.40 dnl File from /usr/share/aclocal @@ -210,7 +211,7 @@ 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);], + [char* cs = nl_langinfo(CODESET); (void)cs], am_cv_langinfo_codeset=yes, am_cv_langinfo_codeset=no) ]) @@ -251,7 +252,7 @@ AC_DEFUN([AM_LC_MESSAGES], fi fi])dnl dnl --------------------------------------------------------------------------- -dnl AM_MULTIBYTE_ABLE version: 9 updated: 2013/12/06 19:12:41 +dnl AM_MULTIBYTE_ABLE version: 10 updated: 2019/12/31 20:39:42 dnl ----------------- dnl dnl check for required multibyte/widechar functions @@ -358,7 +359,7 @@ AC_DEFUN([AM_MULTIBYTE_ABLE], ]) if test "$am_cv_multibyte_able" != no; then if test "$am_cv_multibyte_able" = libutf8; then - AC_DEFINE(HAVE_LIBUTF8_H) + AC_DEFINE(HAVE_LIBUTF8_H,1,[Define this to 1 if we have header libutf8.h]) LIBS="-lutf8 $LIBS" fi AC_DEFINE(MULTIBYTE_ABLE, 1, @@ -783,10 +784,11 @@ define([CF_ACVERSION_COMPARE], [ifelse([$8], , ,[$8])], [ifelse([$9], , ,[$9])])])dnl dnl --------------------------------------------------------------------------- -dnl CF_ADD_CFLAGS version: 13 updated: 2017/02/25 18:57:40 +dnl CF_ADD_CFLAGS version: 14 updated: 2020/04/04 16:16:13 dnl ------------- dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS -dnl The second parameter if given makes this macro verbose. +dnl $1 = flags to add +dnl $2 = if given makes this macro verbose. dnl dnl Put any preprocessor definitions that use quoted strings in $EXTRA_CPPFLAGS, dnl to simplify use of $CPPFLAGS in compiler checks, etc., that are easily @@ -974,7 +976,7 @@ if test -n "$1" ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ADD_LIBS version: 2 updated: 2014/07/13 14:33:27 +dnl CF_ADD_LIBS version: 3 updated: 2019/11/02 16:47:33 dnl ----------- dnl Add one or more libraries, used to enforce consistency. Libraries are dnl prepended to an existing list, since their dependencies are assumed to @@ -983,19 +985,19 @@ dnl dnl $1 = libraries to add, with the "-l", etc. dnl $2 = variable to update (default $LIBS) 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_libs="[$]ifelse($2,,LIBS,[$2])" +# reverse order +cf_add_0lib= +for cf_add_1lib in $1; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done ifelse($2,,LIBS,[$2])="$cf_add_libs" ])dnl @@ -1225,7 +1227,7 @@ esac $3="$withval" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_AR_FLAGS version: 6 updated: 2015/10/10 15:25:05 +dnl CF_AR_FLAGS version: 7 updated: 2020/04/04 11:37:29 dnl ----------- dnl Check for suitable "ar" (archiver) options for updating an archive. dnl @@ -1236,39 +1238,55 @@ AC_DEFUN([CF_AR_FLAGS],[ AC_REQUIRE([CF_PROG_AR]) AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[ - cf_cv_ar_flags=unknown - for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv - do + case $cf_cv_system_name in + *-msvc*) + cf_cv_ar_flags='' + cat >mk_static_lib.sh <<-EOF + #!$SHELL + MSVC_BIN="[$]AR" + out="\[$]1" + shift + exec \[$]MSVC_BIN -out:"\[$]out" \[$]@ + EOF + chmod +x mk_static_lib.sh + AR=`pwd`/mk_static_lib.sh + ;; + *) + cf_cv_ar_flags=unknown + for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv + do - # check if $ARFLAGS already contains this choice - if test "x$ARFLAGS" != "x" ; then - cf_check_ar_flags=`echo "x$ARFLAGS" | sed -e "s/$cf_ar_flags\$//" -e "s/$cf_ar_flags / /"` - if test "x$ARFLAGS" != "$cf_check_ar_flags" ; then - cf_cv_ar_flags= - break + # check if $ARFLAGS already contains this choice + if test "x$ARFLAGS" != "x" ; then + cf_check_ar_flags=`echo "x$ARFLAGS" | sed -e "s/$cf_ar_flags\$//" -e "s/$cf_ar_flags / /"` + if test "x$ARFLAGS" != "$cf_check_ar_flags" ; then + cf_cv_ar_flags= + break + fi fi - fi - rm -f conftest.$ac_cv_objext - rm -f conftest.a + rm -f conftest.$ac_cv_objext + rm -f conftest.a - cat >conftest.$ac_ext <conftest.$ac_ext <&AC_FD_CC - $AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&AC_FD_CC 1>/dev/null - if test -f conftest.a ; then - cf_cv_ar_flags=$cf_ar_flags + if AC_TRY_EVAL(ac_compile) ; then + echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&AC_FD_CC + $AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&AC_FD_CC 1>/dev/null + if test -f conftest.a ; then + cf_cv_ar_flags=$cf_ar_flags + break + fi + else + CF_VERBOSE(cannot compile test-program) break fi - else - CF_VERBOSE(cannot compile test-program) - break - fi - done - rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext + done + rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext + ;; + esac ]) if test -n "$ARFLAGS" ; then @@ -1374,6 +1392,61 @@ AC_SUBST(BUILD_EXEEXT) AC_SUBST(BUILD_OBJEXT) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_BUNDLED_CANLOCK version: 1 updated: 2020/01/09 20:03:25 +dnl ------------------ +dnl Top-level macro for configuring an application with a bundled copy of +dnl the canlock library. +dnl +dnl $1 specifies the top of the directory containing CANLOCK's include/lib dirs. +dnl That is assigned to $cf_canlock_home, which may be updated. +AC_DEFUN([CF_BUNDLED_CANLOCK], +[ +cf_canlock_home=$1 +CANDIR_MAKE= +CANLIBS= +CAN_CPPFLAGS= +CAN_MAKEFILE= + +case .$cf_canlock_home in #(vi +.no) #(vi + CF_VERBOSE(using bundled canlock) + CANLIBS='-L../libcanlock -lcanlock' + CAN_CPPFLAGS='-I$(top_builddir)/libcanlock/include -I$(top_srcdir)/libcanlock/include' + CAN_MAKEFILE='libcanlock/Makefile' + ;; +.yes) #(vi + CF_FIND_CANLOCK( + cf_canlock_cppflags, + cf_canlock_libs, + [ + CANDIR_MAKE='#' + CANLIBS="$cf_canlock_libs" + CAN_CPPFLAGS="$cf_canlock_cppflags" + CF_VERBOSE(using installed canlock) + ],[ + CF_VERBOSE(using bundled canlock because no installed canlock was found) + CANLIBS='-L../libcanlock -lcanlock' + CAN_CPPFLAGS='-I$(top_builddir)/libcanlock/include -I$(top_srcdir)/libcanlock/include' + CAN_MAKEFILE='libcanlock/Makefile' + ]) + ;; +.*) + CF_PATH_SYNTAX(cf_canlock_home) + CANDIR_MAKE='#' + CANLIBS="-L${cf_canlock_home}/lib -lcanlock" + CAN_CPPFLAGS="-I${cf_canlock_home}/include" + CF_VERBOSE(using installed canlock $cf_canlock_home) + ;; +esac + +AC_DEFINE(USE_CANLOCK,1,[Define this to 1 to use Cancel-Locks]) + +AC_SUBST(CANDIR_MAKE) +AC_SUBST(CANLIBS) +AC_SUBST(CAN_CPPFLAGS) +AC_SUBST(CAN_MAKEFILE) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_BUNDLED_INTL version: 19 updated: 2018/06/20 20:23:13 dnl --------------- dnl Top-level macro for configuring an application with a bundled copy of @@ -1510,12 +1583,14 @@ dnl Top-level macro for configuring an a dnl the pcre library. dnl dnl $1 specifies the top of the directory containing PCRE's include, lib dirs. +dnl That is assigned to $cf_pcre_home, which may be updated. AC_DEFUN([CF_BUNDLED_PCRE], [ cf_pcre_home=$1 PCREDIR_MAKE= PCREDIR_LIBS= PCREDIR_CPPFLAGS= + case .$cf_pcre_home in #(vi .no) #(vi # setup to compile the bundled PCRE: @@ -1526,8 +1601,21 @@ case .$cf_pcre_home in #(vi AC_SUBST(PCRE_DEFINES) ;; .yes) #(vi - PCREDIR_MAKE='#' - PCREDIR_LIBS="-lpcre" + CF_FIND_PCRE( + cf_pcre_cppflags, + cf_pcre_libs, + [ + PCREDIR_MAKE='#' + PCREDIR_LIBS="$cf_pcre_libs" + PCREDIR_CPPFLAGS="$cf_pcre_cppflags" + ],[ + CF_VERBOSE(using bundled pcre because no installed pcre was found) + AC_SUBST(PCRE_MAJOR) + AC_SUBST(PCRE_MINOR) + AC_SUBST(PCRE_DATE) + AC_SUBST(PCRE_DEFINES) + cf_pcre_home=no + ]) ;; .*) CF_PATH_SYNTAX(cf_pcre_home) @@ -1536,6 +1624,7 @@ case .$cf_pcre_home in #(vi PCREDIR_CPPFLAGS="-I${cf_pcre_home}/include" ;; esac + AC_SUBST(PCREDIR_MAKE) AC_SUBST(PCREDIR_LIBS) AC_SUBST(PCREDIR_CPPFLAGS) @@ -1714,7 +1803,7 @@ CF_CHECK_1_DECL(${ac_func}, ${ac_tr_func done ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CHECK_ERRNO version: 12 updated: 2015/04/18 08:56:57 +dnl CF_CHECK_ERRNO version: 13 updated: 2020/03/10 18:53:47 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 @@ -1732,7 +1821,7 @@ AC_CACHE_CHECK(if external $1 is declare #include #include #include ], - ifelse([$2],,int,[$2]) x = (ifelse([$2],,int,[$2])) $1, + ifelse([$2],,int,[$2]) x = (ifelse([$2],,int,[$2])) $1; (void)x, [cf_cv_dcl_$1=yes], [cf_cv_dcl_$1=no]) ]) @@ -1771,6 +1860,36 @@ fi ])dnl dnl --------------------------------------------------------------------------- +dnl CF_CHECK_FD_SET version: 5 updated: 2012/10/06 11:17:15 +dnl --------------- +dnl Check if the fd_set type and corresponding macros are defined. +AC_DEFUN([CF_CHECK_FD_SET], +[ +AC_REQUIRE([CF_TYPE_FD_SET]) +AC_CACHE_CHECK([for fd_set macros],cf_cv_macros_fd_set,[ +AC_TRY_COMPILE([ +#include +#if USE_SYS_SELECT_H +# include +#else +# ifdef HAVE_SYS_TIME_H +# include +# ifdef TIME_WITH_SYS_TIME +# include +# endif +# else +# include +# endif +#endif +],[ + fd_set read_bits; + FD_ZERO(&read_bits); + FD_SET(0, &read_bits);], + [cf_cv_macros_fd_set=yes], + [cf_cv_macros_fd_set=no])]) +test $cf_cv_macros_fd_set = yes && AC_DEFINE(HAVE_TYPE_FD_SET,1,[Define to 1 if type fd_set is declared]) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_CHECK_HEADERS version: 3 updated: 2000/11/03 11:14:19 dnl ---------------- dnl AC_CHECK_HEADERS(sys/socket.h) fails on OS/2 EMX because it demands that @@ -1818,7 +1937,7 @@ fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CHECK_NESTED_PARAMS version: 2 updated: 1997/08/28 23:57:55 +dnl CF_CHECK_NESTED_PARAMS version: 3 updated: 2019/12/31 20:39:42 dnl ---------------------- dnl Check if the compiler allows nested parameter lists (some don't) AC_DEFUN([CF_CHECK_NESTED_PARAMS], @@ -1831,10 +1950,10 @@ AC_CACHE_VAL(cf_cv_nested_params,[ [cf_cv_nested_params=no]) ]) AC_MSG_RESULT($cf_cv_nested_params) -test $cf_cv_nested_params = yes && AC_DEFINE(HAVE_NESTED_PARAMS) +test $cf_cv_nested_params = yes && AC_DEFINE(HAVE_NESTED_PARAMS,1,[Define this to 1 if the compiler allows nested parameter lists]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CLANG_COMPILER version: 2 updated: 2013/11/19 19:23:35 +dnl CF_CLANG_COMPILER version: 6 updated: 2020/11/26 17:37:55 dnl ----------------- dnl Check if the given compiler is really clang. clang's C driver defines dnl __GNUC__ (fooling the configure script into setting $GCC to yes) but does @@ -1853,18 +1972,53 @@ ifelse([$2],,CLANG_COMPILER,[$2])=no if test "$ifelse([$1],,[$1],GCC)" = yes ; then AC_MSG_CHECKING(if this is really Clang ifelse([$1],GXX,C++,C) compiler) cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])" - ifelse([$3],,CFLAGS,[$3])="$ifelse([$3],,CFLAGS,[$3]) -Qunused-arguments" AC_TRY_COMPILE([],[ #ifdef __clang__ #else make an error #endif ],[ifelse([$2],,CLANG_COMPILER,[$2])=yes -cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" ],[]) ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS" AC_MSG_RESULT($ifelse([$2],,CLANG_COMPILER,[$2])) fi + +CLANG_VERSION=none + +if test "x$ifelse([$2],,CLANG_COMPILER,[$2])" = "xyes" ; then + case "$CC" in + c[[1-9]][[0-9]]|*/c[[1-9]][[0-9]]) + AC_MSG_WARN(replacing broken compiler alias $CC) + CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`" + CC=clang + ;; + esac + + AC_MSG_CHECKING(version of $CC) + CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[[^)]]*) //' -e 's/^.*(Debian[[^)]]*) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`" + test -z "$CLANG_VERSION" && CLANG_VERSION=unknown + AC_MSG_RESULT($CLANG_VERSION) + + for cf_clang_opt in \ + -Qunused-arguments \ + -Wno-error=implicit-function-declaration + do + AC_MSG_CHECKING(if option $cf_clang_opt works) + cf_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $cf_clang_opt" + AC_TRY_LINK([ + #include ],[ + printf("hello!\n");],[ + cf_clang_optok=yes],[ + cf_clang_optok=no]) + AC_MSG_RESULT($cf_clang_optok) + CFLAGS="$cf_save_CFLAGS" + if test $cf_clang_optok = yes; then + CF_VERBOSE(adding option $cf_clang_opt) + CF_APPEND_TEXT(CFLAGS,$cf_clang_opt) + fi + done +fi ]) dnl --------------------------------------------------------------------------- dnl CF_COLOR_CURSES version: 8 updated: 2012/11/08 20:57:52 @@ -1897,7 +2051,7 @@ if test $cf_cv_color_curses = yes ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_COMPTYPE version: 2 updated: 1997/08/28 23:57:55 +dnl CF_COMPTYPE version: 3 updated: 2019/12/31 20:39:42 dnl ----------- dnl Check if the compiler uses 'void *' for qsort's compare function parameters dnl (i.e., it's an ANSI prototype). @@ -1917,13 +2071,73 @@ AC_CACHE_VAL(cf_cv_comptype,[ ]) AC_MSG_RESULT($cf_cv_comptype) if test $cf_cv_comptype = yes; then - AC_DEFINE(HAVE_COMPTYPE_VOID) + AC_DEFINE(HAVE_COMPTYPE_VOID,1,[Define this to 1 if qsort uses void*]) else - AC_DEFINE(HAVE_COMPTYPE_CHAR) + AC_DEFINE(HAVE_COMPTYPE_CHAR,1,[Define this to 1 if qsort uses char*]) fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_COREFILE version: 4 updated: 2010/10/23 15:52:32 +dnl CF_CONST_X_STRING version: 4 updated: 2020/03/10 18:53:47 +dnl ----------------- +dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most +dnl character-strings. +dnl +dnl It is ambiguous because the specification accommodated the pre-ANSI +dnl compilers bundled by more than one vendor in lieu of providing a standard C +dnl compiler other than by costly add-ons. Because of this, the specification +dnl did not take into account the use of const for telling the compiler that +dnl string literals would be in readonly memory. +dnl +dnl As a workaround, one could (starting with X11R5) define XTSTRINGDEFINES, to +dnl let the compiler decide how to represent Xt's strings which were #define'd. +dnl That does not solve the problem of using the block of Xt's strings which +dnl are compiled into the library (and is less efficient than one might want). +dnl +dnl Xt specification 7 introduces the _CONST_X_STRING symbol which is used both +dnl when compiling the library and compiling using the library, to tell the +dnl compiler that String is const. +AC_DEFUN([CF_CONST_X_STRING], +[ +AC_REQUIRE([AC_PATH_XTRA]) + +CF_SAVE_XTRA_FLAGS([CF_CONST_X_STRING]) + +AC_TRY_COMPILE( +[ +#include +#include +], +[String foo = malloc(1); (void)foo],[ + +AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[ + AC_TRY_COMPILE( + [ +#define _CONST_X_STRING /* X11R7.8 (perhaps) */ +#undef XTSTRINGDEFINES /* X11R5 and later */ +#include +#include + ],[String foo = malloc(1); *foo = 0],[ + cf_cv_const_x_string=no + ],[ + cf_cv_const_x_string=yes + ]) +]) + +CF_RESTORE_XTRA_FLAGS([CF_CONST_X_STRING]) + +case $cf_cv_const_x_string in +no) + CF_APPEND_TEXT(CPPFLAGS,-DXTSTRINGDEFINES) + ;; +*) + CF_APPEND_TEXT(CPPFLAGS,-D_CONST_X_STRING) + ;; +esac + +]) +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_COREFILE version: 5 updated: 2019/12/31 20:39:42 dnl ----------- dnl Check if the application can dump core (for debugging). AC_DEFUN([CF_COREFILE], @@ -1972,10 +2186,10 @@ int main() [cf_cv_corefile=no], [cf_cv_corefile=unknown])]) AC_MSG_RESULT($cf_cv_corefile) -test $cf_cv_corefile = yes && AC_DEFINE(HAVE_COREFILE) +test $cf_cv_corefile = yes && AC_DEFINE(HAVE_COREFILE,1,[Define this to 1 if the application can dump core]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CPP_CONCATS version: 2 updated: 1997/08/28 23:57:55 +dnl CF_CPP_CONCATS version: 3 updated: 2019/12/31 20:39:42 dnl -------------- dnl Test for ANSI token expansion (used in 'assert'). AC_DEFUN([CF_CPP_CONCATS], @@ -1989,10 +2203,10 @@ AC_CACHE_VAL(cf_cv_cpp_concats,[ [cf_cv_cpp_concats=no]) ]) AC_MSG_RESULT($cf_cv_cpp_concats) -test $cf_cv_cpp_concats = yes && AC_DEFINE(CPP_DOES_CONCAT) +test $cf_cv_cpp_concats = yes && AC_DEFINE(CPP_DOES_CONCAT,1,[Define this to 1 for ansi token concatenation]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CPP_EXPANDS version: 2 updated: 1997/08/28 23:57:55 +dnl CF_CPP_EXPANDS version: 3 updated: 2019/12/31 20:39:42 dnl -------------- dnl Test for ANSI token expansion (used in 'assert'). AC_DEFUN([CF_CPP_EXPANDS], @@ -2006,7 +2220,7 @@ AC_CACHE_VAL(cf_cv_cpp_expands,[ [cf_cv_cpp_expands=no]) ]) AC_MSG_RESULT($cf_cv_cpp_expands) -test $cf_cv_cpp_expands = yes && AC_DEFINE(CPP_DOES_EXPAND) +test $cf_cv_cpp_expands = yes && AC_DEFINE(CPP_DOES_EXPAND,1,[Define this to 1 for ansi token expansion/substitution]) ])dnl dnl --------------------------------------------------------------------------- dnl CF_CURSES_CONFIG version: 2 updated: 2006/10/29 11:06:27 @@ -2296,7 +2510,7 @@ esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_TERM_H version: 11 updated: 2015/04/15 19:08:48 +dnl CF_CURSES_TERM_H version: 12 updated: 2020/03/19 20:23: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, @@ -2325,7 +2539,7 @@ do AC_TRY_COMPILE([ #include <${cf_cv_ncurses_header:-curses.h}> #include <${cf_header}>], - [WINDOW *x], + [WINDOW *x; (void)x], [cf_cv_term_header=$cf_header break], [cf_cv_term_header=no]) @@ -2344,7 +2558,7 @@ no) #else make an error #endif], - [WINDOW *x], + [WINDOW *x; (void)x], [cf_cv_term_header=$cf_header break], [cf_cv_term_header=no]) @@ -2366,7 +2580,7 @@ ncursesw/term.h) esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_DEFAULT_SHELL version: 6 updated: 2005/09/29 07:32:03 +dnl CF_DEFAULT_SHELL version: 7 updated: 2019/12/31 20:39:42 dnl ---------------- dnl Look for a Bourne-shell compatible program from a list that we know about: dnl ash Almquist Shell (sh based) @@ -2447,10 +2661,10 @@ Cannot find the default shell you specif AC_MSG_ERROR(Cannot use /bin/false because it does not exist) fi fi -AC_DEFINE_UNQUOTED(DEFAULT_SHELL,"$DEFAULT_SHELL") +AC_DEFINE_UNQUOTED(DEFAULT_SHELL,"$DEFAULT_SHELL",[Define this to the default shell-program]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_DEFINE_STRING version: 2 updated: 2001/07/22 21:09:16 +dnl CF_DEFINE_STRING version: 3 updated: 2019/12/31 20:39:42 dnl ---------------- dnl Define a string which may contain escaped quotes or backslashes dnl $1 = symbol to define @@ -2458,7 +2672,7 @@ dnl $2 = the information we want to quot AC_DEFUN([CF_DEFINE_STRING], [ cf_define=`echo $2|sed -e 's/\\\\/\\\\134/g' -e 's/^[[ ]]\\+//' -e 's/[[ ]]\\+$//' -e 's/"/\\\\042/g'` -AC_DEFINE_UNQUOTED($1, "$cf_define") +AC_DEFINE_UNQUOTED($1, "$cf_define", [Define a value for $1]) ])dnl dnl --------------------------------------------------------------------------- dnl CF_DIRNAME version: 4 updated: 2002/12/21 19:25:52 @@ -2511,6 +2725,53 @@ AC_DEFUN([CF_ERRNO], CF_CHECK_ERRNO(errno) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_FIND_CANLOCK version: 1 updated: 2020/01/09 20:03:25 +dnl --------------- +dnl Look for CANLOCK, to use instead of a bundled copy of CANLOCK. +dnl +dnl $1 = variable to set with CANLOCK's CPPFLAGS +dnl $2 = variable to set with CANLOCK's LIBS +dnl $3 = action to take on success +dnl $4 = action to take on failure +AC_DEFUN([CF_FIND_CANLOCK],[ +AC_REQUIRE([CF_PKG_CONFIG]) + +cf_save_CFLAGS="$CFLAGS" +cf_save_LIBS="$LIBS" +cf_find_CANLOCK=yes + +CF_TRY_PKG_CONFIG(libcanlock3,,[ + CF_TRY_PKG_CONFIG(libcanlock,,[ + cf_pkgconfig_incs= + cf_pkgconfig_libs= + for cf_canlock_lib in canlock3 canlock + do + AC_CHECK_LIB($cf_canlock_lib,cl_clear_secret,[ + cf_pkgconfig_libs="-l$cf_canlock_lib" + break + ]) + done + if test -z "$cf_pkgconfig_libs" ; then + cf_find_CANLOCK=no + else + AC_CHECK_HEADERS(libcanlock-3/canlock.h canlock.h) + fi + ]) + ]) + +CFLAGS="$cf_save_CFLAGS" +LIBS="$cf_save_LIBS" + +$1="$cf_pkgconfig_incs" +$2="$cf_pkgconfig_libs" + +if test "$cf_find_CANLOCK" = yes; then + $3 +else + $4 +fi +])dnl +dnl --------------------------------------------------------------------------- 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. @@ -2853,6 +3114,52 @@ ifelse([$5],,AC_MSG_WARN(Cannot find $3 fi ])dnl dnl --------------------------------------------------------------------------- +dnl CF_FIND_PCRE version: 1 updated: 2020/01/01 16:29:19 +dnl ------------ +dnl Look for PCRE, to use instead of a bundled copy of PCRE. +dnl +dnl $1 = variable to set with PCRE's CPPFLAGS +dnl $2 = variable to set with PCRE's LIBS +dnl $3 = action to take on success +dnl $4 = action to take on failure +AC_DEFUN([CF_FIND_PCRE],[ +AC_REQUIRE([CF_PKG_CONFIG]) + +cf_save_CFLAGS="$CFLAGS" +cf_save_LIBS="$LIBS" +cf_find_PCRE=yes + +CF_TRY_PKG_CONFIG(libpcre2,,[ + CF_TRY_PKG_CONFIG(libpcre,,[ + AC_CHECK_LIB(pcre,pcre_compile,[ + CF_ADD_LIB(pcre) + AC_CHECK_LIB(pcre2-posix,regcomp,[ + CF_ADD_LIB(pcre2-posix)],[ + AC_CHECK_LIB(pcreposix,regcomp,[ + CF_ADD_LIB(pcreposix) + ],[ + cf_find_PCRE=no + ]) + ]) + ],[ + cf_find_PCRE=no + ]) + ]) + ]) + +CFLAGS="$cf_save_CFLAGS" +LIBS="$cf_save_LIBS" + +$1="$cf_pkgconfig_incs" +$2="$cf_pkgconfig_libs" + +if test "$cf_find_PCRE" = yes; then + $3 +else + $4 +fi +])dnl +dnl --------------------------------------------------------------------------- dnl CF_FIX_SLASHES version: 2 updated: 2001/05/27 21:36:02 dnl -------------- dnl OS/2 and Cygwin ports may pick up backslashes in pathnames, which are not @@ -3033,7 +3340,7 @@ int main(void) { fi ])])dnl dnl --------------------------------------------------------------------------- -dnl CF_FUNC_SYSTEM version: 5 updated: 2010/10/23 15:52:32 +dnl CF_FUNC_SYSTEM version: 6 updated: 2019/12/31 20:39:42 dnl -------------- dnl Check if the 'system()' function returns a usable status, or if not, try dnl to use the status returned by a SIGCHLD. @@ -3081,12 +3388,13 @@ int main() [cf_cv_system_status=unknown]) ]) AC_MSG_RESULT($cf_cv_system_status) -test $cf_cv_system_status = no && AC_DEFINE(USE_SYSTEM_STATUS) +test $cf_cv_system_status = no && AC_DEFINE(USE_SYSTEM_STATUS,1,[Define this to 1 if the system function returns usable exit-status]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GCC_VERSION version: 7 updated: 2012/10/18 06:46:33 +dnl CF_GCC_VERSION version: 8 updated: 2019/09/07 13:38:36 dnl -------------- -dnl Find version of gcc +dnl Find version of gcc, and (because icc/clang pretend to be gcc without being +dnl compatible), attempt to determine if icc/clang is actually used. AC_DEFUN([CF_GCC_VERSION],[ AC_REQUIRE([AC_PROG_CC]) GCC_VERSION=none @@ -3096,14 +3404,17 @@ if test "$GCC" = yes ; then test -z "$GCC_VERSION" && GCC_VERSION=unknown AC_MSG_RESULT($GCC_VERSION) fi +CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS) +CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GCC_WARNINGS version: 33 updated: 2018/06/20 20:23:13 +dnl CF_GCC_WARNINGS version: 38 updated: 2020/08/28 15:08:28 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: dnl dnl -Wconversion (useful in older versions of gcc, but not in gcc 2.7.x) +dnl -Winline (usually not worthwhile) dnl -Wredundant-decls (system headers make this too noisy) dnl -Wtraditional (combines too many unrelated messages, only a few useful) dnl -Wwrite-strings (too noisy, but should review occasionally). This @@ -3120,14 +3431,11 @@ dnl AC_DEFUN([CF_GCC_WARNINGS], [ AC_REQUIRE([CF_GCC_VERSION]) -CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS) -CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS) - +if test "x$have_x" = xyes; then CF_CONST_X_STRING fi cat > conftest.$ac_ext <], + [initscr(); mousemask(0,0); tigetstr((char *)0);], + [AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { char *xx = curses_version(); return (xx == 0); }], + [cf_test_ncuconfig=yes], + [cf_test_ncuconfig=no], + [cf_test_ncuconfig=maybe])], + [cf_test_ncuconfig=no]) + + CFLAGS="$cf_save_CFLAGS" + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" + + if test "x$cf_test_ncuconfig" != xyes; then + cf_temp=`echo "x$cf_pkg_cflags" | sed -e s/^x// -e 's/-W[[^ ]]*//g'` + cf_pkg_cflags="$cf_temp" + cf_temp=`echo "x$cf_pkg_libs" | sed -e s/^x// -e 's/-W[[^ ]]*//g'` + cf_pkg_libs="$cf_temp" + fi + ;; + esac + + CF_ADD_CFLAGS($cf_pkg_cflags) + CF_ADD_LIBS($cf_pkg_libs) AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], - [initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);], + [initscr(); mousemask(0,0); tigetstr((char *)0);], [AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}> int main(void) { char *xx = curses_version(); return (xx == 0); }], @@ -3930,7 +4272,7 @@ if test -n "$cf_ncurses_LIBS" ; then fi done AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], - [initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);], + [initscr(); mousemask(0,0); tigetstr((char *)0);], [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no) LIBS="$cf_ncurses_SAVE"]) @@ -4179,7 +4521,7 @@ ifelse([$1],,,[$1=$PATH_SEPARATOR]) AC_MSG_RESULT($PATH_SEPARATOR) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PATH_EDITOR version: 5 updated: 2000/07/20 00:41:18 +dnl CF_PATH_EDITOR version: 6 updated: 2019/12/31 20:39:42 dnl -------------- dnl Look for the default editor (vi) AC_DEFUN([CF_PATH_EDITOR], @@ -4198,10 +4540,10 @@ if test -z "$DEFAULT_EDITOR" ; then fi fi AC_MSG_RESULT($DEFAULT_EDITOR) -AC_DEFINE_UNQUOTED(DEFAULT_EDITOR,"$DEFAULT_EDITOR") +AC_DEFINE_UNQUOTED(DEFAULT_EDITOR,"$DEFAULT_EDITOR",[Define this to the default editor]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PATH_MAILBOX version: 4 updated: 1998/04/01 11:39:13 +dnl CF_PATH_MAILBOX version: 5 updated: 2019/12/31 20:39:42 dnl --------------- dnl Look for the directory that contains incoming mail. I would check for an dnl actual mail-file, to verify this, but that is not always easy to arrange. @@ -4226,14 +4568,14 @@ for cf_dir in \ done fi if test -n "$DEFAULT_MAILBOX" ; then - AC_DEFINE_UNQUOTED(DEFAULT_MAILBOX,"$DEFAULT_MAILBOX") + AC_DEFINE_UNQUOTED(DEFAULT_MAILBOX,"$DEFAULT_MAILBOX",[Define this to the directory for incoming mailboxes]) else DEFAULT_MAILBOX=none fi AC_MSG_RESULT($DEFAULT_MAILBOX) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PATH_MAILER version: 6 updated: 2001/05/27 21:36:02 +dnl CF_PATH_MAILER version: 7 updated: 2019/12/31 20:39:42 dnl -------------- dnl Look for the program that sends outgoing mail. AC_DEFUN([CF_PATH_MAILER], @@ -4252,7 +4594,7 @@ AC_MSG_CHECKING(for default mailer) if test -n "$DEFAULT_MAILER" ; then CF_FIX_SLASHES(ac_cv_path_DEFAULT_MAILER) CF_FIX_SLASHES(DEFAULT_MAILER) - AC_DEFINE_UNQUOTED(DEFAULT_MAILER,"$DEFAULT_MAILER") + AC_DEFINE_UNQUOTED(DEFAULT_MAILER,"$DEFAULT_MAILER",[Define this to the default mailer-program]) else DEFAULT_MAILER=none fi @@ -4456,7 +4798,7 @@ fi # cf_cv_posix_visible ])dnl dnl --------------------------------------------------------------------------- -dnl CF_POSIX_JC version: 3 updated: 2001/05/27 21:36:02 +dnl CF_POSIX_JC version: 4 updated: 2019/12/31 20:39:42 dnl ----------- dnl Check if we have POSIX-style job control (i.e., sigaction), or if we must dnl use the signal functions. Use AC_CHECK_FUNCS(sigaction) first. @@ -4474,7 +4816,7 @@ AC_TRY_COMPILE([ [cf_cv_sigact_bad=no],[cf_cv_sigact_bad=yes]) ]) -test "$cf_cv_sigact_bad" = yes && AC_DEFINE(SVR4_ACTION) +test "$cf_cv_sigact_bad" = yes && AC_DEFINE(SVR4_ACTION,1,[Define this to 1 if sigaction needs _POSIX_SOURCE]) AC_CACHE_CHECK(if we have sigaction/related functions,cf_cv_sigaction_funcs,[ AC_TRY_LINK([ @@ -4492,7 +4834,7 @@ AC_TRY_LINK([ [cf_cv_sigaction_funcs=yes], [cf_cv_sigaction_funcs=no])]) -test "$cf_cv_sigaction_funcs" = yes && AC_DEFINE(HAVE_POSIX_JC) +test "$cf_cv_sigaction_funcs" = yes && AC_DEFINE(HAVE_POSIX_JC,1,[Define this to 1 if we have POSIX-style job-control functions]) fi ])dnl @@ -4531,11 +4873,15 @@ AC_DEFUN([CF_PROG_AR],[ AC_CHECK_TOOL(AR, ar, ar) ]) dnl --------------------------------------------------------------------------- -dnl CF_PROG_CC version: 4 updated: 2014/07/12 18:57:58 +dnl CF_PROG_CC version: 5 updated: 2019/12/31 08:53:54 dnl ---------- dnl standard check for CC, plus followup sanity checks dnl $1 = optional parameter to pass to AC_PROG_CC to specify compiler name AC_DEFUN([CF_PROG_CC],[ +CF_ACVERSION_CHECK(2.53, + [AC_MSG_WARN(this will incorrectly handle gnatgcc choice) + AC_REQUIRE([AC_PROG_CC])], + []) ifelse($1,,[AC_PROG_CC],[AC_PROG_CC($1)]) CF_GCC_VERSION CF_ACVERSION_CHECK(2.52, @@ -4569,7 +4915,7 @@ AC_SUBST(PROG_EXT) test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT",[Define to the program extension (normally blank)]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PROG_SUM_R version: 2 updated: 1997/08/28 23:57:55 +dnl CF_PROG_SUM_R version: 3 updated: 2019/12/31 20:39:42 dnl ------------- dnl See if sum can take -r AC_DEFUN([CF_PROG_SUM_R], @@ -4586,8 +4932,8 @@ else fi ]) if test $ac_cv_prog_sum_r = yes; then - AC_DEFINE(SUM_TAKES_DASH_R) - AC_DEFINE_UNQUOTED(PATH_SUM_R, "$ac_cv_path_PATH_SUM -r") + AC_DEFINE(SUM_TAKES_DASH_R,1,[Define this if the sum command support -r option]) + AC_DEFINE_UNQUOTED(PATH_SUM_R, "$ac_cv_path_PATH_SUM -r", [Define this to the sum command, with -r option if supported]) else AC_DEFINE_UNQUOTED(PATH_SUM_R, "$ac_cv_path_PATH_SUM") fi @@ -4648,7 +4994,7 @@ YACC="$cf_cv_prog_YACC" AC_SUBST(YACC)dnl ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PW_GECOS version: 2 updated: 2000/04/13 10:13:00 +dnl CF_PW_GECOS version: 3 updated: 2019/12/31 20:39:42 dnl ----------- dnl Check if the passwd-struct defines the '.pw_gecos' member (useful dnl in decoding user names). @@ -4662,7 +5008,7 @@ AC_CACHE_CHECK([for passwd.pw_gecos], cf char bar = foo.pw_gecos], [cf_cv_pw_gecos=yes], [cf_cv_pw_gecos=no])]) -test $cf_cv_pw_gecos = no && AC_DEFINE(DONT_HAVE_PW_GECOS) +test $cf_cv_pw_gecos = no && AC_DEFINE(DONT_HAVE_PW_GECOS,1,[Define this to 1 if passwd struct has .pw_gecos]) ])dnl dnl --------------------------------------------------------------------------- dnl CF_RECHECK_FUNC version: 3 updated: 2000/10/18 19:29:13 @@ -4708,12 +5054,48 @@ $1=`echo "$2" | \ -e 's/-[[UD]]'"$3"'\(=[[^ ]]*\)\?[$]//g'` ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SIGWINCH version: 1 updated: 2006/04/02 16:41:09 +dnl CF_RESTORE_XTRA_FLAGS version: 1 updated: 2020/01/11 16:47:45 +dnl --------------------- +dnl Restore flags saved in CF_SAVE_XTRA_FLAGS +dnl $1 = name of current macro +define([CF_RESTORE_XTRA_FLAGS], +[ +LIBS="$cf_save_LIBS_$1" +CFLAGS="$cf_save_CFLAGS_$1" +CPPFLAGS="$cf_save_CPPFLAGS_$1" +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_SAVE_XTRA_FLAGS version: 1 updated: 2020/01/11 16:46:44 +dnl ------------------ +dnl Use this macro to save CFLAGS/CPPFLAGS/LIBS before checks against X headers +dnl and libraries which do not update those variables. +dnl +dnl $1 = name of current macro +define([CF_SAVE_XTRA_FLAGS], +[ +cf_save_LIBS_$1="$LIBS" +cf_save_CFLAGS_$1="$CFLAGS" +cf_save_CPPFLAGS_$1="$CPPFLAGS" +LIBS="$LIBS ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS}" +for cf_X_CFLAGS in $X_CFLAGS +do + case "x$cf_X_CFLAGS" in + x-[[IUD]]*) + CPPFLAGS="$CPPFLAGS $cf_X_CFLAGS" + ;; + *) + CFLAGS="$CFLAGS $cf_X_CFLAGS" + ;; + esac +done +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_SIGWINCH version: 3 updated: 2020/03/10 18:53:47 dnl ----------- dnl Use this macro after CF_XOPEN_SOURCE, but do not require it (not all dnl programs need this test). dnl -dnl This is really a MacOS X 10.4.3 workaround. Defining _POSIX_C_SOURCE +dnl This is really a Mac OS X 10.4.3 workaround. Defining _POSIX_C_SOURCE dnl forces SIGWINCH to be undefined (breaks xterm, ncurses). Oddly, the struct dnl winsize declaration is left alone - we may revisit this if Apple choose to dnl break that part of the interface as well. @@ -4723,7 +5105,7 @@ AC_CACHE_CHECK(if SIGWINCH is defined,cf AC_TRY_COMPILE([ #include #include -],[int x = SIGWINCH], +],[int x = SIGWINCH; (void)x], [cf_cv_define_sigwinch=yes], [AC_TRY_COMPILE([ #undef _XOPEN_SOURCE @@ -4731,7 +5113,7 @@ AC_CACHE_CHECK(if SIGWINCH is defined,cf #undef _POSIX_C_SOURCE #include #include -],[int x = SIGWINCH], +],[int x = SIGWINCH; (void)x], [cf_cv_define_sigwinch=maybe], [cf_cv_define_sigwinch=no]) ]) @@ -4753,7 +5135,7 @@ do #if SIGWINCH != $cf_sigwinch make an error #endif -int x = SIGWINCH], +int x = SIGWINCH; (void)x], [cf_cv_fixup_sigwinch=$cf_sigwinch break]) @@ -4767,7 +5149,7 @@ done fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SIG_ARGS version: 2 updated: 1997/08/28 23:57:55 +dnl CF_SIG_ARGS version: 3 updated: 2019/12/31 20:39:42 dnl ----------- dnl Check for systems that have signal-handlers prototyped with one argument dnl versus those with more than one argument, define the symbol SIG_ARGS to @@ -4786,10 +5168,10 @@ do done ]) AC_MSG_RESULT($cf_cv_sig_args) -AC_DEFINE_UNQUOTED(SIG_ARGS,$cf_cv_sig_args) +AC_DEFINE_UNQUOTED(SIG_ARGS,$cf_cv_sig_args,[Define this to 1 if signal handlers are prototyped with more than one argument]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SIG_CONST version: 4 updated: 2010/10/23 15:52:32 +dnl CF_SIG_CONST version: 5 updated: 2019/12/31 20:39:42 dnl ------------ dnl Check for systems where the special signal constants aren't prototyped dnl (there's a lot of them, and the compiler can generate a lot of warning @@ -4832,10 +5214,10 @@ int main() fi ]) AC_MSG_RESULT($cf_cv_sig_const) -test "$cf_cv_sig_const" = yes && AC_DEFINE(DECL_SIG_CONST) +test "$cf_cv_sig_const" = yes && AC_DEFINE(DECL_SIG_CONST,1,[Define this to 1 for redefinable signal constants]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SIZECHANGE version: 14 updated: 2018/06/20 20:23:13 +dnl CF_SIZECHANGE version: 16 updated: 2020/03/19 20:46:13 dnl ------------- dnl Check for definitions & structures needed for window size-changing dnl @@ -4878,13 +5260,17 @@ do ],[ #ifdef TIOCGSIZE struct ttysize win; /* SunOS 3.0... */ - int y = win.ts_lines; - int x = win.ts_cols; + int y = win.ts_lines = 2; + int x = win.ts_cols = 1; + (void)y; + (void)x; #else #ifdef TIOCGWINSZ struct winsize win; /* everything else */ - int y = win.ws_row; - int x = win.ws_col; + int y = win.ws_row = 2; + int x = win.ws_col = 1; + (void)y; + (void)x; #else no TIOCGSIZE or TIOCGWINSZ #endif /* TIOCGWINSZ */ @@ -5001,7 +5387,7 @@ AC_DEFUN([CF_STRERROR],[ AC_CHECK_FUNCS(strerror, AC_DEFINE(HAVE_STRERROR),[CF_SYS_ERRLIST]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_STRUCT_TERMIOS version: 9 updated: 2018/06/08 21:57:23 +dnl CF_STRUCT_TERMIOS version: 11 updated: 2020/03/19 20:46:13 dnl ----------------- dnl Some machines require _POSIX_SOURCE to completely define struct termios. AC_DEFUN([CF_STRUCT_TERMIOS],[ @@ -5024,12 +5410,12 @@ if test "$ac_cv_header_termios_h" = yes if test "$termios_bad" = maybe ; then AC_MSG_CHECKING(whether termios.h needs _POSIX_SOURCE) AC_TRY_COMPILE([#include ], - [struct termios foo; int x = foo.c_iflag], + [struct termios foo; int x = foo.c_iflag = 1; (void)x], termios_bad=no, [ AC_TRY_COMPILE([ #define _POSIX_SOURCE #include ], - [struct termios foo; int x = foo.c_iflag], + [struct termios foo; int x = foo.c_iflag = 2; (void)x], termios_bad=unknown, termios_bad=yes AC_DEFINE(_POSIX_SOURCE,1,[Define to 1 if we must define _POSIX_SOURCE])) ]) @@ -5073,7 +5459,7 @@ AC_DEFUN([CF_SYS_ERRLIST], CF_CHECK_ERRNO(sys_errlist) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SYS_SELECT_TIMEVAL version: 4 updated: 1997/12/16 11:22:31 +dnl CF_SYS_SELECT_TIMEVAL version: 5 updated: 2019/12/31 20:39:42 dnl --------------------- dnl Check if there is a conflict between and . dnl This is known to be a problem with SCO. @@ -5111,7 +5497,7 @@ AC_TRY_COMPILE([ done ]) AC_MSG_RESULT($cf_cv_sys_select_timeval) -test $cf_cv_sys_select_timeval = yes && AC_DEFINE(NEED_TIMEVAL_FIX) +test $cf_cv_sys_select_timeval = yes && AC_DEFINE(NEED_TIMEVAL_FIX,1,[Define this to 1 if sys/time.h conflicts with sys/select.h]) ]) dnl --------------------------------------------------------------------------- dnl CF_TERMCAP_LIBS version: 15 updated: 2015/04/15 19:08:48 @@ -5173,7 +5559,7 @@ if test "$cf_cv_termlib" = none; then fi ])])dnl dnl --------------------------------------------------------------------------- -dnl CF_TERMIOS version: 2 updated: 1997/08/28 23:57:55 +dnl CF_TERMIOS version: 3 updated: 2019/12/31 20:39:42 dnl ---------- dnl See if we can link with the termios functions tcsetattr/tcgetattr AC_DEFUN([CF_TERMIOS], @@ -5201,13 +5587,13 @@ AC_CACHE_VAL(cf_cv_use_termios_h,[ ]) AC_MSG_RESULT($cf_cv_use_termios_h) if test $cf_cv_use_termios_h = yes; then - AC_DEFINE(HAVE_TERMIOS_H) - AC_DEFINE(HAVE_TCGETATTR) - AC_DEFINE(HAVE_TCSETATTR) + AC_DEFINE(HAVE_TERMIOS_H,1,[Define this to 1 if we have header termios.h]) + AC_DEFINE(HAVE_TCGETATTR,1,[Define this to 1 if we have function tcgetattr]) + AC_DEFINE(HAVE_TCSETATTR,1,[Define this to 1 if we have function tcsetattr]) fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_TERM_HEADER version: 4 updated: 2015/04/15 19:08:48 +dnl CF_TERM_HEADER version: 5 updated: 2020/03/19 20:23: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, @@ -5228,7 +5614,7 @@ do AC_TRY_COMPILE([#include #include <${cf_cv_ncurses_header:-curses.h}> #include <$cf_test> -],[int x = auto_left_margin],[ +],[int x = auto_left_margin; (void)x],[ cf_cv_term_header="$cf_test"],[ cf_cv_term_header=unknown ]) @@ -5254,7 +5640,7 @@ ncursesw/term.h) esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_TIOCGWINSZ version: 5 updated: 2010/10/23 15:52:32 +dnl CF_TIOCGWINSZ version: 6 updated: 2019/12/31 20:39:42 dnl ------------- dnl On some systems ioctl(fd, TIOCGWINSZ, &size) will always return {0,0} until dnl ioctl(fd, TIOCSWINSZ, &size) is called to explicitly set the size of the @@ -5299,7 +5685,7 @@ int main() rm -f autoconf.h CFLAGS="$cf_save_CFLAGS"]) AC_MSG_RESULT($cf_cv_use_tiocgwinsz) -test $cf_cv_use_tiocgwinsz != yes && AC_DEFINE(DONT_HAVE_SIGWINCH) +test $cf_cv_use_tiocgwinsz != yes && AC_DEFINE(DONT_HAVE_SIGWINCH,1,[Define this to 1 for working TIOCGWINSZ]) ])dnl dnl --------------------------------------------------------------------------- dnl CF_TM_GMTOFF version: 3 updated: 2012/11/08 20:57:52 @@ -5412,6 +5798,41 @@ if test "$cf_cv_xopen_source" != no ; th fi ]) dnl --------------------------------------------------------------------------- +dnl CF_TYPE_FD_SET version: 6 updated: 2020/03/10 18:53:47 +dnl -------------- +dnl Check for the declaration of fd_set. Some platforms declare it in +dnl , and some in , which requires . +dnl Finally, if we are using this for an X application, Xpoll.h may include +dnl , so we don't want to do it twice. +AC_DEFUN([CF_TYPE_FD_SET], +[ +AC_CHECK_HEADERS(X11/Xpoll.h) + +AC_CACHE_CHECK(for declaration of fd_set,cf_cv_type_fd_set, + [CF_MSG_LOG(sys/types alone) +AC_TRY_COMPILE([ +#include ], + [fd_set x; (void)x], + [cf_cv_type_fd_set=sys/types.h], + [CF_MSG_LOG(X11/Xpoll.h) +AC_TRY_COMPILE([ +#ifdef HAVE_X11_XPOLL_H +#include +#endif], + [fd_set x; (void)x], + [cf_cv_type_fd_set=X11/Xpoll.h], + [CF_MSG_LOG(sys/select.h) +AC_TRY_COMPILE([ +#include +#include ], + [fd_set x; (void)x], + [cf_cv_type_fd_set=sys/select.h], + [cf_cv_type_fd_set=unknown])])])]) +if test $cf_cv_type_fd_set = sys/select.h ; then + AC_DEFINE(USE_SYS_SELECT_H,1,[Define to 1 to include sys/select.h to declare fd_set]) +fi +]) +dnl --------------------------------------------------------------------------- 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(). @@ -5505,7 +5926,7 @@ AC_MSG_RESULT($cf_cv_type_sigaction) test "$cf_cv_type_sigaction" = yes && AC_DEFINE(HAVE_TYPE_SIGACTION,1,[Define to 1 if we have the sigaction_t type]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_UNION_WAIT version: 6 updated: 2012/10/06 08:57:51 +dnl CF_UNION_WAIT version: 7 updated: 2020/03/19 20:23:48 dnl ------------- dnl Check to see if the BSD-style union wait is declared. Some platforms may dnl use this, though it is deprecated in favor of the 'int' type in Posix. @@ -5529,6 +5950,9 @@ AC_CACHE_VAL(cf_cv_type_unionwait,[ int y = WEXITSTATUS(x); int z = WTERMSIG(x); wait(&x); + (void)x; + (void)y; + (void)z; ], [cf_cv_type_unionwait=no echo compiles ok w/o union wait 1>&AC_FD_CC @@ -5542,6 +5966,13 @@ AC_CACHE_VAL(cf_cv_type_unionwait,[ int z = WTERMSIG(x); #endif wait(&x); + (void)x; +#ifdef WEXITSTATUS + (void)y; +#endif +#ifdef WTERMSIG + (void)z; +#endif ], [cf_cv_type_unionwait=yes echo compiles ok with union wait and possibly macros too 1>&AC_FD_CC @@ -5560,7 +5991,7 @@ AC_DEFUN([CF_UPPER], $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` ])dnl dnl --------------------------------------------------------------------------- -dnl CF_VA_COPY version: 5 updated: 2018/12/03 20:07:13 +dnl CF_VA_COPY version: 6 updated: 2018/12/04 18:14:25 dnl ---------- dnl check for va_copy, part of stdarg.h starting with ISO C 1999. dnl Also, workaround for glibc's __va_copy, by checking for both. @@ -5723,7 +6154,7 @@ if test "$with_dbmalloc" = yes ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_DFTENV version: 5 updated: 2019/01/26 18:33:16 +dnl CF_WITH_DFTENV version: 6 updated: 2019/12/31 20:39:42 dnl -------------- dnl Wrapper for AC_ARG_WITH to inherit/override an environment variable's dnl "#define" in the compile. @@ -5740,7 +6171,7 @@ yes|no) ;; esac $3="$withval" -AC_DEFINE_UNQUOTED($3,"[$]$3")dnl +AC_DEFINE_UNQUOTED($3,"[$]$3",[Define $2])dnl ])dnl dnl --------------------------------------------------------------------------- dnl CF_WITH_DMALLOC version: 7 updated: 2010/06/21 17:26:47 @@ -5779,7 +6210,7 @@ eval $3="$withval" AC_SUBST($3)dnl ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_PROGRAM version: 6 updated: 2008/03/23 14:48:54 +dnl CF_WITH_PROGRAM version: 7 updated: 2019/12/31 20:39:42 dnl --------------- dnl Wrapper for AC_PATH_PROG, with command-line option. dnl Params: @@ -5802,8 +6233,8 @@ AC_ARG_WITH($1,[$2],ifelse($3,, # user supplied option-value for "--with-$1=path" AC_MSG_CHECKING(for $1) ac_cv_path_]cf_path_name[="$withval" - AC_DEFINE_UNQUOTED(cf_path_name,"$withval")dnl - AC_DEFINE(cf_have_name)dnl + AC_DEFINE_UNQUOTED(cf_path_name,"$withval",[Define this to the pathname for $1])dnl + AC_DEFINE(cf_have_name,1,[Define this to 1 if the $1 program exists])dnl AC_MSG_RESULT($withval) ;; esac],[$3]),[ @@ -5816,7 +6247,7 @@ AC_ARG_WITH($1,[$2],ifelse($3,, ])dnl undefine([cf_path_name])undefine([cf_have_name])])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_VALUE version: 3 updated: 1998/04/01 11:39:13 +dnl CF_WITH_VALUE version: 4 updated: 2019/12/31 20:39:42 dnl ------------- dnl Wrapper for AC_ARG_WITH to ensure that if the user supplies a value, it is dnl not simply defaulting to yes/no. Empty strings are ok if the macro is @@ -5827,10 +6258,10 @@ dnl $3 = variable to inherit/override dnl $4 = default value, if any. AC_DEFUN([CF_WITH_VALUE], [CF_ARG_WITH($1,[$2],[$3],[$4]) - AC_DEFINE_UNQUOTED($3,"$withval")dnl + AC_DEFINE_UNQUOTED($3,"$withval",[Define a value for $1])dnl ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_CURSES version: 14 updated: 2018/06/20 20:23:13 +dnl CF_XOPEN_CURSES version: 15 updated: 2020/03/19 20:23:48 dnl --------------- dnl Test if we should define X/Open source for curses, needed on Digital Unix dnl 4.x, to see the extended functions, but breaks on IRIX 6.x. @@ -5856,7 +6287,14 @@ AC_TRY_LINK([ #endif long x = winnstr(stdscr, "", 0); int x1, y1; - getbegyx(stdscr, y1, x1)], +#ifdef NCURSES_VERSION + (void)check2; +#endif + getbegyx(stdscr, y1, x1); + (void)x; + (void)y1; + (void)x1; + ], [cf_cv_need_xopen_extension=none], [ for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR @@ -5871,7 +6309,14 @@ AC_TRY_LINK([ #endif long x = winnstr(stdscr, "", 0); int x1, y1; - getbegyx(stdscr, y1, x1)], + getbegyx(stdscr, y1, x1); +#ifdef NCURSES_VERSION + (void)check2; +#endif + (void)x; + (void)y1; + (void)x1; + ], [cf_cv_need_xopen_extension=$cf_try_xopen_extension; break]) done ]) @@ -6016,7 +6461,7 @@ fi fi # cf_cv_posix_visible ]) dnl --------------------------------------------------------------------------- -dnl CF_X_ATHENA version: 23 updated: 2015/04/12 15:39:00 +dnl CF_X_ATHENA version: 24 updated: 2020/03/10 18:53:47 dnl ----------- dnl Check for Xaw (Athena) libraries dnl @@ -6092,7 +6537,8 @@ AC_CACHE_CHECK(for usable $cf_x_athena/X AC_TRY_LINK([ #include ],[ -int check = XmuCompareISOLatin1("big", "small") +int check = XmuCompareISOLatin1("big", "small"); +(void)check; ],[cf_cv_xaw_compat=yes],[cf_cv_xaw_compat=no])]) if test "$cf_cv_xaw_compat" = no @@ -6128,12 +6574,13 @@ if test -z "$cf_x_athena_lib" ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_X_ATHENA_CPPFLAGS version: 6 updated: 2018/06/20 20:23:13 +dnl CF_X_ATHENA_CPPFLAGS version: 8 updated: 2020/01/16 05:21:56 dnl -------------------- dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw. AC_DEFUN([CF_X_ATHENA_CPPFLAGS], [ +AC_REQUIRE([AC_PATH_XTRA]) cf_x_athena_root=ifelse([$1],,Xaw,[$1]) cf_x_athena_inc="" @@ -6144,10 +6591,9 @@ for cf_path in default \ /usr/local do if test -z "$cf_x_athena_inc" ; then - cf_save="$CPPFLAGS" + CF_SAVE_XTRA_FLAGS([CF_X_ATHENA_CPPFLAGS]) cf_test=X11/$cf_x_athena_root/SimpleMenu.h if test $cf_path != default ; then - CPPFLAGS="$cf_save" CF_APPEND_TEXT(CPPFLAGS,-I$cf_path/include) AC_MSG_CHECKING(for $cf_test in $cf_path) else @@ -6159,24 +6605,23 @@ do [cf_result=yes], [cf_result=no]) AC_MSG_RESULT($cf_result) + CF_RESTORE_XTRA_FLAGS([CF_X_ATHENA_CPPFLAGS]) if test "$cf_result" = yes ; then - cf_x_athena_inc=$cf_path + test "$cf_path" = default && cf_x_athena_inc=default + test "$cf_path" != default && cf_x_athena_inc=$cf_path/include break - else - CPPFLAGS="$cf_save" fi fi done if test -z "$cf_x_athena_inc" ; then - AC_MSG_WARN( -[Unable to successfully find Athena header files with test program]) + AC_MSG_WARN([Unable to find Athena header files]) elif test "$cf_x_athena_inc" != default ; then CF_APPEND_TEXT(CPPFLAGS,-I$cf_x_athena_inc) fi ]) dnl --------------------------------------------------------------------------- -dnl CF_X_ATHENA_LIBS version: 12 updated: 2011/07/17 19:55:02 +dnl CF_X_ATHENA_LIBS version: 13 updated: 2020/01/11 18:16:10 dnl ---------------- dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw. @@ -6201,29 +6646,26 @@ do "-l$cf_lib -lXpm -lXmu" \ "-l${cf_lib}_s -lXmu_s" do - if test -z "$cf_x_athena_lib" ; then - cf_save="$LIBS" - cf_test=XawSimpleMenuAddGlobalActions - if test $cf_path != default ; then - CF_ADD_LIBS(-L$cf_path/lib $cf_libs) - AC_MSG_CHECKING(for $cf_libs in $cf_path) - else - CF_ADD_LIBS($cf_libs) - AC_MSG_CHECKING(for $cf_test in $cf_libs) - fi - AC_TRY_LINK([ + test -n "$cf_x_athena_lib" && break + + CF_SAVE_XTRA_FLAGS([CF_X_ATHENA_LIBS]) + cf_test=XawSimpleMenuAddGlobalActions + test "$cf_path" != default && cf_libs="-L$cf_path/lib $cf_libs" + CF_ADD_LIBS($cf_libs) + AC_MSG_CHECKING(for $cf_test in $cf_libs) + AC_TRY_LINK([ #include #include ],[ $cf_test((XtAppContext) 0)], - [cf_result=yes], - [cf_result=no]) - AC_MSG_RESULT($cf_result) - if test "$cf_result" = yes ; then - cf_x_athena_lib="$cf_libs" - break - fi - LIBS="$cf_save" + [cf_result=yes], + [cf_result=no]) + AC_MSG_RESULT($cf_result) + CF_RESTORE_XTRA_FLAGS([CF_X_ATHENA_LIBS]) + + if test "$cf_result" = yes ; then + cf_x_athena_lib="$cf_libs" + break fi done # cf_libs test -n "$cf_x_athena_lib" && break @@ -6235,6 +6677,7 @@ if test -z "$cf_x_athena_lib" ; then [Unable to successfully link Athena library (-l$cf_x_athena_root) with test program]) fi +CF_ADD_LIBS($cf_x_athena_lib) CF_UPPER(cf_x_athena_LIBS,HAVE_LIB_$cf_x_athena) AC_DEFINE_UNQUOTED($cf_x_athena_LIBS) ]) @@ -6247,7 +6690,7 @@ CF_TRY_PKG_CONFIG(Xext,,[ [CF_ADD_LIB(Xext)])]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_X_TOOLKIT version: 23 updated: 2015/04/12 15:39:00 +dnl CF_X_TOOLKIT version: 25 updated: 2020/03/10 17:26:15 dnl ------------ dnl Check for X Toolkit libraries AC_DEFUN([CF_X_TOOLKIT], @@ -6255,7 +6698,7 @@ 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 +# OSX is schizoid about who owns /usr/X11 (old) versus /opt/X11 (new) (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 @@ -6267,6 +6710,8 @@ then 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)]) +else + LIBS="$X_PRE_LIBS $LIBS $X_EXTRA_LIBS" fi cf_have_X_LIBS=no @@ -6299,7 +6744,7 @@ AC_TRY_LINK([ AC_CACHE_CHECK(for usable X Toolkit package,cf_cv_xt_ice_compat,[ AC_TRY_LINK([ #include -],[int num = IceConnectionNumber(0) +],[int num = IceConnectionNumber(0); (void) num ],[cf_cv_xt_ice_compat=yes],[cf_cv_xt_ice_compat=no])]) if test "$cf_cv_xt_ice_compat" = no @@ -6329,15 +6774,13 @@ AC_TRY_LINK([ AC_CHECK_FUNC(XOpenDisplay,,[ AC_CHECK_LIB(X11,XOpenDisplay, - [CF_ADD_LIB(X11)],, - [$X_PRE_LIBS $LIBS $X_EXTRA_LIBS])]) + [CF_ADD_LIB(X11)])]) AC_CHECK_FUNC(XtAppInitialize,,[ AC_CHECK_LIB(Xt, XtAppInitialize, [AC_DEFINE(HAVE_LIBXT,1,[Define to 1 if we can compile with the Xt library]) cf_have_X_LIBS=Xt - LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS"],, - [$X_PRE_LIBS $LIBS $X_EXTRA_LIBS])]) + LIBS="-lXt $LIBS"])]) ]) if test $cf_have_X_LIBS = no ; then @@ -6414,68 +6857,3 @@ AC_CACHE_CHECK(whether we are using the AC_SUBST(GLIBC21) GLIBC21="$ac_cv_gnu_library_2_1" ]) - -dnl CF_CHECK_FD_SET version: 5 updated: 2012/10/06 11:17:15 -dnl --------------- -dnl Check if the fd_set type and corresponding macros are defined. -AC_DEFUN([CF_CHECK_FD_SET], -[ -AC_REQUIRE([CF_TYPE_FD_SET]) -AC_CACHE_CHECK([for fd_set macros],cf_cv_macros_fd_set,[ -AC_TRY_COMPILE([ -#include -#if USE_SYS_SELECT_H -# include -#else -# ifdef HAVE_SYS_TIME_H -# include -# ifdef TIME_WITH_SYS_TIME -# include -# endif -# else -# include -# endif -#endif -],[ - fd_set read_bits; - FD_ZERO(&read_bits); - FD_SET(0, &read_bits);], - [cf_cv_macros_fd_set=yes], - [cf_cv_macros_fd_set=no])]) -test $cf_cv_macros_fd_set = yes && AC_DEFINE(HAVE_TYPE_FD_SET,1,[Define to 1 if type fd_set is declared]) -])dnl - -dnl CF_TYPE_FD_SET version: 5 updated: 2012/10/04 20:12:20 -dnl -------------- -dnl Check for the declaration of fd_set. Some platforms declare it in -dnl , and some in , which requires . -dnl Finally, if we are using this for an X application, Xpoll.h may include -dnl , so we don't want to do it twice. -AC_DEFUN([CF_TYPE_FD_SET], -[ -AC_CHECK_HEADERS(X11/Xpoll.h) - -AC_CACHE_CHECK(for declaration of fd_set,cf_cv_type_fd_set, - [CF_MSG_LOG(sys/types alone) -AC_TRY_COMPILE([ -#include ], - [fd_set x], - [cf_cv_type_fd_set=sys/types.h], - [CF_MSG_LOG(X11/Xpoll.h) -AC_TRY_COMPILE([ -#ifdef HAVE_X11_XPOLL_H -#include -#endif], - [fd_set x], - [cf_cv_type_fd_set=X11/Xpoll.h], - [CF_MSG_LOG(sys/select.h) -AC_TRY_COMPILE([ -#include -#include ], - [fd_set x], - [cf_cv_type_fd_set=sys/select.h], - [cf_cv_type_fd_set=unknown])])])]) -if test $cf_cv_type_fd_set = sys/select.h ; then - AC_DEFINE(USE_SYS_SELECT_H,1,[Define to 1 to include sys/select.h to declare fd_set]) -fi -]) diff -Nurp '--exclude=.bzr*' tin-2.4.4/config.guess tin-2.4.5/config.guess --- tin-2.4.4/config.guess 2019-12-21 11:08:49.000000000 +0100 +++ tin-2.4.5/config.guess 2020-12-23 11:06:36.309889087 +0100 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2019 Free Software Foundation, Inc. +# Copyright 1992-2020 Free Software Foundation, Inc. -timestamp='2019-12-21' +timestamp='2020-10-22' # 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 @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2019 Free Software Foundation, Inc. +Copyright 1992-2020 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -140,7 +140,7 @@ case "$UNAME_SYSTEM" in Linux|GNU|GNU/*) # If the system lacks a compiler, then just pick glibc. # We could probably try harder. - LIBC=gnu + LIBC=unknown set_cc_for_build cat <<-EOF > "$dummy.c" @@ -149,17 +149,29 @@ Linux|GNU|GNU/*) LIBC=uclibc #elif defined(__dietlibc__) LIBC=dietlibc - #else + #elif defined(__GLIBC__) LIBC=gnu + #else + #include + /* First heuristic to detect musl libc. */ + #ifdef __DEFINED_va_list + LIBC=musl + #endif #endif EOF eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" - # If ldd exists, use it to detect musl libc. - if command -v ldd >/dev/null && \ - ldd --version 2>&1 | grep -q ^musl - then - LIBC=musl + # Second heuristic to detect musl libc. + if [ "$LIBC" = unknown ] && + command -v ldd >/dev/null && + ldd --version 2>&1 | grep -q ^musl; then + LIBC=musl + fi + + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + if [ "$LIBC" = unknown ]; then + LIBC=gnu fi ;; esac @@ -184,6 +196,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAM "/usr/sbin/$sysctl" 2>/dev/null || \ echo unknown)` case "$UNAME_MACHINE_ARCH" in + aarch64eb) machine=aarch64_be-unknown ;; armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; @@ -404,7 +417,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAM # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if test "$CC_FOR_BUILD" != no_compiler_found; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null @@ -544,10 +557,10 @@ EOF AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] + if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110 then - if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ - [ "$TARGET_BINARY_INTERFACE"x = x ] + if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \ + test "$TARGET_BINARY_INTERFACE"x = x then echo m88k-dg-dgux"$UNAME_RELEASE" else @@ -580,7 +593,7 @@ EOF echo i386-ibm-aix exit ;; ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then + if test -x /usr/bin/oslevel ; then IBM_REV=`/usr/bin/oslevel` else IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" @@ -620,7 +633,7 @@ EOF else IBM_ARCH=powerpc fi - if [ -x /usr/bin/lslpp ] ; then + if test -x /usr/bin/lslpp ; then IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else @@ -655,7 +668,7 @@ EOF 9000/31?) HP_ARCH=m68000 ;; 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then + if test -x /usr/bin/getconf; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "$sc_cpu_version" in @@ -669,7 +682,7 @@ EOF esac ;; esac fi - if [ "$HP_ARCH" = "" ]; then + if test "$HP_ARCH" = ""; then set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" @@ -708,7 +721,7 @@ EOF test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ "$HP_ARCH" = hppa2.0w ] + if test "$HP_ARCH" = hppa2.0w then set_cc_for_build @@ -782,7 +795,7 @@ EOF echo hppa1.0-hp-osf exit ;; i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then + if test -x /usr/sbin/sysversion ; then echo "$UNAME_MACHINE"-unknown-osf1mk else echo "$UNAME_MACHINE"-unknown-osf1 @@ -985,6 +998,9 @@ EOF k1om:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; + loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; m32r*:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; @@ -1095,7 +1111,17 @@ EOF echo "$UNAME_MACHINE"-dec-linux-"$LIBC" exit ;; x86_64:Linux:*:*) - echo "$UNAME_MACHINE"-pc-linux-"$LIBC" + set_cc_for_build + LIBCABI=$LIBC + if test "$CC_FOR_BUILD" != no_compiler_found; then + if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_X32 >/dev/null + then + LIBCABI="$LIBC"x32 + fi + fi + echo "$UNAME_MACHINE"-pc-linux-"$LIBCABI" exit ;; xtensa*:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" @@ -1284,7 +1310,7 @@ EOF echo mips-sony-newsos6 exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then + if test -d /usr/nec; then echo mips-nec-sysv"$UNAME_RELEASE" else echo mips-unknown-sysv"$UNAME_RELEASE" @@ -1332,6 +1358,9 @@ EOF *:Rhapsody:*:*) echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" exit ;; + arm64:Darwin:*:*) + echo aarch64-apple-darwin"$UNAME_RELEASE" + exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` case $UNAME_PROCESSOR in @@ -1346,7 +1375,7 @@ EOF else set_cc_for_build fi - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if test "$CC_FOR_BUILD" != no_compiler_found; then if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null @@ -1629,6 +1658,12 @@ copies of config.guess and config.sub wi https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess and https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub +EOF + +year=`echo $timestamp | sed 's,-.*,,'` +# shellcheck disable=SC2003 +if test "`expr "\`date +%Y\`" - "$year"`" -lt 3 ; then + cat >&2 <&2 - exit 1 + # No normalization, but not necessarily accepted, that comes below. ;; esac + else # Here we handle the default operating systems that come with various machines. @@ -1528,6 +1499,7 @@ else # will signal an error saying that MANUFACTURER isn't an operating # system, and we'll never get to this point. +kernel= case $cpu-$vendor in score-*) os=elf @@ -1539,7 +1511,8 @@ case $cpu-$vendor in os=riscix1.2 ;; arm*-rebel) - os=linux + kernel=linux + os=gnu ;; arm*-semi) os=aout @@ -1705,84 +1678,173 @@ case $cpu-$vendor in os=none ;; esac + fi +# Now, validate our (potentially fixed-up) OS. +case $os in + # Sometimes we do "kernel-abi", so those need to count as OSes. + musl* | newlib* | uclibc*) + ;; + # Likewise for "kernel-libc" + eabi | eabihf | gnueabi | gnueabihf) + ;; + # Now accept the basic system types. + # The portable systems comes first. + # Each alternative MUST end in a * to match a version number. + gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ + | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \ + | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ + | sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \ + | hiux* | abug | nacl* | netware* | windows* \ + | os9* | macos* | osx* | ios* \ + | mpw* | magic* | mmixware* | mon960* | lnews* \ + | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ + | aos* | aros* | cloudabi* | sortix* | twizzler* \ + | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ + | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ + | mirbsd* | netbsd* | dicos* | openedition* | ose* \ + | bitrig* | openbsd* | solidbsd* | libertybsd* | os108* \ + | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \ + | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ + | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ + | udi* | lites* | ieee* | go32* | aux* | hcos* \ + | chorusrdb* | cegcc* | glidix* \ + | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ + | midipix* | mingw32* | mingw64* | mint* \ + | uxpv* | beos* | mpeix* | udk* | moxiebox* \ + | interix* | uwin* | mks* | rhapsody* | darwin* \ + | openstep* | oskit* | conix* | pw32* | nonstopux* \ + | storm-chaos* | tops10* | tenex* | tops20* | its* \ + | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \ + | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \ + | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ + | skyos* | haiku* | rdos* | toppers* | drops* | es* \ + | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ + | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ + | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx*) + ;; + # This one is extra strict with allowed versions + sco3.2v2 | sco3.2v[4-9]* | sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + ;; + none) + ;; + *) + echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 + exit 1 + ;; +esac + +# As a final step for OS-related things, validate the OS-kernel combination +# (given a valid OS), if there is a kernel. +case $kernel-$os in + linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* | linux-musl* | linux-uclibc* ) + ;; + uclinux-uclibc* ) + ;; + -dietlibc* | -newlib* | -musl* | -uclibc* ) + # These are just libc implementations, not actual OSes, and thus + # require a kernel. + echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 + exit 1 + ;; + kfreebsd*-gnu* | kopensolaris*-gnu*) + ;; + nto-qnx*) + ;; + os2-emx) + ;; + *-eabi* | *-gnueabi*) + ;; + -*) + # Blank kernel with real OS is always fine. + ;; + *-*) + echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2 + exit 1 + ;; +esac + # Here we handle the case where we know the os, and the CPU type, but not the # manufacturer. We pick the logical manufacturer. case $vendor in unknown) - case $os in - riscix*) + case $cpu-$os in + *-riscix*) vendor=acorn ;; - sunos*) + *-sunos*) vendor=sun ;; - cnk*|-aix*) + *-cnk* | *-aix*) vendor=ibm ;; - beos*) + *-beos*) vendor=be ;; - hpux*) + *-hpux*) vendor=hp ;; - mpeix*) + *-mpeix*) vendor=hp ;; - hiux*) + *-hiux*) vendor=hitachi ;; - unos*) + *-unos*) vendor=crds ;; - dgux*) + *-dgux*) vendor=dg ;; - luna*) + *-luna*) vendor=omron ;; - genix*) + *-genix*) vendor=ns ;; - clix*) + *-clix*) vendor=intergraph ;; - mvs* | opened*) + *-mvs* | *-opened*) + vendor=ibm + ;; + *-os400*) vendor=ibm ;; - os400*) + s390-* | s390x-*) vendor=ibm ;; - ptx*) + *-ptx*) vendor=sequent ;; - tpf*) + *-tpf*) vendor=ibm ;; - vxsim* | vxworks* | windiss*) + *-vxsim* | *-vxworks* | *-windiss*) vendor=wrs ;; - aux*) + *-aux*) vendor=apple ;; - hms*) + *-hms*) vendor=hitachi ;; - mpw* | macos*) + *-mpw* | *-macos*) vendor=apple ;; - *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) + *-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*) vendor=atari ;; - vos*) + *-vos*) vendor=stratus ;; esac ;; esac -echo "$cpu-$vendor-$os" +echo "$cpu-$vendor-${kernel:+$kernel-}$os" exit # Local variables: diff -Nurp '--exclude=.bzr*' tin-2.4.4/configure tin-2.4.5/configure --- tin-2.4.4/configure 2019-12-24 11:00:18.000000000 +0100 +++ tin-2.4.5/configure 2020-12-24 12:47:24.179946647 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52.20181006. +# Generated by Autoconf 2.52.20200802. # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -716,6 +716,7 @@ Optional Features: --with-editor=PROG specify editor (default: vi) --with-mailer=PROG specify default mailer-program (default: mailx) --with-mailbox=DIR directory for incoming mailboxes (default: empty) + --with-pkg-config{=path} enable/disable use of pkg-config --disable-pgp-gpg disable PGP/GPG Support --with-pgp (default: from system path) --with-pgpk (default: from system path) @@ -728,6 +729,7 @@ Optional Features: --disable-echo do not display "compiling" commands --enable-prototypes check for optional prototypes --enable-warnings turn on GCC compiler warnings + --with-x use the X Window System --with-libdir=PATH news-library (default: /usr/lib/news) --with-spooldir=PATH news spool-directory (default: /var/spool/news) --with-nov-dir=PATH news overview-directory (default: $SPOOLDIR) @@ -745,7 +747,6 @@ Optional Features: --with-curses-dir=DIR directory in which (n)curses is installed --with-ncurses link with ncurses if available (deprecated) --enable-curses use curses interface (deprecated) - --with-pkg-config{=path} enable/disable use of pkg-config --with-pcre=PATH use installed pcre versus bundled --with-dbmalloc test: use Conor Cahill's dbmalloc library --with-dmalloc test: use Gray Watson's dmalloc library @@ -757,6 +758,7 @@ Optional Features: --enable-mh-mail-handling use MH style mail handling for mailgroups --enable-cancel-locks enable creation of Cancel-Locks + --with-cancel-locks=PATH use installed canlock versus bundled --disable-gsasl don't use GNU SASL --disable-8bit-keys disable 8-bit keycode support --disable-color disable ANSI-color support @@ -799,7 +801,6 @@ Optional Features: --with-Xaw3dxft link with Xaw 3d xft library --with-neXtaw link with neXT Athena library --with-XawPlus link with Athena-Plus library - --with-x use the X Window System Some influential environment variables: CC C compiler command @@ -869,7 +870,7 @@ This file contains any messages produced running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.52.20181006. Invocation command line was +generated by GNU Autoconf 2.52.20200802. Invocation command line was $ $0 $@ @@ -993,7 +994,7 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:996: loading site script $ac_site_file" >&5 + { echo "$as_me:997: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} cat "$ac_site_file" >&5 . "$ac_site_file" @@ -1004,7 +1005,7 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:1007: loading cache $cache_file" >&5 + { echo "$as_me:1008: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -1012,7 +1013,7 @@ echo "$as_me: loading cache $cache_file" esac fi else - { echo "$as_me:1015: creating cache $cache_file" >&5 + { echo "$as_me:1016: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1028,21 +1029,21 @@ for ac_var in `(set) 2>&1 | eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:1031: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:1032: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:1035: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:1036: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:1041: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:1042: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:1043: former value: $ac_old_val" >&5 + { echo "$as_me:1044: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:1045: current value: $ac_new_val" >&5 + { echo "$as_me:1046: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; @@ -1061,9 +1062,9 @@ echo "$as_me: current value: $ac_new_v fi done if $ac_cache_corrupted; then - { echo "$as_me:1064: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:1065: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:1066: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:1067: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -1084,10 +1085,10 @@ esac echo "#! $SHELL" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh -if { (echo "$as_me:1087: PATH=\".;.\"; conftest.sh") >&5 +if { (echo "$as_me:1088: PATH=\".;.\"; conftest.sh") >&5 (PATH=".;."; conftest.sh) 2>&5 ac_status=$? - echo "$as_me:1090: \$? = $ac_status" >&5 + echo "$as_me:1091: \$? = $ac_status" >&5 (exit $ac_status); }; then ac_path_separator=';' else @@ -1099,7 +1100,8 @@ rm -f conftest.sh ac_config_headers="$ac_config_headers include/autoconf.h:include/autoconf.hin" PACKAGE=tin -VERSION=2.4.4 +VERSION=2.4.5 + cat >>confdefs.h <&5 + { { echo "$as_me:1132: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} { (exit 1); exit 1; }; } fi @@ -1137,11 +1139,11 @@ ac_configure="$SHELL $ac_aux_dir/configu # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:1140: error: cannot run $ac_config_sub" >&5 + { { echo "$as_me:1142: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:1144: checking build system type" >&5 +echo "$as_me:1146: checking build system type" >&5 echo $ECHO_N "checking build system type... $ECHO_C" >&6 if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1150,16 +1152,16 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:1153: error: cannot guess build type; you must specify one" >&5 + { { echo "$as_me:1155: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:1157: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + { { echo "$as_me:1159: error: $ac_config_sub $ac_cv_build_alias failed." >&5 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1162: result: $ac_cv_build" >&5 +echo "$as_me:1164: result: $ac_cv_build" >&5 echo "${ECHO_T}$ac_cv_build" >&6 build=$ac_cv_build build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` @@ -1167,7 +1169,7 @@ build_vendor=`echo $ac_cv_build | sed 's build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then - echo "$as_me:1170: checking host system type" >&5 + echo "$as_me:1172: checking host system type" >&5 echo $ECHO_N "checking host system type... $ECHO_C" >&6 if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1176,12 +1178,12 @@ else test -z "$ac_cv_host_alias" && ac_cv_host_alias=$ac_cv_build_alias ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:1179: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { echo "$as_me:1181: error: $ac_config_sub $ac_cv_host_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1184: result: $ac_cv_host" >&5 +echo "$as_me:1186: result: $ac_cv_host" >&5 echo "${ECHO_T}$ac_cv_host" >&6 host=$ac_cv_host host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` @@ -1207,25 +1209,25 @@ else fi test -z "$system_name" && system_name="$cf_cv_system_name" -test -n "$cf_cv_system_name" && echo "$as_me:1210: result: Configuring for $cf_cv_system_name" >&5 +test -n "$cf_cv_system_name" && echo "$as_me:1212: result: Configuring for $cf_cv_system_name" >&5 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6 if test ".$system_name" != ".$cf_cv_system_name" ; then - echo "$as_me:1214: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "$as_me:1216: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6 - { { echo "$as_me:1216: error: \"Please remove config.cache and try again.\"" >&5 + { { echo "$as_me:1218: error: \"Please remove config.cache and try again.\"" >&5 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;} { (exit 1); exit 1; }; } fi - echo "$as_me:1221: checking for PATH separator" >&5 + echo "$as_me:1223: checking for PATH separator" >&5 echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6 case $cf_cv_system_name in os2*) PATH_SEPARATOR=';' ;; *) ${PATH_SEPARATOR:=':'} ;; esac - echo "$as_me:1228: result: $PATH_SEPARATOR" >&5 + echo "$as_me:1230: result: $PATH_SEPARATOR" >&5 echo "${ECHO_T}$PATH_SEPARATOR" >&6 # Check whether --with-install-prefix or --without-install-prefix was given. @@ -1261,7 +1263,7 @@ case ".$withval" in withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:1264: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:1266: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -1297,7 +1299,7 @@ case "$host_os" in if test "$CC" = ""; then # Extract the first word of "xlc", so it can be a program name with args. set dummy xlc; ac_word=$2 -echo "$as_me:1300: checking for $ac_word" >&5 +echo "$as_me:1302: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_XLC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1314,7 +1316,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_XLC="$ac_dir/$ac_word" - echo "$as_me:1317: found $ac_dir/$ac_word" >&5 + echo "$as_me:1319: found $ac_dir/$ac_word" >&5 break fi done @@ -1325,10 +1327,10 @@ fi XLC=$ac_cv_path_XLC if test -n "$XLC"; then - echo "$as_me:1328: result: $XLC" >&5 + echo "$as_me:1330: result: $XLC" >&5 echo "${ECHO_T}$XLC" >&6 else - echo "$as_me:1331: result: no" >&5 + echo "$as_me:1333: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1357,7 +1359,7 @@ ac_main_return=return if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1360: checking for $ac_word" >&5 +echo "$as_me:1362: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1372,7 +1374,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:1375: found $ac_dir/$ac_word" >&5 +echo "$as_me:1377: found $ac_dir/$ac_word" >&5 break done @@ -1380,10 +1382,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1383: result: $CC" >&5 + echo "$as_me:1385: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1386: result: no" >&5 + echo "$as_me:1388: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1392,7 +1394,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1395: checking for $ac_word" >&5 +echo "$as_me:1397: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1407,7 +1409,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1410: found $ac_dir/$ac_word" >&5 +echo "$as_me:1412: found $ac_dir/$ac_word" >&5 break done @@ -1415,10 +1417,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1418: result: $ac_ct_CC" >&5 + echo "$as_me:1420: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1421: result: no" >&5 + echo "$as_me:1423: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1431,7 +1433,7 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1434: checking for $ac_word" >&5 +echo "$as_me:1436: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1446,7 +1448,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:1449: found $ac_dir/$ac_word" >&5 +echo "$as_me:1451: found $ac_dir/$ac_word" >&5 break done @@ -1454,10 +1456,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1457: result: $CC" >&5 + echo "$as_me:1459: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1460: result: no" >&5 + echo "$as_me:1462: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1466,7 +1468,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1469: checking for $ac_word" >&5 +echo "$as_me:1471: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1481,7 +1483,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1484: found $ac_dir/$ac_word" >&5 +echo "$as_me:1486: found $ac_dir/$ac_word" >&5 break done @@ -1489,10 +1491,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1492: result: $ac_ct_CC" >&5 + echo "$as_me:1494: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1495: result: no" >&5 + echo "$as_me:1497: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1505,7 +1507,7 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1508: checking for $ac_word" >&5 +echo "$as_me:1510: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1525,7 +1527,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/c continue fi ac_cv_prog_CC="cc" -echo "$as_me:1528: found $ac_dir/$ac_word" >&5 +echo "$as_me:1530: found $ac_dir/$ac_word" >&5 break done @@ -1547,10 +1549,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1550: result: $CC" >&5 + echo "$as_me:1552: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1553: result: no" >&5 + echo "$as_me:1555: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1561,7 +1563,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1564: checking for $ac_word" >&5 +echo "$as_me:1566: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1576,7 +1578,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1579: found $ac_dir/$ac_word" >&5 +echo "$as_me:1581: found $ac_dir/$ac_word" >&5 break done @@ -1584,10 +1586,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1587: result: $CC" >&5 + echo "$as_me:1589: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1590: result: no" >&5 + echo "$as_me:1592: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1600,7 +1602,7 @@ if test -z "$CC"; then 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 "$as_me:1603: checking for $ac_word" >&5 +echo "$as_me:1605: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1615,7 +1617,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1618: found $ac_dir/$ac_word" >&5 +echo "$as_me:1620: found $ac_dir/$ac_word" >&5 break done @@ -1623,10 +1625,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1626: result: $ac_ct_CC" >&5 + echo "$as_me:1628: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1629: result: no" >&5 + echo "$as_me:1631: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1638,32 +1640,32 @@ fi fi -test -z "$CC" && { { echo "$as_me:1641: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:1643: error: no acceptable cc found in \$PATH" >&5 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:1646:" \ +echo "$as_me:1648:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1649: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:1651: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1652: \$? = $ac_status" >&5 + echo "$as_me:1654: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1654: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:1656: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1657: \$? = $ac_status" >&5 + echo "$as_me:1659: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1659: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:1661: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1662: \$? = $ac_status" >&5 + echo "$as_me:1664: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line 1666 "configure" +#line 1668 "configure" #include "confdefs.h" int @@ -1679,13 +1681,13 @@ ac_clean_files="$ac_clean_files a.out a. # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:1682: checking for C compiler default output" >&5 +echo "$as_me:1684: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:1685: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:1687: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1688: \$? = $ac_status" >&5 + echo "$as_me:1690: \$? = $ac_status" >&5 (exit $ac_status); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last @@ -1708,34 +1710,34 @@ done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1711: error: C compiler cannot create executables" >&5 +{ { echo "$as_me:1713: error: C compiler cannot create executables" >&5 echo "$as_me: error: C compiler cannot create executables" >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:1717: result: $ac_file" >&5 +echo "$as_me:1719: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1722: checking whether the C compiler works" >&5 +echo "$as_me:1724: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:1728: \"$ac_try\"") >&5 + { (eval echo "$as_me:1730: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1731: \$? = $ac_status" >&5 + echo "$as_me:1733: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1738: error: cannot run C compiled programs. + { { echo "$as_me:1740: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&5 echo "$as_me: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&2;} @@ -1743,24 +1745,24 @@ If you meant to cross compile, use \`--h fi fi fi -echo "$as_me:1746: result: yes" >&5 +echo "$as_me:1748: result: yes" >&5 echo "${ECHO_T}yes" >&6 rm -f a.out a.exe conftest$ac_cv_exeext ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1753: checking whether we are cross compiling" >&5 +echo "$as_me:1755: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1755: result: $cross_compiling" >&5 +echo "$as_me:1757: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1758: checking for executable suffix" >&5 +echo "$as_me:1760: checking for executable suffix" >&5 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1760: \"$ac_link\"") >&5 +if { (eval echo "$as_me:1762: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1763: \$? = $ac_status" >&5 + echo "$as_me:1765: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will @@ -1776,25 +1778,25 @@ for ac_file in `(ls conftest.exe; ls con esac done else - { { echo "$as_me:1779: error: cannot compute EXEEXT: cannot compile and link" >&5 + { { echo "$as_me:1781: error: cannot compute EXEEXT: cannot compile and link" >&5 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest$ac_cv_exeext -echo "$as_me:1785: result: $ac_cv_exeext" >&5 +echo "$as_me:1787: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1791: checking for object suffix" >&5 +echo "$as_me:1793: checking for object suffix" >&5 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1797 "configure" +#line 1799 "configure" #include "confdefs.h" int @@ -1806,10 +1808,10 @@ main (void) } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1809: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1811: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1812: \$? = $ac_status" >&5 + echo "$as_me:1814: \$? = $ac_status" >&5 (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in @@ -1821,24 +1823,24 @@ done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1824: error: cannot compute OBJEXT: cannot compile" >&5 +{ { echo "$as_me:1826: error: cannot compute OBJEXT: cannot compile" >&5 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:1831: result: $ac_cv_objext" >&5 +echo "$as_me:1833: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1835: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:1837: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1841 "configure" +#line 1843 "configure" #include "confdefs.h" int @@ -1853,16 +1855,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1856: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1858: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1859: \$? = $ac_status" >&5 + echo "$as_me:1861: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1862: \"$ac_try\"") >&5 + { (eval echo "$as_me:1864: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1865: \$? = $ac_status" >&5 + echo "$as_me:1867: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else @@ -1874,19 +1876,19 @@ rm -f conftest.$ac_objext conftest.$ac_e ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1877: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:1879: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" -echo "$as_me:1883: checking whether $CC accepts -g" >&5 +echo "$as_me:1885: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1889 "configure" +#line 1891 "configure" #include "confdefs.h" int @@ -1898,16 +1900,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1901: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1903: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1904: \$? = $ac_status" >&5 + echo "$as_me:1906: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1907: \"$ac_try\"") >&5 + { (eval echo "$as_me:1909: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1910: \$? = $ac_status" >&5 + echo "$as_me:1912: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else @@ -1917,7 +1919,7 @@ ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:1920: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:1922: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -1944,16 +1946,16 @@ cat >conftest.$ac_ext <<_ACEOF #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1947: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1949: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1950: \$? = $ac_status" >&5 + echo "$as_me:1952: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1953: \"$ac_try\"") >&5 + { (eval echo "$as_me:1955: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1956: \$? = $ac_status" >&5 + echo "$as_me:1958: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ @@ -1965,7 +1967,7 @@ if { (eval echo "$as_me:1947: \"$ac_comp 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 1968 "configure" +#line 1970 "configure" #include "confdefs.h" #include $ac_declaration @@ -1978,16 +1980,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1981: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1983: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1984: \$? = $ac_status" >&5 + echo "$as_me:1986: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1987: \"$ac_try\"") >&5 + { (eval echo "$as_me:1989: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1990: \$? = $ac_status" >&5 + echo "$as_me:1992: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -1997,7 +1999,7 @@ continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 2000 "configure" +#line 2002 "configure" #include "confdefs.h" $ac_declaration int @@ -2009,16 +2011,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2012: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2014: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2015: \$? = $ac_status" >&5 + echo "$as_me:2017: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2018: \"$ac_try\"") >&5 + { (eval echo "$as_me:2020: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2021: \$? = $ac_status" >&5 + echo "$as_me:2023: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -2048,15 +2050,192 @@ ac_main_return=return GCC_VERSION=none if test "$GCC" = yes ; then - echo "$as_me:2051: checking version of $CC" >&5 + echo "$as_me:2053: checking version of $CC" >&5 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 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 "$as_me:2055: result: $GCC_VERSION" >&5 + echo "$as_me:2057: result: $GCC_VERSION" >&5 echo "${ECHO_T}$GCC_VERSION" >&6 fi -echo "$as_me:2059: checking for $CC option to accept ANSI C" >&5 +INTEL_COMPILER=no + +if test "$GCC" = yes ; then + case $host_os in + linux*|gnu*) + echo "$as_me:2066: checking if this is really Intel C compiler" >&5 +echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -no-gcc" + cat >conftest.$ac_ext <<_ACEOF +#line 2071 "configure" +#include "confdefs.h" + +int +main (void) +{ + +#ifdef __INTEL_COMPILER +#else +make an error +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:2088: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:2091: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:2094: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2097: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + INTEL_COMPILER=yes +cf_save_CFLAGS="$cf_save_CFLAGS -we147" + +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext conftest.$ac_ext + CFLAGS="$cf_save_CFLAGS" + echo "$as_me:2108: result: $INTEL_COMPILER" >&5 +echo "${ECHO_T}$INTEL_COMPILER" >&6 + ;; + esac +fi + +CLANG_COMPILER=no + +if test "$GCC" = yes ; then + echo "$as_me:2117: checking if this is really Clang C compiler" >&5 +echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" + cat >conftest.$ac_ext <<_ACEOF +#line 2121 "configure" +#include "confdefs.h" + +int +main (void) +{ + +#ifdef __clang__ +#else +make an error +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:2138: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:2141: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:2144: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2147: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + CLANG_COMPILER=yes + +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext conftest.$ac_ext + CFLAGS="$cf_save_CFLAGS" + echo "$as_me:2157: result: $CLANG_COMPILER" >&5 +echo "${ECHO_T}$CLANG_COMPILER" >&6 +fi + +CLANG_VERSION=none + +if test "x$CLANG_COMPILER" = "xyes" ; then + case "$CC" in + c[1-9][0-9]|*/c[1-9][0-9]) + { echo "$as_me:2166: WARNING: replacing broken compiler alias $CC" >&5 +echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;} + CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`" + CC=clang + ;; + esac + + echo "$as_me:2173: checking version of $CC" >&5 +echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 + CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" + test -z "$CLANG_VERSION" && CLANG_VERSION=unknown + echo "$as_me:2177: result: $CLANG_VERSION" >&5 +echo "${ECHO_T}$CLANG_VERSION" >&6 + + for cf_clang_opt in \ + -Qunused-arguments \ + -Wno-error=implicit-function-declaration + do + echo "$as_me:2184: checking if option $cf_clang_opt works" >&5 +echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $cf_clang_opt" + cat >conftest.$ac_ext <<_ACEOF +#line 2189 "configure" +#include "confdefs.h" + + #include +int +main (void) +{ + + printf("hello!\n"); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:2203: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:2206: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:2209: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2212: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_clang_optok=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + + cf_clang_optok=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + echo "$as_me:2223: result: $cf_clang_optok" >&5 +echo "${ECHO_T}$cf_clang_optok" >&6 + CFLAGS="$cf_save_CFLAGS" + if test $cf_clang_optok = yes; then + test -n "$verbose" && echo " adding option $cf_clang_opt" 1>&6 + +echo "${as_me:-configure}:2229: testing adding option $cf_clang_opt ..." 1>&5 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_clang_opt" + + fi + done +fi + +echo "$as_me:2238: checking for $CC option to accept ANSI C" >&5 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 if test "${ac_cv_prog_cc_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2064,7 +2243,7 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line 2067 "configure" +#line 2246 "configure" #include "confdefs.h" #include #include @@ -2113,16 +2292,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -A do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:2116: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2295: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2119: \$? = $ac_status" >&5 + echo "$as_me:2298: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2122: \"$ac_try\"") >&5 + { (eval echo "$as_me:2301: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2125: \$? = $ac_status" >&5 + echo "$as_me:2304: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -2139,10 +2318,10 @@ fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:2142: result: none needed" >&5 + echo "$as_me:2321: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:2145: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:2324: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac @@ -2150,13 +2329,13 @@ esac # This should have been defined by AC_PROG_CC : ${CC:=cc} -echo "$as_me:2153: checking \$CFLAGS variable" >&5 +echo "$as_me:2332: checking \$CFLAGS variable" >&5 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6 case "x$CFLAGS" in *-[IUD]*) - echo "$as_me:2157: result: broken" >&5 + echo "$as_me:2336: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:2159: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 + { echo "$as_me:2338: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;} cf_flags="$CFLAGS" CFLAGS= @@ -2264,18 +2443,18 @@ fi done ;; *) - echo "$as_me:2267: result: ok" >&5 + echo "$as_me:2446: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac -echo "$as_me:2272: checking \$CC variable" >&5 +echo "$as_me:2451: checking \$CC variable" >&5 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 case "$CC" in *[\ \ ]-*) - echo "$as_me:2276: result: broken" >&5 + echo "$as_me:2455: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:2278: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 + { echo "$as_me:2457: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} # humor him... cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'` @@ -2392,19 +2571,19 @@ fi done test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 -echo "${as_me:-configure}:2395: testing resulting CC: '$CC' ..." 1>&5 +echo "${as_me:-configure}:2574: testing resulting CC: '$CC' ..." 1>&5 test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 -echo "${as_me:-configure}:2399: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 +echo "${as_me:-configure}:2578: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 -echo "${as_me:-configure}:2403: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 +echo "${as_me:-configure}:2582: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 ;; *) - echo "$as_me:2407: result: ok" >&5 + echo "$as_me:2586: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac @@ -2415,7 +2594,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return=return -echo "$as_me:2418: checking how to run the C preprocessor" >&5 +echo "$as_me:2597: checking how to run the C preprocessor" >&5 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then @@ -2436,18 +2615,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line 2439 "configure" +#line 2618 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2444: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2623: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2450: \$? = $ac_status" >&5 + echo "$as_me:2629: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2470,17 +2649,17 @@ rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 2473 "configure" +#line 2652 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2477: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2656: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2483: \$? = $ac_status" >&5 + echo "$as_me:2662: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2517,7 +2696,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:2520: result: $CPP" >&5 +echo "$as_me:2699: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -2527,18 +2706,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line 2530 "configure" +#line 2709 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2535: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2714: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2541: \$? = $ac_status" >&5 + echo "$as_me:2720: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2561,17 +2740,17 @@ rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 2564 "configure" +#line 2743 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2568: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2747: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2574: \$? = $ac_status" >&5 + echo "$as_me:2753: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2599,7 +2778,7 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:2602: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:2781: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -2612,14 +2791,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return=return if test $ac_cv_c_compiler_gnu = yes; then - echo "$as_me:2615: checking whether $CC needs -traditional" >&5 + echo "$as_me:2794: checking whether $CC needs -traditional" >&5 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 if test "${ac_cv_prog_gcc_traditional+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_pattern="Autoconf.*'x'" cat >conftest.$ac_ext <<_ACEOF -#line 2622 "configure" +#line 2801 "configure" #include "confdefs.h" #include int Autoconf = TIOCGETP; @@ -2634,7 +2813,7 @@ rm -rf conftest* if test $ac_cv_prog_gcc_traditional = no; then cat >conftest.$ac_ext <<_ACEOF -#line 2637 "configure" +#line 2816 "configure" #include "confdefs.h" #include int Autoconf = TCGETA; @@ -2647,14 +2826,14 @@ rm -rf conftest* fi fi -echo "$as_me:2650: result: $ac_cv_prog_gcc_traditional" >&5 +echo "$as_me:2829: result: $ac_cv_prog_gcc_traditional" >&5 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 if test $ac_cv_prog_gcc_traditional = yes; then CC="$CC -traditional" fi fi -echo "$as_me:2657: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "$as_me:2836: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then @@ -2674,11 +2853,11 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:2677: result: yes" >&5 + echo "$as_me:2856: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:2681: result: no" >&5 + echo "$as_me:2860: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -2695,7 +2874,7 @@ fi # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:2698: checking for a BSD compatible install" >&5 +echo "$as_me:2877: checking for a BSD compatible install" >&5 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then @@ -2744,7 +2923,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:2747: result: $INSTALL" >&5 +echo "$as_me:2926: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2777,22 +2956,22 @@ EOF for cf_prog in 'bison -y' byacc yacc do rm -f y.tab.ch - echo "$as_me:2780: checking for $cf_prog" >&5 + echo "$as_me:2959: checking for $cf_prog" >&5 echo $ECHO_N "checking for $cf_prog... $ECHO_C" >&6 cf_command="$cf_prog conftest.y" cf_result=no - if { (eval echo "$as_me:2784: \"$cf_command\"") >&5 + if { (eval echo "$as_me:2963: \"$cf_command\"") >&5 (eval $cf_command) 2>&5 ac_status=$? - echo "$as_me:2787: \$? = $ac_status" >&5 + echo "$as_me:2966: \$? = $ac_status" >&5 (exit $ac_status); } && 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 "$as_me:2792: \"$ac_link\"") >&5 + if { (eval echo "$as_me:2971: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2795: \$? = $ac_status" >&5 + echo "$as_me:2974: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest ; then cf_result=yes fi @@ -2800,7 +2979,7 @@ echo $ECHO_N "checking for $cf_prog... $ cf_result=yes fi fi - echo "$as_me:2803: result: $cf_result" >&5 + echo "$as_me:2982: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then cf_cv_prog_YACC="$cf_prog" @@ -2817,7 +2996,7 @@ for ac_prog in lint alint lclint tdlint 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 "$as_me:2820: checking for $ac_word" >&5 +echo "$as_me:2999: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LINT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2832,7 +3011,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_LINT="$ac_prog" -echo "$as_me:2835: found $ac_dir/$ac_word" >&5 +echo "$as_me:3014: found $ac_dir/$ac_word" >&5 break done @@ -2840,10 +3019,10 @@ fi fi LINT=$ac_cv_prog_LINT if test -n "$LINT"; then - echo "$as_me:2843: result: $LINT" >&5 + echo "$as_me:3022: result: $LINT" >&5 echo "${ECHO_T}$LINT" >&6 else - echo "$as_me:2846: result: no" >&5 + echo "$as_me:3025: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2851,14 +3030,14 @@ fi done test -n "$LINT" || LINT=":" -echo "$as_me:2854: checking if the POSIX test-macros are already defined" >&5 +echo "$as_me:3033: checking if the POSIX test-macros are already defined" >&5 echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6 if test "${cf_cv_posix_visible+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2861 "configure" +#line 3040 "configure" #include "confdefs.h" #include int @@ -2877,16 +3056,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2880: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3059: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2883: \$? = $ac_status" >&5 + echo "$as_me:3062: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2886: \"$ac_try\"") >&5 + { (eval echo "$as_me:3065: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2889: \$? = $ac_status" >&5 + echo "$as_me:3068: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_visible=no else @@ -2897,7 +3076,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2900: result: $cf_cv_posix_visible" >&5 +echo "$as_me:3079: result: $cf_cv_posix_visible" >&5 echo "${ECHO_T}$cf_cv_posix_visible" >&6 if test "$cf_cv_posix_visible" = no; then @@ -2942,14 +3121,14 @@ linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cy cf_gnu_xopen_source=$cf_XOPEN_SOURCE -echo "$as_me:2945: checking if this is the GNU C library" >&5 +echo "$as_me:3124: checking if this is the GNU C library" >&5 echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6 if test "${cf_cv_gnu_library+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2952 "configure" +#line 3131 "configure" #include "confdefs.h" #include int @@ -2968,16 +3147,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2971: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3150: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2974: \$? = $ac_status" >&5 + echo "$as_me:3153: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2977: \"$ac_try\"") >&5 + { (eval echo "$as_me:3156: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2980: \$? = $ac_status" >&5 + echo "$as_me:3159: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_library=yes else @@ -2988,7 +3167,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2991: result: $cf_cv_gnu_library" >&5 +echo "$as_me:3170: result: $cf_cv_gnu_library" >&5 echo "${ECHO_T}$cf_cv_gnu_library" >&6 if test x$cf_cv_gnu_library = xyes; then @@ -2996,7 +3175,7 @@ if test x$cf_cv_gnu_library = xyes; then # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE # was changed to help a little. newlib incorporated the change about 4 # years later. - echo "$as_me:2999: checking if _DEFAULT_SOURCE can be used as a basis" >&5 + echo "$as_me:3178: checking if _DEFAULT_SOURCE can be used as a basis" >&5 echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6 if test "${cf_cv_gnu_library_219+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3008,7 +3187,7 @@ else CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 3011 "configure" +#line 3190 "configure" #include "confdefs.h" #include int @@ -3027,16 +3206,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3030: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3209: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3033: \$? = $ac_status" >&5 + echo "$as_me:3212: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3036: \"$ac_try\"") >&5 + { (eval echo "$as_me:3215: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3039: \$? = $ac_status" >&5 + echo "$as_me:3218: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_library_219=yes else @@ -3048,12 +3227,12 @@ rm -f conftest.$ac_objext conftest.$ac_e CPPFLAGS="$cf_save" fi -echo "$as_me:3051: result: $cf_cv_gnu_library_219" >&5 +echo "$as_me:3230: result: $cf_cv_gnu_library_219" >&5 echo "${ECHO_T}$cf_cv_gnu_library_219" >&6 if test "x$cf_cv_gnu_library_219" = xyes; then cf_save="$CPPFLAGS" - echo "$as_me:3056: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 + echo "$as_me:3235: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6 if test "${cf_cv_gnu_dftsrc_219+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3158,7 +3337,7 @@ if test -n "$cf_new_extra_cppflags" ; th fi cat >conftest.$ac_ext <<_ACEOF -#line 3161 "configure" +#line 3340 "configure" #include "confdefs.h" #include @@ -3178,16 +3357,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3181: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3360: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3184: \$? = $ac_status" >&5 + echo "$as_me:3363: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3187: \"$ac_try\"") >&5 + { (eval echo "$as_me:3366: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3190: \$? = $ac_status" >&5 + echo "$as_me:3369: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_dftsrc_219=yes else @@ -3198,7 +3377,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3201: result: $cf_cv_gnu_dftsrc_219" >&5 +echo "$as_me:3380: result: $cf_cv_gnu_dftsrc_219" >&5 echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save" else @@ -3207,14 +3386,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >& if test "x$cf_cv_gnu_dftsrc_219" != xyes; then - echo "$as_me:3210: checking if we must define _GNU_SOURCE" >&5 + echo "$as_me:3389: checking if we must define _GNU_SOURCE" >&5 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 if test "${cf_cv_gnu_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3217 "configure" +#line 3396 "configure" #include "confdefs.h" #include int @@ -3229,16 +3408,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3232: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3411: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3235: \$? = $ac_status" >&5 + echo "$as_me:3414: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3238: \"$ac_try\"") >&5 + { (eval echo "$as_me:3417: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3241: \$? = $ac_status" >&5 + echo "$as_me:3420: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -3345,7 +3524,7 @@ if test -n "$cf_new_extra_cppflags" ; th fi cat >conftest.$ac_ext <<_ACEOF -#line 3348 "configure" +#line 3527 "configure" #include "confdefs.h" #include int @@ -3360,16 +3539,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3363: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3542: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3366: \$? = $ac_status" >&5 + echo "$as_me:3545: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3369: \"$ac_try\"") >&5 + { (eval echo "$as_me:3548: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3372: \$? = $ac_status" >&5 + echo "$as_me:3551: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -3384,12 +3563,12 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3387: result: $cf_cv_gnu_source" >&5 +echo "$as_me:3566: result: $cf_cv_gnu_source" >&5 echo "${ECHO_T}$cf_cv_gnu_source" >&6 if test "$cf_cv_gnu_source" = yes then - echo "$as_me:3392: checking if we should also define _DEFAULT_SOURCE" >&5 + echo "$as_me:3571: checking if we should also define _DEFAULT_SOURCE" >&5 echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6 if test "${cf_cv_default_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3399,7 +3578,7 @@ else CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 3402 "configure" +#line 3581 "configure" #include "confdefs.h" #include int @@ -3414,16 +3593,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3417: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3596: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3420: \$? = $ac_status" >&5 + echo "$as_me:3599: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3423: \"$ac_try\"") >&5 + { (eval echo "$as_me:3602: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3426: \$? = $ac_status" >&5 + echo "$as_me:3605: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_default_source=no else @@ -3434,7 +3613,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3437: result: $cf_cv_default_source" >&5 +echo "$as_me:3616: result: $cf_cv_default_source" >&5 echo "${ECHO_T}$cf_cv_default_source" >&6 if test "$cf_cv_default_source" = yes then @@ -3471,16 +3650,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAG sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -echo "$as_me:3474: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:3653: checking if we should define _POSIX_C_SOURCE" >&5 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 if test "${cf_cv_posix_c_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "${as_me:-configure}:3480: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:3659: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 3483 "configure" +#line 3662 "configure" #include "confdefs.h" #include int @@ -3495,16 +3674,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3498: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3677: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3501: \$? = $ac_status" >&5 + echo "$as_me:3680: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3504: \"$ac_try\"") >&5 + { (eval echo "$as_me:3683: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3507: \$? = $ac_status" >&5 + echo "$as_me:3686: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -3525,7 +3704,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 3528 "configure" +#line 3707 "configure" #include "confdefs.h" #include int @@ -3540,16 +3719,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3543: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3722: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3546: \$? = $ac_status" >&5 + echo "$as_me:3725: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3549: \"$ac_try\"") >&5 + { (eval echo "$as_me:3728: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3552: \$? = $ac_status" >&5 + echo "$as_me:3731: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3560,7 +3739,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me:-configure}:3563: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:3742: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -3568,10 +3747,10 @@ echo "${as_me:-configure}:3563: testing test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:3571: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:3750: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 3574 "configure" +#line 3753 "configure" #include "confdefs.h" #include int @@ -3586,16 +3765,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3589: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3768: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3592: \$? = $ac_status" >&5 + echo "$as_me:3771: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3595: \"$ac_try\"") >&5 + { (eval echo "$as_me:3774: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3598: \$? = $ac_status" >&5 + echo "$as_me:3777: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3611,7 +3790,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3614: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:3793: result: $cf_cv_posix_c_source" >&5 echo "${ECHO_T}$cf_cv_posix_c_source" >&6 if test "$cf_cv_posix_c_source" != no ; then @@ -3751,14 +3930,14 @@ sysv4.2uw2.*) # Novell/SCO UnixWare 2.x ;; *) -echo "$as_me:3754: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:3933: checking if we should define _XOPEN_SOURCE" >&5 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 if test "${cf_cv_xopen_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3761 "configure" +#line 3940 "configure" #include "confdefs.h" #include @@ -3777,16 +3956,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3780: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3959: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3783: \$? = $ac_status" >&5 + echo "$as_me:3962: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3786: \"$ac_try\"") >&5 + { (eval echo "$as_me:3965: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3789: \$? = $ac_status" >&5 + echo "$as_me:3968: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -3798,7 +3977,7 @@ cf_save="$CPPFLAGS" CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 3801 "configure" +#line 3980 "configure" #include "confdefs.h" #include @@ -3817,16 +3996,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3820: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3999: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3823: \$? = $ac_status" >&5 + echo "$as_me:4002: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3826: \"$ac_try\"") >&5 + { (eval echo "$as_me:4005: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3829: \$? = $ac_status" >&5 + echo "$as_me:4008: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -3841,7 +4020,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3844: result: $cf_cv_xopen_source" >&5 +echo "$as_me:4023: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -3971,16 +4150,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAG sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -echo "$as_me:3974: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:4153: checking if we should define _POSIX_C_SOURCE" >&5 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 if test "${cf_cv_posix_c_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "${as_me:-configure}:3980: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:4159: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 3983 "configure" +#line 4162 "configure" #include "confdefs.h" #include int @@ -3995,16 +4174,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3998: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4177: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4001: \$? = $ac_status" >&5 + echo "$as_me:4180: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4004: \"$ac_try\"") >&5 + { (eval echo "$as_me:4183: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4007: \$? = $ac_status" >&5 + echo "$as_me:4186: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -4025,7 +4204,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 4028 "configure" +#line 4207 "configure" #include "confdefs.h" #include int @@ -4040,16 +4219,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4043: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4222: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4046: \$? = $ac_status" >&5 + echo "$as_me:4225: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4049: \"$ac_try\"") >&5 + { (eval echo "$as_me:4228: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4052: \$? = $ac_status" >&5 + echo "$as_me:4231: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -4060,7 +4239,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me:-configure}:4063: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:4242: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -4068,10 +4247,10 @@ echo "${as_me:-configure}:4063: testing test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:4071: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:4250: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 4074 "configure" +#line 4253 "configure" #include "confdefs.h" #include int @@ -4086,16 +4265,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4089: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4268: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4092: \$? = $ac_status" >&5 + echo "$as_me:4271: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4095: \"$ac_try\"") >&5 + { (eval echo "$as_me:4274: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4098: \$? = $ac_status" >&5 + echo "$as_me:4277: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -4111,7 +4290,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4114: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:4293: result: $cf_cv_posix_c_source" >&5 echo "${ECHO_T}$cf_cv_posix_c_source" >&6 if test "$cf_cv_posix_c_source" != no ; then @@ -4305,7 +4484,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}:4308: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:4487: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -4315,7 +4494,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}:4318: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:4497: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -4325,7 +4504,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}:4328: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:4507: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" @@ -4335,10 +4514,10 @@ fi fi if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then - echo "$as_me:4338: checking if _XOPEN_SOURCE really is set" >&5 + echo "$as_me:4517: checking if _XOPEN_SOURCE really is set" >&5 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 4341 "configure" +#line 4520 "configure" #include "confdefs.h" #include int @@ -4353,16 +4532,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4356: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4535: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4359: \$? = $ac_status" >&5 + echo "$as_me:4538: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4362: \"$ac_try\"") >&5 + { (eval echo "$as_me:4541: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4365: \$? = $ac_status" >&5 + echo "$as_me:4544: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_XOPEN_SOURCE_set=yes else @@ -4371,12 +4550,12 @@ cat conftest.$ac_ext >&5 cf_XOPEN_SOURCE_set=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:4374: result: $cf_XOPEN_SOURCE_set" >&5 + echo "$as_me:4553: result: $cf_XOPEN_SOURCE_set" >&5 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6 if test $cf_XOPEN_SOURCE_set = yes then cat >conftest.$ac_ext <<_ACEOF -#line 4379 "configure" +#line 4558 "configure" #include "confdefs.h" #include int @@ -4391,16 +4570,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4394: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4573: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4397: \$? = $ac_status" >&5 + echo "$as_me:4576: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4400: \"$ac_try\"") >&5 + { (eval echo "$as_me:4579: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4403: \$? = $ac_status" >&5 + echo "$as_me:4582: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_XOPEN_SOURCE_set_ok=yes else @@ -4411,19 +4590,19 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext if test $cf_XOPEN_SOURCE_set_ok = no then - { echo "$as_me:4414: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + { echo "$as_me:4593: WARNING: _XOPEN_SOURCE is lower than requested" >&5 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} fi else -echo "$as_me:4419: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:4598: checking if we should define _XOPEN_SOURCE" >&5 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 if test "${cf_cv_xopen_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4426 "configure" +#line 4605 "configure" #include "confdefs.h" #include @@ -4442,16 +4621,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4445: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4624: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4448: \$? = $ac_status" >&5 + echo "$as_me:4627: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4451: \"$ac_try\"") >&5 + { (eval echo "$as_me:4630: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4454: \$? = $ac_status" >&5 + echo "$as_me:4633: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -4463,7 +4642,7 @@ cf_save="$CPPFLAGS" CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 4466 "configure" +#line 4645 "configure" #include "confdefs.h" #include @@ -4482,16 +4661,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4485: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4664: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4488: \$? = $ac_status" >&5 + echo "$as_me:4667: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4491: \"$ac_try\"") >&5 + { (eval echo "$as_me:4670: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4494: \$? = $ac_status" >&5 + echo "$as_me:4673: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -4506,7 +4685,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4509: result: $cf_cv_xopen_source" >&5 +echo "$as_me:4688: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -4625,14 +4804,14 @@ fi fi fi # cf_cv_posix_visible -echo "$as_me:4628: checking if SIGWINCH is defined" >&5 +echo "$as_me:4807: checking if SIGWINCH is defined" >&5 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6 if test "${cf_cv_define_sigwinch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4635 "configure" +#line 4814 "configure" #include "confdefs.h" #include @@ -4641,29 +4820,29 @@ else int main (void) { -int x = SIGWINCH +int x = SIGWINCH; (void)x ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4650: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4829: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4653: \$? = $ac_status" >&5 + echo "$as_me:4832: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4656: \"$ac_try\"") >&5 + { (eval echo "$as_me:4835: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4659: \$? = $ac_status" >&5 + echo "$as_me:4838: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_define_sigwinch=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 4666 "configure" +#line 4845 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -4675,22 +4854,22 @@ cat >conftest.$ac_ext <<_ACEOF int main (void) { -int x = SIGWINCH +int x = SIGWINCH; (void)x ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4684: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4863: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4687: \$? = $ac_status" >&5 + echo "$as_me:4866: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4690: \"$ac_try\"") >&5 + { (eval echo "$as_me:4869: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4693: \$? = $ac_status" >&5 + echo "$as_me:4872: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_define_sigwinch=maybe else @@ -4704,11 +4883,11 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4707: result: $cf_cv_define_sigwinch" >&5 +echo "$as_me:4886: result: $cf_cv_define_sigwinch" >&5 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6 if test "$cf_cv_define_sigwinch" = maybe ; then -echo "$as_me:4711: checking for actual SIGWINCH definition" >&5 +echo "$as_me:4890: checking for actual SIGWINCH definition" >&5 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6 if test "${cf_cv_fixup_sigwinch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4719,7 +4898,7 @@ cf_sigwinch=32 while test $cf_sigwinch != 1 do cat >conftest.$ac_ext <<_ACEOF -#line 4722 "configure" +#line 4901 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -4735,22 +4914,22 @@ main (void) #if SIGWINCH != $cf_sigwinch make an error #endif -int x = SIGWINCH +int x = SIGWINCH; (void)x ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4744: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4923: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4747: \$? = $ac_status" >&5 + echo "$as_me:4926: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4750: \"$ac_try\"") >&5 + { (eval echo "$as_me:4929: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4753: \$? = $ac_status" >&5 + echo "$as_me:4932: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_fixup_sigwinch=$cf_sigwinch break @@ -4764,7 +4943,7 @@ cf_sigwinch=`expr $cf_sigwinch - 1` done fi -echo "$as_me:4767: result: $cf_cv_fixup_sigwinch" >&5 +echo "$as_me:4946: result: $cf_cv_fixup_sigwinch" >&5 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 if test "$cf_cv_fixup_sigwinch" != unknown ; then @@ -4801,19 +4980,22 @@ EOF LIB_PREFIX='' fi ;; + *-msvc*) + LIB_PREFIX='' + ;; *) LIB_PREFIX='lib' ;; esac LIB_PREFIX=$LIB_PREFIX -echo "$as_me:4809: checking whether ln -s works" >&5 +echo "$as_me:4991: checking whether ln -s works" >&5 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - echo "$as_me:4813: result: yes" >&5 + echo "$as_me:4995: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:4816: result: no, using $LN_S" >&5 + echo "$as_me:4998: result: no, using $LN_S" >&5 echo "${ECHO_T}no, using $LN_S" >&6 fi @@ -4836,7 +5018,7 @@ else 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 "$as_me:4839: checking for $ac_word" >&5 +echo "$as_me:5021: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_BUILD_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4851,7 +5033,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_BUILD_CC="$ac_prog" -echo "$as_me:4854: found $ac_dir/$ac_word" >&5 +echo "$as_me:5036: found $ac_dir/$ac_word" >&5 break done @@ -4859,10 +5041,10 @@ fi fi BUILD_CC=$ac_cv_prog_BUILD_CC if test -n "$BUILD_CC"; then - echo "$as_me:4862: result: $BUILD_CC" >&5 + echo "$as_me:5044: result: $BUILD_CC" >&5 echo "${ECHO_T}$BUILD_CC" >&6 else - echo "$as_me:4865: result: no" >&5 + echo "$as_me:5047: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4871,12 +5053,12 @@ done test -n "$BUILD_CC" || BUILD_CC="none" fi; - echo "$as_me:4874: checking for native build C compiler" >&5 + echo "$as_me:5056: checking for native build C compiler" >&5 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 - echo "$as_me:4876: result: $BUILD_CC" >&5 + echo "$as_me:5058: result: $BUILD_CC" >&5 echo "${ECHO_T}$BUILD_CC" >&6 - echo "$as_me:4879: checking for native build C preprocessor" >&5 + echo "$as_me:5061: checking for native build C preprocessor" >&5 echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6 # Check whether --with-build-cpp or --without-build-cpp was given. @@ -4886,10 +5068,10 @@ if test "${with_build_cpp+set}" = set; t else BUILD_CPP='${BUILD_CC} -E' fi; - echo "$as_me:4889: result: $BUILD_CPP" >&5 + echo "$as_me:5071: result: $BUILD_CPP" >&5 echo "${ECHO_T}$BUILD_CPP" >&6 - echo "$as_me:4892: checking for native build C flags" >&5 + echo "$as_me:5074: checking for native build C flags" >&5 echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6 # Check whether --with-build-cflags or --without-build-cflags was given. @@ -4897,10 +5079,10 @@ if test "${with_build_cflags+set}" = set withval="$with_build_cflags" BUILD_CFLAGS="$withval" fi; - echo "$as_me:4900: result: $BUILD_CFLAGS" >&5 + echo "$as_me:5082: result: $BUILD_CFLAGS" >&5 echo "${ECHO_T}$BUILD_CFLAGS" >&6 - echo "$as_me:4903: checking for native build C preprocessor-flags" >&5 + echo "$as_me:5085: checking for native build C preprocessor-flags" >&5 echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6 # Check whether --with-build-cppflags or --without-build-cppflags was given. @@ -4908,10 +5090,10 @@ if test "${with_build_cppflags+set}" = s withval="$with_build_cppflags" BUILD_CPPFLAGS="$withval" fi; - echo "$as_me:4911: result: $BUILD_CPPFLAGS" >&5 + echo "$as_me:5093: result: $BUILD_CPPFLAGS" >&5 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 - echo "$as_me:4914: checking for native build linker-flags" >&5 + echo "$as_me:5096: checking for native build linker-flags" >&5 echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6 # Check whether --with-build-ldflags or --without-build-ldflags was given. @@ -4919,10 +5101,10 @@ if test "${with_build_ldflags+set}" = se withval="$with_build_ldflags" BUILD_LDFLAGS="$withval" fi; - echo "$as_me:4922: result: $BUILD_LDFLAGS" >&5 + echo "$as_me:5104: result: $BUILD_LDFLAGS" >&5 echo "${ECHO_T}$BUILD_LDFLAGS" >&6 - echo "$as_me:4925: checking for native build linker-libraries" >&5 + echo "$as_me:5107: checking for native build linker-libraries" >&5 echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6 # Check whether --with-build-libs or --without-build-libs was given. @@ -4930,7 +5112,7 @@ if test "${with_build_libs+set}" = set; withval="$with_build_libs" BUILD_LIBS="$withval" fi; - echo "$as_me:4933: result: $BUILD_LIBS" >&5 + echo "$as_me:5115: result: $BUILD_LIBS" >&5 echo "${ECHO_T}$BUILD_LIBS" >&6 # this assumes we're on Unix. @@ -4940,7 +5122,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6 : ${BUILD_CC:='${CC}'} if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then - { { echo "$as_me:4943: error: Cross-build requires two compilers. + { { echo "$as_me:5125: error: Cross-build requires two compilers. Use --with-build-cc to specify the native compiler." >&5 echo "$as_me: error: Cross-build requires two compilers. Use --with-build-cc to specify the native compiler." >&2;} @@ -4961,7 +5143,7 @@ fi if test -n "$ac_tool_prefix"; then # 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 "$as_me:4964: checking for $ac_word" >&5 +echo "$as_me:5146: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4976,7 +5158,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -echo "$as_me:4979: found $ac_dir/$ac_word" >&5 +echo "$as_me:5161: found $ac_dir/$ac_word" >&5 break done @@ -4984,10 +5166,10 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:4987: result: $RANLIB" >&5 + echo "$as_me:5169: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else - echo "$as_me:4990: result: no" >&5 + echo "$as_me:5172: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4996,7 +5178,7 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:4999: checking for $ac_word" >&5 +echo "$as_me:5181: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5011,7 +5193,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_RANLIB="ranlib" -echo "$as_me:5014: found $ac_dir/$ac_word" >&5 +echo "$as_me:5196: found $ac_dir/$ac_word" >&5 break done @@ -5020,10 +5202,10 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:5023: result: $ac_ct_RANLIB" >&5 + echo "$as_me:5205: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$as_me:5026: result: no" >&5 + echo "$as_me:5208: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5035,7 +5217,7 @@ fi if test -n "$ac_tool_prefix"; then # 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 "$as_me:5038: checking for $ac_word" >&5 +echo "$as_me:5220: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5050,7 +5232,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_LD="${ac_tool_prefix}ld" -echo "$as_me:5053: found $ac_dir/$ac_word" >&5 +echo "$as_me:5235: found $ac_dir/$ac_word" >&5 break done @@ -5058,10 +5240,10 @@ fi fi LD=$ac_cv_prog_LD if test -n "$LD"; then - echo "$as_me:5061: result: $LD" >&5 + echo "$as_me:5243: result: $LD" >&5 echo "${ECHO_T}$LD" >&6 else - echo "$as_me:5064: result: no" >&5 + echo "$as_me:5246: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5070,7 +5252,7 @@ if test -z "$ac_cv_prog_LD"; then ac_ct_LD=$LD # Extract the first word of "ld", so it can be a program name with args. set dummy ld; ac_word=$2 -echo "$as_me:5073: checking for $ac_word" >&5 +echo "$as_me:5255: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5085,7 +5267,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_LD="ld" -echo "$as_me:5088: found $ac_dir/$ac_word" >&5 +echo "$as_me:5270: found $ac_dir/$ac_word" >&5 break done @@ -5094,10 +5276,10 @@ fi fi ac_ct_LD=$ac_cv_prog_ac_ct_LD if test -n "$ac_ct_LD"; then - echo "$as_me:5097: result: $ac_ct_LD" >&5 + echo "$as_me:5279: result: $ac_ct_LD" >&5 echo "${ECHO_T}$ac_ct_LD" >&6 else - echo "$as_me:5100: result: no" >&5 + echo "$as_me:5282: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5109,7 +5291,7 @@ fi if test -n "$ac_tool_prefix"; then # 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 "$as_me:5112: checking for $ac_word" >&5 +echo "$as_me:5294: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5124,7 +5306,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_AR="${ac_tool_prefix}ar" -echo "$as_me:5127: found $ac_dir/$ac_word" >&5 +echo "$as_me:5309: found $ac_dir/$ac_word" >&5 break done @@ -5132,10 +5314,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:5135: result: $AR" >&5 + echo "$as_me:5317: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:5138: result: no" >&5 + echo "$as_me:5320: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5144,7 +5326,7 @@ if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo "$as_me:5147: checking for $ac_word" >&5 +echo "$as_me:5329: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5159,7 +5341,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_AR="ar" -echo "$as_me:5162: found $ac_dir/$ac_word" >&5 +echo "$as_me:5344: found $ac_dir/$ac_word" >&5 break done @@ -5168,10 +5350,10 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:5171: result: $ac_ct_AR" >&5 + echo "$as_me:5353: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:5174: result: no" >&5 + echo "$as_me:5356: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5180,55 +5362,71 @@ else AR="$ac_cv_prog_AR" fi -echo "$as_me:5183: checking for options to update archives" >&5 +echo "$as_me:5365: checking for options to update archives" >&5 echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6 if test "${cf_cv_ar_flags+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cf_cv_ar_flags=unknown - for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv - do + case $cf_cv_system_name in + *-msvc*) + cf_cv_ar_flags='' + cat >mk_static_lib.sh <<-EOF + #!$SHELL + MSVC_BIN="$AR" + out="\$1" + shift + exec \$MSVC_BIN -out:"\$out" \$@ + EOF + chmod +x mk_static_lib.sh + AR=`pwd`/mk_static_lib.sh + ;; + *) + cf_cv_ar_flags=unknown + for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv + do - # check if $ARFLAGS already contains this choice - if test "x$ARFLAGS" != "x" ; then - cf_check_ar_flags=`echo "x$ARFLAGS" | sed -e "s/$cf_ar_flags\$//" -e "s/$cf_ar_flags / /"` - if test "x$ARFLAGS" != "$cf_check_ar_flags" ; then - cf_cv_ar_flags= - break + # check if $ARFLAGS already contains this choice + if test "x$ARFLAGS" != "x" ; then + cf_check_ar_flags=`echo "x$ARFLAGS" | sed -e "s/$cf_ar_flags\$//" -e "s/$cf_ar_flags / /"` + if test "x$ARFLAGS" != "$cf_check_ar_flags" ; then + cf_cv_ar_flags= + break + fi fi - fi - rm -f conftest.$ac_cv_objext - rm -f conftest.a + rm -f conftest.$ac_cv_objext + rm -f conftest.a - cat >conftest.$ac_ext <conftest.$ac_ext <&5 + if { (eval echo "$as_me:5405: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5212: \$? = $ac_status" >&5 + echo "$as_me:5408: \$? = $ac_status" >&5 (exit $ac_status); } ; then - echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5 - $AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null - if test -f conftest.a ; then - cf_cv_ar_flags=$cf_ar_flags - break - fi - else - test -n "$verbose" && echo " cannot compile test-program" 1>&6 + echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5 + $AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null + if test -f conftest.a ; then + cf_cv_ar_flags=$cf_ar_flags + break + fi + else + test -n "$verbose" && echo " cannot compile test-program" 1>&6 -echo "${as_me:-configure}:5223: testing cannot compile test-program ..." 1>&5 +echo "${as_me:-configure}:5419: testing cannot compile test-program ..." 1>&5 - break - fi - done - rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext + break + fi + done + rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext + ;; + esac fi -echo "$as_me:5231: result: $cf_cv_ar_flags" >&5 +echo "$as_me:5429: result: $cf_cv_ar_flags" >&5 echo "${ECHO_T}$cf_cv_ar_flags" >&6 if test -n "$ARFLAGS" ; then @@ -5247,14 +5445,22 @@ case "$host_cpu:$host_vendor:$host_os" i ;; # SEIUX doesn't have any useful preprocessor symbol mips:sei:seiux*) #(vi - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define SEIUX 1 EOF ;; + # ISC Interactive Unix likewise + i386:pc:isc*) #(vi + +cat >>confdefs.h <<\EOF +#define ISC_UNIX 1 +EOF + esac -echo "$as_me:5257: checking if you would like to use heapsort" >&5 +echo "$as_me:5463: checking if you would like to use heapsort" >&5 echo $ECHO_N "checking if you would like to use heapsort... $ECHO_C" >&6 # Check whether --enable-heapsort or --disable-heapsort was given. @@ -5271,20 +5477,20 @@ else cf_use_heapsort=yes fi; -echo "$as_me:5274: result: $cf_use_heapsort" >&5 +echo "$as_me:5480: result: $cf_use_heapsort" >&5 echo "${ECHO_T}$cf_use_heapsort" >&6 if test "x$cf_use_heapsort" = xyes; then for ac_func in heapsort do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:5281: checking for $ac_func" >&5 +echo "$as_me:5487: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5287 "configure" +#line 5493 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -5315,16 +5521,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5318: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5524: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5321: \$? = $ac_status" >&5 + echo "$as_me:5527: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5324: \"$ac_try\"") >&5 + { (eval echo "$as_me:5530: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5327: \$? = $ac_status" >&5 + echo "$as_me:5533: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -5334,7 +5540,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5337: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:5543: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <&5 + echo "$as_me:5554: checking if its prototype is compatible with qsort" >&5 echo $ECHO_N "checking if its prototype is compatible with qsort... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 5351 "configure" +#line 5557 "configure" #include "confdefs.h" #include @@ -5367,16 +5573,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5370: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5576: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5373: \$? = $ac_status" >&5 + echo "$as_me:5579: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5376: \"$ac_try\"") >&5 + { (eval echo "$as_me:5582: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5379: \$? = $ac_status" >&5 + echo "$as_me:5585: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -5385,19 +5591,20 @@ cat conftest.$ac_ext >&5 cf_use_heapsort=no fi rm -f conftest.$ac_objext conftest.$ac_ext; - echo "$as_me:5388: result: $cf_use_heapsort" >&5 + echo "$as_me:5594: result: $cf_use_heapsort" >&5 echo "${ECHO_T}$cf_use_heapsort" >&6 else test -n "$verbose" && echo " will use our own heapsort function" 1>&6 -echo "${as_me:-configure}:5393: testing will use our own heapsort function ..." 1>&5 +echo "${as_me:-configure}:5599: testing will use our own heapsort function ..." 1>&5 EXTRAO_DEP='' EXTRAOBJS="$EXTRAOBJS \$(OBJDIR)/heapsort.o" fi fi if test "x$cf_use_heapsort" = xyes; then - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define USE_HEAPSORT 1 EOF @@ -5408,7 +5615,7 @@ if test "${with_ispell+set}" = set; then withval="$with_ispell" case "$withval" in #(vi yes) - { { echo "$as_me:5411: error: expected a value for --with-ispell" >&5 + { { echo "$as_me:5618: error: expected a value for --with-ispell" >&5 echo "$as_me: error: expected a value for --with-ispell" >&2;} { (exit 1); exit 1; }; } ;; #(vi @@ -5416,16 +5623,18 @@ echo "$as_me: error: expected a value fo ;; #(vi *) # user supplied option-value for "--with-ispell=path" - echo "$as_me:5419: checking for ispell" >&5 + echo "$as_me:5626: checking for ispell" >&5 echo $ECHO_N "checking for ispell... $ECHO_C" >&6 ac_cv_path_PATH_ISPELL="$withval" - cat >>confdefs.h <>confdefs.h <>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_ISPELL 1 EOF - echo "$as_me:5428: result: $withval" >&5 + echo "$as_me:5637: result: $withval" >&5 echo "${ECHO_T}$withval" >&6 ;; esac @@ -5434,7 +5643,7 @@ else # user did not specify "--with-ispell"; do automatic check # Extract the first word of "ispell", so it can be a program name with args. set dummy ispell; ac_word=$2 -echo "$as_me:5437: checking for $ac_word" >&5 +echo "$as_me:5646: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PATH_ISPELL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5451,7 +5660,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_PATH_ISPELL="$ac_dir/$ac_word" - echo "$as_me:5454: found $ac_dir/$ac_word" >&5 + echo "$as_me:5663: found $ac_dir/$ac_word" >&5 break fi done @@ -5462,10 +5671,10 @@ fi PATH_ISPELL=$ac_cv_path_PATH_ISPELL if test -n "$PATH_ISPELL"; then - echo "$as_me:5465: result: $PATH_ISPELL" >&5 + echo "$as_me:5674: result: $PATH_ISPELL" >&5 echo "${ECHO_T}$PATH_ISPELL" >&6 else - echo "$as_me:5468: result: no" >&5 + echo "$as_me:5677: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5485,7 +5694,7 @@ if test "${with_metamail+set}" = set; th withval="$with_metamail" case "$withval" in #(vi yes) - { { echo "$as_me:5488: error: expected a value for --with-metamail" >&5 + { { echo "$as_me:5697: error: expected a value for --with-metamail" >&5 echo "$as_me: error: expected a value for --with-metamail" >&2;} { (exit 1); exit 1; }; } ;; #(vi @@ -5493,16 +5702,18 @@ echo "$as_me: error: expected a value fo ;; #(vi *) # user supplied option-value for "--with-metamail=path" - echo "$as_me:5496: checking for metamail" >&5 + echo "$as_me:5705: checking for metamail" >&5 echo $ECHO_N "checking for metamail... $ECHO_C" >&6 ac_cv_path_PATH_METAMAIL="$withval" - cat >>confdefs.h <>confdefs.h <>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_METAMAIL 1 EOF - echo "$as_me:5505: result: $withval" >&5 + echo "$as_me:5716: result: $withval" >&5 echo "${ECHO_T}$withval" >&6 ;; esac @@ -5511,7 +5722,7 @@ else # user did not specify "--with-metamail"; do automatic check # Extract the first word of "metamail", so it can be a program name with args. set dummy metamail; ac_word=$2 -echo "$as_me:5514: checking for $ac_word" >&5 +echo "$as_me:5725: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PATH_METAMAIL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5528,7 +5739,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_PATH_METAMAIL="$ac_dir/$ac_word" - echo "$as_me:5531: found $ac_dir/$ac_word" >&5 + echo "$as_me:5742: found $ac_dir/$ac_word" >&5 break fi done @@ -5539,10 +5750,10 @@ fi PATH_METAMAIL=$ac_cv_path_PATH_METAMAIL if test -n "$PATH_METAMAIL"; then - echo "$as_me:5542: result: $PATH_METAMAIL" >&5 + echo "$as_me:5753: result: $PATH_METAMAIL" >&5 echo "${ECHO_T}$PATH_METAMAIL" >&6 else - echo "$as_me:5545: result: no" >&5 + echo "$as_me:5756: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5562,7 +5773,7 @@ if test "${with_sum+set}" = set; then withval="$with_sum" case "$withval" in #(vi yes) - { { echo "$as_me:5565: error: expected a value for --with-sum" >&5 + { { echo "$as_me:5776: error: expected a value for --with-sum" >&5 echo "$as_me: error: expected a value for --with-sum" >&2;} { (exit 1); exit 1; }; } ;; #(vi @@ -5570,16 +5781,18 @@ echo "$as_me: error: expected a value fo ;; #(vi *) # user supplied option-value for "--with-sum=path" - echo "$as_me:5573: checking for sum" >&5 + echo "$as_me:5784: checking for sum" >&5 echo $ECHO_N "checking for sum... $ECHO_C" >&6 ac_cv_path_PATH_SUM="$withval" - cat >>confdefs.h <>confdefs.h <>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_SUM 1 EOF - echo "$as_me:5582: result: $withval" >&5 + echo "$as_me:5795: result: $withval" >&5 echo "${ECHO_T}$withval" >&6 ;; esac @@ -5588,7 +5801,7 @@ else # user did not specify "--with-sum"; do automatic check # Extract the first word of "sum", so it can be a program name with args. set dummy sum; ac_word=$2 -echo "$as_me:5591: checking for $ac_word" >&5 +echo "$as_me:5804: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PATH_SUM+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5605,7 +5818,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_PATH_SUM="$ac_dir/$ac_word" - echo "$as_me:5608: found $ac_dir/$ac_word" >&5 + echo "$as_me:5821: found $ac_dir/$ac_word" >&5 break fi done @@ -5616,10 +5829,10 @@ fi PATH_SUM=$ac_cv_path_PATH_SUM if test -n "$PATH_SUM"; then - echo "$as_me:5619: result: $PATH_SUM" >&5 + echo "$as_me:5832: result: $PATH_SUM" >&5 echo "${ECHO_T}$PATH_SUM" >&6 else - echo "$as_me:5622: result: no" >&5 + echo "$as_me:5835: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5636,17 +5849,17 @@ fi; if test $ac_cv_path_PATH_SUM then -echo "$as_me:5639: checking if $ac_cv_path_PATH_SUM takes -r" >&5 +echo "$as_me:5852: checking if $ac_cv_path_PATH_SUM takes -r" >&5 echo $ECHO_N "checking if $ac_cv_path_PATH_SUM takes -r... $ECHO_C" >&6 if test "${ac_cv_prog_sum_r+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if { ac_try='$ac_cv_path_PATH_SUM -r config.log 1>&5' - { (eval echo "$as_me:5646: \"$ac_try\"") >&5 + { (eval echo "$as_me:5859: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5649: \$? = $ac_status" >&5 + echo "$as_me:5862: \$? = $ac_status" >&5 (exit $ac_status); }; } then ac_cv_prog_sum_r=yes @@ -5657,11 +5870,12 @@ fi fi if test $ac_cv_prog_sum_r = yes; then - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define SUM_TAKES_DASH_R 1 EOF - cat >>confdefs.h <>confdefs.h <&5 +echo "$as_me:5888: result: $ac_cv_prog_sum_r" >&5 echo "${ECHO_T}$ac_cv_prog_sum_r" >&6 fi -echo "$as_me:5678: checking for default editor" >&5 +echo "$as_me:5892: checking for default editor" >&5 echo $ECHO_N "checking for default editor... $ECHO_C" >&6 # Check whether --with-editor or --without-editor was given. @@ -5687,7 +5901,7 @@ else fi; test -n "$withval" && \ case "$withval" in #(vi yes) - { { echo "$as_me:5690: error: expected a value for --with-editor" >&5 + { { echo "$as_me:5904: error: expected a value for --with-editor" >&5 echo "$as_me: error: expected a value for --with-editor" >&2;} { (exit 1); exit 1; }; } ;; #(vi @@ -5704,7 +5918,7 @@ if test -z "$DEFAULT_EDITOR" ; then else # Extract the first word of "vi", so it can be a program name with args. set dummy vi; ac_word=$2 -echo "$as_me:5707: checking for $ac_word" >&5 +echo "$as_me:5921: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_DEFAULT_EDITOR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5721,7 +5935,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_DEFAULT_EDITOR="$ac_dir/$ac_word" - echo "$as_me:5724: found $ac_dir/$ac_word" >&5 + echo "$as_me:5938: found $ac_dir/$ac_word" >&5 break fi done @@ -5733,24 +5947,25 @@ fi DEFAULT_EDITOR=$ac_cv_path_DEFAULT_EDITOR if test -n "$DEFAULT_EDITOR"; then - echo "$as_me:5736: result: $DEFAULT_EDITOR" >&5 + echo "$as_me:5950: result: $DEFAULT_EDITOR" >&5 echo "${ECHO_T}$DEFAULT_EDITOR" >&6 else - echo "$as_me:5739: result: no" >&5 + echo "$as_me:5953: result: no" >&5 echo "${ECHO_T}no" >&6 fi fi fi -echo "$as_me:5745: result: $DEFAULT_EDITOR" >&5 +echo "$as_me:5959: result: $DEFAULT_EDITOR" >&5 echo "${ECHO_T}$DEFAULT_EDITOR" >&6 + cat >>confdefs.h <&5 +echo "$as_me:5968: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_DEFAULT_MAILER+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5767,7 +5982,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_DEFAULT_MAILER="$ac_dir/$ac_word" - echo "$as_me:5770: found $ac_dir/$ac_word" >&5 + echo "$as_me:5985: found $ac_dir/$ac_word" >&5 break fi done @@ -5778,10 +5993,10 @@ fi DEFAULT_MAILER=$ac_cv_path_DEFAULT_MAILER if test -n "$DEFAULT_MAILER"; then - echo "$as_me:5781: result: $DEFAULT_MAILER" >&5 + echo "$as_me:5996: result: $DEFAULT_MAILER" >&5 echo "${ECHO_T}$DEFAULT_MAILER" >&6 else - echo "$as_me:5784: result: no" >&5 + echo "$as_me:5999: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5794,7 +6009,7 @@ else fi; test -n "$withval" && \ case "$withval" in #(vi yes) - { { echo "$as_me:5797: error: expected a value for --with-mailer" >&5 + { { echo "$as_me:6012: error: expected a value for --with-mailer" >&5 echo "$as_me: error: expected a value for --with-mailer" >&2;} { (exit 1); exit 1; }; } ;; #(vi @@ -5806,7 +6021,7 @@ DEFAULT_MAILER="$withval" 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 "$as_me:5809: checking for $ac_word" >&5 +echo "$as_me:6024: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_DEFAULT_MAILER+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5823,7 +6038,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_DEFAULT_MAILER="$ac_dir/$ac_word" - echo "$as_me:5826: found $ac_dir/$ac_word" >&5 + echo "$as_me:6041: found $ac_dir/$ac_word" >&5 break fi done @@ -5834,10 +6049,10 @@ fi DEFAULT_MAILER=$ac_cv_path_DEFAULT_MAILER if test -n "$DEFAULT_MAILER"; then - echo "$as_me:5837: result: $DEFAULT_MAILER" >&5 + echo "$as_me:6052: result: $DEFAULT_MAILER" >&5 echo "${ECHO_T}$DEFAULT_MAILER" >&6 else - echo "$as_me:5840: result: no" >&5 + echo "$as_me:6055: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5845,7 +6060,7 @@ fi 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 "$as_me:5848: checking for $ac_word" >&5 +echo "$as_me:6063: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_DEFAULT_MAILER+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5862,7 +6077,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_DEFAULT_MAILER="$ac_dir/$ac_word" - echo "$as_me:5865: found $ac_dir/$ac_word" >&5 + echo "$as_me:6080: found $ac_dir/$ac_word" >&5 break fi done @@ -5873,15 +6088,15 @@ fi DEFAULT_MAILER=$ac_cv_path_DEFAULT_MAILER if test -n "$DEFAULT_MAILER"; then - echo "$as_me:5876: result: $DEFAULT_MAILER" >&5 + echo "$as_me:6091: result: $DEFAULT_MAILER" >&5 echo "${ECHO_T}$DEFAULT_MAILER" >&6 else - echo "$as_me:5879: result: no" >&5 + echo "$as_me:6094: result: no" >&5 echo "${ECHO_T}no" >&6 fi fi -echo "$as_me:5884: checking for default mailer" >&5 +echo "$as_me:6099: checking for default mailer" >&5 echo $ECHO_N "checking for default mailer... $ECHO_C" >&6 if test -n "$DEFAULT_MAILER" ; then @@ -5897,17 +6112,17 @@ os2*|cygwin*) ;; esac - cat >>confdefs.h <>confdefs.h <&5 +echo "$as_me:6122: result: $DEFAULT_MAILER" >&5 echo "${ECHO_T}$DEFAULT_MAILER" >&6 -echo "$as_me:5910: checking for incoming-mail directory" >&5 +echo "$as_me:6125: checking for incoming-mail directory" >&5 echo $ECHO_N "checking for incoming-mail directory... $ECHO_C" >&6 # Check whether --with-mailbox or --without-mailbox was given. @@ -5919,7 +6134,7 @@ else fi; test -n "$withval" && \ case "$withval" in #(vi yes) - { { echo "$as_me:5922: error: expected a value for --with-mailbox" >&5 + { { echo "$as_me:6137: error: expected a value for --with-mailbox" >&5 echo "$as_me: error: expected a value for --with-mailbox" >&2;} { (exit 1); exit 1; }; } ;; #(vi @@ -5943,77 +6158,228 @@ for cf_dir in \ done fi if test -n "$DEFAULT_MAILBOX" ; then - cat >>confdefs.h <>confdefs.h <&5 +echo "$as_me:6169: result: $DEFAULT_MAILBOX" >&5 echo "${ECHO_T}$DEFAULT_MAILBOX" >&6 -## PGP Support -echo "$as_me:5957: checking if you want PGP/GPG-Support" >&5 -echo $ECHO_N "checking if you want PGP/GPG-Support... $ECHO_C" >&6 +echo "$as_me:6172: checking if you want to use pkg-config" >&5 +echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6 -# 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 - USE_PGP_GPG=no - else - USE_PGP_GPG=yes - fi +# 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 - enableval=yes - USE_PGP_GPG=yes - + cf_pkg_config=yes fi; -echo "$as_me:5974: result: $enableval" >&5 -echo "${ECHO_T}$enableval" >&6 -if test "$USE_PGP_GPG" = "yes" ; then +echo "$as_me:6182: result: $cf_pkg_config" >&5 +echo "${ECHO_T}$cf_pkg_config" >&6 -# Check whether --with-pgp or --without-pgp was given. -if test "${with_pgp+set}" = set; then - withval="$with_pgp" - case "$withval" in #(vi - yes) - { { echo "$as_me:5983: error: expected a value for --with-pgp" >&5 -echo "$as_me: error: expected a value for --with-pgp" >&2;} - { (exit 1); exit 1; }; } - ;; #(vi - no) - ;; #(vi - *) - # user supplied option-value for "--with-pgp=path" - echo "$as_me:5991: checking for pgp" >&5 -echo $ECHO_N "checking for pgp... $ECHO_C" >&6 - ac_cv_path_PATH_PGP="$withval" - cat >>confdefs.h <>confdefs.h <<\EOF -#define HAVE_PGP 1 -EOF - echo "$as_me:6000: result: $withval" >&5 -echo "${ECHO_T}$withval" >&6 - ;; - esac -else +case $cf_pkg_config in +no) + PKG_CONFIG=none + ;; +yes) - # user did not specify "--with-pgp"; do automatic check - # Extract the first word of "pgp", so it can be a program name with args. -set dummy pgp; ac_word=$2 -echo "$as_me:6009: checking for $ac_word" >&5 +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +echo "$as_me:6194: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_PATH_PGP+set}" = set; then +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $PATH_PGP in + case $PKG_CONFIG in [\\/]* | ?:[\\/]*) - ac_cv_path_PATH_PGP="$PATH_PGP" # 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_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" + echo "$as_me:6211: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG + +if test -n "$PKG_CONFIG"; then + echo "$as_me:6222: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 +else + echo "$as_me:6225: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo "$as_me:6234: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word" + echo "$as_me:6251: found $ac_dir/$ac_word" >&5 + break +fi +done + + test -z "$ac_cv_path_ac_pt_PKG_CONFIG" && ac_cv_path_ac_pt_PKG_CONFIG="none" + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG + +if test -n "$ac_pt_PKG_CONFIG"; then + echo "$as_me:6263: result: $ac_pt_PKG_CONFIG" >&5 +echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 +else + echo "$as_me:6266: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + PKG_CONFIG=$ac_pt_PKG_CONFIG +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +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 +.\$\(*\)*|.\'*\'*) + ;; +..|./*|.\\*) + ;; +.[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 "$as_me:6309: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 +echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;} + { (exit 1); exit 1; }; } + ;; +esac + +elif test "x$cf_pkg_config" != xno ; then + { echo "$as_me:6316: WARNING: pkg-config is not installed" >&5 +echo "$as_me: WARNING: pkg-config is not installed" >&2;} +fi + +## PGP Support +echo "$as_me:6321: checking if you want PGP/GPG-Support" >&5 +echo $ECHO_N "checking if you want PGP/GPG-Support... $ECHO_C" >&6 + +# 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 + USE_PGP_GPG=no + else + USE_PGP_GPG=yes + fi +else + enableval=yes + USE_PGP_GPG=yes + +fi; +echo "$as_me:6338: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 +if test "$USE_PGP_GPG" = "yes" ; then + +# Check whether --with-pgp or --without-pgp was given. +if test "${with_pgp+set}" = set; then + withval="$with_pgp" + case "$withval" in #(vi + yes) + { { echo "$as_me:6347: error: expected a value for --with-pgp" >&5 +echo "$as_me: error: expected a value for --with-pgp" >&2;} + { (exit 1); exit 1; }; } + ;; #(vi + no) + ;; #(vi + *) + # user supplied option-value for "--with-pgp=path" + echo "$as_me:6355: checking for pgp" >&5 +echo $ECHO_N "checking for pgp... $ECHO_C" >&6 + ac_cv_path_PATH_PGP="$withval" + +cat >>confdefs.h <>confdefs.h <<\EOF +#define HAVE_PGP 1 +EOF + echo "$as_me:6366: result: $withval" >&5 +echo "${ECHO_T}$withval" >&6 + ;; + esac +else + + # user did not specify "--with-pgp"; do automatic check + # Extract the first word of "pgp", so it can be a program name with args. +set dummy pgp; ac_word=$2 +echo "$as_me:6375: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PATH_PGP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PATH_PGP in + [\\/]* | ?:[\\/]*) + ac_cv_path_PATH_PGP="$PATH_PGP" # Let the user override the test with a path. ;; *) ac_save_IFS=$IFS; IFS=$ac_path_separator @@ -6023,7 +6389,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_PATH_PGP="$ac_dir/$ac_word" - echo "$as_me:6026: found $ac_dir/$ac_word" >&5 + echo "$as_me:6392: found $ac_dir/$ac_word" >&5 break fi done @@ -6034,10 +6400,10 @@ fi PATH_PGP=$ac_cv_path_PATH_PGP if test -n "$PATH_PGP"; then - echo "$as_me:6037: result: $PATH_PGP" >&5 + echo "$as_me:6403: result: $PATH_PGP" >&5 echo "${ECHO_T}$PATH_PGP" >&6 else - echo "$as_me:6040: result: no" >&5 + echo "$as_me:6406: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6058,7 +6424,7 @@ if test "${with_pgpk+set}" = set; then withval="$with_pgpk" case "$withval" in #(vi yes) - { { echo "$as_me:6061: error: expected a value for --with-pgpk" >&5 + { { echo "$as_me:6427: error: expected a value for --with-pgpk" >&5 echo "$as_me: error: expected a value for --with-pgpk" >&2;} { (exit 1); exit 1; }; } ;; #(vi @@ -6066,16 +6432,18 @@ echo "$as_me: error: expected a value fo ;; #(vi *) # user supplied option-value for "--with-pgpk=path" - echo "$as_me:6069: checking for pgpk" >&5 + echo "$as_me:6435: checking for pgpk" >&5 echo $ECHO_N "checking for pgpk... $ECHO_C" >&6 ac_cv_path_PATH_PGPK="$withval" - cat >>confdefs.h <>confdefs.h <>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_PGPK 1 EOF - echo "$as_me:6078: result: $withval" >&5 + echo "$as_me:6446: result: $withval" >&5 echo "${ECHO_T}$withval" >&6 ;; esac @@ -6084,7 +6452,7 @@ else # user did not specify "--with-pgpk"; do automatic check # Extract the first word of "pgpk", so it can be a program name with args. set dummy pgpk; ac_word=$2 -echo "$as_me:6087: checking for $ac_word" >&5 +echo "$as_me:6455: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PATH_PGPK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6101,7 +6469,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_PATH_PGPK="$ac_dir/$ac_word" - echo "$as_me:6104: found $ac_dir/$ac_word" >&5 + echo "$as_me:6472: found $ac_dir/$ac_word" >&5 break fi done @@ -6112,10 +6480,10 @@ fi PATH_PGPK=$ac_cv_path_PATH_PGPK if test -n "$PATH_PGPK"; then - echo "$as_me:6115: result: $PATH_PGPK" >&5 + echo "$as_me:6483: result: $PATH_PGPK" >&5 echo "${ECHO_T}$PATH_PGPK" >&6 else - echo "$as_me:6118: result: no" >&5 + echo "$as_me:6486: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6136,7 +6504,7 @@ if test "${with_gpg+set}" = set; then withval="$with_gpg" case "$withval" in #(vi yes) - { { echo "$as_me:6139: error: expected a value for --with-gpg" >&5 + { { echo "$as_me:6507: error: expected a value for --with-gpg" >&5 echo "$as_me: error: expected a value for --with-gpg" >&2;} { (exit 1); exit 1; }; } ;; #(vi @@ -6144,16 +6512,18 @@ echo "$as_me: error: expected a value fo ;; #(vi *) # user supplied option-value for "--with-gpg=path" - echo "$as_me:6147: checking for gpg" >&5 + echo "$as_me:6515: checking for gpg" >&5 echo $ECHO_N "checking for gpg... $ECHO_C" >&6 ac_cv_path_PATH_GPG="$withval" - cat >>confdefs.h <>confdefs.h <>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_GPG 1 EOF - echo "$as_me:6156: result: $withval" >&5 + echo "$as_me:6526: result: $withval" >&5 echo "${ECHO_T}$withval" >&6 ;; esac @@ -6162,7 +6532,7 @@ else # user did not specify "--with-gpg"; do automatic check # Extract the first word of "gpg", so it can be a program name with args. set dummy gpg; ac_word=$2 -echo "$as_me:6165: checking for $ac_word" >&5 +echo "$as_me:6535: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PATH_GPG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6179,7 +6549,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_PATH_GPG="$ac_dir/$ac_word" - echo "$as_me:6182: found $ac_dir/$ac_word" >&5 + echo "$as_me:6552: found $ac_dir/$ac_word" >&5 break fi done @@ -6190,10 +6560,10 @@ fi PATH_GPG=$ac_cv_path_PATH_GPG if test -n "$PATH_GPG"; then - echo "$as_me:6193: result: $PATH_GPG" >&5 + echo "$as_me:6563: result: $PATH_GPG" >&5 echo "${ECHO_T}$PATH_GPG" >&6 else - echo "$as_me:6196: result: no" >&5 + echo "$as_me:6566: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6216,7 +6586,7 @@ if test "${with_slrnface+set}" = set; th withval="$with_slrnface" case "$withval" in #(vi yes) - { { echo "$as_me:6219: error: expected a value for --with-slrnface" >&5 + { { echo "$as_me:6589: error: expected a value for --with-slrnface" >&5 echo "$as_me: error: expected a value for --with-slrnface" >&2;} { (exit 1); exit 1; }; } ;; #(vi @@ -6224,16 +6594,18 @@ echo "$as_me: error: expected a value fo ;; #(vi *) # user supplied option-value for "--with-slrnface=path" - echo "$as_me:6227: checking for slrnface" >&5 + echo "$as_me:6597: checking for slrnface" >&5 echo $ECHO_N "checking for slrnface... $ECHO_C" >&6 ac_cv_path_PATH_SLRNFACE="$withval" - cat >>confdefs.h <>confdefs.h <>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_SLRNFACE 1 EOF - echo "$as_me:6236: result: $withval" >&5 + echo "$as_me:6608: result: $withval" >&5 echo "${ECHO_T}$withval" >&6 ;; esac @@ -6242,7 +6614,7 @@ else # user did not specify "--with-slrnface"; do automatic check # Extract the first word of "slrnface", so it can be a program name with args. set dummy slrnface; ac_word=$2 -echo "$as_me:6245: checking for $ac_word" >&5 +echo "$as_me:6617: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PATH_SLRNFACE+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6259,7 +6631,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_PATH_SLRNFACE="$ac_dir/$ac_word" - echo "$as_me:6262: found $ac_dir/$ac_word" >&5 + echo "$as_me:6634: found $ac_dir/$ac_word" >&5 break fi done @@ -6270,10 +6642,10 @@ fi PATH_SLRNFACE=$ac_cv_path_PATH_SLRNFACE if test -n "$PATH_SLRNFACE"; then - echo "$as_me:6273: result: $PATH_SLRNFACE" >&5 + echo "$as_me:6645: result: $PATH_SLRNFACE" >&5 echo "${ECHO_T}$PATH_SLRNFACE" >&6 else - echo "$as_me:6276: result: no" >&5 + echo "$as_me:6648: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6302,14 +6674,14 @@ else cf_cv_default_shell= fi; -echo "$as_me:6305: checking for the default shell program" >&5 +echo "$as_me:6677: checking for the default shell program" >&5 echo $ECHO_N "checking for the default shell program... $ECHO_C" >&6 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 <<_ACEOF -#line 6312 "configure" +#line 6684 "configure" #include "confdefs.h" #include @@ -6327,16 +6699,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6330: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6702: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6333: \$? = $ac_status" >&5 + echo "$as_me:6705: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6336: \"$ac_try\"") >&5 + { (eval echo "$as_me:6708: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6339: \$? = $ac_status" >&5 + echo "$as_me:6711: \$? = $ac_status" >&5 (exit $ac_status); }; }; then $cf_shell_progs="csh tcsh $cf_shell_progs" else @@ -6346,11 +6718,11 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me:-configure}:6349: testing paths of shell programs: $cf_shell_progs ..." 1>&5 +echo "${as_me:-configure}:6721: 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}:6353: testing /etc/shells ..." 1>&5 +echo "${as_me:-configure}:6725: testing /etc/shells ..." 1>&5 for cf_prog in $cf_shell_progs do @@ -6359,7 +6731,7 @@ echo "${as_me:-configure}:6353: testing cf_pattern="^"$cf_prog"$" ;; */*) - { { echo "$as_me:6362: error: Program name must be absolute or filename: $cf_prog" >&5 + { { echo "$as_me:6734: error: Program name must be absolute or filename: $cf_prog" >&5 echo "$as_me: error: Program name must be absolute or filename: $cf_prog" >&2;} { (exit 1); exit 1; }; } ;; @@ -6384,17 +6756,17 @@ echo "$as_me: error: Program name must b break fi done - echo "$as_me:6387: result: $DEFAULT_SHELL" >&5 + echo "$as_me:6759: result: $DEFAULT_SHELL" >&5 echo "${ECHO_T}$DEFAULT_SHELL" >&6 else -echo "${as_me:-configure}:6391: testing $PATH ..." 1>&5 +echo "${as_me:-configure}:6763: 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 "$as_me:6397: checking for $ac_word" >&5 +echo "$as_me:6769: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_DEFAULT_SHELL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6411,7 +6783,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_DEFAULT_SHELL="$ac_dir/$ac_word" - echo "$as_me:6414: found $ac_dir/$ac_word" >&5 + echo "$as_me:6786: found $ac_dir/$ac_word" >&5 break fi done @@ -6422,10 +6794,10 @@ fi DEFAULT_SHELL=$ac_cv_path_DEFAULT_SHELL if test -n "$DEFAULT_SHELL"; then - echo "$as_me:6425: result: $DEFAULT_SHELL" >&5 + echo "$as_me:6797: result: $DEFAULT_SHELL" >&5 echo "${ECHO_T}$DEFAULT_SHELL" >&6 else - echo "$as_me:6428: result: no" >&5 + echo "$as_me:6800: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6434,24 +6806,25 @@ done fi if test -z "$DEFAULT_SHELL" ; then - { echo "$as_me:6437: WARNING: Cannot find the default shell you specified: $cf_shell_progs" >&5 + { echo "$as_me:6809: WARNING: Cannot find the default shell you specified: $cf_shell_progs" >&5 echo "$as_me: WARNING: Cannot find the default shell you specified: $cf_shell_progs" >&2;} if test -f /bin/false ; then - { echo "$as_me:6440: WARNING: Using /bin/false instead" >&5 + { echo "$as_me:6812: WARNING: Using /bin/false instead" >&5 echo "$as_me: WARNING: Using /bin/false instead" >&2;} DEFAULT_SHELL=/bin/false else - { { echo "$as_me:6444: error: Cannot use /bin/false because it does not exist" >&5 + { { echo "$as_me:6816: error: Cannot use /bin/false because it does not exist" >&5 echo "$as_me: error: Cannot use /bin/false because it does not exist" >&2;} { (exit 1); exit 1; }; } fi fi + cat >>confdefs.h <&5 +echo "$as_me:6827: checking if NNTP-support will be used" >&5 echo $ECHO_N "checking if NNTP-support will be used... $ECHO_C" >&6 # Check whether --enable-nntp or --disable-nntp was given. @@ -6468,12 +6841,12 @@ else USE_NNTP=yes fi; -echo "$as_me:6471: result: $enableval" >&5 +echo "$as_me:6844: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 USE_SPOOLDIR=yes if test "$USE_NNTP" = "yes" ; then -echo "$as_me:6476: checking whether to be NNTP_ONLY" >&5 +echo "$as_me:6849: checking whether to be NNTP_ONLY" >&5 echo $ECHO_N "checking whether to be NNTP_ONLY... $ECHO_C" >&6 # Check whether --enable-nntp-only or --disable-nntp-only was given. @@ -6481,30 +6854,33 @@ if test "${enable_nntp_only+set}" = set; enableval="$enable_nntp_only" test "$enableval" != yes && enableval=no if test "$enableval" != "no" ; then - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define NNTP_ONLY 1 EOF USE_SPOOLDIR=no else - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define NNTP_ABLE 1 EOF fi else enableval=no - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define NNTP_ABLE 1 EOF fi; -echo "$as_me:6502: result: $enableval" >&5 +echo "$as_me:6878: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 fi ### use option --enable-debug to compile-in test/development code -echo "$as_me:6507: checking if you want to compile-in debug support" >&5 +echo "$as_me:6883: checking if you want to compile-in debug support" >&5 echo $ECHO_N "checking if you want to compile-in debug support... $ECHO_C" >&6 # Check whether --enable-debug or --disable-debug was given. @@ -6525,12 +6901,12 @@ else test -z "$save_CFLAGS" && CFLAGS=`echo $CFLAGS|sed -e 's/-g //' -e 's/-g$//'` fi; -echo "$as_me:6528: result: $enableval" >&5 +echo "$as_me:6904: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 ### use option --disable-echo to suppress full display compiling commands -echo "$as_me:6533: checking if you want to see long compiling messages" >&5 +echo "$as_me:6909: checking if you want to see long compiling messages" >&5 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 # Check whether --enable-echo or --disable-echo was given. @@ -6564,11 +6940,11 @@ else ECHO_CC='' fi; -echo "$as_me:6567: result: $enableval" >&5 +echo "$as_me:6943: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 ### use option --enable-prototypes to turn on optional prototypes -echo "$as_me:6571: checking if you want to compile with fallback prototypes" >&5 +echo "$as_me:6947: checking if you want to compile with fallback prototypes" >&5 echo $ECHO_N "checking if you want to compile with fallback prototypes... $ECHO_C" >&6 # Check whether --enable-prototypes or --disable-prototypes was given. @@ -6585,14 +6961,14 @@ else with_decl_check=no fi; -echo "$as_me:6588: result: $enableval" >&5 +echo "$as_me:6964: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 ### use option --enable-warnings to turn on all gcc warnings EXTRA_CFLAGS="" if test -n "$GCC" then -echo "$as_me:6595: checking if you want to turn on gcc warnings" >&5 +echo "$as_me:6971: checking if you want to turn on gcc warnings" >&5 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6 # Check whether --enable-warnings or --disable-warnings was given. @@ -6609,1529 +6985,921 @@ else with_warnings=no fi; -echo "$as_me:6612: result: $with_warnings" >&5 +echo "$as_me:6988: result: $with_warnings" >&5 echo "${ECHO_T}$with_warnings" >&6 if test "$with_warnings" = "yes" then with_ext_const=yes + echo "$as_me:6993: checking for X" >&5 +echo $ECHO_N "checking for X... $ECHO_C" >&6 -INTEL_COMPILER=no - -if test "$GCC" = yes ; then - case $host_os in - linux*|gnu*) - echo "$as_me:6623: checking if this is really Intel C compiler" >&5 -echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 - cf_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -no-gcc" - cat >conftest.$ac_ext <<_ACEOF -#line 6628 "configure" -#include "confdefs.h" - -int -main (void) -{ - -#ifdef __INTEL_COMPILER -#else -make an error -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:6645: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:6648: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6651: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:6654: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - INTEL_COMPILER=yes -cf_save_CFLAGS="$cf_save_CFLAGS -we147" +# Check whether --with-x or --without-x was given. +if test "${with_x+set}" = set; then + withval="$with_x" +fi; +# $have_x is `yes', `no', `disabled', or empty when we do not yet know. +if test "x$with_x" = xno; then + # The user explicitly disabled X. + have_x=disabled else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f conftest.$ac_objext conftest.$ac_ext - CFLAGS="$cf_save_CFLAGS" - echo "$as_me:6665: result: $INTEL_COMPILER" >&5 -echo "${ECHO_T}$INTEL_COMPILER" >&6 - ;; - esac -fi - -CLANG_COMPILER=no - -if test "$GCC" = yes ; then - echo "$as_me:6674: checking if this is really Clang C compiler" >&5 -echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6 - cf_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Qunused-arguments" - cat >conftest.$ac_ext <<_ACEOF -#line 6679 "configure" -#include "confdefs.h" - -int -main (void) -{ - -#ifdef __clang__ -#else -make an error -#endif + if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then + # Both variables are already set. + have_x=yes + else + if test "${ac_cv_have_x+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # One or both of the vars are not set, and there is no cached value. +ac_x_includes=no ac_x_libraries=no +rm -fr conftest.dir +if mkdir conftest.dir; then + cd conftest.dir + # Make sure to not put "make" in the Imakefile rules, since we grep it out. + cat >Imakefile <<'EOF' +acfindx: + @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' +EOF + if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then + # GNU make sometimes prints "make[1]: Entering...", which would confuse us. + eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` + # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. + for ac_extension in a so sl dylib dll; do + if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && + test -f $ac_im_libdir/libX11.$ac_extension; then + ac_im_usrlibdir=$ac_im_libdir; break + fi + done + # Screen out bogus values from the imake configuration. They are + # bogus both because they are the default anyway, and because + # using them would break gcc on systems where it needs fixed includes. + case $ac_im_incroot in + /usr/include) ;; + *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; + esac + case $ac_im_usrlibdir in + /usr/lib | /lib) ;; + *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; + esac + fi + cd .. + rm -fr conftest.dir +fi + +# Standard set of common directories for X headers. +# Check X11 before X11Rn because it is often a symlink to the current release. +ac_x_header_dirs=' +/usr/X11/include +/usr/X11R7/include +/usr/X11R6/include +/usr/X11R5/include +/usr/X11R4/include + +/opt/local/include +/opt/X11/include + +/usr/include/X11 +/usr/include/X11R7 +/usr/include/X11R6 +/usr/include/X11R5 +/usr/include/X11R4 + +/usr/local/X11/include +/usr/local/X11R7/include +/usr/local/X11R6/include +/usr/local/X11R5/include +/usr/local/X11R4/include + +/usr/local/include/X11 +/usr/local/include/X11R7 +/usr/local/include/X11R6 +/usr/local/include/X11R5 +/usr/local/include/X11R4 + +/usr/X386/include +/usr/x386/include +/usr/XFree86/include/X11 + +/usr/include +/usr/local/include +/usr/unsupported/include +/usr/athena/include +/usr/local/x11r5/include +/usr/lpp/Xamples/include + +/usr/openwin/include +/usr/openwin/share/include' + +if test "$ac_x_includes" = no; then + # Guess where to find include files, by looking for Intrinsic.h. + # First, try using that file with no special directory specified. + cat >conftest.$ac_ext <<_ACEOF +#line 7097 "configure" +#include "confdefs.h" +#include +_ACEOF +if { (eval echo "$as_me:7101: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:7107: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + # We can compile using X headers with no special include directory. +ac_x_includes= +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + for ac_dir in $ac_x_header_dirs; do + if test -r "$ac_dir/X11/Intrinsic.h"; then + ac_x_includes=$ac_dir + break + fi +done +fi +rm -f conftest.err conftest.$ac_ext +fi # $ac_x_includes = no +if test "$ac_x_libraries" = no; then + # Check for the libraries. + # See if we find them without any special options. + # Don't add to $LIBS permanently. + ac_save_LIBS=$LIBS + LIBS="-lXt $LIBS" + cat >conftest.$ac_ext <<_ACEOF +#line 7140 "configure" +#include "confdefs.h" +#include +int +main (void) +{ +XtMalloc (0) ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:6696: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7152: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6699: \$? = $ac_status" >&5 + echo "$as_me:7155: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6702: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7158: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6705: \$? = $ac_status" >&5 + echo "$as_me:7161: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - CLANG_COMPILER=yes -cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" - + LIBS=$ac_save_LIBS +# We can link X programs with no special library path. +ac_x_libraries= else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 +LIBS=$ac_save_LIBS +for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` +do + # Don't even attempt the hair of trying to link an X program! + for ac_extension in a so sl dylib dll; do + if test -r $ac_dir/libXt.$ac_extension; then + ac_x_libraries=$ac_dir + break 2 + fi + done +done fi -rm -f conftest.$ac_objext conftest.$ac_ext - CFLAGS="$cf_save_CFLAGS" - echo "$as_me:6716: result: $CLANG_COMPILER" >&5 -echo "${ECHO_T}$CLANG_COMPILER" >&6 -fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi # $ac_x_libraries = no -cat > conftest.$ac_ext <&5 -echo "$as_me: checking for $CC warning options..." >&6;} - cf_save_CFLAGS="$CFLAGS" - EXTRA_CFLAGS="-Wall" - for cf_opt in \ - wd1419 \ - wd1683 \ - wd1684 \ - wd193 \ - wd593 \ - wd279 \ - wd810 \ - wd869 \ - wd981 - do - CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:6754: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:6757: \$? = $ac_status" >&5 - (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:6759: result: ... -$cf_opt" >&5 -echo "${ECHO_T}... -$cf_opt" >&6 - EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" - fi - done - CFLAGS="$cf_save_CFLAGS" +if test "$have_x" != yes; then + echo "$as_me:7199: result: $have_x" >&5 +echo "${ECHO_T}$have_x" >&6 + no_x=yes +else + # If each of the values was on the command line, it overrides each guess. + test "x$x_includes" = xNONE && x_includes=$ac_x_includes + test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries + # Update the cache value to reflect the command line values. + ac_cv_have_x="have_x=yes \ + ac_x_includes=$x_includes ac_x_libraries=$x_libraries" + echo "$as_me:7209: result: libraries $x_libraries, headers $x_includes" >&5 +echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 +fi -elif test "$GCC" = yes -then - { echo "$as_me:6768: checking for $CC warning options..." >&5 -echo "$as_me: checking for $CC warning options..." >&6;} - cf_save_CFLAGS="$CFLAGS" - EXTRA_CFLAGS= - cf_warn_CONST="" - test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings" - cf_gcc_warnings="Wignored-qualifiers Wlogical-op Wvarargs" - test "x$CLANG_COMPILER" = xyes && cf_gcc_warnings= - for cf_opt in W Wall \ - Wbad-function-cast \ - Wcast-align \ - Wcast-qual \ - Wdeclaration-after-statement \ - Wextra \ - Winline \ - Wmissing-declarations \ - Wmissing-prototypes \ - Wnested-externs \ - Wpointer-arith \ - Wshadow \ - Wstrict-prototypes \ - Wundef $cf_gcc_warnings $cf_warn_CONST - do - CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:6792: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:6795: \$? = $ac_status" >&5 - (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:6797: result: ... -$cf_opt" >&5 -echo "${ECHO_T}... -$cf_opt" >&6 - case $cf_opt in - Wcast-qual) +if test "$no_x" = yes; then + # Not all programs may use this symbol, but it does not hurt to define it. - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-DXTSTRINGDEFINES" +cat >>confdefs.h <<\EOF +#define X_DISPLAY_MISSING 1 +EOF - ;; - Winline) - case $GCC_VERSION in - [34].*) - test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 - -echo "${as_me:-configure}:6811: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 - - continue;; - esac - ;; - Wpointer-arith) - case $GCC_VERSION in - [12].*) - test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 - -echo "${as_me:-configure}:6821: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 - - continue;; - esac - ;; - esac - EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" - fi - done - CFLAGS="$cf_save_CFLAGS" -fi -rm -rf conftest* - -fi -fi - -## !NNTP_ONLY -if test "$USE_SPOOLDIR" = "yes"; then - ## options for directories - echo "$as_me:6840: checking for news-library path" >&5 -echo $ECHO_N "checking for news-library path... $ECHO_C" >&6 - -# Check whether --with-libdir or --without-libdir was given. -if test "${with_libdir+set}" = set; then - withval="$with_libdir" - -else - withval="${NEWSLIBDIR:-/usr/lib/news}" -fi; if true ; then - -if test "x$prefix" != xNONE; then - cf_path_syntax="$prefix" -else - cf_path_syntax="$ac_default_prefix" -fi - -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 "$as_me:6876: error: expected a pathname, not \"$withval\"" >&5 -echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} - { (exit 1); exit 1; }; } - ;; -esac - -fi -eval NEWSLIBDIR="$withval" - - echo "$as_me:6885: result: $NEWSLIBDIR" >&5 -echo "${ECHO_T}$NEWSLIBDIR" >&6 - - echo "$as_me:6888: checking for news spool-directory path" >&5 -echo $ECHO_N "checking for news spool-directory path... $ECHO_C" >&6 - -# Check whether --with-spooldir or --without-spooldir was given. -if test "${with_spooldir+set}" = set; then - withval="$with_spooldir" - -else - withval="${SPOOLDIR:-/var/spool/news}" -fi; if true ; then - -if test "x$prefix" != xNONE; then - cf_path_syntax="$prefix" -else - cf_path_syntax="$ac_default_prefix" -fi - -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 "$as_me:6924: error: expected a pathname, not \"$withval\"" >&5 -echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} - { (exit 1); exit 1; }; } - ;; -esac - -fi -eval SPOOLDIR="$withval" - - echo "$as_me:6933: result: $SPOOLDIR" >&5 -echo "${ECHO_T}$SPOOLDIR" >&6 - - echo "$as_me:6936: checking for news overview-directory path" >&5 -echo $ECHO_N "checking for news overview-directory path... $ECHO_C" >&6 - -# Check whether --with-nov-dir or --without-nov-dir was given. -if test "${with_nov_dir+set}" = set; then - withval="$with_nov_dir" - -else - withval="${NOVROOTDIR:-$SPOOLDIR}" -fi; if true ; then - -if test "x$prefix" != xNONE; then - cf_path_syntax="$prefix" -else - cf_path_syntax="$ac_default_prefix" -fi - -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 "$as_me:6972: error: expected a pathname, not \"$withval\"" >&5 -echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} - { (exit 1); exit 1; }; } - ;; -esac - -fi -eval NOVROOTDIR="$withval" - - echo "$as_me:6981: result: $NOVROOTDIR" >&5 -echo "${ECHO_T}$NOVROOTDIR" >&6 - - echo "$as_me:6984: checking for overview filename" >&5 -echo $ECHO_N "checking for overview filename... $ECHO_C" >&6 - -# Check whether --with-nov-fname or --without-nov-fname was given. -if test "${with_nov_fname+set}" = set; then - withval="$with_nov_fname" - -else - withval="${OVERVIEW_FILE-.overview}" -fi; test -z "$withval" && withval=no -case "$withval" in #(vi -yes) - { { echo "$as_me:6996: error: expected a value for --with-nov-fname" >&5 -echo "$as_me: error: expected a value for --with-nov-fname" >&2;} - { (exit 1); exit 1; }; } - ;; #(vi -no) withval="" - ;; -esac -OVERVIEW_FILE="$withval" - - cat >>confdefs.h <&5 -echo "${ECHO_T}$OVERVIEW_FILE" >&6 - - INEWSPATH="$NEWSLIBDIR" -else - NEWSLIBDIR="" - SPOOLDIR="" - NOVROOTDIR="" - INEWSPATH="/usr/lib/news" -fi - -## TODO: kick the --with-inews-dir= stuff, the check below should be enough -## (requires some code rework in tin) -echo "$as_me:7022: checking for directory containing \"inews\"" >&5 -echo $ECHO_N "checking for directory containing \"inews\"... $ECHO_C" >&6 - -# Check whether --with-inews-dir or --without-inews-dir was given. -if test "${with_inews_dir+set}" = set; then - withval="$with_inews_dir" - -else - withval="${INEWSDIR:-$INEWSPATH}" -fi; if true ; then - -if test "x$prefix" != xNONE; then - cf_path_syntax="$prefix" -else - cf_path_syntax="$ac_default_prefix" -fi - -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 "$as_me:7058: error: expected a pathname, not \"$withval\"" >&5 -echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} - { (exit 1); exit 1; }; } - ;; -esac - -fi -eval INEWSDIR="$withval" - -INEWSDIR=`echo $INEWSDIR |sed -e 's,/$,,'` -echo "$as_me:7068: result: $INEWSDIR" >&5 -echo "${ECHO_T}$INEWSDIR" >&6 - -# Extract the first word of "inews", so it can be a program name with args. -set dummy inews; ac_word=$2 -echo "$as_me:7073: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_INEWS+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $INEWS in - [\\/]* | ?:[\\/]*) - ac_cv_path_INEWS="$INEWS" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$INEWSDIR:/news/bin:/usr/lib/news/bin:$INEWSPATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_INEWS="$ac_dir/$ac_word" - echo "$as_me:7090: found $ac_dir/$ac_word" >&5 - break -fi -done - - test -z "$ac_cv_path_INEWS" && ac_cv_path_INEWS="--internal" - ;; -esac -fi -INEWS=$ac_cv_path_INEWS - -if test -n "$INEWS"; then - echo "$as_me:7102: result: $INEWS" >&5 -echo "${ECHO_T}$INEWS" >&6 -else - echo "$as_me:7105: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -if test "$ac_cv_path_INEWS" != ""; then - if test "$ac_cv_path_INEWS" = "--internal"; then - -cf_define=`echo "$INEWS"|sed -e 's/\\\\/\\\\134/g' -e 's/^[ ]\\+//' -e 's/[ ]\\+$//' -e 's/"/\\\\042/g'` -cat >>confdefs.h <>confdefs.h <&5 -echo $ECHO_N "checking if you want socks library... $ECHO_C" >&6 -if test "${cf_cv_use_libsocks+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -# Check whether --with-socks or --without-socks was given. -if test "${with_socks+set}" = set; then - withval="$with_socks" - cf_cv_use_libsocks=$withval -else - cf_cv_use_libsocks=no -fi; - -fi -echo "$as_me:7144: result: $cf_cv_use_libsocks" >&5 -echo "${ECHO_T}$cf_cv_use_libsocks" >&6 - -echo "$as_me:7147: checking if you want socks5 library" >&5 -echo $ECHO_N "checking if you want socks5 library... $ECHO_C" >&6 -if test "${cf_cv_use_libsocks5+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -# Check whether --with-socks5 or --without-socks5 was given. -if test "${with_socks5+set}" = set; then - withval="$with_socks5" - cf_cv_use_libsocks5=$withval + X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= else - cf_cv_use_libsocks5=no -fi; - -fi -echo "$as_me:7162: result: $cf_cv_use_libsocks5" >&5 -echo "${ECHO_T}$cf_cv_use_libsocks5" >&6 - -if test "x$cf_cv_use_libsocks" != xno ; then - -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 - -if test -n "$cf_searchpath/include" ; then - for cf_add_incdir in $cf_searchpath/include - do - while test $cf_add_incdir != /usr/include - do - if test -d $cf_add_incdir - then - cf_have_incdir=no - if test -n "$CFLAGS$CPPFLAGS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_incdir in $CFLAGS $CPPFLAGS ; do - if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then - cf_have_incdir=yes; break - fi - done - fi - - if test "$cf_have_incdir" = no ; then - if test "$cf_add_incdir" = /usr/local/include ; then - if test "$GCC" = yes - then - cf_save_CPPFLAGS=$CPPFLAGS - - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + if test -n "$x_includes"; then + X_CFLAGS="$X_CFLAGS -I$x_includes" + fi - cat >conftest.$ac_ext <<_ACEOF -#line 7204 "configure" + # It would also be nice to do this for all -L options, not just this one. + if test -n "$x_libraries"; then + X_LIBS="$X_LIBS -L$x_libraries" + # For Solaris; some versions of Sun CC require a space after -R and + # others require no space. Words are not sufficient . . . . + case `(uname -sr) 2>/dev/null` in + "SunOS 5"*) + echo "$as_me:7233: checking whether -R must be followed by a space" >&5 +echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 + ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" + cat >conftest.$ac_ext <<_ACEOF +#line 7237 "configure" #include "confdefs.h" -#include -int -main (void) -{ -printf("Hello") - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:7216: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:7219: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7222: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:7225: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cf_have_incdir=yes -fi -rm -f conftest.$ac_objext conftest.$ac_ext - CPPFLAGS=$cf_save_CPPFLAGS - fi - fi - fi - - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - -echo "${as_me:-configure}:7242: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` - test "$cf_top_incdir" = "$cf_add_incdir" && break - cf_add_incdir="$cf_top_incdir" - else - break - fi - else - break - fi - done - done -fi - - elif test -d $cf_searchpath/../include ; then - -if test -n "$cf_searchpath/../include" ; then - for cf_add_incdir in $cf_searchpath/../include - do - while test $cf_add_incdir != /usr/include - do - if test -d $cf_add_incdir - then - cf_have_incdir=no - if test -n "$CFLAGS$CPPFLAGS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_incdir in $CFLAGS $CPPFLAGS ; do - if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then - cf_have_incdir=yes; break - fi - done - fi - - if test "$cf_have_incdir" = no ; then - if test "$cf_add_incdir" = /usr/local/include ; then - if test "$GCC" = yes - then - cf_save_CPPFLAGS=$CPPFLAGS - - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF -#line 7288 "configure" -#include "confdefs.h" -#include int main (void) { -printf("Hello") + ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:7300: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7249: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7303: \$? = $ac_status" >&5 + echo "$as_me:7252: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7306: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7255: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7309: \$? = $ac_status" >&5 + echo "$as_me:7258: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - : + ac_R_nospace=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_have_incdir=yes -fi -rm -f conftest.$ac_objext conftest.$ac_ext - CPPFLAGS=$cf_save_CPPFLAGS - fi - fi - fi - - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - -echo "${as_me:-configure}:7326: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` - test "$cf_top_incdir" = "$cf_add_incdir" && break - cf_add_incdir="$cf_top_incdir" - else - break - fi - else - break - fi - done - done -fi - - else -{ { echo "$as_me:7344: error: cannot find socks library under $cf_cv_use_libsocks" >&5 -echo "$as_me: error: cannot find socks library under $cf_cv_use_libsocks" >&2;} - { (exit 1); exit 1; }; } - 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 - -echo "${as_me:-configure}:7369: testing adding $cf_add_libdir to library-path ..." 1>&5 - - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi - fi - done +ac_R_nospace=no fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + if test $ac_R_nospace = yes; then + echo "$as_me:7268: result: no" >&5 +echo "${ECHO_T}no" >&6 + X_LIBS="$X_LIBS -R$x_libraries" + else + LIBS="$ac_xsave_LIBS -R $x_libraries" + cat >conftest.$ac_ext <<_ACEOF +#line 7274 "configure" +#include "confdefs.h" - 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 - -echo "${as_me:-configure}:7398: testing adding $cf_add_libdir to library-path ..." 1>&5 +int +main (void) +{ - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi - fi - done + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7286: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7289: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7292: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7295: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_R_space=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_R_space=no fi - +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + if test $ac_R_space = yes; then + echo "$as_me:7305: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + X_LIBS="$X_LIBS -R $x_libraries" else -{ { echo "$as_me:7407: error: cannot find socks library under $cf_cv_use_libsocks" >&5 -echo "$as_me: error: cannot find socks library under $cf_cv_use_libsocks" >&2;} - { (exit 1); exit 1; }; } + echo "$as_me:7309: result: neither works" >&5 +echo "${ECHO_T}neither works" >&6 fi -done - - ;; -esac - -# If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these -# will be set on completion of the AC_TRY_LINK below. -cf_cv_header_path_socks= -cf_cv_library_path_socks= - -echo "${as_me:-configure}:7421: testing Starting FIND_LINKAGE(socks,) ..." 1>&5 + fi + LIBS=$ac_xsave_LIBS + esac + fi -cf_save_LIBS="$LIBS" + # Check for system-dependent libraries X programs must link with. + # Do this before checking for the system-independent R6 libraries + # (-lICE), since we may need -lsocket or whatever for X linking. -cat >conftest.$ac_ext <<_ACEOF -#line 7426 "configure" + if test "$ISC" = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" + else + # Martyn Johnson says this is needed for Ultrix, if the X + # libraries were built with DECnet support. And Karl Berry says + # the Alpha needs dnet_stub (dnet does not exist). + ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" + cat >conftest.$ac_ext <<_ACEOF +#line 7329 "configure" #include "confdefs.h" -#include - +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char XOpenDisplay (); int main (void) { - - Raccept((char *)0) - +XOpenDisplay (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7442: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7348: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7445: \$? = $ac_status" >&5 + echo "$as_me:7351: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7448: \"$ac_try\"") >&5 + { (eval echo "$as_me:7354: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7451: \$? = $ac_status" >&5 + echo "$as_me:7357: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - cf_cv_find_linkage_socks=yes - cf_cv_header_path_socks=/usr/include - cf_cv_library_path_socks=/usr/lib - + : else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - -LIBS="-lsocks $cf_save_LIBS" - +echo "$as_me:7363: checking for dnet_ntoa in -ldnet" >&5 +echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 +if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldnet $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7465 "configure" +#line 7371 "configure" #include "confdefs.h" -#include - +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dnet_ntoa (); int main (void) { - - Raccept((char *)0) - +dnet_ntoa (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7481: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7390: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7484: \$? = $ac_status" >&5 + echo "$as_me:7393: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7487: \"$ac_try\"") >&5 + { (eval echo "$as_me:7396: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7490: \$? = $ac_status" >&5 + echo "$as_me:7399: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - cf_cv_find_linkage_socks=yes - cf_cv_header_path_socks=/usr/include - cf_cv_library_path_socks=/usr/lib - cf_cv_library_file_socks="-lsocks" - + ac_cv_lib_dnet_dnet_ntoa=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - - cf_cv_find_linkage_socks=no - LIBS="$cf_save_LIBS" - - test -n "$verbose" && echo " find linkage for socks library" 1>&6 - -echo "${as_me:-configure}:7507: testing find linkage for socks library ..." 1>&5 - -echo "${as_me:-configure}:7509: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5 - - cf_save_CPPFLAGS="$CPPFLAGS" - cf_test_CPPFLAGS="$CPPFLAGS" - -cf_search= - -# collect the current set of include-directories from compiler flags -cf_header_path_list="" -if test -n "${CFLAGS}${CPPFLAGS}" ; then - for cf_header_path in $CPPFLAGS $CFLAGS - do - 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" && \ -test -d "$cf_header_path" && \ - { - test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" - test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" - test -d $cf_header_path/include/socks && cf_search="$cf_search $cf_header_path/include/socks" - test -d $cf_header_path/include/socks/include && cf_search="$cf_search $cf_header_path/include/socks/include" - test -d $cf_header_path/socks/include && cf_search="$cf_search $cf_header_path/socks/include" - test -d $cf_header_path/socks/include/socks && cf_search="$cf_search $cf_header_path/socks/include/socks" -} - - cf_header_path_list="$cf_header_path_list $cf_search" - ;; - esac - done +ac_cv_lib_dnet_dnet_ntoa=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:7410: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 +if test $ac_cv_lib_dnet_dnet_ntoa = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi -# add the variations for the package we are looking for - -cf_search= - -test "x$prefix" != "xNONE" && \ -test -d "$prefix" && \ - { - test -n "$verbose" && echo " ... testing for include-directories under $prefix" - test -d $prefix/include && cf_search="$cf_search $prefix/include" - test -d $prefix/include/socks && cf_search="$cf_search $prefix/include/socks" - test -d $prefix/include/socks/include && cf_search="$cf_search $prefix/include/socks/include" - test -d $prefix/socks/include && cf_search="$cf_search $prefix/socks/include" - test -d $prefix/socks/include/socks && cf_search="$cf_search $prefix/socks/include/socks" -} - -for cf_subdir_prefix in \ - /usr \ - /usr/local \ - /usr/pkg \ - /opt \ - /opt/local \ - $HOME -do + if test $ac_cv_lib_dnet_dnet_ntoa = no; then + echo "$as_me:7417: checking for dnet_ntoa in -ldnet_stub" >&5 +echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 +if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldnet_stub $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 7425 "configure" +#include "confdefs.h" -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" +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dnet_ntoa (); +int +main (void) +{ +dnet_ntoa (); + ; + return 0; } +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7444: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7447: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7450: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7453: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dnet_stub_dnet_ntoa=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_dnet_stub_dnet_ntoa=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:7464: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 +if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" +fi -done - -test "$includedir" != NONE && \ -test "$includedir" != "/usr/include" && \ -test -d "$includedir" && { - test -d $includedir && cf_search="$cf_search $includedir" - test -d $includedir/socks && cf_search="$cf_search $includedir/socks" -} + fi +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS="$ac_xsave_LIBS" -test "$oldincludedir" != NONE && \ -test "$oldincludedir" != "/usr/include" && \ -test -d "$oldincludedir" && { - test -d $oldincludedir && cf_search="$cf_search $oldincludedir" - test -d $oldincludedir/socks && cf_search="$cf_search $oldincludedir/socks" -} + # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, + # to get the SysV transport functions. + # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) + # needs -lnsl. + # The nsl library prevents programs from opening the X display + # on Irix 5.2, according to T.E. Dickey. + # The functions gethostbyname, getservbyname, and inet_addr are + # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. + echo "$as_me:7483: checking for gethostbyname" >&5 +echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 +if test "${ac_cv_func_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 7489 "configure" +#include "confdefs.h" +#define gethostbyname autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef gethostbyname -cf_search="$cf_search $cf_header_path_list" +#ifdef __cplusplus +extern "C" +#endif - 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 +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char gethostbyname (void); -echo "${as_me:-configure}:7600: testing ... testing $cf_cv_header_path_socks ..." 1>&5 +int +main (void) +{ - CPPFLAGS="$cf_save_CPPFLAGS" +/* The GNU C library defines stubs 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_gethostbyname) || defined (__stub___gethostbyname) +#error found stub for gethostbyname +#endif - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_socks" + return gethostbyname (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7520: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7523: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7526: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7529: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_gethostbyname=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_gethostbyname=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:7539: result: $ac_cv_func_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line 7608 "configure" + if test $ac_cv_func_gethostbyname = no; then + echo "$as_me:7543: checking for gethostbyname in -lnsl" >&5 +echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 +if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lnsl $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 7551 "configure" #include "confdefs.h" -#include - +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char gethostbyname (); int main (void) { +gethostbyname (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7570: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7573: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7576: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7579: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_nsl_gethostbyname=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_nsl_gethostbyname=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:7590: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 +if test $ac_cv_lib_nsl_gethostbyname = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" +fi - Raccept((char *)0) + if test $ac_cv_lib_nsl_gethostbyname = no; then + echo "$as_me:7597: checking for gethostbyname in -lbsd" >&5 +echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 +if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lbsd $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 7605 "configure" +#include "confdefs.h" +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char gethostbyname (); +int +main (void) +{ +gethostbyname (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:7624: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7624: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? echo "$as_me:7627: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:7630: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:7633: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - test -n "$verbose" && echo " ... found socks headers in $cf_cv_header_path_socks" 1>&6 - -echo "${as_me:-configure}:7638: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5 - - cf_cv_find_linkage_socks=maybe - cf_test_CPPFLAGS="$CPPFLAGS" - break + ac_cv_lib_bsd_gethostbyname=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - - CPPFLAGS="$cf_save_CPPFLAGS" - +ac_cv_lib_bsd_gethostbyname=no fi -rm -f conftest.$ac_objext conftest.$ac_ext - fi - done - - if test "$cf_cv_find_linkage_socks" = maybe ; then - -echo "${as_me:-configure}:7656: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5 - - cf_save_LIBS="$LIBS" - cf_save_LDFLAGS="$LDFLAGS" - - 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 - -L*) - cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` - -test "x$cf_library_path" != "xNONE" && \ -test -d "$cf_library_path" && \ - { - test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" - test -d $cf_library_path/lib && cf_search="$cf_search $cf_library_path/lib" - test -d $cf_library_path/lib/socks && cf_search="$cf_search $cf_library_path/lib/socks" - test -d $cf_library_path/lib/socks/lib && cf_search="$cf_search $cf_library_path/lib/socks/lib" - test -d $cf_library_path/socks/lib && cf_search="$cf_search $cf_library_path/socks/lib" - test -d $cf_library_path/socks/lib/socks && cf_search="$cf_search $cf_library_path/socks/lib/socks" -} - - cf_library_path_list="$cf_library_path_list $cf_search" - ;; - esac - done +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:7644: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 +if test $ac_cv_lib_bsd_gethostbyname = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi -cf_search= - -test "x$prefix" != "xNONE" && \ -test -d "$prefix" && \ - { - test -n "$verbose" && echo " ... testing for lib-directories under $prefix" - test -d $prefix/lib && cf_search="$cf_search $prefix/lib" - test -d $prefix/lib/socks && cf_search="$cf_search $prefix/lib/socks" - test -d $prefix/lib/socks/lib && cf_search="$cf_search $prefix/lib/socks/lib" - test -d $prefix/socks/lib && cf_search="$cf_search $prefix/socks/lib" - test -d $prefix/socks/lib/socks && cf_search="$cf_search $prefix/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}:7731: testing ... testing $cf_cv_library_path_socks ..." 1>&5 + fi + fi - CPPFLAGS="$cf_test_CPPFLAGS" - LIBS="-lsocks $cf_save_LIBS" - LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_socks" - cat >conftest.$ac_ext <<_ACEOF -#line 7737 "configure" + # lieder@skyler.mavd.honeywell.com says without -lsocket, + # socket/setsockopt and other routines are undefined under SCO ODT + # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary + # on later versions), says Simon Leinen: it contains gethostby* + # variants that don't use the nameserver (or something). -lsocket + # must be given before -lnsl if both are needed. We assume that + # if connect needs -lnsl, so does gethostbyname. + echo "$as_me:7660: checking for connect" >&5 +echo $ECHO_N "checking for connect... $ECHO_C" >&6 +if test "${ac_cv_func_connect+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 7666 "configure" #include "confdefs.h" +#define connect autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef connect -#include +#ifdef __cplusplus +extern "C" +#endif + +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char connect (void); int main (void) { - Raccept((char *)0) +/* The GNU C library defines stubs 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_connect) || defined (__stub___connect) +#error found stub for connect +#endif + return connect (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7753: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7697: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7756: \$? = $ac_status" >&5 + echo "$as_me:7700: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7759: \"$ac_try\"") >&5 + { (eval echo "$as_me:7703: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7762: \$? = $ac_status" >&5 + echo "$as_me:7706: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - test -n "$verbose" && echo " ... found socks library in $cf_cv_library_path_socks" 1>&6 - -echo "${as_me:-configure}:7767: 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 + ac_cv_func_connect=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - - CPPFLAGS="$cf_save_CPPFLAGS" - LIBS="$cf_save_LIBS" - LDFLAGS="$cf_save_LDFLAGS" - -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi - done - CPPFLAGS="$cf_save_CPPFLAGS" - LDFLAGS="$cf_save_LDFLAGS" - fi - - else - cf_cv_find_linkage_socks=no - fi - +ac_cv_func_connect=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - -LIBS="$cf_save_LIBS" - -if test "$cf_cv_find_linkage_socks" = yes ; then - -if test -n "$cf_cv_header_path_socks" ; then - for cf_add_incdir in $cf_cv_header_path_socks - do - while test $cf_add_incdir != /usr/include - do - if test -d $cf_add_incdir - then - cf_have_incdir=no - if test -n "$CFLAGS$CPPFLAGS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_incdir in $CFLAGS $CPPFLAGS ; do - if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then - cf_have_incdir=yes; break - fi - done - fi - - if test "$cf_have_incdir" = no ; then - if test "$cf_add_incdir" = /usr/local/include ; then - if test "$GCC" = yes - then - cf_save_CPPFLAGS=$CPPFLAGS - - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" +echo "$as_me:7716: result: $ac_cv_func_connect" >&5 +echo "${ECHO_T}$ac_cv_func_connect" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line 7829 "configure" + if test $ac_cv_func_connect = no; then + echo "$as_me:7720: checking for connect in -lsocket" >&5 +echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 +if test "${ac_cv_lib_socket_connect+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsocket $X_EXTRA_LIBS $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 7728 "configure" #include "confdefs.h" -#include + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char connect (); int main (void) { -printf("Hello") +connect (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:7841: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7747: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7844: \$? = $ac_status" >&5 + echo "$as_me:7750: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7847: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7753: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7850: \$? = $ac_status" >&5 + echo "$as_me:7756: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - : + ac_cv_lib_socket_connect=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_have_incdir=yes -fi -rm -f conftest.$ac_objext conftest.$ac_ext - CPPFLAGS=$cf_save_CPPFLAGS - fi - fi - fi - - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - -echo "${as_me:-configure}:7867: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` - test "$cf_top_incdir" = "$cf_add_incdir" && break - cf_add_incdir="$cf_top_incdir" - else - break - fi - else - break - fi - done - done +ac_cv_lib_socket_connect=no 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 - -echo "${as_me:-configure}:7903: testing adding $cf_add_libdir to library-path ..." 1>&5 - - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi - fi - done +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi - -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 "$as_me:7928: WARNING: Cannot find socks library" >&5 -echo "$as_me: WARNING: Cannot find socks library" >&2;} +echo "$as_me:7767: result: $ac_cv_lib_socket_connect" >&5 +echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 +if test $ac_cv_lib_socket_connect = yes; then + X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" fi - if test "x$cf_cv_find_linkage_socks" = "xyes" ; then - -cat >>confdefs.h <<\EOF -#define SOCKS 1 -EOF - -cat >>confdefs.h <<\EOF -#define accept Raccept -EOF - -cat >>confdefs.h <<\EOF -#define bind Rbind -EOF - -cat >>confdefs.h <<\EOF -#define connect Rconnect -EOF - -cat >>confdefs.h <<\EOF -#define getpeername Rgetpeername -EOF - -cat >>confdefs.h <<\EOF -#define getsockname Rgetsockname -EOF - -cat >>confdefs.h <<\EOF -#define listen Rlisten -EOF - -cat >>confdefs.h <<\EOF -#define recvfrom Rrecvfrom -EOF - -cat >>confdefs.h <<\EOF -#define select Rselect -EOF - - else - { { echo "$as_me:7971: error: cannot link with socks library" >&5 -echo "$as_me: error: cannot link with socks library" >&2;} - { (exit 1); exit 1; }; } - fi - -else - -cf_test_netlibs=no - -echo "$as_me:7980: checking for network libraries" >&5 -echo $ECHO_N "checking for network libraries... $ECHO_C" >&6 + fi -if test "${cf_cv_netlibs+set}" = set; then + # Guillermo Gomez says -lposix is necessary on A/UX. + echo "$as_me:7776: checking for remove" >&5 +echo $ECHO_N "checking for remove... $ECHO_C" >&6 +if test "${ac_cv_func_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + cat >conftest.$ac_ext <<_ACEOF +#line 7782 "configure" +#include "confdefs.h" +#define remove autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef remove -echo "$as_me:7987: result: working..." >&5 -echo "${ECHO_T}working..." >&6 +#ifdef __cplusplus +extern "C" +#endif -cf_cv_netlibs="" -cf_test_netlibs=yes +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char remove (void); -case $host_os in -mingw*) +int +main (void) +{ -for ac_header in windows.h winsock.h winsock2.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:7999: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 8005 "configure" -#include "confdefs.h" -#include <$ac_header> +/* The GNU C library defines stubs 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_remove) || defined (__stub___remove) +#error found stub for remove +#endif + + return remove (); + ; + return 0; +} _ACEOF -if { (eval echo "$as_me:8009: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7813: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:8015: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + echo "$as_me:7816: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7819: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7822: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_remove=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" -fi -rm -f conftest.err conftest.$ac_ext +cat conftest.$ac_ext >&5 +ac_cv_func_remove=no fi -echo "$as_me:8034: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <&5 +echo "${ECHO_T}$ac_cv_func_remove" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line 8069 "configure" + if test $ac_cv_func_remove = no; then + echo "$as_me:7836: checking for remove in -lposix" >&5 +echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 +if test "${ac_cv_lib_posix_remove+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lposix $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 7844 "configure" #include "confdefs.h" -#ifdef HAVE_WINDOWS_H -#undef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#include -#ifdef HAVE_WINSOCK2_H -#include -#else -#ifdef HAVE_WINSOCK_H -#include -#endif -#endif +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" #endif - +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char remove (); int main (void) { - - char buffer[1024]; - gethostname(buffer, sizeof(buffer)); +remove (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8096: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7863: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8099: \$? = $ac_status" >&5 + echo "$as_me:7866: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8102: \"$ac_try\"") >&5 + { (eval echo "$as_me:7869: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8105: \$? = $ac_status" >&5 + echo "$as_me:7872: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_netlibs="$cf_winsock_lib $cf_cv_netlibs" + ac_cv_lib_posix_remove=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:8111: error: Cannot link against winsock library" >&5 -echo "$as_me: error: Cannot link against winsock library" >&2;} - { (exit 1); exit 1; }; } +ac_cv_lib_posix_remove=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:7883: result: $ac_cv_lib_posix_remove" >&5 +echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 +if test $ac_cv_lib_posix_remove = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" +fi - LIBS="$cf_save_LIBS" - ;; -*) + fi -for ac_func in gethostname -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:8124: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then + # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. + echo "$as_me:7892: checking for shmat" >&5 +echo $ECHO_N "checking for shmat... $ECHO_C" >&6 +if test "${ac_cv_func_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8130 "configure" +#line 7898 "configure" #include "confdefs.h" -#define $ac_func autoconf_temporary +#define shmat autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef $ac_func +#undef shmat #ifdef __cplusplus extern "C" @@ -8139,7 +7907,7 @@ extern "C" /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char $ac_func (void); +char shmat (void); int main (void) @@ -8148,53 +7916,48 @@ main (void) /* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -#error found stub for $ac_func +#if defined (__stub_shmat) || defined (__stub___shmat) +#error found stub for shmat #endif - return $ac_func (); + return shmat (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8161: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7929: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8164: \$? = $ac_status" >&5 + echo "$as_me:7932: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8167: \"$ac_try\"") >&5 + { (eval echo "$as_me:7935: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8170: \$? = $ac_status" >&5 + echo "$as_me:7938: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$as_ac_var=yes" + ac_cv_func_shmat=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -eval "$as_ac_var=no" +ac_cv_func_shmat=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8180: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <&5 +echo "${ECHO_T}$ac_cv_func_shmat" >&6 -echo "$as_me:8189: checking for gethostname in -lnsl" >&5 -echo $ECHO_N "checking for gethostname in -lnsl... $ECHO_C" >&6 -if test "${ac_cv_lib_nsl_gethostname+set}" = set; then + if test $ac_cv_func_shmat = no; then + echo "$as_me:7952: checking for shmat in -lipc" >&5 +echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 +if test "${ac_cv_lib_ipc_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lnsl $cf_cv_netlibs $LIBS" +LIBS="-lipc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8197 "configure" +#line 7960 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8203,62 +7966,63 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char gethostname (); +char shmat (); int main (void) { -gethostname (); +shmat (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8216: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7979: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8219: \$? = $ac_status" >&5 + echo "$as_me:7982: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8222: \"$ac_try\"") >&5 + { (eval echo "$as_me:7985: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8225: \$? = $ac_status" >&5 + echo "$as_me:7988: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_nsl_gethostname=yes + ac_cv_lib_ipc_shmat=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_nsl_gethostname=no +ac_cv_lib_ipc_shmat=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8236: result: $ac_cv_lib_nsl_gethostname" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_gethostname" >&6 -if test $ac_cv_lib_nsl_gethostname = yes; then - -cf_tr_func=`echo "gethostname" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - - cat >>confdefs.h <&5 +echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 +if test $ac_cv_lib_ipc_shmat = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" +fi - ac_cv_func_gethostname=unknown - unset ac_cv_func_gethostname 2>/dev/null + fi + fi -echo "$as_me:8253: checking for gethostname in -lsocket" >&5 -echo $ECHO_N "checking for gethostname in -lsocket... $ECHO_C" >&6 -if test "${ac_cv_lib_socket_gethostname+set}" = set; then + # Check for libraries that X11R6 Xt/Xaw programs need. + ac_save_LDFLAGS=$LDFLAGS + test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" + # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to + # check for ICE first), but we must link in the order -lSM -lICE or + # we get undefined symbols. So assume we have SM if we have ICE. + # These have to be linked with before -lX11, unlike the other + # libraries we check for below, so use a different variable. + # John Interrante, Karl Berry + echo "$as_me:8017: checking for IceConnectionNumber in -lICE" >&5 +echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 +if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lsocket $cf_cv_netlibs $LIBS" +LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8261 "configure" +#line 8025 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8267,1465 +8031,2032 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char gethostname (); +char IceConnectionNumber (); int main (void) { -gethostname (); +IceConnectionNumber (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8280: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8044: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8283: \$? = $ac_status" >&5 + echo "$as_me:8047: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8050: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8053: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_ICE_IceConnectionNumber=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_ICE_IceConnectionNumber=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:8064: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 +if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then + X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" +fi + + LDFLAGS=$ac_save_LDFLAGS + +fi + +if test "x$have_x" = xyes; then + +cf_save_LIBS_CF_CONST_X_STRING="$LIBS" +cf_save_CFLAGS_CF_CONST_X_STRING="$CFLAGS" +cf_save_CPPFLAGS_CF_CONST_X_STRING="$CPPFLAGS" +LIBS="$LIBS ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS}" +for cf_X_CFLAGS in $X_CFLAGS +do + case "x$cf_X_CFLAGS" in + x-[IUD]*) + CPPFLAGS="$CPPFLAGS $cf_X_CFLAGS" + ;; + *) + CFLAGS="$CFLAGS $cf_X_CFLAGS" + ;; + esac +done + +cat >conftest.$ac_ext <<_ACEOF +#line 8093 "configure" +#include "confdefs.h" + +#include +#include + +int +main (void) +{ +String foo = malloc(1); (void)foo + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:8108: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:8111: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:8114: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8117: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + +echo "$as_me:8120: checking for X11/Xt const-feature" >&5 +echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6 +if test "${cf_cv_const_x_string+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF +#line 8127 "configure" +#include "confdefs.h" + +#define _CONST_X_STRING /* X11R7.8 (perhaps) */ +#undef XTSTRINGDEFINES /* X11R5 and later */ +#include +#include + +int +main (void) +{ +String foo = malloc(1); *foo = 0 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:8144: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:8147: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8286: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:8150: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8289: \$? = $ac_status" >&5 + echo "$as_me:8153: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_socket_gethostname=yes + + cf_cv_const_x_string=no + else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_socket_gethostname=no + + cf_cv_const_x_string=yes + fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f conftest.$ac_objext conftest.$ac_ext + fi -echo "$as_me:8300: result: $ac_cv_lib_socket_gethostname" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_gethostname" >&6 -if test $ac_cv_lib_socket_gethostname = yes; then +echo "$as_me:8168: result: $cf_cv_const_x_string" >&5 +echo "${ECHO_T}$cf_cv_const_x_string" >&6 -cf_tr_func=`echo "gethostname" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` +LIBS="$cf_save_LIBS_CF_CONST_X_STRING" +CFLAGS="$cf_save_CFLAGS_CF_CONST_X_STRING" +CPPFLAGS="$cf_save_CPPFLAGS_CF_CONST_X_STRING" - cat >>confdefs.h </dev/null + ;; +*) + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-D_CONST_X_STRING" + ;; +esac + +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi +rm -f conftest.$ac_objext conftest.$ac_ext + fi +cat > conftest.$ac_ext <&5 +echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" + for cf_opt in \ + wd1419 \ + wd1683 \ + wd1684 \ + wd193 \ + wd593 \ + wd279 \ + wd810 \ + wd869 \ + wd981 + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" + if { (eval echo "$as_me:8229: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:8232: \$? = $ac_status" >&5 + (exit $ac_status); }; then + test -n "$verbose" && echo "$as_me:8234: result: ... -$cf_opt" >&5 +echo "${ECHO_T}... -$cf_opt" >&6 + EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" + fi + done + CFLAGS="$cf_save_CFLAGS" +elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" +then + { echo "$as_me:8242: checking for $CC warning options..." >&5 +echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + cf_warn_CONST="" + test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings" + cf_gcc_warnings="Wignored-qualifiers Wlogical-op Wvarargs" + test "x$CLANG_COMPILER" = xyes && cf_gcc_warnings= + for cf_opt in W Wall \ + Wbad-function-cast \ + Wcast-align \ + Wcast-qual \ + Wdeclaration-after-statement \ + Wextra \ + Winline \ + Wmissing-declarations \ + Wmissing-prototypes \ + Wnested-externs \ + Wpointer-arith \ + Wshadow \ + Wstrict-prototypes \ + Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" + if { (eval echo "$as_me:8265: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:8268: \$? = $ac_status" >&5 + (exit $ac_status); }; then + test -n "$verbose" && echo "$as_me:8270: result: ... -$cf_opt" >&5 +echo "${ECHO_T}... -$cf_opt" >&6 + case $cf_opt in + Winline) + case $GCC_VERSION in + [34].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +echo "${as_me:-configure}:8278: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + continue;; + esac + ;; + Wpointer-arith) + case $GCC_VERSION in + [12].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +echo "${as_me:-configure}:8288: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + continue;; + esac + ;; + esac + EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" + fi + done + CFLAGS="$cf_save_CFLAGS" fi +rm -rf conftest* fi -done +fi + +## !NNTP_ONLY +if test "$USE_SPOOLDIR" = "yes"; then + ## options for directories + echo "$as_me:8307: checking for news-library path" >&5 +echo $ECHO_N "checking for news-library path... $ECHO_C" >&6 + +# Check whether --with-libdir or --without-libdir was given. +if test "${with_libdir+set}" = set; then + withval="$with_libdir" - echo "$as_me:8324: checking for main in -linet" >&5 -echo $ECHO_N "checking for main in -linet... $ECHO_C" >&6 -if test "${ac_cv_lib_inet_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-linet $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 8332 "configure" -#include "confdefs.h" + withval="${NEWSLIBDIR:-/usr/lib/news}" +fi; if true ; then -int -main (void) -{ -main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8344: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:8347: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8350: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:8353: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_inet_main=yes +if test "x$prefix" != xNONE; then + cf_path_syntax="$prefix" else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_inet_main=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + cf_path_syntax="$ac_default_prefix" fi -echo "$as_me:8364: result: $ac_cv_lib_inet_main" >&5 -echo "${ECHO_T}$ac_cv_lib_inet_main" >&6 -if test $ac_cv_lib_inet_main = yes; then - cf_cv_netlibs="-linet $cf_cv_netlibs" + +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 "$as_me:8343: error: expected a pathname, not \"$withval\"" >&5 +echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +esac + fi +eval NEWSLIBDIR="$withval" - if test "$ac_cv_func_lsocket" != no ; then + echo "$as_me:8352: result: $NEWSLIBDIR" >&5 +echo "${ECHO_T}$NEWSLIBDIR" >&6 + + echo "$as_me:8355: checking for news spool-directory path" >&5 +echo $ECHO_N "checking for news spool-directory path... $ECHO_C" >&6 + +# Check whether --with-spooldir or --without-spooldir was given. +if test "${with_spooldir+set}" = set; then + withval="$with_spooldir" -for ac_func in socket -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:8375: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 8381 "configure" -#include "confdefs.h" -#define $ac_func autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef $ac_func + withval="${SPOOLDIR:-/var/spool/news}" +fi; if true ; then + +if test "x$prefix" != xNONE; then + cf_path_syntax="$prefix" +else + cf_path_syntax="$ac_default_prefix" +fi + +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 "$as_me:8391: error: expected a pathname, not \"$withval\"" >&5 +echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +esac + +fi +eval SPOOLDIR="$withval" -#ifdef __cplusplus -extern "C" -#endif + echo "$as_me:8400: result: $SPOOLDIR" >&5 +echo "${ECHO_T}$SPOOLDIR" >&6 -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (void); + echo "$as_me:8403: checking for news overview-directory path" >&5 +echo $ECHO_N "checking for news overview-directory path... $ECHO_C" >&6 -int -main (void) -{ +# Check whether --with-nov-dir or --without-nov-dir was given. +if test "${with_nov_dir+set}" = set; then + withval="$with_nov_dir" -/* The GNU C library defines stubs for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -#error found stub for $ac_func -#endif +else + withval="${NOVROOTDIR:-$SPOOLDIR}" +fi; if true ; then - return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8412: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:8415: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8418: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:8421: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" +if test "x$prefix" != xNONE; then + cf_path_syntax="$prefix" else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$as_ac_var=no" + cf_path_syntax="$ac_default_prefix" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +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 "$as_me:8439: error: expected a pathname, not \"$withval\"" >&5 +echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +esac + fi -echo "$as_me:8431: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <&5 +echo "${ECHO_T}$NOVROOTDIR" >&6 + + echo "$as_me:8451: checking for overview filename" >&5 +echo $ECHO_N "checking for overview filename... $ECHO_C" >&6 + +# Check whether --with-nov-fname or --without-nov-fname was given. +if test "${with_nov_fname+set}" = set; then + withval="$with_nov_fname" -echo "$as_me:8440: checking for socket in -lsocket" >&5 -echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6 -if test "${ac_cv_lib_socket_socket+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsocket $cf_cv_netlibs $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 8448 "configure" -#include "confdefs.h" + withval="${OVERVIEW_FILE-.overview}" +fi; test -z "$withval" && withval=no +case "$withval" in #(vi +yes) + { { echo "$as_me:8463: error: expected a value for --with-nov-fname" >&5 +echo "$as_me: error: expected a value for --with-nov-fname" >&2;} + { (exit 1); exit 1; }; } + ;; #(vi +no) withval="" + ;; +esac +OVERVIEW_FILE="$withval" -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char socket (); -int -main (void) -{ -socket (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8467: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:8470: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8473: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:8476: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_socket_socket=yes +cat >>confdefs.h <&5 +echo "${ECHO_T}$OVERVIEW_FILE" >&6 + + INEWSPATH="$NEWSLIBDIR" else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_socket_socket=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + NEWSLIBDIR="" + SPOOLDIR="" + NOVROOTDIR="" + INEWSPATH="/usr/lib/news" fi -echo "$as_me:8487: result: $ac_cv_lib_socket_socket" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6 -if test $ac_cv_lib_socket_socket = yes; then -cf_tr_func=`echo "socket" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` +## TODO: kick the --with-inews-dir= stuff, the check below should be enough +## (requires some code rework in tin) +echo "$as_me:8489: checking for directory containing \"inews\"" >&5 +echo $ECHO_N "checking for directory containing \"inews\"... $ECHO_C" >&6 - cat >>confdefs.h </dev/null +if test "x$prefix" != xNONE; then + cf_path_syntax="$prefix" +else + cf_path_syntax="$ac_default_prefix" +fi -echo "$as_me:8504: checking for socket in -lbsd" >&5 -echo $ECHO_N "checking for socket in -lbsd... $ECHO_C" >&6 -if test "${ac_cv_lib_bsd_socket+set}" = set; then +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 "$as_me:8525: error: expected a pathname, not \"$withval\"" >&5 +echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +esac + +fi +eval INEWSDIR="$withval" + +INEWSDIR=`echo $INEWSDIR |sed -e 's,/$,,'` +echo "$as_me:8535: result: $INEWSDIR" >&5 +echo "${ECHO_T}$INEWSDIR" >&6 + +# Extract the first word of "inews", so it can be a program name with args. +set dummy inews; ac_word=$2 +echo "$as_me:8540: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_INEWS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lbsd $cf_cv_netlibs $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 8512 "configure" -#include "confdefs.h" + case $INEWS in + [\\/]* | ?:[\\/]*) + ac_cv_path_INEWS="$INEWS" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$INEWSDIR:/news/bin:/usr/lib/news/bin:$INEWSPATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_INEWS="$ac_dir/$ac_word" + echo "$as_me:8557: found $ac_dir/$ac_word" >&5 + break +fi +done -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char socket (); -int -main (void) -{ -socket (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8531: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:8534: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8537: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:8540: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_bsd_socket=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_bsd_socket=no + test -z "$ac_cv_path_INEWS" && ac_cv_path_INEWS="--internal" + ;; +esac fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +INEWS=$ac_cv_path_INEWS + +if test -n "$INEWS"; then + echo "$as_me:8569: result: $INEWS" >&5 +echo "${ECHO_T}$INEWS" >&6 +else + echo "$as_me:8572: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -echo "$as_me:8551: result: $ac_cv_lib_bsd_socket" >&5 -echo "${ECHO_T}$ac_cv_lib_bsd_socket" >&6 -if test $ac_cv_lib_bsd_socket = yes; then -cf_tr_func=`echo "socket" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` +if test "$ac_cv_path_INEWS" != ""; then + if test "$ac_cv_path_INEWS" = "--internal"; then - cat >>confdefs.h <>confdefs.h </dev/null +cf_define=`echo "$INEWS -h"|sed -e 's/\\\\/\\\\134/g' -e 's/^[ ]\\+//' -e 's/[ ]\\+$//' -e 's/"/\\\\042/g'` -fi +cat >>confdefs.h <&5 +echo $ECHO_N "checking if you want socks library... $ECHO_C" >&6 +if test "${cf_cv_use_libsocks+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else - fi +# Check whether --with-socks or --without-socks was given. +if test "${with_socks+set}" = set; then + withval="$with_socks" + cf_cv_use_libsocks=$withval +else + cf_cv_use_libsocks=no +fi; -for ac_func in gethostbyname -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:8580: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +fi +echo "$as_me:8613: result: $cf_cv_use_libsocks" >&5 +echo "${ECHO_T}$cf_cv_use_libsocks" >&6 + +echo "$as_me:8616: checking if you want socks5 library" >&5 +echo $ECHO_N "checking if you want socks5 library... $ECHO_C" >&6 +if test "${cf_cv_use_libsocks5+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 8586 "configure" -#include "confdefs.h" -#define $ac_func autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef $ac_func -#ifdef __cplusplus -extern "C" -#endif +# Check whether --with-socks5 or --without-socks5 was given. +if test "${with_socks5+set}" = set; then + withval="$with_socks5" + cf_cv_use_libsocks5=$withval +else + cf_cv_use_libsocks5=no +fi; -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (void); +fi +echo "$as_me:8631: result: $cf_cv_use_libsocks5" >&5 +echo "${ECHO_T}$cf_cv_use_libsocks5" >&6 + +if test "x$cf_cv_use_libsocks" != xno ; then + +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 + +if test -n "$cf_searchpath/include" ; then + for cf_add_incdir in $cf_searchpath/include + do + while test $cf_add_incdir != /usr/include + do + if test -d $cf_add_incdir + then + cf_have_incdir=no + if test -n "$CFLAGS$CPPFLAGS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then + cf_have_incdir=yes; break + fi + done + fi + + if test "$cf_have_incdir" = no ; then + if test "$cf_add_incdir" = /usr/local/include ; then + if test "$GCC" = yes + then + cf_save_CPPFLAGS=$CPPFLAGS + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +#line 8673 "configure" +#include "confdefs.h" +#include int main (void) { - -/* The GNU C library defines stubs for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -#error found stub for $ac_func -#endif - - return $ac_func (); +printf("Hello") ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8617: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:8685: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8620: \$? = $ac_status" >&5 + echo "$as_me:8688: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8623: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:8691: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8626: \$? = $ac_status" >&5 + echo "$as_me:8694: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$as_ac_var=yes" + : else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -eval "$as_ac_var=no" +cf_have_incdir=yes fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$cf_save_CPPFLAGS + fi + fi + fi + + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +echo "${as_me:-configure}:8711: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + test "$cf_top_incdir" = "$cf_add_incdir" && break + cf_add_incdir="$cf_top_incdir" + else + break + fi + else + break + fi + done + done fi -echo "$as_me:8636: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <&5 -echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lnsl $cf_cv_netlibs $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 8653 "configure" -#include "confdefs.h" +if test -n "$cf_searchpath/../include" ; then + for cf_add_incdir in $cf_searchpath/../include + do + while test $cf_add_incdir != /usr/include + do + if test -d $cf_add_incdir + then + cf_have_incdir=no + if test -n "$CFLAGS$CPPFLAGS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then + cf_have_incdir=yes; break + fi + done + fi -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname (); + if test "$cf_have_incdir" = no ; then + if test "$cf_add_incdir" = /usr/local/include ; then + if test "$GCC" = yes + then + cf_save_CPPFLAGS=$CPPFLAGS + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >conftest.$ac_ext <<_ACEOF +#line 8757 "configure" +#include "confdefs.h" +#include int main (void) { -gethostbyname (); +printf("Hello") ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8672: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:8769: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8675: \$? = $ac_status" >&5 + echo "$as_me:8772: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8678: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:8775: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8681: \$? = $ac_status" >&5 + echo "$as_me:8778: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_nsl_gethostbyname=yes + : else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_nsl_gethostbyname=no +cf_have_incdir=yes fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$cf_save_CPPFLAGS + fi + fi + fi + + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +echo "${as_me:-configure}:8795: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + test "$cf_top_incdir" = "$cf_add_incdir" && break + cf_add_incdir="$cf_top_incdir" + else + break + fi + else + break + fi + done + done fi -echo "$as_me:8692: result: $ac_cv_lib_nsl_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 -if test $ac_cv_lib_nsl_gethostbyname = yes; then -cf_tr_func=`echo "gethostbyname" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + else +{ { echo "$as_me:8813: error: cannot find socks library under $cf_cv_use_libsocks" >&5 +echo "$as_me: error: cannot find socks library under $cf_cv_use_libsocks" >&2;} + { (exit 1); exit 1; }; } + 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 + +echo "${as_me:-configure}:8838: testing adding $cf_add_libdir to library-path ..." 1>&5 - cat >>confdefs.h </dev/null +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 -fi +echo "${as_me:-configure}:8867: testing adding $cf_add_libdir to library-path ..." 1>&5 + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done fi + + else +{ { echo "$as_me:8876: error: cannot find socks library under $cf_cv_use_libsocks" >&5 +echo "$as_me: error: cannot find socks library under $cf_cv_use_libsocks" >&2;} + { (exit 1); exit 1; }; } + fi done -for ac_func in inet_ntoa -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:8717: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 8723 "configure" -#include "confdefs.h" -#define $ac_func autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef $ac_func + ;; +esac -#ifdef __cplusplus -extern "C" -#endif +# If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these +# will be set on completion of the AC_TRY_LINK below. +cf_cv_header_path_socks= +cf_cv_library_path_socks= -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (void); +echo "${as_me:-configure}:8890: testing Starting FIND_LINKAGE(socks,) ..." 1>&5 + +cf_save_LIBS="$LIBS" + +cat >conftest.$ac_ext <<_ACEOF +#line 8895 "configure" +#include "confdefs.h" + +#include int main (void) { -/* The GNU C library defines stubs for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -#error found stub for $ac_func -#endif + Raccept((char *)0) - return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8754: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8911: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8757: \$? = $ac_status" >&5 + echo "$as_me:8914: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8760: \"$ac_try\"") >&5 + { (eval echo "$as_me:8917: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8763: \$? = $ac_status" >&5 + echo "$as_me:8920: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$as_ac_var=yes" + + cf_cv_find_linkage_socks=yes + cf_cv_header_path_socks=/usr/include + cf_cv_library_path_socks=/usr/lib + else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -eval "$as_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:8773: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <&5 -echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6 -if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lnsl $cf_cv_netlibs $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8790 "configure" +#line 8934 "configure" #include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char inet_ntoa (); +#include + int main (void) { -inet_ntoa (); + + Raccept((char *)0) + ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8809: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8950: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8812: \$? = $ac_status" >&5 + echo "$as_me:8953: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8815: \"$ac_try\"") >&5 + { (eval echo "$as_me:8956: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8818: \$? = $ac_status" >&5 + echo "$as_me:8959: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_nsl_inet_ntoa=yes + + cf_cv_find_linkage_socks=yes + cf_cv_header_path_socks=/usr/include + cf_cv_library_path_socks=/usr/lib + cf_cv_library_file_socks="-lsocks" + else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_nsl_inet_ntoa=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:8829: result: $ac_cv_lib_nsl_inet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6 -if test $ac_cv_lib_nsl_inet_ntoa = yes; then -cf_tr_func=`echo "inet_ntoa" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + cf_cv_find_linkage_socks=no + LIBS="$cf_save_LIBS" - cat >>confdefs.h <&6 - ac_cv_func_inet_ntoa=yes - if test "$cf_used_lib_nsl" != yes ; then cf_used_lib_nsl=yes; cf_cv_netlibs="-lnsl $cf_cv_netlibs"; fi -else +echo "${as_me:-configure}:8976: testing find linkage for socks library ..." 1>&5 - ac_cv_func_inet_ntoa=unknown - unset ac_cv_func_inet_ntoa 2>/dev/null +echo "${as_me:-configure}:8978: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5 -fi + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" + +cf_search= + +# collect the current set of include-directories from compiler flags +cf_header_path_list="" +if test -n "${CFLAGS}${CPPFLAGS}" ; then + for cf_header_path in $CPPFLAGS $CFLAGS + do + 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" && \ +test -d "$cf_header_path" && \ + { + test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" + test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" + test -d $cf_header_path/include/socks && cf_search="$cf_search $cf_header_path/include/socks" + test -d $cf_header_path/include/socks/include && cf_search="$cf_search $cf_header_path/include/socks/include" + test -d $cf_header_path/socks/include && cf_search="$cf_search $cf_header_path/socks/include" + test -d $cf_header_path/socks/include/socks && cf_search="$cf_search $cf_header_path/socks/include/socks" +} + cf_header_path_list="$cf_header_path_list $cf_search" + ;; + esac + done fi -done -for ac_func in gethostbyname +# add the variations for the package we are looking for + +cf_search= + +test "x$prefix" != "xNONE" && \ +test -d "$prefix" && \ + { + test -n "$verbose" && echo " ... testing for include-directories under $prefix" + test -d $prefix/include && cf_search="$cf_search $prefix/include" + test -d $prefix/include/socks && cf_search="$cf_search $prefix/include/socks" + test -d $prefix/include/socks/include && cf_search="$cf_search $prefix/include/socks/include" + test -d $prefix/socks/include && cf_search="$cf_search $prefix/socks/include" + test -d $prefix/socks/include/socks && cf_search="$cf_search $prefix/socks/include/socks" +} + +for cf_subdir_prefix in \ + /usr \ + /usr/local \ + /usr/pkg \ + /opt \ + /opt/local \ + $HOME do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:8854: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 8860 "configure" -#include "confdefs.h" -#define $ac_func autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef $ac_func -#ifdef __cplusplus -extern "C" -#endif +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 && \ +test "$includedir" != "/usr/include" && \ +test -d "$includedir" && { + test -d $includedir && cf_search="$cf_search $includedir" + test -d $includedir/socks && cf_search="$cf_search $includedir/socks" +} + +test "$oldincludedir" != NONE && \ +test "$oldincludedir" != "/usr/include" && \ +test -d "$oldincludedir" && { + test -d $oldincludedir && cf_search="$cf_search $oldincludedir" + test -d $oldincludedir/socks && cf_search="$cf_search $oldincludedir/socks" +} + +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 + +echo "${as_me:-configure}:9069: testing ... testing $cf_cv_header_path_socks ..." 1>&5 -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (void); + CPPFLAGS="$cf_save_CPPFLAGS" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_socks" + + cat >conftest.$ac_ext <<_ACEOF +#line 9077 "configure" +#include "confdefs.h" + +#include int main (void) { -/* The GNU C library defines stubs for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -#error found stub for $ac_func -#endif + Raccept((char *)0) - return $ac_func (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8891: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:9093: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8894: \$? = $ac_status" >&5 + echo "$as_me:9096: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8897: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:9099: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8900: \$? = $ac_status" >&5 + echo "$as_me:9102: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$as_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:8910: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <&6 -echo "$as_me:8919: checking for gethostbyname in -lnetwork" >&5 -echo $ECHO_N "checking for gethostbyname in -lnetwork... $ECHO_C" >&6 -if test "${ac_cv_lib_network_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lnetwork $cf_cv_netlibs $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 8927 "configure" -#include "confdefs.h" +echo "${as_me:-configure}:9107: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5 -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname (); -int -main (void) -{ -gethostbyname (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8946: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:8949: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8952: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:8955: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_network_gethostbyname=yes + cf_cv_find_linkage_socks=maybe + cf_test_CPPFLAGS="$CPPFLAGS" + break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_network_gethostbyname=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + + CPPFLAGS="$cf_save_CPPFLAGS" + fi -echo "$as_me:8966: result: $ac_cv_lib_network_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_network_gethostbyname" >&6 -if test $ac_cv_lib_network_gethostbyname = yes; then +rm -f conftest.$ac_objext conftest.$ac_ext + fi + done -cf_tr_func=`echo "gethostbyname" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + if test "$cf_cv_find_linkage_socks" = maybe ; then - cat >>confdefs.h <&5 - ac_cv_func_gethostbyname=yes - if test "$cf_used_lib_network" != yes ; then cf_used_lib_network=yes; cf_cv_netlibs="-lnetwork $cf_cv_netlibs"; fi -else + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" - ac_cv_func_gethostbyname=unknown - unset ac_cv_func_gethostbyname 2>/dev/null + if test "$cf_cv_find_linkage_socks" != yes ; then -fi +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 + -L*) + cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` + +test "x$cf_library_path" != "xNONE" && \ +test -d "$cf_library_path" && \ + { + test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" + test -d $cf_library_path/lib && cf_search="$cf_search $cf_library_path/lib" + test -d $cf_library_path/lib/socks && cf_search="$cf_search $cf_library_path/lib/socks" + test -d $cf_library_path/lib/socks/lib && cf_search="$cf_search $cf_library_path/lib/socks/lib" + test -d $cf_library_path/socks/lib && cf_search="$cf_search $cf_library_path/socks/lib" + test -d $cf_library_path/socks/lib/socks && cf_search="$cf_search $cf_library_path/socks/lib/socks" +} + cf_library_path_list="$cf_library_path_list $cf_search" + ;; + esac + done fi -done -for ac_func in strcasecmp +cf_search= + +test "x$prefix" != "xNONE" && \ +test -d "$prefix" && \ + { + test -n "$verbose" && echo " ... testing for lib-directories under $prefix" + test -d $prefix/lib && cf_search="$cf_search $prefix/lib" + test -d $prefix/lib/socks && cf_search="$cf_search $prefix/lib/socks" + test -d $prefix/lib/socks/lib && cf_search="$cf_search $prefix/lib/socks/lib" + test -d $prefix/socks/lib && cf_search="$cf_search $prefix/socks/lib" + test -d $prefix/socks/lib/socks && cf_search="$cf_search $prefix/socks/lib/socks" +} + +for cf_subdir_prefix in \ + /usr \ + /usr/local \ + /usr/pkg \ + /opt \ + /opt/local \ + $HOME do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:8991: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 8997 "configure" -#include "confdefs.h" -#define $ac_func autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef $ac_func -#ifdef __cplusplus -extern "C" -#endif +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" +} -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (void); +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}:9200: 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 <<_ACEOF +#line 9206 "configure" +#include "confdefs.h" + +#include int main (void) { -/* The GNU C library defines stubs for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -#error found stub for $ac_func -#endif + Raccept((char *)0) - return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9028: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9222: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9031: \$? = $ac_status" >&5 + echo "$as_me:9225: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9034: \"$ac_try\"") >&5 + { (eval echo "$as_me:9228: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9037: \$? = $ac_status" >&5 + echo "$as_me:9231: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$as_ac_var=yes" + + test -n "$verbose" && echo " ... found socks library in $cf_cv_library_path_socks" 1>&6 + +echo "${as_me:-configure}:9236: 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 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -eval "$as_ac_var=no" + + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" + LDFLAGS="$cf_save_LDFLAGS" + +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi + done + CPPFLAGS="$cf_save_CPPFLAGS" + LDFLAGS="$cf_save_LDFLAGS" + fi + + else + cf_cv_find_linkage_socks=no + fi + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi -echo "$as_me:9047: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <&5 -echo $ECHO_N "checking for strcasecmp in -lresolv... $ECHO_C" >&6 -if test "${ac_cv_lib_resolv_strcasecmp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lresolv $cf_cv_netlibs $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 9064 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 9298 "configure" #include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char strcasecmp (); +#include int main (void) { -strcasecmp (); +printf("Hello") ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9083: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:9310: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9086: \$? = $ac_status" >&5 + echo "$as_me:9313: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9089: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:9316: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9092: \$? = $ac_status" >&5 + echo "$as_me:9319: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_resolv_strcasecmp=yes + : else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_resolv_strcasecmp=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +cf_have_incdir=yes fi -echo "$as_me:9103: result: $ac_cv_lib_resolv_strcasecmp" >&5 -echo "${ECHO_T}$ac_cv_lib_resolv_strcasecmp" >&6 -if test $ac_cv_lib_resolv_strcasecmp = yes; then - -cf_tr_func=`echo "strcasecmp" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` +rm -f conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$cf_save_CPPFLAGS + fi + fi + fi - cat >>confdefs.h <&6 - ac_cv_func_strcasecmp=yes - if test "$cf_used_lib_resolv" != yes ; then cf_used_lib_resolv=yes; cf_cv_netlibs="-lresolv $cf_cv_netlibs"; fi -else +echo "${as_me:-configure}:9336: testing adding $cf_add_incdir to include-path ..." 1>&5 - ac_cv_func_strcasecmp=unknown - unset ac_cv_func_strcasecmp 2>/dev/null + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + test "$cf_top_incdir" = "$cf_add_incdir" && break + cf_add_incdir="$cf_top_incdir" + else + break + fi + else + break + fi + done + done fi -fi -done +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 - ;; -esac +echo "${as_me:-configure}:9372: testing adding $cf_add_libdir to library-path ..." 1>&5 + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done fi -case $cf_cv_netlibs in -*ws2_32*) - -cat >>confdefs.h <<\EOF -#define USE_WINSOCK2_H 1 -EOF - - ;; -esac - -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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lsocks; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" -test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&6 +else +{ echo "$as_me:9397: WARNING: Cannot find socks library" >&5 +echo "$as_me: WARNING: Cannot find socks library" >&2;} +fi - if test "x$cf_cv_use_libsocks5" != xno ; then + if test "x$cf_cv_find_linkage_socks" = "xyes" ; then -case "$cf_cv_use_libsocks5" in -no) - ;; -yes) - ;; -*) +cat >>confdefs.h <<\EOF +#define SOCKS 1 +EOF -for cf_searchpath in `echo "$cf_cv_use_libsocks5" | tr $PATH_SEPARATOR ' '`; do - if test -d $cf_searchpath/include; then +cat >>confdefs.h <<\EOF +#define accept Raccept +EOF -if test -n "$cf_searchpath/include" ; then - for cf_add_incdir in $cf_searchpath/include - do - while test $cf_add_incdir != /usr/include - do - if test -d $cf_add_incdir - then - cf_have_incdir=no - if test -n "$CFLAGS$CPPFLAGS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_incdir in $CFLAGS $CPPFLAGS ; do - if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then - cf_have_incdir=yes; break - fi - done - fi +cat >>confdefs.h <<\EOF +#define bind Rbind +EOF - if test "$cf_have_incdir" = no ; then - if test "$cf_add_incdir" = /usr/local/include ; then - if test "$GCC" = yes - then - cf_save_CPPFLAGS=$CPPFLAGS +cat >>confdefs.h <<\EOF +#define connect Rconnect +EOF - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" +cat >>confdefs.h <<\EOF +#define getpeername Rgetpeername +EOF + +cat >>confdefs.h <<\EOF +#define getsockname Rgetsockname +EOF + +cat >>confdefs.h <<\EOF +#define listen Rlisten +EOF + +cat >>confdefs.h <<\EOF +#define recvfrom Rrecvfrom +EOF + +cat >>confdefs.h <<\EOF +#define select Rselect +EOF + + else + { { echo "$as_me:9440: error: cannot link with socks library" >&5 +echo "$as_me: error: cannot link with socks library" >&2;} + { (exit 1); exit 1; }; } + fi + +else + +cf_test_netlibs=no + +echo "$as_me:9449: checking for network libraries" >&5 +echo $ECHO_N "checking for network libraries... $ECHO_C" >&6 + +if test "${cf_cv_netlibs+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +echo "$as_me:9456: result: working..." >&5 +echo "${ECHO_T}working..." >&6 + +cf_cv_netlibs="" +cf_test_netlibs=yes + +case $host_os in +mingw*) + +for ac_header in windows.h winsock.h winsock2.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:9468: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 9474 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:9478: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:9484: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + eval "$as_ac_Header=no" +fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:9503: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <conftest.$ac_ext <<_ACEOF -#line 9197 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 9538 "configure" #include "confdefs.h" -#include + +#ifdef HAVE_WINDOWS_H +#undef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN +#include +#ifdef HAVE_WINSOCK2_H +#include +#else +#ifdef HAVE_WINSOCK_H +#include +#endif +#endif +#endif + int main (void) { -printf("Hello") + + char buffer[1024]; + gethostname(buffer, sizeof(buffer)); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:9209: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:9565: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9212: \$? = $ac_status" >&5 + echo "$as_me:9568: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9215: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:9571: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9218: \$? = $ac_status" >&5 + echo "$as_me:9574: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - : + cf_cv_netlibs="$cf_winsock_lib $cf_cv_netlibs" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_have_incdir=yes -fi -rm -f conftest.$ac_objext conftest.$ac_ext - CPPFLAGS=$cf_save_CPPFLAGS - fi - fi - fi - - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - -echo "${as_me:-configure}:9235: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` - test "$cf_top_incdir" = "$cf_add_incdir" && break - cf_add_incdir="$cf_top_incdir" - else - break - fi - else - break - fi - done - done +{ { echo "$as_me:9580: error: Cannot link against winsock library" >&5 +echo "$as_me: error: Cannot link against winsock library" >&2;} + { (exit 1); exit 1; }; } fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - elif test -d $cf_searchpath/../include ; then + LIBS="$cf_save_LIBS" + ;; +*) -if test -n "$cf_searchpath/../include" ; then - for cf_add_incdir in $cf_searchpath/../include - do - while test $cf_add_incdir != /usr/include - do - if test -d $cf_add_incdir - then - cf_have_incdir=no - if test -n "$CFLAGS$CPPFLAGS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_incdir in $CFLAGS $CPPFLAGS ; do - if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then - cf_have_incdir=yes; break - fi - done - fi +for ac_func in gethostname +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:9593: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 9599 "configure" +#include "confdefs.h" +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func - if test "$cf_have_incdir" = no ; then - if test "$cf_add_incdir" = /usr/local/include ; then - if test "$GCC" = yes - then - cf_save_CPPFLAGS=$CPPFLAGS +#ifdef __cplusplus +extern "C" +#endif - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (void); - cat >conftest.$ac_ext <<_ACEOF -#line 9281 "configure" -#include "confdefs.h" -#include int main (void) { -printf("Hello") + +/* The GNU C library defines stubs for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#error found stub for $ac_func +#endif + + return $ac_func (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:9293: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:9630: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9296: \$? = $ac_status" >&5 + echo "$as_me:9633: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9299: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:9636: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9302: \$? = $ac_status" >&5 + echo "$as_me:9639: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - : + eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_have_incdir=yes -fi -rm -f conftest.$ac_objext conftest.$ac_ext - CPPFLAGS=$cf_save_CPPFLAGS - fi - fi - fi - - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - -echo "${as_me:-configure}:9319: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` - test "$cf_top_incdir" = "$cf_add_incdir" && break - cf_add_incdir="$cf_top_incdir" - else - break - fi - else - break - fi - done - done -fi - - else -{ { echo "$as_me:9337: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5 -echo "$as_me: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&2;} - { (exit 1); exit 1; }; } - 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 - -echo "${as_me:-configure}:9362: testing adding $cf_add_libdir to library-path ..." 1>&5 - - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi - fi - done +eval "$as_ac_var=no" 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 - -echo "${as_me:-configure}:9391: testing adding $cf_add_libdir to library-path ..." 1>&5 - - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi - fi - done +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - - else -{ { echo "$as_me:9400: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5 -echo "$as_me: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&2;} - { (exit 1); exit 1; }; } - fi -done - - ;; -esac - -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 +echo "$as_me:9649: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <>confdefs.h <<\EOF -#define SOCKS 1 -EOF +else -echo "$as_me:9433: checking if the socks library uses socks4 prefix" >&5 -echo $ECHO_N "checking if the socks library uses socks4 prefix... $ECHO_C" >&6 -cf_use_socks4=error +echo "$as_me:9658: checking for gethostname in -lnsl" >&5 +echo $ECHO_N "checking for gethostname in -lnsl... $ECHO_C" >&6 +if test "${ac_cv_lib_nsl_gethostname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lnsl $cf_cv_netlibs $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9437 "configure" +#line 9666 "configure" #include "confdefs.h" -#include +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char gethostname (); int main (void) { - - Rinit((char *)0) +gethostname (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9451: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9685: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9454: \$? = $ac_status" >&5 + echo "$as_me:9688: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9457: \"$ac_try\"") >&5 + { (eval echo "$as_me:9691: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9460: \$? = $ac_status" >&5 + echo "$as_me:9694: \$? = $ac_status" >&5 (exit $ac_status); }; }; then + ac_cv_lib_nsl_gethostname=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_nsl_gethostname=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:9705: result: $ac_cv_lib_nsl_gethostname" >&5 +echo "${ECHO_T}$ac_cv_lib_nsl_gethostname" >&6 +if test $ac_cv_lib_nsl_gethostname = yes; then -cat >>confdefs.h <<\EOF -#define USE_SOCKS4_PREFIX 1 +cf_tr_func=`echo "gethostname" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + cat >>confdefs.h <&5 -cat conftest.$ac_ext >&5 + + ac_cv_func_gethostname=unknown + unset ac_cv_func_gethostname 2>/dev/null + +echo "$as_me:9722: checking for gethostname in -lsocket" >&5 +echo $ECHO_N "checking for gethostname in -lsocket... $ECHO_C" >&6 +if test "${ac_cv_lib_socket_gethostname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsocket $cf_cv_netlibs $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9472 "configure" +#line 9730 "configure" #include "confdefs.h" -#include + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char gethostname (); int main (void) { -SOCKSinit((char *)0) +gethostname (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9484: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9749: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9487: \$? = $ac_status" >&5 + echo "$as_me:9752: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9490: \"$ac_try\"") >&5 + { (eval echo "$as_me:9755: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9493: \$? = $ac_status" >&5 + echo "$as_me:9758: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_use_socks4=no + ac_cv_lib_socket_gethostname=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:9499: error: Cannot link with socks5 library" >&5 -echo "$as_me: error: Cannot link with socks5 library" >&2;} - { (exit 1); exit 1; }; } +ac_cv_lib_socket_gethostname=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -echo "$as_me:9506: result: $cf_use_socks4" >&5 -echo "${ECHO_T}$cf_use_socks4" >&6 - -if test "$cf_use_socks4" = "yes" ; then - cat >>confdefs.h <<\EOF -#define accept Raccept -EOF - - cat >>confdefs.h <<\EOF -#define bind Rbind -EOF - - cat >>confdefs.h <<\EOF -#define connect Rconnect -EOF - - cat >>confdefs.h <<\EOF -#define getpeername Rgetpeername -EOF - - cat >>confdefs.h <<\EOF -#define getsockname Rgetsockname -EOF - - cat >>confdefs.h <<\EOF -#define listen Rlisten -EOF +echo "$as_me:9769: result: $ac_cv_lib_socket_gethostname" >&5 +echo "${ECHO_T}$ac_cv_lib_socket_gethostname" >&6 +if test $ac_cv_lib_socket_gethostname = yes; then - cat >>confdefs.h <<\EOF -#define recvfrom Rrecvfrom -EOF +cf_tr_func=`echo "gethostname" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >>confdefs.h <<\EOF -#define select Rselect + cat >>confdefs.h <>confdefs.h <<\EOF -#define accept SOCKSaccept -EOF - cat >>confdefs.h <<\EOF -#define getpeername SOCKSgetpeername -EOF + ac_cv_func_gethostname=unknown + unset ac_cv_func_gethostname 2>/dev/null - cat >>confdefs.h <<\EOF -#define getsockname SOCKSgetsockname -EOF +fi - cat >>confdefs.h <<\EOF -#define recvfrom SOCKSrecvfrom -EOF +fi fi +done -echo "$as_me:9561: checking if socks5p.h is available" >&5 -echo $ECHO_N "checking if socks5p.h is available... $ECHO_C" >&6 + echo "$as_me:9793: checking for main in -linet" >&5 +echo $ECHO_N "checking for main in -linet... $ECHO_C" >&6 +if test "${ac_cv_lib_inet_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-linet $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9564 "configure" +#line 9801 "configure" #include "confdefs.h" -#define INCLUDE_PROTOTYPES -#include int main (void) { - - init((char *)0) +main (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:9579: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:9813: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9582: \$? = $ac_status" >&5 + echo "$as_me:9816: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9585: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:9819: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9588: \$? = $ac_status" >&5 + echo "$as_me:9822: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_use_socks5p_h=yes + ac_cv_lib_inet_main=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_use_socks5p_h=no +ac_cv_lib_inet_main=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:9597: result: $cf_use_socks5p_h" >&5 -echo "${ECHO_T}$cf_use_socks5p_h" >&6 - -test "$cf_use_socks5p_h" = yes && -cat >>confdefs.h <<\EOF -#define INCLUDE_PROTOTYPES 1 -EOF - - fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:9833: result: $ac_cv_lib_inet_main" >&5 +echo "${ECHO_T}$ac_cv_lib_inet_main" >&6 +if test $ac_cv_lib_inet_main = yes; then + cf_cv_netlibs="-linet $cf_cv_netlibs" fi -### which locking method should be used for mailbox locking -### first look for all available locking methods + if test "$ac_cv_func_lsocket" != no ; then -for ac_header in unistd.h fcntl.h sys/file.h +for ac_func in socket do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:9614: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:9844: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9620 "configure" +#line 9850 "configure" #include "confdefs.h" -#include <$ac_header> +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func + +#ifdef __cplusplus +extern "C" +#endif + +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (void); + +int +main (void) +{ + +/* The GNU C library defines stubs for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#error found stub for $ac_func +#endif + + return $ac_func (); + ; + return 0; +} _ACEOF -if { (eval echo "$as_me:9624: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:9881: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:9630: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi + echo "$as_me:9884: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:9887: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9890: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" else - ac_cpp_err=yes + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" fi -if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:9900: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5 +echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6 +if test "${ac_cv_lib_socket_socket+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsocket $cf_cv_netlibs $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 9917 "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char socket (); +int +main (void) +{ +socket (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:9936: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:9939: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:9942: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9945: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_socket_socket=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" +cat conftest.$ac_ext >&5 +ac_cv_lib_socket_socket=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9649: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <&5 +echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6 +if test $ac_cv_lib_socket_socket = yes; then + +cf_tr_func=`echo "socket" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + cat >>confdefs.h <&5 -echo $ECHO_N "checking for fcntl... $ECHO_C" >&6 -if test "${ac_cv_func_fcntl+set}" = set; then + ac_cv_func_socket=unknown + unset ac_cv_func_socket 2>/dev/null + +echo "$as_me:9973: checking for socket in -lbsd" >&5 +echo $ECHO_N "checking for socket in -lbsd... $ECHO_C" >&6 +if test "${ac_cv_lib_bsd_socket+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 9665 "configure" + ac_check_lib_save_LIBS=$LIBS +LIBS="-lbsd $cf_cv_netlibs $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 9981 "configure" #include "confdefs.h" -#define fcntl autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef fcntl +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif - /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char fcntl (void); - +char socket (); int main (void) { - -/* The GNU C library defines stubs 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_fcntl) || defined (__stub___fcntl) -#error found stub for fcntl -#endif - - return fcntl (); +socket (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9696: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10000: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9699: \$? = $ac_status" >&5 + echo "$as_me:10003: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9702: \"$ac_try\"") >&5 + { (eval echo "$as_me:10006: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9705: \$? = $ac_status" >&5 + echo "$as_me:10009: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func_fcntl=yes + ac_cv_lib_bsd_socket=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_func_fcntl=no +ac_cv_lib_bsd_socket=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9715: result: $ac_cv_func_fcntl" >&5 -echo "${ECHO_T}$ac_cv_func_fcntl" >&6 +echo "$as_me:10020: result: $ac_cv_lib_bsd_socket" >&5 +echo "${ECHO_T}$ac_cv_lib_bsd_socket" >&6 +if test $ac_cv_lib_bsd_socket = yes; then -echo "$as_me:9718: checking for lockf" >&5 -echo $ECHO_N "checking for lockf... $ECHO_C" >&6 -if test "${ac_cv_func_lockf+set}" = set; then +cf_tr_func=`echo "socket" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + cat >>confdefs.h </dev/null + +fi + +fi + +fi +done + + fi + +for ac_func in gethostbyname +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:10049: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9724 "configure" +#line 10055 "configure" #include "confdefs.h" -#define lockf autoconf_temporary +#define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef lockf +#undef $ac_func #ifdef __cplusplus extern "C" @@ -9733,7 +10064,7 @@ extern "C" /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char lockf (void); +char $ac_func (void); int main (void) @@ -9742,1356 +10073,1541 @@ main (void) /* The GNU C library defines stubs 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_lockf) || defined (__stub___lockf) -#error found stub for lockf +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#error found stub for $ac_func #endif - return lockf (); + return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9755: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10086: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9758: \$? = $ac_status" >&5 + echo "$as_me:10089: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9761: \"$ac_try\"") >&5 + { (eval echo "$as_me:10092: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9764: \$? = $ac_status" >&5 + echo "$as_me:10095: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func_lockf=yes + eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_func_lockf=no +eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9774: result: $ac_cv_func_lockf" >&5 -echo "${ECHO_T}$ac_cv_func_lockf" >&6 +echo "$as_me:10105: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5 -echo $ECHO_N "checking for flock... $ECHO_C" >&6 -if test "${ac_cv_func_flock+set}" = set; then +else + +echo "$as_me:10114: checking for gethostbyname in -lnsl" >&5 +echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 +if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 9783 "configure" + ac_check_lib_save_LIBS=$LIBS +LIBS="-lnsl $cf_cv_netlibs $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 10122 "configure" #include "confdefs.h" -#define flock autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef flock +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif - /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char flock (void); - +char gethostbyname (); int main (void) { - -/* The GNU C library defines stubs 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_flock) || defined (__stub___flock) -#error found stub for flock -#endif - - return flock (); +gethostbyname (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9814: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10141: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9817: \$? = $ac_status" >&5 + echo "$as_me:10144: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9820: \"$ac_try\"") >&5 + { (eval echo "$as_me:10147: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9823: \$? = $ac_status" >&5 + echo "$as_me:10150: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func_flock=yes + ac_cv_lib_nsl_gethostbyname=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_func_flock=no +ac_cv_lib_nsl_gethostbyname=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9833: result: $ac_cv_func_flock" >&5 -echo "${ECHO_T}$ac_cv_func_flock" >&6 +echo "$as_me:10161: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 +if test $ac_cv_lib_nsl_gethostbyname = yes; then -echo "$as_me:9836: checking for file-locking functions" >&5 -echo $ECHO_N "checking for file-locking functions... $ECHO_C" >&6 -if test "${cf_cv_lockfile+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +cf_tr_func=`echo "gethostbyname" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + cat >>confdefs.h </dev/null + +fi + +fi +done + +for ac_func in inet_ntoa do -if eval 'test ${ac_cv_func_'$cf_lock'+set} = set'; then - case $cf_lock in #(vi - fcntl) #(vi - cat >conftest.$ac_ext <<_ACEOF -#line 9849 "configure" +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:10186: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 10192 "configure" #include "confdefs.h" +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func -#include -#ifdef HAVE_UNISTD_H -#include -#endif -#ifdef HAVE_FCNTL_H -#include +#ifdef __cplusplus +extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (void); + int main (void) { - struct flock flk; - int block = 1; - int fd = 0; - int rc; - - flk.l_type = F_WRLCK; - flk.l_whence = SEEK_SET; - flk.l_start = 0; - flk.l_len = 0; - rc = fcntl(fd, block ? F_SETLKW : F_SETLK, &flk) - && fcntl(fd, F_GETLK, &flk) - && fcntl(fd, F_SETLK, &flk); +/* The GNU C library defines stubs for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#error found stub for $ac_func +#endif + return $ac_func (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:9882: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:10223: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9885: \$? = $ac_status" >&5 + echo "$as_me:10226: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9888: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:10229: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9891: \$? = $ac_status" >&5 + echo "$as_me:10232: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - : + eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -continue +eval "$as_ac_var=no" fi -rm -f conftest.$ac_objext conftest.$ac_ext - ;; - lockf) #(vi - cat >conftest.$ac_ext <<_ACEOF -#line 9903 "configure" +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:10242: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5 +echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6 +if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lnsl $cf_cv_netlibs $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 10259 "configure" #include "confdefs.h" -#include -#ifdef HAVE_UNISTD_H -#include -#endif -#ifdef HAVE_FCNTL_H -#include +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" #endif - +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char inet_ntoa (); int main (void) { - - int block = 1, fd = 0; - int ret = lockf(fd, block ? F_LOCK : F_TLOCK, 0L) - && lockf(fd, F_TEST, 0L) - && lockf(fd, F_ULOCK, 0L); - +inet_ntoa (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:9928: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:10278: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9931: \$? = $ac_status" >&5 + echo "$as_me:10281: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9934: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:10284: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9937: \$? = $ac_status" >&5 + echo "$as_me:10287: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - : + ac_cv_lib_nsl_inet_ntoa=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -continue +ac_cv_lib_nsl_inet_ntoa=no fi -rm -f conftest.$ac_objext conftest.$ac_ext - ;; - flock) - cat >conftest.$ac_ext <<_ACEOF -#line 9949 "configure" +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:10298: result: $ac_cv_lib_nsl_inet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6 +if test $ac_cv_lib_nsl_inet_ntoa = yes; then + +cf_tr_func=`echo "inet_ntoa" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + cat >>confdefs.h </dev/null + +fi + +fi +done + +for ac_func in gethostbyname +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:10323: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 10329 "configure" #include "confdefs.h" +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func -#include -#ifdef HAVE_UNISTD_H -#include -#endif -#ifdef HAVE_FCNTL_H -#include -#endif -#ifdef HAVE_SYS_FILE_H -#include +#ifdef __cplusplus +extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (void); + int main (void) { - int block = 1, fd = 0; - int ret = flock(fd, (LOCK_EX|LOCK_NB)) - && flock(fd, LOCK_UN) - && flock(fd, block ? LOCK_EX : (LOCK_EX | LOCK_NB)); +/* The GNU C library defines stubs for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#error found stub for $ac_func +#endif + return $ac_func (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:9977: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:10360: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9980: \$? = $ac_status" >&5 + echo "$as_me:10363: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9983: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:10366: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9986: \$? = $ac_status" >&5 + echo "$as_me:10369: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - : + eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -continue -fi -rm -f conftest.$ac_objext conftest.$ac_ext - ;; - esac - cf_cv_lockfile="$cf_cv_lockfile $cf_lock" +eval "$as_ac_var=no" fi -done - +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10002: result: $cf_cv_lockfile" >&5 -echo "${ECHO_T}$cf_cv_lockfile" >&6 - -echo "$as_me:10005: checking which locking method will be used" >&5 -echo $ECHO_N "checking which locking method will be used... $ECHO_C" >&6 -### fcntl() is preferred, if the user just disables fcntl() -### without specifying an alternative lockf() is preferred - -# Check whether --enable-fcntl or --disable-fcntl was given. -if test "${enable_fcntl+set}" = set; then - enableval="$enable_fcntl" - test "$enableval" != no && enableval=yes - if test "$enableval" != "yes" ; then - requested_lock="lockf" - else - requested_lock="fcntl" - fi -else - enableval=yes - requested_lock="fcntl" - -fi; - -# Check whether --enable-lockf or --disable-lockf was given. -if test "${enable_lockf+set}" = set; then - enableval="$enable_lockf" - test "$enableval" != yes && enableval=no - if test "$enableval" != "no" ; then - requested_lock="lockf" - fi -else - enableval=no -fi; - -# Check whether --enable-flock or --disable-flock was given. -if test "${enable_flock+set}" = set; then - enableval="$enable_flock" - test "$enableval" != yes && enableval=no - if test "$enableval" != "no" ; then - requested_lock="flock" - fi -else - enableval=no -fi; -### now check the users wishes against available locking methods -if test -n "$cf_cv_lockfile"; then - for lock in $cf_cv_lockfile; do - if test "$lock" = "$requested_lock"; then - used_locking=$lock - break - fi - done -### if none of them matched use the one with the highest priority - if test "x$used_locking" = "x"; then - used_locking=`echo $cf_cv_lockfile|sed -e 's/^\([^ ]\+\).*/\1/g'` - fi - echo "$as_me:10058: result: $used_locking" >&5 -echo "${ECHO_T}$used_locking" >&6 - -used_locking=`echo "$used_locking" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - - cat >>confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5 -echo "${ECHO_T}none" >&6; - { echo "$as_me:10070: WARNING: None of fcntl(), lockf(), flock() available" >&5 -echo "$as_me: WARNING: None of fcntl(), lockf(), flock() available" >&2;} -fi - -echo "$as_me:10074: checking for screen type" >&5 -echo $ECHO_N "checking for screen type... $ECHO_C" >&6 - -# Check whether --with-screen or --without-screen was given. -if test "${with_screen+set}" = set; then - withval="$with_screen" - cf_with_screen=$withval -else - cf_with_screen=none -fi; -echo "$as_me:10084: result: $cf_with_screen" >&5 -echo "${ECHO_T}$cf_with_screen" >&6 - -use_curses=no -use_ncurses=no - -echo "$as_me:10090: checking for specific curses-directory" >&5 -echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6 - -# Check whether --with-curses-dir or --without-curses-dir was given. -if test "${with_curses_dir+set}" = set; then - withval="$with_curses_dir" - cf_cv_curses_dir=$withval -else - cf_cv_curses_dir=no -fi; -echo "$as_me:10100: result: $cf_cv_curses_dir" >&5 -echo "${ECHO_T}$cf_cv_curses_dir" >&6 - -if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) -then - -if test "x$prefix" != xNONE; then - cf_path_syntax="$prefix" -else - cf_path_syntax="$ac_default_prefix" -fi - -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 "$as_me:10131: error: expected a pathname, not \"$withval\"" >&5 -echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} - { (exit 1); exit 1; }; } - ;; -esac - - if test -d "$cf_cv_curses_dir" - then - -if test -n "$cf_cv_curses_dir/include" ; then - for cf_add_incdir in $cf_cv_curses_dir/include - do - while test $cf_add_incdir != /usr/include - do - if test -d $cf_add_incdir - then - cf_have_incdir=no - if test -n "$CFLAGS$CPPFLAGS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_incdir in $CFLAGS $CPPFLAGS ; do - if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then - cf_have_incdir=yes; break - fi - done - fi - - if test "$cf_have_incdir" = no ; then - if test "$cf_add_incdir" = /usr/local/include ; then - if test "$GCC" = yes - then - cf_save_CPPFLAGS=$CPPFLAGS - - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" - - cat >conftest.$ac_ext <<_ACEOF -#line 10167 "configure" +else + +echo "$as_me:10388: checking for gethostbyname in -lnetwork" >&5 +echo $ECHO_N "checking for gethostbyname in -lnetwork... $ECHO_C" >&6 +if test "${ac_cv_lib_network_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lnetwork $cf_cv_netlibs $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 10396 "configure" #include "confdefs.h" -#include + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char gethostbyname (); int main (void) { -printf("Hello") +gethostbyname (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:10179: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:10415: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10182: \$? = $ac_status" >&5 + echo "$as_me:10418: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10185: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:10421: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10188: \$? = $ac_status" >&5 + echo "$as_me:10424: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - : + ac_cv_lib_network_gethostbyname=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_have_incdir=yes +ac_cv_lib_network_gethostbyname=no fi -rm -f conftest.$ac_objext conftest.$ac_ext - CPPFLAGS=$cf_save_CPPFLAGS - fi - fi - fi - - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - -echo "${as_me:-configure}:10205: testing adding $cf_add_incdir to include-path ..." 1>&5 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:10435: result: $ac_cv_lib_network_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_network_gethostbyname" >&6 +if test $ac_cv_lib_network_gethostbyname = yes; then - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" +cf_tr_func=`echo "gethostbyname" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` - test "$cf_top_incdir" = "$cf_add_incdir" && break - cf_add_incdir="$cf_top_incdir" - else - break - fi - else - break - fi - done - done -fi + cat >>confdefs.h <&6 + ac_cv_func_gethostbyname=yes + if test "$cf_used_lib_network" != yes ; then cf_used_lib_network=yes; cf_cv_netlibs="-lnetwork $cf_cv_netlibs"; fi +else -echo "${as_me:-configure}:10241: testing adding $cf_add_libdir to library-path ..." 1>&5 + ac_cv_func_gethostbyname=unknown + unset ac_cv_func_gethostbyname 2>/dev/null - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi - fi - done fi - fi fi +done -case $cf_with_screen in #(vi -termcap|terminfo) #(we will determine which it really is - ;; -curses) #(vi - use_curses=yes - ;; -ncurses) #(vi - use_curses=yes - use_ncurses=yes - ;; -ncursesw) #(vi - use_curses=yes - use_ncurses=yes - ;; -pdcurses) #(vi - use_curses=yes - ;; -none) - echo "$as_me:10270: checking if you want to use ncurses library" >&5 -echo $ECHO_N "checking if you want to use ncurses library... $ECHO_C" >&6 - -# Check whether --with-ncurses or --without-ncurses was given. -if test "${with_ncurses+set}" = set; then - withval="$with_ncurses" - use_ncurses=$withval -else - use_ncurses=no -fi; - echo "$as_me:10280: result: $use_ncurses" >&5 -echo "${ECHO_T}$use_ncurses" >&6 - - echo "$as_me:10283: checking if you want curses rather than termcap interface" >&5 -echo $ECHO_N "checking if you want curses rather than termcap interface... $ECHO_C" >&6 - -# 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 - cf_with_screen=curses; use_curses=$withval - else - cf_with_screen=termcap; use_curses=no - fi +for ac_func in strcasecmp +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:10460: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - enableval=no - cf_with_screen=termcap; use_curses=no + cat >conftest.$ac_ext <<_ACEOF +#line 10466 "configure" +#include "confdefs.h" +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func -fi; - echo "$as_me:10300: result: $enableval" >&5 -echo "${ECHO_T}$enableval" >&6 - ;; -esac +#ifdef __cplusplus +extern "C" +#endif -if test $use_curses != no ; then - cat >>confdefs.h <<\EOF -#define USE_CURSES 1 -EOF +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (void); - case $cf_with_screen in #(vi - ncurses) #(vi +int +main (void) +{ -echo "$as_me:10313: checking if you want to use pkg-config" >&5 -echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6 +/* The GNU C library defines stubs for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#error found stub for $ac_func +#endif -# 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 + return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:10497: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:10500: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:10503: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10506: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" else - cf_pkg_config=yes -fi; -echo "$as_me:10323: result: $cf_pkg_config" >&5 -echo "${ECHO_T}$cf_pkg_config" >&6 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:10516: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then +echo "$as_me:10525: checking for strcasecmp in -lresolv" >&5 +echo $ECHO_N "checking for strcasecmp in -lresolv... $ECHO_C" >&6 +if test "${ac_cv_lib_resolv_strcasecmp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" - echo "$as_me:10352: found $ac_dir/$ac_word" >&5 - break + ac_check_lib_save_LIBS=$LIBS +LIBS="-lresolv $cf_cv_netlibs $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 10533 "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char strcasecmp (); +int +main (void) +{ +strcasecmp (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:10552: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:10555: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:10558: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10561: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_resolv_strcasecmp=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_resolv_strcasecmp=no fi -done - - ;; -esac +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG +echo "$as_me:10572: result: $ac_cv_lib_resolv_strcasecmp" >&5 +echo "${ECHO_T}$ac_cv_lib_resolv_strcasecmp" >&6 +if test $ac_cv_lib_resolv_strcasecmp = yes; then -if test -n "$PKG_CONFIG"; then - echo "$as_me:10363: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 +cf_tr_func=`echo "strcasecmp" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + cat >>confdefs.h <&5 -echo "${ECHO_T}no" >&6 -fi + + ac_cv_func_strcasecmp=unknown + unset ac_cv_func_strcasecmp 2>/dev/null fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -echo "$as_me:10375: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word" - echo "$as_me:10392: found $ac_dir/$ac_word" >&5 - break + fi done - test -z "$ac_cv_path_ac_pt_PKG_CONFIG" && ac_cv_path_ac_pt_PKG_CONFIG="none" - ;; + ;; esac -fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - echo "$as_me:10404: result: $ac_pt_PKG_CONFIG" >&5 -echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 -else - echo "$as_me:10407: result: no" >&5 -echo "${ECHO_T}no" >&6 fi - PKG_CONFIG=$ac_pt_PKG_CONFIG -else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -fi +case $cf_cv_netlibs in +*ws2_32*) + +cat >>confdefs.h <<\EOF +#define USE_WINSOCK2_H 1 +EOF - ;; -*) - PKG_CONFIG=$withval ;; esac -test -z "$PKG_CONFIG" && PKG_CONFIG=none -if test "$PKG_CONFIG" != none ; then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_cv_netlibs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" -if test "x$prefix" != xNONE; then - cf_path_syntax="$prefix" -else - cf_path_syntax="$ac_default_prefix" -fi +test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&6 -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 + if test "x$cf_cv_use_libsocks5" != xno ; then + +case "$cf_cv_use_libsocks5" in +no) ;; -.no|.NONE/*) - PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` +yes) ;; *) - { { echo "$as_me:10450: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 -echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;} - { (exit 1); exit 1; }; } - ;; -esac -elif test "x$cf_pkg_config" != xno ; then - { echo "$as_me:10457: WARNING: pkg-config is not installed" >&5 -echo "$as_me: WARNING: pkg-config is not installed" >&2;} -fi - -cf_ncuconfig_root=ncurses -cf_have_ncuconfig=no - -if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:10465: checking pkg-config for $cf_ncuconfig_root" >&5 -echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 - if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then - echo "$as_me:10468: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +for cf_searchpath in `echo "$cf_cv_use_libsocks5" | tr $PATH_SEPARATOR ' '`; do + if test -d $cf_searchpath/include; then - echo "$as_me:10471: checking if the $cf_ncuconfig_root package files work" >&5 -echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 - cf_have_ncuconfig=unknown +if test -n "$cf_searchpath/include" ; then + for cf_add_incdir in $cf_searchpath/include + do + while test $cf_add_incdir != /usr/include + do + if test -d $cf_add_incdir + then + cf_have_incdir=no + if test -n "$CFLAGS$CPPFLAGS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then + cf_have_incdir=yes; break + fi + done + fi - cf_save_CPPFLAGS="$CPPFLAGS" - cf_save_LIBS="$LIBS" + if test "$cf_have_incdir" = no ; then + if test "$cf_add_incdir" = /usr/local/include ; then + if test "$GCC" = yes + then + cf_save_CPPFLAGS=$CPPFLAGS -cf_fix_cppflags=no -cf_new_cflags= -cf_new_cppflags= -cf_new_extra_cppflags= + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" -for cf_add_cflags in `$PKG_CONFIG --cflags $cf_ncuconfig_root` -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[^=]*='\''\"[^"]*//'` + cat >conftest.$ac_ext <<_ACEOF +#line 10666 "configure" +#include "confdefs.h" +#include +int +main (void) +{ +printf("Hello") + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:10678: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:10681: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:10684: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10687: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_incdir=yes +fi +rm -f conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$cf_save_CPPFLAGS + fi + fi + fi - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - if test $cf_fix_cppflags = yes ; then +echo "${as_me:-configure}:10704: testing adding $cf_add_incdir to include-path ..." 1>&5 - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - continue - elif test "${cf_tst_cflags}" = "\"'" ; then + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + test "$cf_top_incdir" = "$cf_add_incdir" && break + cf_add_incdir="$cf_top_incdir" + else + break + fi + else + break + fi + done + done +fi - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + elif test -d $cf_searchpath/../include ; then - continue +if test -n "$cf_searchpath/../include" ; then + for cf_add_incdir in $cf_searchpath/../include + do + while test $cf_add_incdir != /usr/include + do + if test -d $cf_add_incdir + then + cf_have_incdir=no + if test -n "$CFLAGS$CPPFLAGS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then + cf_have_incdir=yes; break 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'` + done + fi - ;; - esac + if test "$cf_have_incdir" = no ; then + if test "$cf_add_incdir" = /usr/local/include ; then + if test "$GCC" = yes + then + cf_save_CPPFLAGS=$CPPFLAGS - test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " - cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" - ;; - esac - ;; - *) + cat >conftest.$ac_ext <<_ACEOF +#line 10750 "configure" +#include "confdefs.h" +#include +int +main (void) +{ +printf("Hello") + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:10762: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:10765: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:10768: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10771: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_incdir=yes +fi +rm -f conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$cf_save_CPPFLAGS + fi + fi + fi - test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " - cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - ;; - esac - ;; -yes) +echo "${as_me:-configure}:10788: testing adding $cf_add_incdir to include-path ..." 1>&5 - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + test "$cf_top_incdir" = "$cf_add_incdir" && break + cf_add_incdir="$cf_top_incdir" + else + break + fi + else + break + fi + done + done +fi - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=no - ;; -esac -done + else +{ { echo "$as_me:10806: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5 +echo "$as_me: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&2;} + { (exit 1); exit 1; }; } + fi + if test -d $cf_searchpath/lib; then -if test -n "$cf_new_cflags" ; 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 - test -n "$CFLAGS" && CFLAGS="$CFLAGS " - CFLAGS="${CFLAGS}$cf_new_cflags" +echo "${as_me:-configure}:10831: testing adding $cf_add_libdir to library-path ..." 1>&5 + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done fi -if test -n "$cf_new_cppflags" ; then + elif test -d $cf_searchpath ; then - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" +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 -fi +echo "${as_me:-configure}:10860: testing adding $cf_add_libdir to library-path ..." 1>&5 -if test -n "$cf_new_extra_cppflags" ; then + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done +fi - test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " - EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + else +{ { echo "$as_me:10869: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5 +echo "$as_me: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&2;} + { (exit 1); exit 1; }; } + fi +done -fi + ;; +esac -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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lsocks5; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" - cat >conftest.$ac_ext <<_ACEOF -#line 10593 "configure" +cat >>confdefs.h <<\EOF +#define USE_SOCKS5 1 +EOF + +cat >>confdefs.h <<\EOF +#define SOCKS 1 +EOF + +echo "$as_me:10902: checking if the socks library uses socks4 prefix" >&5 +echo $ECHO_N "checking if the socks library uses socks4 prefix... $ECHO_C" >&6 +cf_use_socks4=error +cat >conftest.$ac_ext <<_ACEOF +#line 10906 "configure" #include "confdefs.h" -#include <${cf_cv_ncurses_header:-curses.h}> + +#include int main (void) { -initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); + + Rinit((char *)0) ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10605: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10920: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10608: \$? = $ac_status" >&5 + echo "$as_me:10923: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10611: \"$ac_try\"") >&5 + { (eval echo "$as_me:10926: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10614: \$? = $ac_status" >&5 + echo "$as_me:10929: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - if test "$cross_compiling" = yes; then - cf_have_ncuconfig=maybe + +cat >>confdefs.h <<\EOF +#define USE_SOCKS4_PREFIX 1 +EOF + + cf_use_socks4=yes else - cat >conftest.$ac_ext <<_ACEOF -#line 10620 "configure" + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cat >conftest.$ac_ext <<_ACEOF +#line 10941 "configure" #include "confdefs.h" -#include <${cf_cv_ncurses_header:-curses.h}> - int main(void) - { char *xx = curses_version(); return (xx == 0); } +#include +int +main (void) +{ +SOCKSinit((char *)0) + ; + return 0; +} _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:10627: \"$ac_link\"") >&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:10953: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10630: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:10632: \"$ac_try\"") >&5 + echo "$as_me:10956: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:10959: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10635: \$? = $ac_status" >&5 + echo "$as_me:10962: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_have_ncuconfig=yes -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cf_have_ncuconfig=no -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi + cf_use_socks4=no else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_have_ncuconfig=no +{ { echo "$as_me:10968: error: Cannot link with socks5 library" >&5 +echo "$as_me: error: Cannot link with socks5 library" >&2;} + { (exit 1); exit 1; }; } fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:10652: result: $cf_have_ncuconfig" >&5 -echo "${ECHO_T}$cf_have_ncuconfig" >&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 +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +echo "$as_me:10975: result: $cf_use_socks4" >&5 +echo "${ECHO_T}$cf_use_socks4" >&6 -cat >>confdefs.h <<\EOF -#define NCURSES 1 +if test "$cf_use_socks4" = "yes" ; then + cat >>confdefs.h <<\EOF +#define accept Raccept EOF - NCURSES_CONFIG_PKG=$cf_ncuconfig_root + cat >>confdefs.h <<\EOF +#define bind Rbind +EOF + + cat >>confdefs.h <<\EOF +#define connect Rconnect +EOF + + cat >>confdefs.h <<\EOF +#define getpeername Rgetpeername +EOF + + cat >>confdefs.h <<\EOF +#define getsockname Rgetsockname +EOF + + cat >>confdefs.h <<\EOF +#define listen Rlisten +EOF + + cat >>confdefs.h <<\EOF +#define recvfrom Rrecvfrom +EOF + + cat >>confdefs.h <<\EOF +#define select Rselect +EOF -echo "$as_me:10668: checking for terminfo header" >&5 -echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 -if test "${cf_cv_term_header+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 else + cat >>confdefs.h <<\EOF +#define accept SOCKSaccept +EOF + + cat >>confdefs.h <<\EOF +#define getpeername SOCKSgetpeername +EOF + + cat >>confdefs.h <<\EOF +#define getsockname SOCKSgetsockname +EOF -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 + cat >>confdefs.h <<\EOF +#define recvfrom SOCKSrecvfrom +EOF -for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" -do +fi + +echo "$as_me:11030: checking if socks5p.h is available" >&5 +echo $ECHO_N "checking if socks5p.h is available... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 10686 "configure" +#line 11033 "configure" #include "confdefs.h" -#include -#include <${cf_cv_ncurses_header:-curses.h}> -#include <$cf_test> +#define INCLUDE_PROTOTYPES +#include int main (void) { -int x = auto_left_margin + + init((char *)0) ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10701: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11048: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10704: \$? = $ac_status" >&5 + echo "$as_me:11051: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10707: \"$ac_try\"") >&5 + { (eval echo "$as_me:11054: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10710: \$? = $ac_status" >&5 + echo "$as_me:11057: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - cf_cv_term_header="$cf_test" + cf_use_socks5p_h=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - - cf_cv_term_header=unknown - +cf_use_socks5p_h=no fi rm -f conftest.$ac_objext conftest.$ac_ext - test "$cf_cv_term_header" != unknown && break -done - -fi -echo "$as_me:10726: result: $cf_cv_term_header" >&5 -echo "${ECHO_T}$cf_cv_term_header" >&6 - -# Set definitions to allow ifdef'ing to accommodate subdirectories - -case $cf_cv_term_header in -*term.h) - -cat >>confdefs.h <<\EOF -#define HAVE_TERM_H 1 -EOF - - ;; -esac - -case $cf_cv_term_header in -ncurses/term.h) - -cat >>confdefs.h <<\EOF -#define HAVE_NCURSES_TERM_H 1 -EOF - - ;; -ncursesw/term.h) +echo "$as_me:11066: result: $cf_use_socks5p_h" >&5 +echo "${ECHO_T}$cf_use_socks5p_h" >&6 +test "$cf_use_socks5p_h" = yes && cat >>confdefs.h <<\EOF -#define HAVE_NCURSESW_TERM_H 1 +#define INCLUDE_PROTOTYPES 1 EOF - ;; -esac - - fi - - else - echo "$as_me:10761: result: no" >&5 -echo "${ECHO_T}no" >&6 - NCURSES_CONFIG_PKG=none fi -else - NCURSES_CONFIG_PKG=none fi -if test "x$cf_have_ncuconfig" = "xno"; then - cf_ncurses_config="${cf_ncuconfig_root}${NCURSES_CONFIG_SUFFIX}-config"; echo "Looking for ${cf_ncurses_config}" +### which locking method should be used for mailbox locking +### first look for all available locking methods -if test -n "$ac_tool_prefix"; then - for ac_prog in ${cf_ncurses_config} ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:10777: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then +for ac_header in unistd.h fcntl.h sys/file.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:11083: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$NCURSES_CONFIG"; then - ac_cv_prog_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test. + cat >conftest.$ac_ext <<_ACEOF +#line 11089 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:11093: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:11099: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" -echo "$as_me:10792: found $ac_dir/$ac_word" >&5 -break -done - -fi + ac_cpp_err=yes fi -NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG -if test -n "$NCURSES_CONFIG"; then - echo "$as_me:10800: result: $NCURSES_CONFIG" >&5 -echo "${ECHO_T}$NCURSES_CONFIG" >&6 +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" else - echo "$as_me:10803: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + eval "$as_ac_Header=no" fi - - test -n "$NCURSES_CONFIG" && break - done +rm -f conftest.err conftest.$ac_ext fi -if test -z "$NCURSES_CONFIG"; then - ac_ct_NCURSES_CONFIG=$NCURSES_CONFIG - for ac_prog in ${cf_ncurses_config} ${cf_ncuconfig_root}6-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 "$as_me:10816: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_NCURSES_CONFIG"; then - ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_ct_NCURSES_CONFIG" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" -echo "$as_me:10831: found $ac_dir/$ac_word" >&5 -break -done +echo "$as_me:11118: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 -echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 -else - echo "$as_me:10842: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$ac_ct_NCURSES_CONFIG" && break done -test -n "$ac_ct_NCURSES_CONFIG" || ac_ct_NCURSES_CONFIG="none" - - NCURSES_CONFIG=$ac_ct_NCURSES_CONFIG -fi - - if test "$NCURSES_CONFIG" != none ; then - -cf_fix_cppflags=no -cf_new_cflags= -cf_new_cppflags= -cf_new_extra_cppflags= -for cf_add_cflags in `$NCURSES_CONFIG --cflags` -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 +echo "$as_me:11128: checking for fcntl" >&5 +echo $ECHO_N "checking for fcntl... $ECHO_C" >&6 +if test "${ac_cv_func_fcntl+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 11134 "configure" +#include "confdefs.h" +#define fcntl autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef fcntl - if test $cf_fix_cppflags = yes ; then +#ifdef __cplusplus +extern "C" +#endif - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char fcntl (void); - continue - elif test "${cf_tst_cflags}" = "\"'" ; then +int +main (void) +{ - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" +/* The GNU C library defines stubs 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_fcntl) || defined (__stub___fcntl) +#error found stub for fcntl +#endif - 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/=.*//'` + return fcntl (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:11165: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:11168: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:11171: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11174: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_fcntl=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_fcntl=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:11184: result: $ac_cv_func_fcntl" >&5 +echo "${ECHO_T}$ac_cv_func_fcntl" >&6 -CPPFLAGS=`echo "$CPPFLAGS" | \ - sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` +echo "$as_me:11187: checking for lockf" >&5 +echo $ECHO_N "checking for lockf... $ECHO_C" >&6 +if test "${ac_cv_func_lockf+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 11193 "configure" +#include "confdefs.h" +#define lockf autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef lockf - ;; - esac +#ifdef __cplusplus +extern "C" +#endif - test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " - cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char lockf (void); - ;; - esac - ;; - *) +int +main (void) +{ - test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " - cf_new_cflags="${cf_new_cflags}$cf_add_cflags" +/* The GNU C library defines stubs 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_lockf) || defined (__stub___lockf) +#error found stub for lockf +#endif - ;; - esac - ;; -yes) + return lockf (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:11224: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:11227: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:11230: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11233: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_lockf=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_lockf=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:11243: result: $ac_cv_func_lockf" >&5 +echo "${ECHO_T}$ac_cv_func_lockf" >&6 - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" +echo "$as_me:11246: checking for flock" >&5 +echo $ECHO_N "checking for flock... $ECHO_C" >&6 +if test "${ac_cv_func_flock+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 11252 "configure" +#include "confdefs.h" +#define flock autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef flock - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` +#ifdef __cplusplus +extern "C" +#endif - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=no - ;; -esac -done +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char flock (void); -if test -n "$cf_new_cflags" ; then +int +main (void) +{ - test -n "$CFLAGS" && CFLAGS="$CFLAGS " - CFLAGS="${CFLAGS}$cf_new_cflags" +/* The GNU C library defines stubs 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_flock) || defined (__stub___flock) +#error found stub for flock +#endif + return flock (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:11283: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:11286: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:11289: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11292: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_flock=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_flock=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi +echo "$as_me:11302: result: $ac_cv_func_flock" >&5 +echo "${ECHO_T}$ac_cv_func_flock" >&6 -if test -n "$cf_new_cppflags" ; then +echo "$as_me:11305: checking for file-locking functions" >&5 +echo $ECHO_N "checking for file-locking functions... $ECHO_C" >&6 +if test "${cf_cv_lockfile+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" +cf_cv_lockfile= +for cf_lock in fcntl lockf flock +do +if eval 'test ${ac_cv_func_'$cf_lock'+set} = set'; then + case $cf_lock in #(vi + fcntl) #(vi + cat >conftest.$ac_ext <<_ACEOF +#line 11318 "configure" +#include "confdefs.h" -fi +#include +#ifdef HAVE_UNISTD_H +#include +#endif +#ifdef HAVE_FCNTL_H +#include +#endif -if test -n "$cf_new_extra_cppflags" ; then +int +main (void) +{ - test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " - EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + struct flock flk; + int block = 1; + int fd = 0; + int rc; + + flk.l_type = F_WRLCK; + flk.l_whence = SEEK_SET; + flk.l_start = 0; + flk.l_len = 0; + rc = fcntl(fd, block ? F_SETLKW : F_SETLK, &flk) + && fcntl(fd, F_GETLK, &flk) + && fcntl(fd, F_SETLK, &flk); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11351: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11354: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11357: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11360: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +continue fi +rm -f conftest.$ac_objext conftest.$ac_ext + ;; + lockf) #(vi + cat >conftest.$ac_ext <<_ACEOF +#line 11372 "configure" +#include "confdefs.h" -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" +#include +#ifdef HAVE_UNISTD_H +#include +#endif +#ifdef HAVE_FCNTL_H +#include +#endif - # even with config script, some packages use no-override for curses.h +int +main (void) +{ -echo "$as_me:10971: checking if we have identified curses headers" >&5 -echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 -if test "${cf_cv_ncurses_header+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else + int block = 1, fd = 0; + int ret = lockf(fd, block ? F_LOCK : F_TLOCK, 0L) + && lockf(fd, F_TEST, 0L) + && lockf(fd, F_ULOCK, 0L); -cf_cv_ncurses_header=none -for cf_header in \ - ncurses.h ncurses/ncurses.h \ - curses.h ncurses/curses.h -do -cat >conftest.$ac_ext <<_ACEOF -#line 10983 "configure" + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11397: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11400: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11403: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11406: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +continue +fi +rm -f conftest.$ac_objext conftest.$ac_ext + ;; + flock) + cat >conftest.$ac_ext <<_ACEOF +#line 11418 "configure" #include "confdefs.h" -#include <${cf_header}> + +#include +#ifdef HAVE_UNISTD_H +#include +#endif +#ifdef HAVE_FCNTL_H +#include +#endif +#ifdef HAVE_SYS_FILE_H +#include +#endif + int main (void) { -initscr(); tgoto("?", 0,0) + + int block = 1, fd = 0; + int ret = flock(fd, (LOCK_EX|LOCK_NB)) + && flock(fd, LOCK_UN) + && flock(fd, block ? LOCK_EX : (LOCK_EX | LOCK_NB)); + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10995: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11446: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10998: \$? = $ac_status" >&5 + echo "$as_me:11449: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11001: \"$ac_try\"") >&5 + { (eval echo "$as_me:11452: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11004: \$? = $ac_status" >&5 + echo "$as_me:11455: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_ncurses_header=$cf_header; break + : else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 +continue fi rm -f conftest.$ac_objext conftest.$ac_ext -done - + ;; + esac + cf_cv_lockfile="$cf_cv_lockfile $cf_lock" fi -echo "$as_me:11015: result: $cf_cv_ncurses_header" >&5 -echo "${ECHO_T}$cf_cv_ncurses_header" >&6 +done -if test "$cf_cv_ncurses_header" = none ; then - { { echo "$as_me:11019: error: No curses header-files found" >&5 -echo "$as_me: error: No curses header-files found" >&2;} - { (exit 1); exit 1; }; } fi +echo "$as_me:11471: result: $cf_cv_lockfile" >&5 +echo "${ECHO_T}$cf_cv_lockfile" >&6 -# cheat, to get the right #define's for HAVE_NCURSES_H, etc. +echo "$as_me:11474: checking which locking method will be used" >&5 +echo $ECHO_N "checking which locking method will be used... $ECHO_C" >&6 +### fcntl() is preferred, if the user just disables fcntl() +### without specifying an alternative lockf() is preferred -for ac_header in $cf_cv_ncurses_header -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:11029: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# Check whether --enable-fcntl or --disable-fcntl was given. +if test "${enable_fcntl+set}" = set; then + enableval="$enable_fcntl" + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + requested_lock="lockf" + else + requested_lock="fcntl" + fi else - cat >conftest.$ac_ext <<_ACEOF -#line 11035 "configure" -#include "confdefs.h" -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:11039: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:11045: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi + enableval=yes + requested_lock="fcntl" + +fi; + +# Check whether --enable-lockf or --disable-lockf was given. +if test "${enable_lockf+set}" = set; then + enableval="$enable_lockf" + test "$enableval" != yes && enableval=no + if test "$enableval" != "no" ; then + requested_lock="lockf" + fi else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + enableval=no +fi; + +# Check whether --enable-flock or --disable-flock was given. +if test "${enable_flock+set}" = set; then + enableval="$enable_flock" + test "$enableval" != yes && enableval=no + if test "$enableval" != "no" ; then + requested_lock="flock" + fi else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" -fi -rm -f conftest.err conftest.$ac_ext -fi -echo "$as_me:11064: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <&5 +echo "${ECHO_T}$used_locking" >&6 + +used_locking=`echo "$used_locking" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + cat >>confdefs.h <&5 +echo "${ECHO_T}none" >&6; + { echo "$as_me:11539: WARNING: None of fcntl(), lockf(), flock() available" >&5 +echo "$as_me: WARNING: None of fcntl(), lockf(), flock() available" >&2;} fi -done -cat >>confdefs.h <<\EOF -#define NCURSES 1 -EOF +echo "$as_me:11543: checking for screen type" >&5 +echo $ECHO_N "checking for screen type... $ECHO_C" >&6 -cf_nculib_ROOT=`echo "HAVE_LIB$cf_ncuconfig_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` +# Check whether --with-screen or --without-screen was given. +if test "${with_screen+set}" = set; then + withval="$with_screen" + cf_with_screen=$withval +else + cf_with_screen=none +fi; +echo "$as_me:11553: result: $cf_with_screen" >&5 +echo "${ECHO_T}$cf_with_screen" >&6 - cat >>confdefs.h <&5 +echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6 - else +# Check whether --with-curses-dir or --without-curses-dir was given. +if test "${with_curses_dir+set}" = set; then + withval="$with_curses_dir" + cf_cv_curses_dir=$withval +else + cf_cv_curses_dir=no +fi; +echo "$as_me:11569: result: $cf_cv_curses_dir" >&5 +echo "${ECHO_T}$cf_cv_curses_dir" >&6 -cf_ncuhdr_root=ncurses +if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) +then -test -n "$cf_cv_curses_dir" && \ -test "$cf_cv_curses_dir" != "no" && { \ +if test "x$prefix" != xNONE; then + cf_path_syntax="$prefix" +else + cf_path_syntax="$ac_default_prefix" +fi -if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then - for cf_add_incdir in $cf_cv_curses_dir/include/$cf_ncuhdr_root +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 "$as_me:11600: error: expected a pathname, not \"$withval\"" >&5 +echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +esac + + if test -d "$cf_cv_curses_dir" + then + +if test -n "$cf_cv_curses_dir/include" ; then + for cf_add_incdir in $cf_cv_curses_dir/include do while test $cf_add_incdir != /usr/include do @@ -11117,494 +11633,560 @@ if test -n "$cf_cv_curses_dir/include/$c CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 11120 "configure" +#line 11636 "configure" #include "confdefs.h" #include -int -main (void) -{ -printf("Hello") - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:11132: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:11135: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11138: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:11141: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cf_have_incdir=yes -fi -rm -f conftest.$ac_objext conftest.$ac_ext - CPPFLAGS=$cf_save_CPPFLAGS - fi - fi - fi - - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - -echo "${as_me:-configure}:11158: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` - test "$cf_top_incdir" = "$cf_add_incdir" && break - cf_add_incdir="$cf_top_incdir" - else - break - fi - else - break - fi - done - done -fi - -} - -echo "$as_me:11177: checking for $cf_ncuhdr_root header in include-path" >&5 -echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 -if test "${cf_cv_ncurses_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h" - ( test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw ) && cf_header_list="$cf_header_list curses.h ncurses.h" - for cf_header in $cf_header_list - do - - cat >conftest.$ac_ext <<_ACEOF -#line 11189 "configure" -#include "confdefs.h" - -#include <$cf_header> -int -main (void) -{ - -#ifdef NCURSES_VERSION - -printf("%s\n", NCURSES_VERSION); -#else -#ifdef __NCURSES_H -printf("old\n"); -#else - make an error -#endif -#endif - +int +main (void) +{ +printf("Hello") ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11213: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11648: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11216: \$? = $ac_status" >&5 + echo "$as_me:11651: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11219: \"$ac_try\"") >&5 + { (eval echo "$as_me:11654: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11222: \$? = $ac_status" >&5 + echo "$as_me:11657: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_ncurses_h=$cf_header - + : else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_ncurses_h=no +cf_have_incdir=yes fi rm -f conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$cf_save_CPPFLAGS + fi + fi + fi - test "$cf_cv_ncurses_h" != no && break + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +echo "${as_me:-configure}:11674: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + test "$cf_top_incdir" = "$cf_add_incdir" && break + cf_add_incdir="$cf_top_incdir" + else + break + fi + else + break + fi + done + done +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 + +echo "${as_me:-configure}:11710: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi done +fi + fi fi -echo "$as_me:11237: result: $cf_cv_ncurses_h" >&5 -echo "${ECHO_T}$cf_cv_ncurses_h" >&6 -if test "$cf_cv_ncurses_h" != no ; then - cf_cv_ncurses_header=$cf_cv_ncurses_h +case $cf_with_screen in #(vi +termcap|terminfo) #(we will determine which it really is + ;; +curses) #(vi + use_curses=yes + ;; +ncurses) #(vi + use_curses=yes + use_ncurses=yes + ;; +ncursesw) #(vi + use_curses=yes + use_ncurses=yes + ;; +pdcurses) #(vi + use_curses=yes + ;; +none) + echo "$as_me:11739: checking if you want to use ncurses library" >&5 +echo $ECHO_N "checking if you want to use ncurses library... $ECHO_C" >&6 + +# Check whether --with-ncurses or --without-ncurses was given. +if test "${with_ncurses+set}" = set; then + withval="$with_ncurses" + use_ncurses=$withval else + use_ncurses=no +fi; + echo "$as_me:11749: result: $use_ncurses" >&5 +echo "${ECHO_T}$use_ncurses" >&6 -echo "$as_me:11244: checking for $cf_ncuhdr_root include-path" >&5 -echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 -if test "${cf_cv_ncurses_h2+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + echo "$as_me:11752: checking if you want curses rather than termcap interface" >&5 +echo $ECHO_N "checking if you want curses rather than termcap interface... $ECHO_C" >&6 + +# 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 + cf_with_screen=curses; use_curses=$withval + else + cf_with_screen=termcap; use_curses=no + fi else + enableval=no + cf_with_screen=termcap; use_curses=no - test -n "$verbose" && echo +fi; + echo "$as_me:11769: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 + ;; +esac -cf_search= +if test $use_curses != no ; then -# collect the current set of include-directories from compiler flags -cf_header_path_list="" -if test -n "${CFLAGS}${CPPFLAGS}" ; then - for cf_header_path in $CPPFLAGS $CFLAGS - do - case $cf_header_path in - -I*) - cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` +cat >>confdefs.h <<\EOF +#define USE_CURSES 1 +EOF -test "x$cf_header_path" != "xNONE" && \ -test -d "$cf_header_path" && \ - { - test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" - test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" - test -d $cf_header_path/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root" - test -d $cf_header_path/include/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root/include" - test -d $cf_header_path/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include" - test -d $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root" -} + case $cf_with_screen in #(vi + ncurses) #(vi - cf_header_path_list="$cf_header_path_list $cf_search" +cf_ncuconfig_root=ncurses +cf_have_ncuconfig=no + +if test "x${PKG_CONFIG:=none}" != xnone; then + echo "$as_me:11787: checking pkg-config for $cf_ncuconfig_root" >&5 +echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 + if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then + echo "$as_me:11790: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + + echo "$as_me:11793: checking if the $cf_ncuconfig_root package files work" >&5 +echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 + cf_have_ncuconfig=unknown + + cf_save_CFLAGS="$CFLAGS" + cf_save_CPPFLAGS="$CPPFLAGS" + cf_save_LIBS="$LIBS" + + cf_pkg_cflags=`$PKG_CONFIG --cflags $cf_ncuconfig_root` + cf_pkg_libs=`$PKG_CONFIG --libs $cf_ncuconfig_root` + + # while -W for passing linker flags is prevalent, it is not "standard". + # At least one wrapper for c89/c99 (in Apple's xcode) has its own + # incompatible _and_ non-standard -W option which gives an error. Work + # around that pitfall. + case "x${CC}@@${cf_pkg_libs}@${cf_pkg_cflags}" in + x*c[89]9@@*-W*) + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in $cf_pkg_cflags +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 + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + fi ;; esac - done -fi + 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/=.*//'` -# add the variations for the package we are looking for +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` -cf_search= + ;; + esac -test "x$prefix" != "xNONE" && \ -test -d "$prefix" && \ - { - test -n "$verbose" && echo " ... testing for include-directories under $prefix" - test -d $prefix/include && cf_search="$cf_search $prefix/include" - test -d $prefix/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root" - test -d $prefix/include/$cf_ncuhdr_root/include && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include" - test -d $prefix/$cf_ncuhdr_root/include && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include" - test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" -} + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" -for cf_subdir_prefix in \ - /usr \ - /usr/local \ - /usr/pkg \ - /opt \ - /opt/local \ - $HOME -do + ;; + esac + ;; + *) -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" -} + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + + ;; + esac + ;; +yes) + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + 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 -test "$includedir" != NONE && \ -test "$includedir" != "/usr/include" && \ -test -d "$includedir" && { - test -d $includedir && cf_search="$cf_search $includedir" - test -d $includedir/$cf_ncuhdr_root && cf_search="$cf_search $includedir/$cf_ncuhdr_root" -} +if test -n "$cf_new_cflags" ; then + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + +fi + +if test -n "$cf_new_cppflags" ; then -test "$oldincludedir" != NONE && \ -test "$oldincludedir" != "/usr/include" && \ -test -d "$oldincludedir" && { - test -d $oldincludedir && cf_search="$cf_search $oldincludedir" - test -d $oldincludedir/$cf_ncuhdr_root && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root" -} + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" -cf_search="$cf_search $cf_header_path_list" +fi - test -n "$verbose" && echo search path $cf_search - cf_save2_CPPFLAGS="$CPPFLAGS" - for cf_incdir in $cf_search - do +if test -n "$cf_new_extra_cppflags" ; then -if test -n "$cf_incdir" ; then - for cf_add_incdir in $cf_incdir - do - while test $cf_add_incdir != /usr/include - do - if test -d $cf_add_incdir - then - cf_have_incdir=no - if test -n "$CFLAGS$CPPFLAGS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_incdir in $CFLAGS $CPPFLAGS ; do - if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then - cf_have_incdir=yes; break - fi - done - fi + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" - if test "$cf_have_incdir" = no ; then - if test "$cf_add_incdir" = /usr/local/include ; then - if test "$GCC" = yes - then - cf_save_CPPFLAGS=$CPPFLAGS +fi - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkg_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" - cat >conftest.$ac_ext <<_ACEOF -#line 11365 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 11926 "configure" #include "confdefs.h" -#include +#include <${cf_cv_ncurses_header:-curses.h}> int main (void) { -printf("Hello") +initscr(); mousemask(0,0); tigetstr((char *)0); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:11377: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:11938: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11380: \$? = $ac_status" >&5 + echo "$as_me:11941: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11383: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:11944: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11386: \$? = $ac_status" >&5 + echo "$as_me:11947: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - : + if test "$cross_compiling" = yes; then + cf_test_ncuconfig=maybe +else + cat >conftest.$ac_ext <<_ACEOF +#line 11953 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { char *xx = curses_version(); return (xx == 0); } +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:11960: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:11963: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:11965: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11968: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_test_ncuconfig=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_test_ncuconfig=no +fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_have_incdir=yes +cf_test_ncuconfig=no fi -rm -f conftest.$ac_objext conftest.$ac_ext - CPPFLAGS=$cf_save_CPPFLAGS +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + CFLAGS="$cf_save_CFLAGS" + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" + + if test "x$cf_test_ncuconfig" != xyes; then + cf_temp=`echo "x$cf_pkg_cflags" | sed -e s/^x// -e 's/-W[^ ]*//g'` + cf_pkg_cflags="$cf_temp" + cf_temp=`echo "x$cf_pkg_libs" | sed -e s/^x// -e 's/-W[^ ]*//g'` + cf_pkg_libs="$cf_temp" fi - fi - fi + ;; + esac - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= -echo "${as_me:-configure}:11403: testing adding $cf_add_incdir to include-path ..." 1>&5 +for cf_add_cflags in $cf_pkg_cflags +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[^=]*='\''\"[^"]*//'` - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` - test "$cf_top_incdir" = "$cf_add_incdir" && break - cf_add_incdir="$cf_top_incdir" - else - break - fi - else - break - fi - done - done -fi + if test $cf_fix_cppflags = yes ; then - for cf_header in \ - ncurses.h \ - curses.h - do + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cat >conftest.$ac_ext <<_ACEOF -#line 11426 "configure" -#include "confdefs.h" + continue + elif test "${cf_tst_cflags}" = "\"'" ; then -#include <$cf_header> -int -main (void) -{ + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" -#ifdef NCURSES_VERSION + 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/=.*//'` -printf("%s\n", NCURSES_VERSION); -#else -#ifdef __NCURSES_H -printf("old\n"); -#else - make an error -#endif -#endif +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:11450: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:11453: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11456: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:11459: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_ncurses_h2=$cf_header + ;; + esac -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cf_cv_ncurses_h2=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" - if test "$cf_cv_ncurses_h2" != no ; then - cf_cv_ncurses_h2=$cf_incdir/$cf_header - test -n "$verbose" && echo $ac_n " ... found $ac_c" 1>&6 - break - fi - test -n "$verbose" && echo " ... tested $cf_incdir/$cf_header" 1>&6 - done - CPPFLAGS="$cf_save2_CPPFLAGS" - test "$cf_cv_ncurses_h2" != no && break - done - test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11480: error: not found" >&5 -echo "$as_me: error: not found" >&2;} - { (exit 1); exit 1; }; } + ;; + esac + ;; + *) -fi -echo "$as_me:11485: result: $cf_cv_ncurses_h2" >&5 -echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" - cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'` - cf_cv_ncurses_header=`basename $cf_cv_ncurses_h2` - if test `basename $cf_1st_incdir` = $cf_ncuhdr_root ; then - cf_cv_ncurses_header=$cf_ncuhdr_root/$cf_cv_ncurses_header - fi + ;; + esac + ;; +yes) -if test -n "$cf_1st_incdir" ; then - for cf_add_incdir in $cf_1st_incdir - do - while test $cf_add_incdir != /usr/include - do - if test -d $cf_add_incdir - then - cf_have_incdir=no - if test -n "$CFLAGS$CPPFLAGS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_incdir in $CFLAGS $CPPFLAGS ; do - if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then - cf_have_incdir=yes; break - fi - done - fi + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - if test "$cf_have_incdir" = no ; then - if test "$cf_add_incdir" = /usr/local/include ; then - if test "$GCC" = yes - then - cf_save_CPPFLAGS=$CPPFLAGS + 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 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + +fi + +if test -n "$cf_new_cppflags" ; then test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" - cat >conftest.$ac_ext <<_ACEOF -#line 11521 "configure" +fi + +if test -n "$cf_new_extra_cppflags" ; then + + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + +fi + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkg_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" + + cat >conftest.$ac_ext <<_ACEOF +#line 12114 "configure" #include "confdefs.h" -#include +#include <${cf_cv_ncurses_header:-curses.h}> int main (void) { -printf("Hello") +initscr(); mousemask(0,0); tigetstr((char *)0); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:11533: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:12126: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11536: \$? = $ac_status" >&5 + echo "$as_me:12129: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11539: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:12132: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11542: \$? = $ac_status" >&5 + echo "$as_me:12135: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - : + if test "$cross_compiling" = yes; then + cf_have_ncuconfig=maybe else - echo "$as_me: failed program was:" >&5 + cat >conftest.$ac_ext <<_ACEOF +#line 12141 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { char *xx = curses_version(); return (xx == 0); } +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:12148: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:12151: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:12153: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:12156: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_have_ncuconfig=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_have_incdir=yes +cf_have_ncuconfig=no fi -rm -f conftest.$ac_objext conftest.$ac_ext - CPPFLAGS=$cf_save_CPPFLAGS - fi - fi - fi - - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - -echo "${as_me:-configure}:11559: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` - test "$cf_top_incdir" = "$cf_add_incdir" && break - cf_add_incdir="$cf_top_incdir" - else - break - fi - else - break - fi - done - done +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_ncuconfig=no fi - -# Set definitions to allow ifdef'ing for ncurses.h - -case $cf_cv_ncurses_header in -*ncurses.h) - -cat >>confdefs.h <<\EOF -#define HAVE_NCURSES_H 1 -EOF - - ;; -esac - -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) +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + echo "$as_me:12173: result: $cf_have_ncuconfig" >&5 +echo "${ECHO_T}$cf_have_ncuconfig" >&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 HAVE_NCURSESW_NCURSES_H 1 +#define NCURSES 1 EOF - ;; -esac + NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:11607: checking for terminfo header" >&5 +echo "$as_me:12189: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11622,7 +12204,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >conftest.$ac_ext <<_ACEOF -#line 11625 "configure" +#line 12207 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -11631,22 +12213,22 @@ cat >conftest.$ac_ext <<_ACEOF int main (void) { -int x = auto_left_margin +int x = auto_left_margin; (void)x ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11640: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12222: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11643: \$? = $ac_status" >&5 + echo "$as_me:12225: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11646: \"$ac_try\"") >&5 + { (eval echo "$as_me:12228: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11649: \$? = $ac_status" >&5 + echo "$as_me:12231: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header="$cf_test" @@ -11662,7 +12244,7 @@ rm -f conftest.$ac_objext conftest.$ac_e done fi -echo "$as_me:11665: result: $cf_cv_term_header" >&5 +echo "$as_me:12247: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -11670,480 +12252,565 @@ echo "${ECHO_T}$cf_cv_term_header" >&6 case $cf_cv_term_header in *term.h) -cat >>confdefs.h <<\EOF -#define HAVE_TERM_H 1 -EOF +cat >>confdefs.h <<\EOF +#define HAVE_TERM_H 1 +EOF + + ;; +esac + +case $cf_cv_term_header in +ncurses/term.h) + +cat >>confdefs.h <<\EOF +#define HAVE_NCURSES_TERM_H 1 +EOF + + ;; +ncursesw/term.h) + +cat >>confdefs.h <<\EOF +#define HAVE_NCURSESW_TERM_H 1 +EOF + + ;; +esac + + fi + + else + echo "$as_me:12282: result: no" >&5 +echo "${ECHO_T}no" >&6 + NCURSES_CONFIG_PKG=none + fi +else + NCURSES_CONFIG_PKG=none +fi + +if test "x$cf_have_ncuconfig" = "xno"; then + cf_ncurses_config="${cf_ncuconfig_root}${NCURSES_CONFIG_SUFFIX}-config"; echo "Looking for ${cf_ncurses_config}" + +if test -n "$ac_tool_prefix"; then + for ac_prog in ${cf_ncurses_config} ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +echo "$as_me:12298: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$NCURSES_CONFIG"; then + ac_cv_prog_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" +echo "$as_me:12313: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG +if test -n "$NCURSES_CONFIG"; then + echo "$as_me:12321: result: $NCURSES_CONFIG" >&5 +echo "${ECHO_T}$NCURSES_CONFIG" >&6 +else + echo "$as_me:12324: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$NCURSES_CONFIG" && break + done +fi +if test -z "$NCURSES_CONFIG"; then + ac_ct_NCURSES_CONFIG=$NCURSES_CONFIG + for ac_prog in ${cf_ncurses_config} ${cf_ncuconfig_root}6-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 "$as_me:12337: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_NCURSES_CONFIG"; then + ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_ct_NCURSES_CONFIG" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" +echo "$as_me:12352: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG +if test -n "$ac_ct_NCURSES_CONFIG"; then + echo "$as_me:12360: result: $ac_ct_NCURSES_CONFIG" >&5 +echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 +else + echo "$as_me:12363: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$ac_ct_NCURSES_CONFIG" && break +done +test -n "$ac_ct_NCURSES_CONFIG" || ac_ct_NCURSES_CONFIG="none" + + NCURSES_CONFIG=$ac_ct_NCURSES_CONFIG +fi + + if test "$NCURSES_CONFIG" != none ; then + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in `$NCURSES_CONFIG --cflags` +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 + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + elif test "${cf_tst_cflags}" = "\"'" ; then - ;; -esac + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" -case $cf_cv_term_header in -ncurses/term.h) + 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/=.*//'` -cat >>confdefs.h <<\EOF -#define HAVE_NCURSES_TERM_H 1 -EOF +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` - ;; -ncursesw/term.h) + ;; + esac -cat >>confdefs.h <<\EOF -#define HAVE_NCURSESW_TERM_H 1 -EOF + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" - ;; -esac + ;; + esac + ;; + *) -# some applications need this, but should check for NCURSES_VERSION + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" -cat >>confdefs.h <<\EOF -#define NCURSES 1 -EOF + ;; + esac + ;; +yes) -echo "$as_me:11703: checking for ncurses version" >&5 -echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 -if test "${cf_cv_ncurses_version+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_cv_ncurses_version=no - cf_tempfile=out$$ - rm -f $cf_tempfile - if test "$cross_compiling" = yes; then + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` - # This will not work if the preprocessor splits the line after the - # Autoconf token. The 'unproto' program does that. - cat > conftest.$ac_ext < -#undef Autoconf -#ifdef NCURSES_VERSION -Autoconf NCURSES_VERSION -#else -#ifdef __NCURSES_H -Autoconf "old" -#endif -; -#endif -EOF - cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:11729: \"$cf_try\"") >&5 - (eval $cf_try) 2>&5 - ac_status=$? - echo "$as_me:11732: \$? = $ac_status" >&5 - (exit $ac_status); } - 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" - rm -f conftest.out - fi + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done -else - cat >conftest.$ac_ext <<_ACEOF -#line 11742 "configure" -#include "confdefs.h" +if test -n "$cf_new_cflags" ; then -#include <${cf_cv_ncurses_header:-curses.h}> -#include -int main(void) -{ - FILE *fp = fopen("$cf_tempfile", "w"); -#ifdef NCURSES_VERSION -# ifdef NCURSES_VERSION_PATCH - fprintf(fp, "%s.%d\n", NCURSES_VERSION, NCURSES_VERSION_PATCH); -# else - fprintf(fp, "%s\n", NCURSES_VERSION); -# endif -#else -# ifdef __NCURSES_H - fprintf(fp, "old\n"); -# else - make an error -# endif -#endif - ${cf_cv_main_return:-return}(0); -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:11767: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:11770: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:11772: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:11775: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" - cf_cv_ncurses_version=`cat $cf_tempfile` -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - rm -f $cf_tempfile -fi -echo "$as_me:11789: result: $cf_cv_ncurses_version" >&5 -echo "${ECHO_T}$cf_cv_ncurses_version" >&6 -test "$cf_cv_ncurses_version" = no || -cat >>confdefs.h <<\EOF -#define NCURSES 1 -EOF +if test -n "$cf_new_cppflags" ; then -cf_nculib_root=ncurses - # This works, except for the special case where we find gpm, but - # ncurses is in a nonstandard location via $LIBS, and we really want - # to link gpm. -cf_ncurses_LIBS="" -cf_ncurses_SAVE="$LIBS" -echo "$as_me:11802: checking for Gpm_Open in -lgpm" >&5 -echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 -if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lgpm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 11810 "configure" -#include "confdefs.h" + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char Gpm_Open (); -int -main (void) -{ -Gpm_Open (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11829: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:11832: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11835: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:11838: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_gpm_Gpm_Open=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_gpm_Gpm_Open=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:11849: result: $ac_cv_lib_gpm_Gpm_Open" >&5 -echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 -if test $ac_cv_lib_gpm_Gpm_Open = yes; then - echo "$as_me:11852: checking for initscr in -lgpm" >&5 -echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 -if test "${ac_cv_lib_gpm_initscr+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lgpm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 11860 "configure" -#include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char initscr (); -int -main (void) -{ -initscr (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11879: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:11882: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11885: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:11888: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_gpm_initscr=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_gpm_initscr=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:11899: result: $ac_cv_lib_gpm_initscr" >&5 -echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 -if test $ac_cv_lib_gpm_initscr = yes; then - LIBS="$cf_ncurses_SAVE" -else - cf_ncurses_LIBS="-lgpm" -fi +if test -n "$cf_new_extra_cppflags" ; then + + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" fi -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 "$as_me:11914: checking for tgoto in -lmytinfo" >&5 -echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 -if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in `$NCURSES_CONFIG --libs`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" + + # even with config script, some packages use no-override for curses.h + +echo "$as_me:12492: checking if we have identified curses headers" >&5 +echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 +if test "${cf_cv_ncurses_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmytinfo $LIBS" + +cf_cv_ncurses_header=none +for cf_header in \ + ncurses.h ncurses/ncurses.h \ + curses.h ncurses/curses.h +do cat >conftest.$ac_ext <<_ACEOF -#line 11922 "configure" +#line 12504 "configure" #include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char tgoto (); +#include <${cf_header}> int main (void) { -tgoto (); +initscr(); tgoto("?", 0,0) ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11941: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:12516: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11944: \$? = $ac_status" >&5 + echo "$as_me:12519: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11947: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:12522: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11950: \$? = $ac_status" >&5 + echo "$as_me:12525: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_mytinfo_tgoto=yes + cf_cv_ncurses_header=$cf_header; break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_mytinfo_tgoto=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f conftest.$ac_objext conftest.$ac_ext +done + fi -echo "$as_me:11961: result: $ac_cv_lib_mytinfo_tgoto" >&5 -echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 -if test $ac_cv_lib_mytinfo_tgoto = yes; then - cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" +echo "$as_me:12536: result: $cf_cv_ncurses_header" >&5 +echo "${ECHO_T}$cf_cv_ncurses_header" >&6 + +if test "$cf_cv_ncurses_header" = none ; then + { { echo "$as_me:12540: error: No curses header-files found" >&5 +echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } fi - fi - ;; -esac +# cheat, to get the right #define's for HAVE_NCURSES_H, etc. -cf_add_libs="$cf_ncurses_LIBS" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS +for ac_header in $cf_cv_ncurses_header 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" +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:12550: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 12556 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:12560: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:12566: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + eval "$as_ac_Header=no" +fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:12585: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <>confdefs.h <<\EOF +#define NCURSES 1 +EOF -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" +cf_nculib_ROOT=`echo "HAVE_LIB$cf_ncuconfig_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -else + cat >>confdefs.h <&5 -echo $ECHO_N "checking for initscr... $ECHO_C" >&6 -if test "${ac_cv_func_initscr+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 12016 "configure" -#include "confdefs.h" -#define initscr autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef initscr + cf_cv_ncurses_version=`$NCURSES_CONFIG --version` -#ifdef __cplusplus -extern "C" -#endif + else -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char initscr (void); +cf_ncuhdr_root=ncurses + +test -n "$cf_cv_curses_dir" && \ +test "$cf_cv_curses_dir" != "no" && { \ + +if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then + for cf_add_incdir in $cf_cv_curses_dir/include/$cf_ncuhdr_root + do + while test $cf_add_incdir != /usr/include + do + if test -d $cf_add_incdir + then + cf_have_incdir=no + if test -n "$CFLAGS$CPPFLAGS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then + cf_have_incdir=yes; break + fi + done + fi + + if test "$cf_have_incdir" = no ; then + if test "$cf_add_incdir" = /usr/local/include ; then + if test "$GCC" = yes + then + cf_save_CPPFLAGS=$CPPFLAGS + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +#line 12641 "configure" +#include "confdefs.h" +#include int main (void) { - -/* The GNU C library defines stubs 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_initscr) || defined (__stub___initscr) -#error found stub for initscr -#endif - - return initscr (); +printf("Hello") ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12047: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:12653: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12050: \$? = $ac_status" >&5 + echo "$as_me:12656: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12053: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:12659: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12056: \$? = $ac_status" >&5 + echo "$as_me:12662: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func_initscr=yes + : else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_func_initscr=no +cf_have_incdir=yes fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$cf_save_CPPFLAGS + fi + fi + fi + + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +echo "${as_me:-configure}:12679: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + test "$cf_top_incdir" = "$cf_add_incdir" && break + cf_add_incdir="$cf_top_incdir" + else + break + fi + else + break + fi + done + done fi -echo "$as_me:12066: result: $ac_cv_func_initscr" >&5 -echo "${ECHO_T}$ac_cv_func_initscr" >&6 -if test $ac_cv_func_initscr = yes; then - eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' + +} + +echo "$as_me:12698: checking for $cf_ncuhdr_root header in include-path" >&5 +echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 +if test "${cf_cv_ncurses_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cf_save_LIBS="$LIBS" - echo "$as_me:12073: checking for initscr in -l$cf_nculib_root" >&5 -echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 - LIBS="-l$cf_nculib_root $LIBS" - cat >conftest.$ac_ext <<_ACEOF -#line 12077 "configure" + cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h" + ( test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw ) && cf_header_list="$cf_header_list curses.h ncurses.h" + for cf_header in $cf_header_list + do + + cat >conftest.$ac_ext <<_ACEOF +#line 12710 "configure" #include "confdefs.h" -#include <${cf_cv_ncurses_header:-curses.h}> + +#include <$cf_header> int main (void) { -initscr() + +#ifdef NCURSES_VERSION + +printf("%s\n", NCURSES_VERSION); +#else +#ifdef __NCURSES_H +printf("old\n"); +#else + make an error +#endif +#endif + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12089: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:12734: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12092: \$? = $ac_status" >&5 + echo "$as_me:12737: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12095: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:12740: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12098: \$? = $ac_status" >&5 + echo "$as_me:12743: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:12100: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' + cf_cv_ncurses_h=$cf_header else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:12107: result: no" >&5 -echo "${ECHO_T}no" >&6 +cf_cv_ncurses_h=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext + + test "$cf_cv_ncurses_h" != no && break + done + +fi +echo "$as_me:12758: result: $cf_cv_ncurses_h" >&5 +echo "${ECHO_T}$cf_cv_ncurses_h" >&6 + +if test "$cf_cv_ncurses_h" != no ; then + cf_cv_ncurses_header=$cf_cv_ncurses_h +else + +echo "$as_me:12765: checking for $cf_ncuhdr_root include-path" >&5 +echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 +if test "${cf_cv_ncurses_h2+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + test -n "$verbose" && echo cf_search= -cf_library_path_list="" -if test -n "${LDFLAGS}${LIBS}" ; then - for cf_library_path in $LDFLAGS $LIBS + +# collect the current set of include-directories from compiler flags +cf_header_path_list="" +if test -n "${CFLAGS}${CPPFLAGS}" ; then + for cf_header_path in $CPPFLAGS $CFLAGS do - case $cf_library_path in - -L*) - cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` + case $cf_header_path in + -I*) + cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` -test "x$cf_library_path" != "xNONE" && \ -test -d "$cf_library_path" && \ +test "x$cf_header_path" != "xNONE" && \ +test -d "$cf_header_path" && \ { - test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" - test -d $cf_library_path/lib && cf_search="$cf_search $cf_library_path/lib" - test -d $cf_library_path/lib/$cf_nculib_root && cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root" - test -d $cf_library_path/lib/$cf_nculib_root/lib && cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root/lib" - test -d $cf_library_path/$cf_nculib_root/lib && cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib" - test -d $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root" + test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" + test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" + test -d $cf_header_path/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root" + test -d $cf_header_path/include/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root/include" + test -d $cf_header_path/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include" + test -d $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root" } - cf_library_path_list="$cf_library_path_list $cf_search" + cf_header_path_list="$cf_header_path_list $cf_search" ;; esac done fi +# add the variations for the package we are looking for + cf_search= test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { - test -n "$verbose" && echo " ... testing for lib-directories under $prefix" - test -d $prefix/lib && cf_search="$cf_search $prefix/lib" - test -d $prefix/lib/$cf_nculib_root && cf_search="$cf_search $prefix/lib/$cf_nculib_root" - test -d $prefix/lib/$cf_nculib_root/lib && cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib" - test -d $prefix/$cf_nculib_root/lib && cf_search="$cf_search $prefix/$cf_nculib_root/lib" - test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root" + test -n "$verbose" && echo " ... testing for include-directories under $prefix" + test -d $prefix/include && cf_search="$cf_search $prefix/include" + test -d $prefix/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root" + test -d $prefix/include/$cf_ncuhdr_root/include && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include" + test -d $prefix/$cf_ncuhdr_root/include && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include" + test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" } for cf_subdir_prefix in \ @@ -12158,943 +12825,1009 @@ 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" + 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 -cf_search="$cf_library_path_list $cf_search" +test "$includedir" != NONE && \ +test "$includedir" != "/usr/include" && \ +test -d "$includedir" && { + test -d $includedir && cf_search="$cf_search $includedir" + test -d $includedir/$cf_ncuhdr_root && cf_search="$cf_search $includedir/$cf_ncuhdr_root" +} - for cf_libdir in $cf_search - do - echo "$as_me:12175: checking for -l$cf_nculib_root in $cf_libdir" >&5 -echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 - LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -#line 12179 "configure" +test "$oldincludedir" != NONE && \ +test "$oldincludedir" != "/usr/include" && \ +test -d "$oldincludedir" && { + test -d $oldincludedir && cf_search="$cf_search $oldincludedir" + test -d $oldincludedir/$cf_ncuhdr_root && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root" +} + +cf_search="$cf_search $cf_header_path_list" + + test -n "$verbose" && echo search path $cf_search + cf_save2_CPPFLAGS="$CPPFLAGS" + for cf_incdir in $cf_search + do + +if test -n "$cf_incdir" ; then + for cf_add_incdir in $cf_incdir + do + while test $cf_add_incdir != /usr/include + do + if test -d $cf_add_incdir + then + cf_have_incdir=no + if test -n "$CFLAGS$CPPFLAGS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then + cf_have_incdir=yes; break + fi + done + fi + + if test "$cf_have_incdir" = no ; then + if test "$cf_add_incdir" = /usr/local/include ; then + if test "$GCC" = yes + then + cf_save_CPPFLAGS=$CPPFLAGS + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >conftest.$ac_ext <<_ACEOF +#line 12886 "configure" #include "confdefs.h" -#include <${cf_cv_ncurses_header:-curses.h}> +#include int main (void) { -initscr() +printf("Hello") ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12191: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:12898: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12194: \$? = $ac_status" >&5 + echo "$as_me:12901: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12197: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:12904: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12200: \$? = $ac_status" >&5 + echo "$as_me:12907: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:12202: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' - break + : else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:12209: result: no" >&5 -echo "${ECHO_T}no" >&6 - LIBS="$cf_save_LIBS" +cf_have_incdir=yes fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - done +rm -f conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$cf_save_CPPFLAGS + fi + fi + fi + + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +echo "${as_me:-configure}:12924: testing adding $cf_add_incdir to include-path ..." 1>&5 + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + test "$cf_top_incdir" = "$cf_add_incdir" && break + cf_add_incdir="$cf_top_incdir" + else + break + fi + else + break + fi + done + done fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + for cf_header in \ + ncurses.h \ + curses.h + do + + cat >conftest.$ac_ext <<_ACEOF +#line 12947 "configure" +#include "confdefs.h" + +#include <$cf_header> +int +main (void) +{ + +#ifdef NCURSES_VERSION + +printf("%s\n", NCURSES_VERSION); +#else +#ifdef __NCURSES_H +printf("old\n"); +#else + make an error +#endif +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:12971: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:12974: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:12977: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:12980: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_h2=$cf_header + +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_ncurses_h2=no fi +rm -f conftest.$ac_objext conftest.$ac_ext -eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root + if test "$cf_cv_ncurses_h2" != no ; then + cf_cv_ncurses_h2=$cf_incdir/$cf_header + test -n "$verbose" && echo $ac_n " ... found $ac_c" 1>&6 + break + fi + test -n "$verbose" && echo " ... tested $cf_incdir/$cf_header" 1>&6 + done + CPPFLAGS="$cf_save2_CPPFLAGS" + test "$cf_cv_ncurses_h2" != no && break + done + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:13001: error: not found" >&5 +echo "$as_me: error: not found" >&2;} + { (exit 1); exit 1; }; } + +fi +echo "$as_me:13006: result: $cf_cv_ncurses_h2" >&5 +echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 + + cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'` + cf_cv_ncurses_header=`basename $cf_cv_ncurses_h2` + if test `basename $cf_1st_incdir` = $cf_ncuhdr_root ; then + cf_cv_ncurses_header=$cf_ncuhdr_root/$cf_cv_ncurses_header + fi + +if test -n "$cf_1st_incdir" ; then + for cf_add_incdir in $cf_1st_incdir + do + while test $cf_add_incdir != /usr/include + do + if test -d $cf_add_incdir + then + cf_have_incdir=no + if test -n "$CFLAGS$CPPFLAGS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then + cf_have_incdir=yes; break + fi + done + fi -if test $cf_found_library = no ; then - { { echo "$as_me:12224: error: Cannot link $cf_nculib_root library" >&5 -echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} - { (exit 1); exit 1; }; } -fi + if test "$cf_have_incdir" = no ; then + if test "$cf_add_incdir" = /usr/local/include ; then + if test "$GCC" = yes + then + cf_save_CPPFLAGS=$CPPFLAGS -fi + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" -if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:12232: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 -echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 - cf_ncurses_SAVE="$LIBS" - for p in $cf_ncurses_LIBS ; do - q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` - if test "$q" != "$LIBS" ; then - LIBS="$q" - fi - done - cat >conftest.$ac_ext <<_ACEOF -#line 12242 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 13042 "configure" #include "confdefs.h" -#include <${cf_cv_ncurses_header:-curses.h}> +#include int main (void) { -initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); +printf("Hello") ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12254: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:13054: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12257: \$? = $ac_status" >&5 + echo "$as_me:13057: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12260: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:13060: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12263: \$? = $ac_status" >&5 + echo "$as_me:13063: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:12265: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + : else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:12270: result: no" >&5 -echo "${ECHO_T}no" >&6 - LIBS="$cf_ncurses_SAVE" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +cf_have_incdir=yes fi +rm -f conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$cf_save_CPPFLAGS + fi + fi + fi -cf_nculib_ROOT=`echo "HAVE_LIB$cf_nculib_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -cat >>confdefs.h <&5 - fi -else - NCURSES_CONFIG=none + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + test "$cf_top_incdir" = "$cf_add_incdir" && break + cf_add_incdir="$cf_top_incdir" + else + break + fi + else + break + fi + done + done fi - ;; - ncursesw) #(vi +fi -for cf_hdr in stdlib.h wchar.h wctype.h -do - echo "$as_me:12293: checking for $cf_hdr" >&5 -echo $ECHO_N "checking for $cf_hdr... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line 12296 "configure" -#include "confdefs.h" +# Set definitions to allow ifdef'ing for ncurses.h -#include -#include <$cf_hdr> +case $cf_cv_ncurses_header in +*ncurses.h) -_ACEOF -if { (eval echo "$as_me:12303: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:12309: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - cf_found=yes -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - cf_found=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:12327: result: $cf_found" >&5 -echo "${ECHO_T}$cf_found" >&6 -if test $cf_found = yes ; then +cat >>confdefs.h <<\EOF +#define HAVE_NCURSES_H 1 +EOF -cf_tr_hdr=`echo "$cf_hdr" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + ;; +esac - cat >>confdefs.h <>confdefs.h <<\EOF +#define HAVE_NCURSES_NCURSES_H 1 EOF -fi -done + ;; +ncursesw/curses.h|ncursesw/ncurses.h) - echo "$as_me:12340: checking for wide char and multibyte support" >&5 -echo $ECHO_N "checking for wide char and multibyte support... $ECHO_C" >&6 -if test "${am_cv_multibyte_able+set}" = set; then +cat >>confdefs.h <<\EOF +#define HAVE_NCURSESW_NCURSES_H 1 +EOF + + ;; +esac + +echo "$as_me:13128: checking for terminfo header" >&5 +echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 +if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 12346 "configure" -#include "confdefs.h" -#include -#ifdef HAVE_STDLIB_H -# include -#endif /* HAVE_STDLIB_H */ -#ifdef HAVE_WCHAR_H -# include -#endif /* HAVE_WCHAR_H */ -#ifdef HAVE_WCTYPE_H -# include -#endif /* HAVE_WCTYPE_H */ -int -main (void) -{ -const char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0x00}; - char ocb[5]; - wchar_t wcb[5]; - wchar_t wcb2[5]; - wchar_t format[3]; +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 - putwc(0, 0); - fputwc(0, 0); - fwide(0, 0); - mbtowc(wcb, icb, MB_CUR_MAX); - mbstowcs(wcb, icb, 5); - (void) iswalnum((wint_t) wcb[0]); - (void) iswcntrl((wint_t) wcb[0]); - (void) iswdigit((wint_t) wcb[0]); - (void) iswgraph((wint_t) wcb[0]); - (void) iswprint((wint_t) wcb[0]); - (void) iswspace((wint_t) wcb[0]); - (void) towupper((wint_t) wcb[0]); - /* (void) iswupper((wint_t) wcb[0]); */ - /* (void) towlower((wint_t) wcb[0]); */ - /* (void) iswlower((wint_t) wcb[0]); */ - (void) iswalpha((wint_t) wcb[0]); - /* (void) iswblank((wint_t) wcb[0]); */ - /* (void) iswpunct((wint_t) wcb[0]); */ - /* (void) iswxdigit((wint_t) wcb[0]); */ - /* (void) iswctype((wint_t) wcb[0], wctype("print")); */ - /* (void) towctranse((wint_t) wcb[0], wctrans("toupper")); */ - (void) wcslen(wcb); - /* (void) wcsnlen(wcb, 4); */ - wcwidth((wint_t) wcb[0]); - wcswidth(wcb, 5); - wcstombs(ocb, wcb, 5); - wctomb(ocb, wcb[0]); - wcscat(wcb2, wcb); - wcscpy(wcb2, wcb); - mbstowcs(format, "%s", 2); - swprintf(wcb, 5, format, "test"); - wcsncat(wcb2, wcb, 5); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12405: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:12408: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12411: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:12414: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - am_cv_multibyte_able=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cf_save_LIBS="$LIBS" - LIBS="-lutf8 $LIBS" - cat >conftest.$ac_ext <<_ACEOF -#line 12423 "configure" +for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" +do +cat >conftest.$ac_ext <<_ACEOF +#line 13146 "configure" #include "confdefs.h" -#include -int -main (void) -{ -const char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0x00}; - char ocb[5]; - wchar_t wcb[5]; - wchar_t wcb2[5]; - wchar_t format[3]; - - putwc(0, 0); - fputwc(0, 0); - fwide(0, 0); - mbtowc(wcb, icb, MB_CUR_MAX); - mbstowcs(wcb, icb, 5); - (void) iswalnum((wint_t) wcb[0]); - (void) iswcntrl((wint_t) wcb[0]); - (void) iswdigit((wint_t) wcb[0]); - (void) iswgraph((wint_t) wcb[0]); - (void) iswprint((wint_t) wcb[0]); - (void) iswspace((wint_t) wcb[0]); - (void) towupper((wint_t) wcb[0]); - /* (void) iswupper((wint_t) wcb[0]); */ - /* (void) towlower((wint_t) wcb[0]); */ - /* (void) iswlower((wint_t) wcb[0]); */ - (void) iswalpha((wint_t) wcb[0]); - /* (void) iswblank((wint_t) wcb[0]); */ - /* (void) iswpunct((wint_t) wcb[0]); */ - /* (void) iswxdigit((wint_t) wcb[0]); */ - /* (void) iswctype((wint_t) wcb[0], wctype("print")); */ - /* (void) towctranse((wint_t) wcb[0], wctrans("toupper")); */ - (void) wcslen(wcb); - /* (void) wcsnlen(wcb, 4); */ - wcwidth((wint_t) wcb[0]); - wcswidth(wcb, 5); - wcstombs(ocb, wcb, 5); - wctomb(ocb, wcb[0]); - wcscat(wcb2, wcb); - wcscpy(wcb2, wcb); - mbstowcs(format, "%s", 2); - swprintf(wcb, 5, format, "test"); - wcsncat(wcb2, wcb, 5); +#include +#include <${cf_cv_ncurses_header:-curses.h}> +#include <$cf_test> + +int +main (void) +{ +int x = auto_left_margin; (void)x ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12472: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:13161: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12475: \$? = $ac_status" >&5 + echo "$as_me:13164: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12478: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:13167: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12481: \$? = $ac_status" >&5 + echo "$as_me:13170: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - am_cv_multibyte_able=libutf8 + + cf_cv_term_header="$cf_test" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -am_cv_multibyte_able=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS="$cf_save_LIBS" + + cf_cv_term_header=unknown fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext + test "$cf_cv_term_header" != unknown && break +done fi -echo "$as_me:12496: result: $am_cv_multibyte_able" >&5 -echo "${ECHO_T}$am_cv_multibyte_able" >&6 - if test "$am_cv_multibyte_able" != no; then - if test "$am_cv_multibyte_able" = libutf8; then - cat >>confdefs.h <<\EOF -#define HAVE_LIBUTF8_H 1 -EOF +echo "$as_me:13186: result: $cf_cv_term_header" >&5 +echo "${ECHO_T}$cf_cv_term_header" >&6 - LIBS="-lutf8 $LIBS" - fi +# Set definitions to allow ifdef'ing to accommodate subdirectories + +case $cf_cv_term_header in +*term.h) cat >>confdefs.h <<\EOF -#define MULTIBYTE_ABLE 1 +#define HAVE_TERM_H 1 EOF - fi - -cf_ncuconfig_root=ncursesw -cf_have_ncuconfig=no - -if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:12517: checking pkg-config for $cf_ncuconfig_root" >&5 -echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 - if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then - echo "$as_me:12520: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - - echo "$as_me:12523: checking if the $cf_ncuconfig_root package files work" >&5 -echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 - cf_have_ncuconfig=unknown - - cf_save_CPPFLAGS="$CPPFLAGS" - cf_save_LIBS="$LIBS" - -cf_fix_cppflags=no -cf_new_cflags= -cf_new_cppflags= -cf_new_extra_cppflags= - -for cf_add_cflags in `$PKG_CONFIG --cflags $cf_ncuconfig_root` -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 - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - - continue - elif test "${cf_tst_cflags}" = "\"'" ; then - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - 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 - - test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " - cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + ;; +esac - ;; - esac - ;; - *) +case $cf_cv_term_header in +ncurses/term.h) - test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " - cf_new_cflags="${cf_new_cflags}$cf_add_cflags" +cat >>confdefs.h <<\EOF +#define HAVE_NCURSES_TERM_H 1 +EOF - ;; - esac ;; -yes) - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" +ncursesw/term.h) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` +cat >>confdefs.h <<\EOF +#define HAVE_NCURSESW_TERM_H 1 +EOF - 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 - test -n "$CFLAGS" && CFLAGS="$CFLAGS " - CFLAGS="${CFLAGS}$cf_new_cflags" +# some applications need this, but should check for NCURSES_VERSION -fi +cat >>confdefs.h <<\EOF +#define NCURSES 1 +EOF -if test -n "$cf_new_cppflags" ; then +echo "$as_me:13224: checking for ncurses version" >&5 +echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 +if test "${cf_cv_ncurses_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + cf_cv_ncurses_version=no + cf_tempfile=out$$ + rm -f $cf_tempfile + if test "$cross_compiling" = yes; then -fi + # This will not work if the preprocessor splits the line after the + # Autoconf token. The 'unproto' program does that. + cat > conftest.$ac_ext < +#undef Autoconf +#ifdef NCURSES_VERSION +Autoconf NCURSES_VERSION +#else +#ifdef __NCURSES_H +Autoconf "old" +#endif +; +#endif +EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" + { (eval echo "$as_me:13250: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? + echo "$as_me:13253: \$? = $ac_status" >&5 + (exit $ac_status); } + 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" + rm -f conftest.out + fi -if test -n "$cf_new_extra_cppflags" ; then +else + cat >conftest.$ac_ext <<_ACEOF +#line 13263 "configure" +#include "confdefs.h" - test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " - EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" +#include <${cf_cv_ncurses_header:-curses.h}> +#include +int main(void) +{ + FILE *fp = fopen("$cf_tempfile", "w"); +#ifdef NCURSES_VERSION +# ifdef NCURSES_VERSION_PATCH + fprintf(fp, "%s.%d\n", NCURSES_VERSION, NCURSES_VERSION_PATCH); +# else + fprintf(fp, "%s\n", NCURSES_VERSION); +# endif +#else +# ifdef __NCURSES_H + fprintf(fp, "old\n"); +# else + make an error +# endif +#endif + ${cf_cv_main_return:-return}(0); +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:13288: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:13291: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:13293: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:13296: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_version=`cat $cf_tempfile` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + rm -f $cf_tempfile -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" +fi +echo "$as_me:13310: result: $cf_cv_ncurses_version" >&5 +echo "${ECHO_T}$cf_cv_ncurses_version" >&6 +test "$cf_cv_ncurses_version" = no || +cat >>confdefs.h <<\EOF +#define NCURSES 1 +EOF - cat >conftest.$ac_ext <<_ACEOF -#line 12645 "configure" +cf_nculib_root=ncurses + # This works, except for the special case where we find gpm, but + # ncurses is in a nonstandard location via $LIBS, and we really want + # to link gpm. +cf_ncurses_LIBS="" +cf_ncurses_SAVE="$LIBS" +echo "$as_me:13323: checking for Gpm_Open in -lgpm" >&5 +echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 +if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgpm $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 13331 "configure" #include "confdefs.h" -#include <${cf_cv_ncurses_header:-curses.h}> + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char Gpm_Open (); int main (void) { -initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); +Gpm_Open (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12657: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13350: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12660: \$? = $ac_status" >&5 + echo "$as_me:13353: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12663: \"$ac_try\"") >&5 + { (eval echo "$as_me:13356: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12666: \$? = $ac_status" >&5 + echo "$as_me:13359: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - if test "$cross_compiling" = yes; then - cf_have_ncuconfig=maybe + ac_cv_lib_gpm_Gpm_Open=yes else - cat >conftest.$ac_ext <<_ACEOF -#line 12672 "configure" + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_gpm_Gpm_Open=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:13370: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 +if test $ac_cv_lib_gpm_Gpm_Open = yes; then + echo "$as_me:13373: checking for initscr in -lgpm" >&5 +echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 +if test "${ac_cv_lib_gpm_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgpm $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 13381 "configure" #include "confdefs.h" -#include <${cf_cv_ncurses_header:-curses.h}> - int main(void) - { char *xx = curses_version(); return (xx == 0); } + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char initscr (); +int +main (void) +{ +initscr (); + ; + return 0; +} _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:12679: \"$ac_link\"") >&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:13400: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12682: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:12684: \"$ac_try\"") >&5 + echo "$as_me:13403: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:13406: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12687: \$? = $ac_status" >&5 + echo "$as_me:13409: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_have_ncuconfig=yes + ac_cv_lib_gpm_initscr=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_have_ncuconfig=no +ac_cv_lib_gpm_initscr=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi +echo "$as_me:13420: result: $ac_cv_lib_gpm_initscr" >&5 +echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 +if test $ac_cv_lib_gpm_initscr = yes; then + LIBS="$cf_ncurses_SAVE" else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cf_have_ncuconfig=no + cf_ncurses_LIBS="-lgpm" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:12704: result: $cf_have_ncuconfig" >&5 -echo "${ECHO_T}$cf_have_ncuconfig" >&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 -echo "$as_me:12720: checking for terminfo header" >&5 -echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 -if test "${cf_cv_term_header+set}" = set; then +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 "$as_me:13435: checking for tgoto in -lmytinfo" >&5 +echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 +if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - -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 - -for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" -do + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmytinfo $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12738 "configure" +#line 13443 "configure" #include "confdefs.h" -#include -#include <${cf_cv_ncurses_header:-curses.h}> -#include <$cf_test> +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char tgoto (); int main (void) { -int x = auto_left_margin +tgoto (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12753: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:13462: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12756: \$? = $ac_status" >&5 + echo "$as_me:13465: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12759: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:13468: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12762: \$? = $ac_status" >&5 + echo "$as_me:13471: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - cf_cv_term_header="$cf_test" + ac_cv_lib_mytinfo_tgoto=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - - cf_cv_term_header=unknown - +ac_cv_lib_mytinfo_tgoto=no fi -rm -f conftest.$ac_objext conftest.$ac_ext - test "$cf_cv_term_header" != unknown && break -done - +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:13482: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 +if test $ac_cv_lib_mytinfo_tgoto = yes; then + cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" fi -echo "$as_me:12778: result: $cf_cv_term_header" >&5 -echo "${ECHO_T}$cf_cv_term_header" >&6 - -# Set definitions to allow ifdef'ing to accommodate subdirectories - -case $cf_cv_term_header in -*term.h) - -cat >>confdefs.h <<\EOF -#define HAVE_TERM_H 1 -EOF - - ;; -esac - -case $cf_cv_term_header in -ncurses/term.h) - -cat >>confdefs.h <<\EOF -#define HAVE_NCURSES_TERM_H 1 -EOF - - ;; -ncursesw/term.h) - -cat >>confdefs.h <<\EOF -#define HAVE_NCURSESW_TERM_H 1 -EOF + fi ;; esac +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_ncurses_LIBS; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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 - - else - echo "$as_me:12813: result: no" >&5 -echo "${ECHO_T}no" >&6 - NCURSES_CONFIG_PKG=none - fi -else - NCURSES_CONFIG_PKG=none -fi - -if test "x$cf_have_ncuconfig" = "xno"; then - cf_ncurses_config="${cf_ncuconfig_root}${NCURSES_CONFIG_SUFFIX}-config"; echo "Looking for ${cf_ncurses_config}" - -if test -n "$ac_tool_prefix"; then - for ac_prog in ${cf_ncurses_config} ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:12829: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$NCURSES_CONFIG"; then - ac_cv_prog_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" -echo "$as_me:12844: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG -if test -n "$NCURSES_CONFIG"; then - echo "$as_me:12852: result: $NCURSES_CONFIG" >&5 -echo "${ECHO_T}$NCURSES_CONFIG" >&6 -else - echo "$as_me:12855: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$NCURSES_CONFIG" && break - done -fi -if test -z "$NCURSES_CONFIG"; then - ac_ct_NCURSES_CONFIG=$NCURSES_CONFIG - for ac_prog in ${cf_ncurses_config} ${cf_ncuconfig_root}6-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 "$as_me:12868: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_NCURSES_CONFIG"; then - ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_ct_NCURSES_CONFIG" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" -echo "$as_me:12883: found $ac_dir/$ac_word" >&5 -break + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done +LIBS="$cf_add_libs" -fi -fi -ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG -if test -n "$ac_ct_NCURSES_CONFIG"; then - echo "$as_me:12891: result: $ac_ct_NCURSES_CONFIG" >&5 -echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 -else - echo "$as_me:12894: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi +if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) +then - test -n "$ac_ct_NCURSES_CONFIG" && break +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -l$cf_nculib_root; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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_1lib $cf_add_libs" done -test -n "$ac_ct_NCURSES_CONFIG" || ac_ct_NCURSES_CONFIG="none" - - NCURSES_CONFIG=$ac_ct_NCURSES_CONFIG -fi - - if test "$NCURSES_CONFIG" != none ; then +LIBS="$cf_add_libs" -cf_fix_cppflags=no -cf_new_cflags= -cf_new_cppflags= -cf_new_extra_cppflags= +else -for cf_add_cflags in `$NCURSES_CONFIG --cflags` -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[^=]*='\''\"[^"]*//'` + eval 'cf_cv_have_lib_'$cf_nculib_root'=no' + cf_libdir="" + echo "$as_me:13531: checking for initscr" >&5 +echo $ECHO_N "checking for initscr... $ECHO_C" >&6 +if test "${ac_cv_func_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 13537 "configure" +#include "confdefs.h" +#define initscr autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef initscr - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes +#ifdef __cplusplus +extern "C" +#endif - if test $cf_fix_cppflags = yes ; then +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char initscr (void); - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" +int +main (void) +{ - continue - elif test "${cf_tst_cflags}" = "\"'" ; then +/* The GNU C library defines stubs 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_initscr) || defined (__stub___initscr) +#error found stub for initscr +#endif - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + return initscr (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:13568: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:13571: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:13574: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:13577: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_initscr=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_initscr=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:13587: result: $ac_cv_func_initscr" >&5 +echo "${ECHO_T}$ac_cv_func_initscr" >&6 +if test $ac_cv_func_initscr = yes; then + eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' +else - 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/=.*//'` + cf_save_LIBS="$LIBS" + echo "$as_me:13594: checking for initscr in -l$cf_nculib_root" >&5 +echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 + LIBS="-l$cf_nculib_root $LIBS" + cat >conftest.$ac_ext <<_ACEOF +#line 13598 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> +int +main (void) +{ +initscr() + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:13610: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:13613: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:13616: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:13619: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "$as_me:13621: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' -CPPFLAGS=`echo "$CPPFLAGS" | \ - sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +echo "$as_me:13628: result: no" >&5 +echo "${ECHO_T}no" >&6 - ;; - esac +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 + -L*) + cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` - test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " - cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" +test "x$cf_library_path" != "xNONE" && \ +test -d "$cf_library_path" && \ + { + test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" + test -d $cf_library_path/lib && cf_search="$cf_search $cf_library_path/lib" + test -d $cf_library_path/lib/$cf_nculib_root && cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root" + test -d $cf_library_path/lib/$cf_nculib_root/lib && cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root/lib" + test -d $cf_library_path/$cf_nculib_root/lib && cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib" + test -d $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root" +} + cf_library_path_list="$cf_library_path_list $cf_search" ;; esac - ;; - *) + done +fi - test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " - cf_new_cflags="${cf_new_cflags}$cf_add_cflags" +cf_search= - ;; - esac - ;; -yes) +test "x$prefix" != "xNONE" && \ +test -d "$prefix" && \ + { + test -n "$verbose" && echo " ... testing for lib-directories under $prefix" + test -d $prefix/lib && cf_search="$cf_search $prefix/lib" + test -d $prefix/lib/$cf_nculib_root && cf_search="$cf_search $prefix/lib/$cf_nculib_root" + test -d $prefix/lib/$cf_nculib_root/lib && cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib" + test -d $prefix/$cf_nculib_root/lib && cf_search="$cf_search $prefix/$cf_nculib_root/lib" + test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root" +} - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" +for cf_subdir_prefix in \ + /usr \ + /usr/local \ + /usr/pkg \ + /opt \ + /opt/local \ + $HOME +do - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` +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" +} - 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 - - test -n "$CFLAGS" && CFLAGS="$CFLAGS " - CFLAGS="${CFLAGS}$cf_new_cflags" +cf_search="$cf_library_path_list $cf_search" + for cf_libdir in $cf_search + do + echo "$as_me:13696: checking for -l$cf_nculib_root in $cf_libdir" >&5 +echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 + LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +#line 13700 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> +int +main (void) +{ +initscr() + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:13712: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:13715: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:13718: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:13721: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "$as_me:13723: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' + break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +echo "$as_me:13730: result: no" >&5 +echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" fi - -if test -n "$cf_new_cppflags" ; then - - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + done fi - -if test -n "$cf_new_extra_cppflags" ; then - - test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " - EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -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" +eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root - # even with config script, some packages use no-override for curses.h +if test $cf_found_library = no ; then + { { echo "$as_me:13745: error: Cannot link $cf_nculib_root library" >&5 +echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} + { (exit 1); exit 1; }; } +fi -echo "$as_me:13023: checking if we have identified curses headers" >&5 -echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 -if test "${cf_cv_ncurses_header+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else +fi -cf_cv_ncurses_header=none -for cf_header in \ - ncurses.h ncursesw/ncurses.h \ - curses.h ncursesw/curses.h -do -cat >conftest.$ac_ext <<_ACEOF -#line 13035 "configure" +if test -n "$cf_ncurses_LIBS" ; then + echo "$as_me:13753: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 +echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 + cf_ncurses_SAVE="$LIBS" + for p in $cf_ncurses_LIBS ; do + q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` + if test "$q" != "$LIBS" ; then + LIBS="$q" + fi + done + cat >conftest.$ac_ext <<_ACEOF +#line 13763 "configure" #include "confdefs.h" -#include <${cf_header}> +#include <${cf_cv_ncurses_header:-curses.h}> int main (void) { -initscr(); tgoto("?", 0,0) +initscr(); mousemask(0,0); tigetstr((char *)0); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13047: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:13775: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13050: \$? = $ac_status" >&5 + echo "$as_me:13778: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13053: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:13781: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13056: \$? = $ac_status" >&5 + echo "$as_me:13784: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_ncurses_header=$cf_header; break + echo "$as_me:13786: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 +echo "$as_me:13791: result: no" >&5 +echo "${ECHO_T}no" >&6 + LIBS="$cf_ncurses_SAVE" fi -rm -f conftest.$ac_objext conftest.$ac_ext -done - +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13067: result: $cf_cv_ncurses_header" >&5 -echo "${ECHO_T}$cf_cv_ncurses_header" >&6 -if test "$cf_cv_ncurses_header" = none ; then - { { echo "$as_me:13071: error: No curses header-files found" >&5 -echo "$as_me: error: No curses header-files found" >&2;} - { (exit 1); exit 1; }; } +cf_nculib_ROOT=`echo "HAVE_LIB$cf_nculib_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + +cat >>confdefs.h <&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 13087 "configure" + echo "$as_me:13814: checking for $cf_hdr" >&5 +echo $ECHO_N "checking for $cf_hdr... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line 13817 "configure" #include "confdefs.h" -#include <$ac_header> + +#include +#include <$cf_hdr> + _ACEOF -if { (eval echo "$as_me:13091: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:13824: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:13097: \$? = $ac_status" >&5 + echo "$as_me:13830: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -13105,566 +13838,607 @@ else ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + cf_found=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" + cf_found=no fi rm -f conftest.err conftest.$ac_ext -fi -echo "$as_me:13116: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<\EOF -#define NCURSES 1 -EOF +echo "$as_me:13848: result: $cf_found" >&5 +echo "${ECHO_T}$cf_found" >&6 +if test $cf_found = yes ; then -cf_nculib_ROOT=`echo "HAVE_LIB$cf_ncuconfig_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` +cf_tr_hdr=`echo "$cf_hdr" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >>confdefs.h <>confdefs.h <conftest.$ac_ext <<_ACEOF -#line 13172 "configure" + echo "$as_me:13861: checking for wide char and multibyte support" >&5 +echo $ECHO_N "checking for wide char and multibyte support... $ECHO_C" >&6 +if test "${am_cv_multibyte_able+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 13867 "configure" #include "confdefs.h" #include +#ifdef HAVE_STDLIB_H +# include +#endif /* HAVE_STDLIB_H */ +#ifdef HAVE_WCHAR_H +# include +#endif /* HAVE_WCHAR_H */ +#ifdef HAVE_WCTYPE_H +# include +#endif /* HAVE_WCTYPE_H */ + int main (void) { -printf("Hello") +const char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0x00}; + char ocb[5]; + wchar_t wcb[5]; + wchar_t wcb2[5]; + wchar_t format[3]; + + putwc(0, 0); + fputwc(0, 0); + fwide(0, 0); + mbtowc(wcb, icb, MB_CUR_MAX); + mbstowcs(wcb, icb, 5); + (void) iswalnum((wint_t) wcb[0]); + (void) iswcntrl((wint_t) wcb[0]); + (void) iswdigit((wint_t) wcb[0]); + (void) iswgraph((wint_t) wcb[0]); + (void) iswprint((wint_t) wcb[0]); + (void) iswspace((wint_t) wcb[0]); + (void) towupper((wint_t) wcb[0]); + /* (void) iswupper((wint_t) wcb[0]); */ + /* (void) towlower((wint_t) wcb[0]); */ + /* (void) iswlower((wint_t) wcb[0]); */ + (void) iswalpha((wint_t) wcb[0]); + /* (void) iswblank((wint_t) wcb[0]); */ + /* (void) iswpunct((wint_t) wcb[0]); */ + /* (void) iswxdigit((wint_t) wcb[0]); */ + /* (void) iswctype((wint_t) wcb[0], wctype("print")); */ + /* (void) towctranse((wint_t) wcb[0], wctrans("toupper")); */ + (void) wcslen(wcb); + /* (void) wcsnlen(wcb, 4); */ + wcwidth((wint_t) wcb[0]); + wcswidth(wcb, 5); + wcstombs(ocb, wcb, 5); + wctomb(ocb, wcb[0]); + wcscat(wcb2, wcb); + wcscpy(wcb2, wcb); + mbstowcs(format, "%s", 2); + swprintf(wcb, 5, format, "test"); + wcsncat(wcb2, wcb, 5); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13184: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:13926: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13187: \$? = $ac_status" >&5 + echo "$as_me:13929: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13190: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:13932: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13193: \$? = $ac_status" >&5 + echo "$as_me:13935: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - : + am_cv_multibyte_able=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_have_incdir=yes -fi -rm -f conftest.$ac_objext conftest.$ac_ext - CPPFLAGS=$cf_save_CPPFLAGS - fi - fi - fi - - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - -echo "${as_me:-configure}:13210: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` - test "$cf_top_incdir" = "$cf_add_incdir" && break - cf_add_incdir="$cf_top_incdir" - else - break - fi - else - break - fi - done - done -fi - -} - -echo "$as_me:13229: checking for $cf_ncuhdr_root header in include-path" >&5 -echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 -if test "${cf_cv_ncurses_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h" - ( test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw ) && cf_header_list="$cf_header_list curses.h ncurses.h" - for cf_header in $cf_header_list - do - - cat >conftest.$ac_ext <<_ACEOF -#line 13241 "configure" -#include "confdefs.h" - -#define _XOPEN_SOURCE_EXTENDED -#undef HAVE_LIBUTF8_H /* in case we used CF_UTF8_LIB */ -#define HAVE_LIBUTF8_H /* to force ncurses' header file to use cchar_t */ - -#include <$cf_header> -int -main (void) -{ - -#ifdef NCURSES_VERSION - -#ifndef WACS_BSSB - make an error -#endif - -printf("%s\n", NCURSES_VERSION); -#else -#ifdef __NCURSES_H -printf("old\n"); -#else - make an error -#endif -#endif +cf_save_LIBS="$LIBS" + LIBS="-lutf8 $LIBS" + cat >conftest.$ac_ext <<_ACEOF +#line 13944 "configure" +#include "confdefs.h" +#include +int +main (void) +{ +const char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0x00}; + char ocb[5]; + wchar_t wcb[5]; + wchar_t wcb2[5]; + wchar_t format[3]; + putwc(0, 0); + fputwc(0, 0); + fwide(0, 0); + mbtowc(wcb, icb, MB_CUR_MAX); + mbstowcs(wcb, icb, 5); + (void) iswalnum((wint_t) wcb[0]); + (void) iswcntrl((wint_t) wcb[0]); + (void) iswdigit((wint_t) wcb[0]); + (void) iswgraph((wint_t) wcb[0]); + (void) iswprint((wint_t) wcb[0]); + (void) iswspace((wint_t) wcb[0]); + (void) towupper((wint_t) wcb[0]); + /* (void) iswupper((wint_t) wcb[0]); */ + /* (void) towlower((wint_t) wcb[0]); */ + /* (void) iswlower((wint_t) wcb[0]); */ + (void) iswalpha((wint_t) wcb[0]); + /* (void) iswblank((wint_t) wcb[0]); */ + /* (void) iswpunct((wint_t) wcb[0]); */ + /* (void) iswxdigit((wint_t) wcb[0]); */ + /* (void) iswctype((wint_t) wcb[0], wctype("print")); */ + /* (void) towctranse((wint_t) wcb[0], wctrans("toupper")); */ + (void) wcslen(wcb); + /* (void) wcsnlen(wcb, 4); */ + wcwidth((wint_t) wcb[0]); + wcswidth(wcb, 5); + wcstombs(ocb, wcb, 5); + wctomb(ocb, wcb[0]); + wcscat(wcb2, wcb); + wcscpy(wcb2, wcb); + mbstowcs(format, "%s", 2); + swprintf(wcb, 5, format, "test"); + wcsncat(wcb2, wcb, 5); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13273: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:13993: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13276: \$? = $ac_status" >&5 + echo "$as_me:13996: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13279: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:13999: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13282: \$? = $ac_status" >&5 + echo "$as_me:14002: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_ncurses_h=$cf_header - + am_cv_multibyte_able=libutf8 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_ncurses_h=no +am_cv_multibyte_able=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS="$cf_save_LIBS" - test "$cf_cv_ncurses_h" != no && break - done +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13297: result: $cf_cv_ncurses_h" >&5 -echo "${ECHO_T}$cf_cv_ncurses_h" >&6 +echo "$as_me:14017: result: $am_cv_multibyte_able" >&5 +echo "${ECHO_T}$am_cv_multibyte_able" >&6 + if test "$am_cv_multibyte_able" != no; then + if test "$am_cv_multibyte_able" = libutf8; then -if test "$cf_cv_ncurses_h" != no ; then - cf_cv_ncurses_header=$cf_cv_ncurses_h -else +cat >>confdefs.h <<\EOF +#define HAVE_LIBUTF8_H 1 +EOF -echo "$as_me:13304: checking for $cf_ncuhdr_root include-path" >&5 -echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 -if test "${cf_cv_ncurses_h2+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else + LIBS="-lutf8 $LIBS" + fi - test -n "$verbose" && echo +cat >>confdefs.h <<\EOF +#define MULTIBYTE_ABLE 1 +EOF -cf_search= + fi -# collect the current set of include-directories from compiler flags -cf_header_path_list="" -if test -n "${CFLAGS}${CPPFLAGS}" ; then - for cf_header_path in $CPPFLAGS $CFLAGS - do - case $cf_header_path in - -I*) - cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` +cf_ncuconfig_root=ncursesw +cf_have_ncuconfig=no -test "x$cf_header_path" != "xNONE" && \ -test -d "$cf_header_path" && \ - { - test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" - test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" - test -d $cf_header_path/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root" - test -d $cf_header_path/include/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root/include" - test -d $cf_header_path/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include" - test -d $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root" -} +if test "x${PKG_CONFIG:=none}" != xnone; then + echo "$as_me:14039: checking pkg-config for $cf_ncuconfig_root" >&5 +echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 + if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then + echo "$as_me:14042: result: yes" >&5 +echo "${ECHO_T}yes" >&6 - cf_header_path_list="$cf_header_path_list $cf_search" - ;; - esac - done -fi + echo "$as_me:14045: checking if the $cf_ncuconfig_root package files work" >&5 +echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 + cf_have_ncuconfig=unknown -# add the variations for the package we are looking for + cf_save_CFLAGS="$CFLAGS" + cf_save_CPPFLAGS="$CPPFLAGS" + cf_save_LIBS="$LIBS" -cf_search= + cf_pkg_cflags=`$PKG_CONFIG --cflags $cf_ncuconfig_root` + cf_pkg_libs=`$PKG_CONFIG --libs $cf_ncuconfig_root` -test "x$prefix" != "xNONE" && \ -test -d "$prefix" && \ - { - test -n "$verbose" && echo " ... testing for include-directories under $prefix" - test -d $prefix/include && cf_search="$cf_search $prefix/include" - test -d $prefix/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root" - test -d $prefix/include/$cf_ncuhdr_root/include && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include" - test -d $prefix/$cf_ncuhdr_root/include && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include" - test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" -} + # while -W for passing linker flags is prevalent, it is not "standard". + # At least one wrapper for c89/c99 (in Apple's xcode) has its own + # incompatible _and_ non-standard -W option which gives an error. Work + # around that pitfall. + case "x${CC}@@${cf_pkg_libs}@${cf_pkg_cflags}" in + x*c[89]9@@*-W*) -for cf_subdir_prefix in \ - /usr \ - /usr/local \ - /usr/pkg \ - /opt \ - /opt/local \ - $HOME -do +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= -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" -} +for cf_add_cflags in $cf_pkg_cflags +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[^=]*='\''\"[^"]*//'` -done + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes -test "$includedir" != NONE && \ -test "$includedir" != "/usr/include" && \ -test -d "$includedir" && { - test -d $includedir && cf_search="$cf_search $includedir" - test -d $includedir/$cf_ncuhdr_root && cf_search="$cf_search $includedir/$cf_ncuhdr_root" -} + if test $cf_fix_cppflags = yes ; then -test "$oldincludedir" != NONE && \ -test "$oldincludedir" != "/usr/include" && \ -test -d "$oldincludedir" && { - test -d $oldincludedir && cf_search="$cf_search $oldincludedir" - test -d $oldincludedir/$cf_ncuhdr_root && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root" -} + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" -cf_search="$cf_search $cf_header_path_list" + continue + elif test "${cf_tst_cflags}" = "\"'" ; then - test -n "$verbose" && echo search path $cf_search - cf_save2_CPPFLAGS="$CPPFLAGS" - for cf_incdir in $cf_search - do + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" -if test -n "$cf_incdir" ; then - for cf_add_incdir in $cf_incdir - do - while test $cf_add_incdir != /usr/include - do - if test -d $cf_add_incdir - then - cf_have_incdir=no - if test -n "$CFLAGS$CPPFLAGS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_incdir in $CFLAGS $CPPFLAGS ; do - if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then - cf_have_incdir=yes; break + continue fi - done - 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/=.*//'` - if test "$cf_have_incdir" = no ; then - if test "$cf_add_incdir" = /usr/local/include ; then - if test "$GCC" = yes - then - cf_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + + ;; + esac + ;; + *) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + + ;; + esac + ;; +yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + 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 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + +fi + +if test -n "$cf_new_cppflags" ; then test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" - cat >conftest.$ac_ext <<_ACEOF -#line 13425 "configure" +fi + +if test -n "$cf_new_extra_cppflags" ; then + + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + +fi + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkg_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" + + cat >conftest.$ac_ext <<_ACEOF +#line 14178 "configure" #include "confdefs.h" -#include +#include <${cf_cv_ncurses_header:-curses.h}> int main (void) { -printf("Hello") +initscr(); mousemask(0,0); tigetstr((char *)0); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13437: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:14190: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13440: \$? = $ac_status" >&5 + echo "$as_me:14193: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13443: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:14196: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13446: \$? = $ac_status" >&5 + echo "$as_me:14199: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - : + if test "$cross_compiling" = yes; then + cf_test_ncuconfig=maybe +else + cat >conftest.$ac_ext <<_ACEOF +#line 14205 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { char *xx = curses_version(); return (xx == 0); } +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:14212: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:14215: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:14217: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:14220: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_test_ncuconfig=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_test_ncuconfig=no +fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_have_incdir=yes +cf_test_ncuconfig=no fi -rm -f conftest.$ac_objext conftest.$ac_ext - CPPFLAGS=$cf_save_CPPFLAGS +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + CFLAGS="$cf_save_CFLAGS" + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" + + if test "x$cf_test_ncuconfig" != xyes; then + cf_temp=`echo "x$cf_pkg_cflags" | sed -e s/^x// -e 's/-W[^ ]*//g'` + cf_pkg_cflags="$cf_temp" + cf_temp=`echo "x$cf_pkg_libs" | sed -e s/^x// -e 's/-W[^ ]*//g'` + cf_pkg_libs="$cf_temp" fi - fi - fi + ;; + esac - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= -echo "${as_me:-configure}:13463: testing adding $cf_add_incdir to include-path ..." 1>&5 +for cf_add_cflags in $cf_pkg_cflags +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[^=]*='\''\"[^"]*//'` - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` - test "$cf_top_incdir" = "$cf_add_incdir" && break - cf_add_incdir="$cf_top_incdir" - else - break - fi - else - break - fi - done - done -fi + if test $cf_fix_cppflags = yes ; then - for cf_header in \ - ncurses.h \ - curses.h - do + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cat >conftest.$ac_ext <<_ACEOF -#line 13486 "configure" -#include "confdefs.h" + continue + elif test "${cf_tst_cflags}" = "\"'" ; then -#include <$cf_header> -int -main (void) -{ + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" -#ifdef NCURSES_VERSION + 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/=.*//'` -printf("%s\n", NCURSES_VERSION); -#else -#ifdef __NCURSES_H -printf("old\n"); -#else - make an error -#endif -#endif +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13510: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:13513: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13516: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:13519: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_ncurses_h2=$cf_header + ;; + esac + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + + ;; + esac + ;; + *) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + + ;; + esac + ;; +yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + 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 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cf_cv_ncurses_h2=no fi -rm -f conftest.$ac_objext conftest.$ac_ext - if test "$cf_cv_ncurses_h2" != no ; then - cf_cv_ncurses_h2=$cf_incdir/$cf_header - test -n "$verbose" && echo $ac_n " ... found $ac_c" 1>&6 - break - fi - test -n "$verbose" && echo " ... tested $cf_incdir/$cf_header" 1>&6 - done - CPPFLAGS="$cf_save2_CPPFLAGS" - test "$cf_cv_ncurses_h2" != no && break - done - test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:13540: error: not found" >&5 -echo "$as_me: error: not found" >&2;} - { (exit 1); exit 1; }; } +if test -n "$cf_new_cppflags" ; then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" fi -echo "$as_me:13545: result: $cf_cv_ncurses_h2" >&5 -echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 - cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'` - cf_cv_ncurses_header=`basename $cf_cv_ncurses_h2` - if test `basename $cf_1st_incdir` = $cf_ncuhdr_root ; then - cf_cv_ncurses_header=$cf_ncuhdr_root/$cf_cv_ncurses_header - fi +if test -n "$cf_new_extra_cppflags" ; then -if test -n "$cf_1st_incdir" ; then - for cf_add_incdir in $cf_1st_incdir - do - while test $cf_add_incdir != /usr/include - do - if test -d $cf_add_incdir - then - cf_have_incdir=no - if test -n "$CFLAGS$CPPFLAGS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_incdir in $CFLAGS $CPPFLAGS ; do - if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then - cf_have_incdir=yes; break - fi - done - fi + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" - if test "$cf_have_incdir" = no ; then - if test "$cf_add_incdir" = /usr/local/include ; then - if test "$GCC" = yes - then - cf_save_CPPFLAGS=$CPPFLAGS +fi - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkg_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" - cat >conftest.$ac_ext <<_ACEOF -#line 13581 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 14366 "configure" #include "confdefs.h" -#include +#include <${cf_cv_ncurses_header:-curses.h}> int main (void) { -printf("Hello") +initscr(); mousemask(0,0); tigetstr((char *)0); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13593: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:14378: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:14381: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:14384: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:14387: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + if test "$cross_compiling" = yes; then + cf_have_ncuconfig=maybe +else + cat >conftest.$ac_ext <<_ACEOF +#line 14393 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { char *xx = curses_version(); return (xx == 0); } +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:14400: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13596: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13599: \"$ac_try\"") >&5 + echo "$as_me:14403: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:14405: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13602: \$? = $ac_status" >&5 + echo "$as_me:14408: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - : + cf_have_ncuconfig=yes else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_have_incdir=yes +cf_have_ncuconfig=no fi -rm -f conftest.$ac_objext conftest.$ac_ext - CPPFLAGS=$cf_save_CPPFLAGS - fi - fi - fi - - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - -echo "${as_me:-configure}:13619: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` - test "$cf_top_incdir" = "$cf_add_incdir" && break - cf_add_incdir="$cf_top_incdir" - else - break - fi - else - break - fi - done - done +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_ncuconfig=no fi - -# Set definitions to allow ifdef'ing for ncurses.h - -case $cf_cv_ncurses_header in -*ncurses.h) - -cat >>confdefs.h <<\EOF -#define HAVE_NCURSES_H 1 -EOF - - ;; -esac - -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) +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + echo "$as_me:14425: result: $cf_have_ncuconfig" >&5 +echo "${ECHO_T}$cf_have_ncuconfig" >&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 HAVE_NCURSESW_NCURSES_H 1 +#define NCURSES 1 EOF - ;; -esac + NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:13667: checking for terminfo header" >&5 +echo "$as_me:14441: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13682,7 +14456,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >conftest.$ac_ext <<_ACEOF -#line 13685 "configure" +#line 14459 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -13691,22 +14465,22 @@ cat >conftest.$ac_ext <<_ACEOF int main (void) { -int x = auto_left_margin +int x = auto_left_margin; (void)x ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13700: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14474: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13703: \$? = $ac_status" >&5 + echo "$as_me:14477: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13706: \"$ac_try\"") >&5 + { (eval echo "$as_me:14480: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13709: \$? = $ac_status" >&5 + echo "$as_me:14483: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header="$cf_test" @@ -13722,7 +14496,7 @@ rm -f conftest.$ac_objext conftest.$ac_e done fi -echo "$as_me:13725: result: $cf_cv_term_header" >&5 +echo "$as_me:14499: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -13754,456 +14528,549 @@ EOF ;; esac -# some applications need this, but should check for NCURSES_VERSION + fi + + else + echo "$as_me:14534: result: no" >&5 +echo "${ECHO_T}no" >&6 + NCURSES_CONFIG_PKG=none + fi +else + NCURSES_CONFIG_PKG=none +fi + +if test "x$cf_have_ncuconfig" = "xno"; then + cf_ncurses_config="${cf_ncuconfig_root}${NCURSES_CONFIG_SUFFIX}-config"; echo "Looking for ${cf_ncurses_config}" + +if test -n "$ac_tool_prefix"; then + for ac_prog in ${cf_ncurses_config} ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +echo "$as_me:14550: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$NCURSES_CONFIG"; then + ac_cv_prog_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" +echo "$as_me:14565: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG +if test -n "$NCURSES_CONFIG"; then + echo "$as_me:14573: result: $NCURSES_CONFIG" >&5 +echo "${ECHO_T}$NCURSES_CONFIG" >&6 +else + echo "$as_me:14576: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$NCURSES_CONFIG" && break + done +fi +if test -z "$NCURSES_CONFIG"; then + ac_ct_NCURSES_CONFIG=$NCURSES_CONFIG + for ac_prog in ${cf_ncurses_config} ${cf_ncuconfig_root}6-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 "$as_me:14589: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_NCURSES_CONFIG"; then + ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_ct_NCURSES_CONFIG" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" +echo "$as_me:14604: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG +if test -n "$ac_ct_NCURSES_CONFIG"; then + echo "$as_me:14612: result: $ac_ct_NCURSES_CONFIG" >&5 +echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 +else + echo "$as_me:14615: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$ac_ct_NCURSES_CONFIG" && break +done +test -n "$ac_ct_NCURSES_CONFIG" || ac_ct_NCURSES_CONFIG="none" + + NCURSES_CONFIG=$ac_ct_NCURSES_CONFIG +fi + + if test "$NCURSES_CONFIG" != none ; then + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in `$NCURSES_CONFIG --cflags` +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 + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + 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 + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + + ;; + esac + ;; + *) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + + ;; + esac + ;; +yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + 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 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" -cat >>confdefs.h <<\EOF -#define NCURSES 1 -EOF +fi -echo "$as_me:13763: checking for ncurses version" >&5 -echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 -if test "${cf_cv_ncurses_version+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else +if test -n "$cf_new_cppflags" ; then - cf_cv_ncurses_version=no - cf_tempfile=out$$ - rm -f $cf_tempfile - if test "$cross_compiling" = yes; then + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" - # This will not work if the preprocessor splits the line after the - # Autoconf token. The 'unproto' program does that. - cat > conftest.$ac_ext < -#undef Autoconf -#ifdef NCURSES_VERSION -Autoconf NCURSES_VERSION -#else -#ifdef __NCURSES_H -Autoconf "old" -#endif -; -#endif -EOF - cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:13789: \"$cf_try\"") >&5 - (eval $cf_try) 2>&5 - ac_status=$? - echo "$as_me:13792: \$? = $ac_status" >&5 - (exit $ac_status); } - 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" - rm -f conftest.out - fi +fi -else - cat >conftest.$ac_ext <<_ACEOF -#line 13802 "configure" -#include "confdefs.h" +if test -n "$cf_new_extra_cppflags" ; then -#include <${cf_cv_ncurses_header:-curses.h}> -#include -int main(void) -{ - FILE *fp = fopen("$cf_tempfile", "w"); -#ifdef NCURSES_VERSION -# ifdef NCURSES_VERSION_PATCH - fprintf(fp, "%s.%d\n", NCURSES_VERSION, NCURSES_VERSION_PATCH); -# else - fprintf(fp, "%s\n", NCURSES_VERSION); -# endif -#else -# ifdef __NCURSES_H - fprintf(fp, "old\n"); -# else - make an error -# endif -#endif - ${cf_cv_main_return:-return}(0); -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:13827: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:13830: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:13832: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:13835: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" - cf_cv_ncurses_version=`cat $cf_tempfile` -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - rm -f $cf_tempfile -fi -echo "$as_me:13849: result: $cf_cv_ncurses_version" >&5 -echo "${ECHO_T}$cf_cv_ncurses_version" >&6 -test "$cf_cv_ncurses_version" = no || -cat >>confdefs.h <<\EOF -#define NCURSES 1 -EOF +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in `$NCURSES_CONFIG --libs`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" -cf_nculib_root=ncursesw - # This works, except for the special case where we find gpm, but - # ncurses is in a nonstandard location via $LIBS, and we really want - # to link gpm. -cf_ncurses_LIBS="" -cf_ncurses_SAVE="$LIBS" -echo "$as_me:13862: checking for Gpm_Open in -lgpm" >&5 -echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 -if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then + # even with config script, some packages use no-override for curses.h + +echo "$as_me:14744: checking if we have identified curses headers" >&5 +echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 +if test "${cf_cv_ncurses_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lgpm $LIBS" + +cf_cv_ncurses_header=none +for cf_header in \ + ncurses.h ncursesw/ncurses.h \ + curses.h ncursesw/curses.h +do cat >conftest.$ac_ext <<_ACEOF -#line 13870 "configure" +#line 14756 "configure" #include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char Gpm_Open (); +#include <${cf_header}> int main (void) { -Gpm_Open (); +initscr(); tgoto("?", 0,0) ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13889: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:14768: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13892: \$? = $ac_status" >&5 + echo "$as_me:14771: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13895: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:14774: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13898: \$? = $ac_status" >&5 + echo "$as_me:14777: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_gpm_Gpm_Open=yes + cf_cv_ncurses_header=$cf_header; break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_gpm_Gpm_Open=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f conftest.$ac_objext conftest.$ac_ext +done + fi -echo "$as_me:13909: result: $ac_cv_lib_gpm_Gpm_Open" >&5 -echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 -if test $ac_cv_lib_gpm_Gpm_Open = yes; then - echo "$as_me:13912: checking for initscr in -lgpm" >&5 -echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 -if test "${ac_cv_lib_gpm_initscr+set}" = set; then +echo "$as_me:14788: result: $cf_cv_ncurses_header" >&5 +echo "${ECHO_T}$cf_cv_ncurses_header" >&6 + +if test "$cf_cv_ncurses_header" = none ; then + { { echo "$as_me:14792: error: No curses header-files found" >&5 +echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } +fi + +# cheat, to get the right #define's for HAVE_NCURSES_H, etc. + +for ac_header in $cf_cv_ncurses_header +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:14802: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lgpm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 13920 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 14808 "configure" #include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char initscr (); -int -main (void) -{ -initscr (); - ; - return 0; -} +#include <$ac_header> _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13939: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:13942: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13945: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (eval echo "$as_me:14812: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - echo "$as_me:13948: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_gpm_initscr=yes + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:14818: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_gpm_initscr=no + cat conftest.$ac_ext >&5 + eval "$as_ac_Header=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:13959: result: $ac_cv_lib_gpm_initscr" >&5 -echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 -if test $ac_cv_lib_gpm_initscr = yes; then - LIBS="$cf_ncurses_SAVE" -else - cf_ncurses_LIBS="-lgpm" +echo "$as_me:14837: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <>confdefs.h <<\EOF +#define NCURSES 1 +EOF + +cf_nculib_ROOT=`echo "HAVE_LIB$cf_ncuconfig_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + cat >>confdefs.h <&5 -echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 -if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmytinfo $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 13982 "configure" -#include "confdefs.h" + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char tgoto (); + cat >conftest.$ac_ext <<_ACEOF +#line 14893 "configure" +#include "confdefs.h" +#include int main (void) { -tgoto (); +printf("Hello") ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14001: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:14905: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14004: \$? = $ac_status" >&5 + echo "$as_me:14908: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14007: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:14911: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14010: \$? = $ac_status" >&5 + echo "$as_me:14914: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_mytinfo_tgoto=yes + : else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_mytinfo_tgoto=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:14021: result: $ac_cv_lib_mytinfo_tgoto" >&5 -echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 -if test $ac_cv_lib_mytinfo_tgoto = yes; then - cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" +cf_have_incdir=yes fi +rm -f conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$cf_save_CPPFLAGS + fi + fi + fi - fi - ;; -esac + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -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" +echo "${as_me:-configure}:14931: testing adding $cf_add_incdir to include-path ..." 1>&5 -if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) -then + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" -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 + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + test "$cf_top_incdir" = "$cf_add_incdir" && break + cf_add_incdir="$cf_top_incdir" + else + break fi + else + break + fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" -done -LIBS="$cf_add_libs" + done +fi -else +} - eval 'cf_cv_have_lib_'$cf_nculib_root'=no' - cf_libdir="" - echo "$as_me:14070: checking for initscr" >&5 -echo $ECHO_N "checking for initscr... $ECHO_C" >&6 -if test "${ac_cv_func_initscr+set}" = set; then +echo "$as_me:14950: checking for $cf_ncuhdr_root header in include-path" >&5 +echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 +if test "${cf_cv_ncurses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 14076 "configure" -#include "confdefs.h" -#define initscr autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef initscr -#ifdef __cplusplus -extern "C" -#endif + cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h" + ( test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw ) && cf_header_list="$cf_header_list curses.h ncurses.h" + for cf_header in $cf_header_list + do -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char initscr (void); + cat >conftest.$ac_ext <<_ACEOF +#line 14962 "configure" +#include "confdefs.h" + +#define _XOPEN_SOURCE_EXTENDED +#undef HAVE_LIBUTF8_H /* in case we used CF_UTF8_LIB */ +#define HAVE_LIBUTF8_H /* to force ncurses' header file to use cchar_t */ +#include <$cf_header> int main (void) { -/* The GNU C library defines stubs 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_initscr) || defined (__stub___initscr) -#error found stub for initscr +#ifdef NCURSES_VERSION + +#ifndef WACS_BSSB + make an error +#endif + +printf("%s\n", NCURSES_VERSION); +#else +#ifdef __NCURSES_H +printf("old\n"); +#else + make an error +#endif #endif - return initscr (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14107: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:14994: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14110: \$? = $ac_status" >&5 + echo "$as_me:14997: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14113: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:15000: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14116: \$? = $ac_status" >&5 + echo "$as_me:15003: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func_initscr=yes + cf_cv_ncurses_h=$cf_header + else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_func_initscr=no +cf_cv_ncurses_h=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext + + test "$cf_cv_ncurses_h" != no && break + done + fi -echo "$as_me:14126: result: $ac_cv_func_initscr" >&5 -echo "${ECHO_T}$ac_cv_func_initscr" >&6 -if test $ac_cv_func_initscr = yes; then - eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' -else +echo "$as_me:15018: result: $cf_cv_ncurses_h" >&5 +echo "${ECHO_T}$cf_cv_ncurses_h" >&6 - cf_save_LIBS="$LIBS" - echo "$as_me:14133: checking for initscr in -l$cf_nculib_root" >&5 -echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 - LIBS="-l$cf_nculib_root $LIBS" - cat >conftest.$ac_ext <<_ACEOF -#line 14137 "configure" -#include "confdefs.h" -#include <${cf_cv_ncurses_header:-curses.h}> -int -main (void) -{ -initscr() - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14149: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:14152: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14155: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:14158: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:14160: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' +if test "$cf_cv_ncurses_h" != no ; then + cf_cv_ncurses_header=$cf_cv_ncurses_h +else +echo "$as_me:15025: checking for $cf_ncuhdr_root include-path" >&5 +echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 +if test "${cf_cv_ncurses_h2+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -echo "$as_me:14167: result: no" >&5 -echo "${ECHO_T}no" >&6 + + test -n "$verbose" && echo cf_search= -cf_library_path_list="" -if test -n "${LDFLAGS}${LIBS}" ; then - for cf_library_path in $LDFLAGS $LIBS + +# collect the current set of include-directories from compiler flags +cf_header_path_list="" +if test -n "${CFLAGS}${CPPFLAGS}" ; then + for cf_header_path in $CPPFLAGS $CFLAGS do - case $cf_library_path in - -L*) - cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` + case $cf_header_path in + -I*) + cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` -test "x$cf_library_path" != "xNONE" && \ -test -d "$cf_library_path" && \ +test "x$cf_header_path" != "xNONE" && \ +test -d "$cf_header_path" && \ { - test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" - test -d $cf_library_path/lib && cf_search="$cf_search $cf_library_path/lib" - test -d $cf_library_path/lib/$cf_nculib_root && cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root" - test -d $cf_library_path/lib/$cf_nculib_root/lib && cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root/lib" - test -d $cf_library_path/$cf_nculib_root/lib && cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib" - test -d $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root" + test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" + test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" + test -d $cf_header_path/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root" + test -d $cf_header_path/include/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root/include" + test -d $cf_header_path/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include" + test -d $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root" } - cf_library_path_list="$cf_library_path_list $cf_search" + cf_header_path_list="$cf_header_path_list $cf_search" ;; esac done fi +# add the variations for the package we are looking for + cf_search= test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { - test -n "$verbose" && echo " ... testing for lib-directories under $prefix" - test -d $prefix/lib && cf_search="$cf_search $prefix/lib" - test -d $prefix/lib/$cf_nculib_root && cf_search="$cf_search $prefix/lib/$cf_nculib_root" - test -d $prefix/lib/$cf_nculib_root/lib && cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib" - test -d $prefix/$cf_nculib_root/lib && cf_search="$cf_search $prefix/$cf_nculib_root/lib" - test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root" + test -n "$verbose" && echo " ... testing for include-directories under $prefix" + test -d $prefix/include && cf_search="$cf_search $prefix/include" + test -d $prefix/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root" + test -d $prefix/include/$cf_ncuhdr_root/include && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include" + test -d $prefix/$cf_ncuhdr_root/include && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include" + test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" } for cf_subdir_prefix in \ @@ -14218,389 +15085,307 @@ 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" + 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 -cf_search="$cf_library_path_list $cf_search" +test "$includedir" != NONE && \ +test "$includedir" != "/usr/include" && \ +test -d "$includedir" && { + test -d $includedir && cf_search="$cf_search $includedir" + test -d $includedir/$cf_ncuhdr_root && cf_search="$cf_search $includedir/$cf_ncuhdr_root" +} - for cf_libdir in $cf_search - do - echo "$as_me:14235: checking for -l$cf_nculib_root in $cf_libdir" >&5 -echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 - LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -#line 14239 "configure" -#include "confdefs.h" -#include <${cf_cv_ncurses_header:-curses.h}> -int -main (void) -{ -initscr() - ; - return 0; +test "$oldincludedir" != NONE && \ +test "$oldincludedir" != "/usr/include" && \ +test -d "$oldincludedir" && { + test -d $oldincludedir && cf_search="$cf_search $oldincludedir" + test -d $oldincludedir/$cf_ncuhdr_root && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root" } -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14251: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:14254: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14257: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:14260: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:14262: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' - break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -echo "$as_me:14269: result: no" >&5 -echo "${ECHO_T}no" >&6 - LIBS="$cf_save_LIBS" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - done -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +cf_search="$cf_search $cf_header_path_list" -fi + test -n "$verbose" && echo search path $cf_search + cf_save2_CPPFLAGS="$CPPFLAGS" + for cf_incdir in $cf_search + do -eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root +if test -n "$cf_incdir" ; then + for cf_add_incdir in $cf_incdir + do + while test $cf_add_incdir != /usr/include + do + if test -d $cf_add_incdir + then + cf_have_incdir=no + if test -n "$CFLAGS$CPPFLAGS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then + cf_have_incdir=yes; break + fi + done + fi -if test $cf_found_library = no ; then - { { echo "$as_me:14284: error: Cannot link $cf_nculib_root library" >&5 -echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} - { (exit 1); exit 1; }; } -fi + if test "$cf_have_incdir" = no ; then + if test "$cf_add_incdir" = /usr/local/include ; then + if test "$GCC" = yes + then + cf_save_CPPFLAGS=$CPPFLAGS -fi + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" -if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:14292: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 -echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 - cf_ncurses_SAVE="$LIBS" - for p in $cf_ncurses_LIBS ; do - q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` - if test "$q" != "$LIBS" ; then - LIBS="$q" - fi - done - cat >conftest.$ac_ext <<_ACEOF -#line 14302 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 15146 "configure" #include "confdefs.h" -#include <${cf_cv_ncurses_header:-curses.h}> +#include int main (void) { -initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); +printf("Hello") ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14314: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:15158: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14317: \$? = $ac_status" >&5 + echo "$as_me:15161: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14320: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:15164: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14323: \$? = $ac_status" >&5 + echo "$as_me:15167: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:14325: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + : else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:14330: result: no" >&5 -echo "${ECHO_T}no" >&6 - LIBS="$cf_ncurses_SAVE" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +cf_have_incdir=yes fi +rm -f conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$cf_save_CPPFLAGS + fi + fi + fi -cf_nculib_ROOT=`echo "HAVE_LIB$cf_nculib_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -cat >>confdefs.h <&5 - fi -else - NCURSES_CONFIG=none + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + test "$cf_top_incdir" = "$cf_add_incdir" && break + cf_add_incdir="$cf_top_incdir" + else + break + fi + else + break + fi + done + done fi -echo "$as_me:14348: checking definition to turn on extended curses functions" >&5 -echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6 -if test "${cf_cv_need_xopen_extension+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else + for cf_header in \ + ncurses.h \ + curses.h + do -cf_cv_need_xopen_extension=unknown -cat >conftest.$ac_ext <<_ACEOF -#line 14356 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 15207 "configure" #include "confdefs.h" -#include -#include <${cf_cv_ncurses_header:-curses.h}> +#include <$cf_header> int main (void) { -#if defined(NCURSES_VERSION_PATCH) -#if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403) +#ifdef NCURSES_VERSION + +printf("%s\n", NCURSES_VERSION); +#else +#ifdef __NCURSES_H +printf("old\n"); +#else make an error #endif #endif -#ifdef NCURSES_VERSION - cchar_t check; - int check2 = curs_set((int)sizeof(check)); -#endif - long x = winnstr(stdscr, "", 0); - int x1, y1; - getbegyx(stdscr, y1, x1) - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14382: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:14385: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14388: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:14391: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_need_xopen_extension=none -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - - for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR - do - cat >conftest.$ac_ext <<_ACEOF -#line 14401 "configure" -#include "confdefs.h" - -#define $cf_try_xopen_extension 1 -#include -#include <${cf_cv_ncurses_header:-curses.h}> -int -main (void) -{ -#ifdef NCURSES_VERSION - cchar_t check; - int check2 = curs_set((int)sizeof(check)); -#endif - long x = winnstr(stdscr, "", 0); - int x1, y1; - getbegyx(stdscr, y1, x1) ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14423: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:15231: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14426: \$? = $ac_status" >&5 + echo "$as_me:15234: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14429: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:15237: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14432: \$? = $ac_status" >&5 + echo "$as_me:15240: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_need_xopen_extension=$cf_try_xopen_extension; break + cf_cv_ncurses_h2=$cf_header + else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 +cf_cv_ncurses_h2=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - done - -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - -fi -echo "$as_me:14446: result: $cf_cv_need_xopen_extension" >&5 -echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6 - -case $cf_cv_need_xopen_extension in -*_*) - - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-D$cf_cv_need_xopen_extension" - - ;; -esac - - test "$cf_cv_need_xopen_extension" = unknown && { { echo "$as_me:14458: error: X/Open curses not found" >&5 -echo "$as_me: error: X/Open curses not found" >&2;} - { (exit 1); exit 1; }; } - ;; - curses) #(vi - -echo "$as_me:14464: checking for extra include directories" >&5 -echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6 -if test "${cf_cv_curses_incdir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else +rm -f conftest.$ac_objext conftest.$ac_ext -cf_cv_curses_incdir=no -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*) - if test "x$cf_cv_screen" = "xcurses_5lib" - then - test -d /usr/5lib && \ - test -d /usr/5include && \ - cf_cv_curses_incdir="-I/usr/5include" - fi - ;; -esac + if test "$cf_cv_ncurses_h2" != no ; then + cf_cv_ncurses_h2=$cf_incdir/$cf_header + test -n "$verbose" && echo $ac_n " ... found $ac_c" 1>&6 + break + fi + test -n "$verbose" && echo " ... tested $cf_incdir/$cf_header" 1>&6 + done + CPPFLAGS="$cf_save2_CPPFLAGS" + test "$cf_cv_ncurses_h2" != no && break + done + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:15261: error: not found" >&5 +echo "$as_me: error: not found" >&2;} + { (exit 1); exit 1; }; } fi -echo "$as_me:14490: result: $cf_cv_curses_incdir" >&5 -echo "${ECHO_T}$cf_cv_curses_incdir" >&6 -if test "$cf_cv_curses_incdir" != no -then +echo "$as_me:15266: result: $cf_cv_ncurses_h2" >&5 +echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}$cf_cv_curses_incdir" + cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'` + cf_cv_ncurses_header=`basename $cf_cv_ncurses_h2` + if test `basename $cf_1st_incdir` = $cf_ncuhdr_root ; then + cf_cv_ncurses_header=$cf_ncuhdr_root/$cf_cv_ncurses_header + fi -fi +if test -n "$cf_1st_incdir" ; then + for cf_add_incdir in $cf_1st_incdir + do + while test $cf_add_incdir != /usr/include + do + if test -d $cf_add_incdir + then + cf_have_incdir=no + if test -n "$CFLAGS$CPPFLAGS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then + cf_have_incdir=yes; break + fi + done + fi -echo "$as_me:14500: checking if we have identified curses headers" >&5 -echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 -if test "${cf_cv_ncurses_header+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else + if test "$cf_have_incdir" = no ; then + if test "$cf_add_incdir" = /usr/local/include ; then + if test "$GCC" = yes + then + cf_save_CPPFLAGS=$CPPFLAGS -cf_cv_ncurses_header=none -for cf_header in \ - ncurses.h \ - curses.h ncurses/ncurses.h ncurses/curses.h -do -cat >conftest.$ac_ext <<_ACEOF -#line 14512 "configure" + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >conftest.$ac_ext <<_ACEOF +#line 15302 "configure" #include "confdefs.h" -#include <${cf_header}> +#include int main (void) { -initscr(); tgoto("?", 0,0) +printf("Hello") ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14524: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15314: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14527: \$? = $ac_status" >&5 + echo "$as_me:15317: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14530: \"$ac_try\"") >&5 + { (eval echo "$as_me:15320: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14533: \$? = $ac_status" >&5 + echo "$as_me:15323: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_ncurses_header=$cf_header; break + : else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 +cf_have_incdir=yes fi rm -f conftest.$ac_objext conftest.$ac_ext -done + CPPFLAGS=$cf_save_CPPFLAGS + fi + fi + fi -fi -echo "$as_me:14544: result: $cf_cv_ncurses_header" >&5 -echo "${ECHO_T}$cf_cv_ncurses_header" >&6 + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -if test "$cf_cv_ncurses_header" = none ; then - { { echo "$as_me:14548: error: No curses header-files found" >&5 -echo "$as_me: error: No curses header-files found" >&2;} - { (exit 1); exit 1; }; } -fi +echo "${as_me:-configure}:15340: testing adding $cf_add_incdir to include-path ..." 1>&5 -# cheat, to get the right #define's for HAVE_NCURSES_H, etc. + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" -for ac_header in $cf_cv_ncurses_header -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:14558: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 14564 "configure" -#include "confdefs.h" -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:14568: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:14574: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + test "$cf_top_incdir" = "$cf_add_incdir" && break + cf_add_incdir="$cf_top_incdir" + else + break + fi + else + break + fi + done + done fi -rm -f conftest.err conftest.$ac_ext + fi -echo "$as_me:14593: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<\EOF +#define HAVE_NCURSES_H 1 EOF -fi -done + ;; +esac + +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) + +cat >>confdefs.h <<\EOF +#define HAVE_NCURSESW_NCURSES_H 1 +EOF + + ;; +esac -echo "$as_me:14603: checking for terminfo header" >&5 +echo "$as_me:15388: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14618,7 +15403,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >conftest.$ac_ext <<_ACEOF -#line 14621 "configure" +#line 15406 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -14627,22 +15412,22 @@ cat >conftest.$ac_ext <<_ACEOF int main (void) { -int x = auto_left_margin +int x = auto_left_margin; (void)x ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14636: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15421: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14639: \$? = $ac_status" >&5 + echo "$as_me:15424: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14642: \"$ac_try\"") >&5 + { (eval echo "$as_me:15427: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14645: \$? = $ac_status" >&5 + echo "$as_me:15430: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header="$cf_test" @@ -14658,7 +15443,7 @@ rm -f conftest.$ac_objext conftest.$ac_e done fi -echo "$as_me:14661: result: $cf_cv_term_header" >&5 +echo "$as_me:15446: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -14690,7 +15475,13 @@ EOF ;; esac -echo "$as_me:14693: checking for ncurses version" >&5 +# some applications need this, but should check for NCURSES_VERSION + +cat >>confdefs.h <<\EOF +#define NCURSES 1 +EOF + +echo "$as_me:15484: checking for ncurses version" >&5 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 if test "${cf_cv_ncurses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14710,204 +15501,94 @@ else Autoconf NCURSES_VERSION #else #ifdef __NCURSES_H -Autoconf "old" -#endif -; -#endif -EOF - cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:14719: \"$cf_try\"") >&5 - (eval $cf_try) 2>&5 - ac_status=$? - echo "$as_me:14722: \$? = $ac_status" >&5 - (exit $ac_status); } - 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" - rm -f conftest.out - fi - -else - cat >conftest.$ac_ext <<_ACEOF -#line 14732 "configure" -#include "confdefs.h" - -#include <${cf_cv_ncurses_header:-curses.h}> -#include -int main(void) -{ - FILE *fp = fopen("$cf_tempfile", "w"); -#ifdef NCURSES_VERSION -# ifdef NCURSES_VERSION_PATCH - fprintf(fp, "%s.%d\n", NCURSES_VERSION, NCURSES_VERSION_PATCH); -# else - fprintf(fp, "%s\n", NCURSES_VERSION); -# endif -#else -# ifdef __NCURSES_H - fprintf(fp, "old\n"); -# else - make an error -# endif -#endif - ${cf_cv_main_return:-return}(0); -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:14757: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:14760: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:14762: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:14765: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_ncurses_version=`cat $cf_tempfile` -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - rm -f $cf_tempfile - -fi -echo "$as_me:14779: result: $cf_cv_ncurses_version" >&5 -echo "${ECHO_T}$cf_cv_ncurses_version" >&6 -test "$cf_cv_ncurses_version" = no || -cat >>confdefs.h <<\EOF -#define NCURSES 1 -EOF - -echo "$as_me:14786: checking if we have identified curses libraries" >&5 -echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line 14789 "configure" -#include "confdefs.h" -#include <${cf_cv_ncurses_header:-curses.h}> -int -main (void) -{ -initscr(); tgoto("?", 0,0) - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14801: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:14804: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14807: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:14810: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_result=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cf_result=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -echo "$as_me:14819: result: $cf_result" >&5 -echo "${ECHO_T}$cf_result" >&6 +Autoconf "old" +#endif +; +#endif +EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" + { (eval echo "$as_me:15510: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? + echo "$as_me:15513: \$? = $ac_status" >&5 + (exit $ac_status); } + 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" + rm -f conftest.out + fi -if test "$cf_result" = no ; then -case $host_os in -freebsd*) - echo "$as_me:14825: checking for tgoto in -lmytinfo" >&5 -echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 -if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmytinfo $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 14833 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 15523 "configure" #include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char tgoto (); -int -main (void) +#include <${cf_cv_ncurses_header:-curses.h}> +#include +int main(void) { -tgoto (); - ; - return 0; + FILE *fp = fopen("$cf_tempfile", "w"); +#ifdef NCURSES_VERSION +# ifdef NCURSES_VERSION_PATCH + fprintf(fp, "%s.%d\n", NCURSES_VERSION, NCURSES_VERSION_PATCH); +# else + fprintf(fp, "%s\n", NCURSES_VERSION); +# endif +#else +# ifdef __NCURSES_H + fprintf(fp, "old\n"); +# else + make an error +# endif +#endif + ${cf_cv_main_return:-return}(0); } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14852: \"$ac_link\"") >&5 +rm -f conftest$ac_exeext +if { (eval echo "$as_me:15548: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14855: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14858: \"$ac_try\"") >&5 + echo "$as_me:15551: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:15553: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14861: \$? = $ac_status" >&5 + echo "$as_me:15556: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_mytinfo_tgoto=yes + + cf_cv_ncurses_version=`cat $cf_tempfile` else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_mytinfo_tgoto=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:14872: result: $ac_cv_lib_mytinfo_tgoto" >&5 -echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 -if test $ac_cv_lib_mytinfo_tgoto = yes; then - -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" + rm -f $cf_tempfile fi +echo "$as_me:15570: result: $cf_cv_ncurses_version" >&5 +echo "${ECHO_T}$cf_cv_ncurses_version" >&6 +test "$cf_cv_ncurses_version" = no || +cat >>confdefs.h <<\EOF +#define NCURSES 1 +EOF - ;; -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 - # term.h) for cur_colr - if test "x$cf_cv_screen" = "xcurses_colr" - then - echo "$as_me:14902: checking for initscr in -lcur_colr" >&5 -echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6 -if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then +cf_nculib_root=ncursesw + # This works, except for the special case where we find gpm, but + # ncurses is in a nonstandard location via $LIBS, and we really want + # to link gpm. +cf_ncurses_LIBS="" +cf_ncurses_SAVE="$LIBS" +echo "$as_me:15583: checking for Gpm_Open in -lgpm" >&5 +echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 +if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lcur_colr $LIBS" +LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14910 "configure" +#line 15591 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14916,69 +15597,48 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char initscr (); +char Gpm_Open (); int main (void) { -initscr (); +Gpm_Open (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14929: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15610: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14932: \$? = $ac_status" >&5 + echo "$as_me:15613: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14935: \"$ac_try\"") >&5 + { (eval echo "$as_me:15616: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14938: \$? = $ac_status" >&5 + echo "$as_me:15619: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_cur_colr_initscr=yes + ac_cv_lib_gpm_Gpm_Open=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_cur_colr_initscr=no +ac_cv_lib_gpm_Gpm_Open=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14949: result: $ac_cv_lib_cur_colr_initscr" >&5 -echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6 -if test $ac_cv_lib_cur_colr_initscr = yes; then - -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 "$as_me:14973: checking for initscr in -lHcurses" >&5 -echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6 -if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then +echo "$as_me:15630: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 +if test $ac_cv_lib_gpm_Gpm_Open = yes; then + echo "$as_me:15633: checking for initscr in -lgpm" >&5 +echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 +if test "${ac_cv_lib_gpm_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lHcurses $LIBS" +LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14981 "configure" +#line 15641 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14997,234 +15657,148 @@ initscr (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15000: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15660: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15003: \$? = $ac_status" >&5 + echo "$as_me:15663: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15006: \"$ac_try\"") >&5 + { (eval echo "$as_me:15666: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15009: \$? = $ac_status" >&5 + echo "$as_me:15669: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_Hcurses_initscr=yes + ac_cv_lib_gpm_initscr=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_Hcurses_initscr=no +ac_cv_lib_gpm_initscr=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:15020: result: $ac_cv_lib_Hcurses_initscr" >&5 -echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6 -if test $ac_cv_lib_Hcurses_initscr = yes; then - - # HP's header uses __HP_CURSES, but user claims _HP_CURSES. - -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" - - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-D__HP_CURSES -D_HP_CURSES" - - ac_cv_func_initscr=yes - -fi - -fi - - fi - ;; -linux*) - case `arch 2>/dev/null` in - 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 - -echo "${as_me:-configure}:15078: testing adding $cf_add_libdir to library-path ..." 1>&5 - - 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 - -echo "${as_me:-configure}:15107: testing adding $cf_add_libdir to library-path ..." 1>&5 - - 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 - -echo "${as_me:-configure}:15138: testing adding $cf_add_libdir to library-path ..." 1>&5 +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:15680: result: $ac_cv_lib_gpm_initscr" >&5 +echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 +if test $ac_cv_lib_gpm_initscr = yes; then + LIBS="$cf_ncurses_SAVE" +else + cf_ncurses_LIBS="-lgpm" +fi - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi - fi - done fi - ;; - esac - ;; -sunos3*|sunos4*) - if test "x$cf_cv_screen" = "xcurses_5lib" - then - if test -d /usr/5lib ; then +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 "$as_me:15695: checking for tgoto in -lmytinfo" >&5 +echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 +if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmytinfo $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 15703 "configure" +#include "confdefs.h" -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 +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char tgoto (); +int +main (void) +{ +tgoto (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:15722: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:15725: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:15728: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:15731: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_mytinfo_tgoto=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_mytinfo_tgoto=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:15742: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 +if test $ac_cv_lib_mytinfo_tgoto = yes; then + cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" +fi -echo "${as_me:-configure}:15173: testing adding $cf_add_libdir to library-path ..." 1>&5 + fi + ;; +esac - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_ncurses_LIBS; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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 -fi + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" +done +LIBS="$cf_add_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 +if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) +then + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -l$cf_nculib_root; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" - fi - fi - ac_cv_func_initscr=yes - ;; -esac - -if test ".$ac_cv_func_initscr" != .yes ; then - cf_save_LIBS="$LIBS" - - if test ".${cf_cv_ncurses_version:-no}" != .no - then - cf_check_list="ncurses curses cursesX" - else - cf_check_list="cursesX curses ncurses" - fi +else - # Check for library containing tgoto. Do this before curses library - # because it may be needed to link the test-case for initscr. - if test "x$cf_term_lib" = x - then - echo "$as_me:15217: checking for tgoto" >&5 -echo $ECHO_N "checking for tgoto... $ECHO_C" >&6 -if test "${ac_cv_func_tgoto+set}" = set; then + eval 'cf_cv_have_lib_'$cf_nculib_root'=no' + cf_libdir="" + echo "$as_me:15791: checking for initscr" >&5 +echo $ECHO_N "checking for initscr... $ECHO_C" >&6 +if test "${ac_cv_func_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15223 "configure" +#line 15797 "configure" #include "confdefs.h" -#define tgoto autoconf_temporary +#define initscr autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef tgoto +#undef initscr #ifdef __cplusplus extern "C" @@ -15232,7 +15806,7 @@ extern "C" /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char tgoto (void); +char initscr (void); int main (void) @@ -15241,603 +15815,905 @@ main (void) /* The GNU C library defines stubs 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_tgoto) || defined (__stub___tgoto) -#error found stub for tgoto +#if defined (__stub_initscr) || defined (__stub___initscr) +#error found stub for initscr #endif - return tgoto (); + return initscr (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15254: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15828: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15257: \$? = $ac_status" >&5 + echo "$as_me:15831: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15260: \"$ac_try\"") >&5 + { (eval echo "$as_me:15834: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15263: \$? = $ac_status" >&5 + echo "$as_me:15837: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func_tgoto=yes + ac_cv_func_initscr=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_func_tgoto=no +ac_cv_func_initscr=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15273: result: $ac_cv_func_tgoto" >&5 -echo "${ECHO_T}$ac_cv_func_tgoto" >&6 -if test $ac_cv_func_tgoto = yes; then - cf_term_lib=predefined +echo "$as_me:15847: result: $ac_cv_func_initscr" >&5 +echo "${ECHO_T}$ac_cv_func_initscr" >&6 +if test $ac_cv_func_initscr = yes; then + eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' else - for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown - do - as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh` -echo "$as_me:15282: checking for tgoto in -l$cf_term_lib" >&5 -echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Lib+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + cf_save_LIBS="$LIBS" + echo "$as_me:15854: checking for initscr in -l$cf_nculib_root" >&5 +echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 + LIBS="-l$cf_nculib_root $LIBS" + cat >conftest.$ac_ext <<_ACEOF +#line 15858 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> +int +main (void) +{ +initscr() + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:15870: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:15873: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:15876: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:15879: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "$as_me:15881: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' + else - ac_check_lib_save_LIBS=$LIBS -LIBS="-l$cf_term_lib $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 15290 "configure" + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +echo "$as_me:15888: result: no" >&5 +echo "${ECHO_T}no" >&6 + +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 + -L*) + cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` + +test "x$cf_library_path" != "xNONE" && \ +test -d "$cf_library_path" && \ + { + test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" + test -d $cf_library_path/lib && cf_search="$cf_search $cf_library_path/lib" + test -d $cf_library_path/lib/$cf_nculib_root && cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root" + test -d $cf_library_path/lib/$cf_nculib_root/lib && cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root/lib" + test -d $cf_library_path/$cf_nculib_root/lib && cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib" + test -d $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root" +} + + cf_library_path_list="$cf_library_path_list $cf_search" + ;; + esac + done +fi + +cf_search= + +test "x$prefix" != "xNONE" && \ +test -d "$prefix" && \ + { + test -n "$verbose" && echo " ... testing for lib-directories under $prefix" + test -d $prefix/lib && cf_search="$cf_search $prefix/lib" + test -d $prefix/lib/$cf_nculib_root && cf_search="$cf_search $prefix/lib/$cf_nculib_root" + test -d $prefix/lib/$cf_nculib_root/lib && cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib" + test -d $prefix/$cf_nculib_root/lib && cf_search="$cf_search $prefix/$cf_nculib_root/lib" + test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $prefix/$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" + + for cf_libdir in $cf_search + do + echo "$as_me:15956: checking for -l$cf_nculib_root in $cf_libdir" >&5 +echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 + LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +#line 15960 "configure" #include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char tgoto (); +#include <${cf_cv_ncurses_header:-curses.h}> int main (void) { -tgoto (); +initscr() ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15309: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15972: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15312: \$? = $ac_status" >&5 + echo "$as_me:15975: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15315: \"$ac_try\"") >&5 + { (eval echo "$as_me:15978: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15318: \$? = $ac_status" >&5 + echo "$as_me:15981: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$as_ac_Lib=yes" + echo "$as_me:15983: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' + break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -eval "$as_ac_Lib=no" +echo "$as_me:15990: result: no" >&5 +echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:15329: result: `eval echo '${'$as_ac_Lib'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 -if test `eval echo '${'$as_ac_Lib'}'` = yes; then + done - : ${cf_nculib_root:=$cf_term_lib} - break +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - done +eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root +if test $cf_found_library = no ; then + { { echo "$as_me:16005: error: Cannot link $cf_nculib_root library" >&5 +echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} + { (exit 1); exit 1; }; } fi - fi +fi - # Check for library containing initscr - test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS" - if test "x$cf_curs_lib" = x - then - for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown - do - LIBS="-l$cf_curs_lib $cf_save_LIBS" - if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then - echo "$as_me:15352: checking if we can link with $cf_curs_lib library" >&5 -echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line 15355 "configure" +if test -n "$cf_ncurses_LIBS" ; then + echo "$as_me:16013: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 +echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 + cf_ncurses_SAVE="$LIBS" + for p in $cf_ncurses_LIBS ; do + q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` + if test "$q" != "$LIBS" ; then + LIBS="$q" + fi + done + cat >conftest.$ac_ext <<_ACEOF +#line 16023 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main (void) { -initscr() +initscr(); mousemask(0,0); tigetstr((char *)0); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15367: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16035: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15370: \$? = $ac_status" >&5 + echo "$as_me:16038: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15373: \"$ac_try\"") >&5 + { (eval echo "$as_me:16041: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15376: \$? = $ac_status" >&5 + echo "$as_me:16044: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_result=yes + echo "$as_me:16046: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_result=no +echo "$as_me:16051: result: no" >&5 +echo "${ECHO_T}no" >&6 + LIBS="$cf_ncurses_SAVE" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:15385: result: $cf_result" >&5 -echo "${ECHO_T}$cf_result" >&6 - test $cf_result = yes && break - elif test "$cf_curs_lib" = "$cf_term_lib" ; then - cf_result=no - elif test "$cf_term_lib" != predefined ; then - echo "$as_me:15391: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 -echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line 15394 "configure" +fi + +cf_nculib_ROOT=`echo "HAVE_LIB$cf_nculib_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + +cat >>confdefs.h <&5 +echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6 +if test "${cf_cv_need_xopen_extension+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cf_cv_need_xopen_extension=unknown +cat >conftest.$ac_ext <<_ACEOF +#line 16077 "configure" #include "confdefs.h" + +#include #include <${cf_cv_ncurses_header:-curses.h}> int main (void) { -initscr(); tgoto((char *)0, 0, 0); + +#if defined(NCURSES_VERSION_PATCH) +#if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403) + make an error +#endif +#endif +#ifdef NCURSES_VERSION + cchar_t check; + int check2 = curs_set((int)sizeof(check)); +#endif + long x = winnstr(stdscr, "", 0); + int x1, y1; +#ifdef NCURSES_VERSION + (void)check2; +#endif + getbegyx(stdscr, y1, x1); + (void)x; + (void)y1; + (void)x1; + ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15406: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16110: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15409: \$? = $ac_status" >&5 + echo "$as_me:16113: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15412: \"$ac_try\"") >&5 + { (eval echo "$as_me:16116: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15415: \$? = $ac_status" >&5 + echo "$as_me:16119: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_result=no + cf_cv_need_xopen_extension=none else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -#line 15424 "configure" + for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR + do + cat >conftest.$ac_ext <<_ACEOF +#line 16129 "configure" #include "confdefs.h" + +#define $cf_try_xopen_extension 1 +#include #include <${cf_cv_ncurses_header:-curses.h}> int main (void) { -initscr() + +#ifdef NCURSES_VERSION + cchar_t check; + int check2 = curs_set((int)sizeof(check)); +#endif + long x = winnstr(stdscr, "", 0); + int x1, y1; + getbegyx(stdscr, y1, x1); +#ifdef NCURSES_VERSION + (void)check2; +#endif + (void)x; + (void)y1; + (void)x1; + ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15436: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16158: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15439: \$? = $ac_status" >&5 + echo "$as_me:16161: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15442: \"$ac_try\"") >&5 + { (eval echo "$as_me:16164: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15445: \$? = $ac_status" >&5 + echo "$as_me:16167: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_result=yes + cf_cv_need_xopen_extension=$cf_try_xopen_extension; break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_result=error fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + done fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:15457: result: $cf_result" >&5 -echo "${ECHO_T}$cf_result" >&6 - test $cf_result != error && break - fi - done - fi - test $cf_curs_lib = unknown && { { echo "$as_me:15463: error: no curses library found" >&5 -echo "$as_me: error: no curses library found" >&2;} + +fi +echo "$as_me:16181: result: $cf_cv_need_xopen_extension" >&5 +echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6 + +case $cf_cv_need_xopen_extension in +*_*) + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-D$cf_cv_need_xopen_extension" + + ;; +esac + + test "$cf_cv_need_xopen_extension" = unknown && { { echo "$as_me:16193: error: X/Open curses not found" >&5 +echo "$as_me: error: X/Open curses not found" >&2;} { (exit 1); exit 1; }; } + ;; + curses) #(vi + +echo "$as_me:16199: checking for extra include directories" >&5 +echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6 +if test "${cf_cv_curses_incdir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cf_cv_curses_incdir=no +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*) + if test "x$cf_cv_screen" = "xcurses_5lib" + then + test -d /usr/5lib && \ + test -d /usr/5include && \ + cf_cv_curses_incdir="-I/usr/5include" + fi + ;; +esac + fi +echo "$as_me:16225: result: $cf_cv_curses_incdir" >&5 +echo "${ECHO_T}$cf_cv_curses_incdir" >&6 +if test "$cf_cv_curses_incdir" != no +then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_cv_curses_incdir" + fi -echo "$as_me:15469: checking definition to turn on extended curses functions" >&5 -echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6 -if test "${cf_cv_need_xopen_extension+set}" = set; then +echo "$as_me:16235: checking if we have identified curses headers" >&5 +echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 +if test "${cf_cv_ncurses_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cf_cv_need_xopen_extension=unknown +cf_cv_ncurses_header=none +for cf_header in \ + ncurses.h \ + curses.h ncurses/ncurses.h ncurses/curses.h +do cat >conftest.$ac_ext <<_ACEOF -#line 15477 "configure" +#line 16247 "configure" #include "confdefs.h" - -#include -#include <${cf_cv_ncurses_header:-curses.h}> +#include <${cf_header}> int main (void) { - -#if defined(NCURSES_VERSION_PATCH) -#if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403) - make an error -#endif -#endif -#ifdef NCURSES_VERSION - cchar_t check; - int check2 = curs_set((int)sizeof(check)); -#endif - long x = winnstr(stdscr, "", 0); - int x1, y1; - getbegyx(stdscr, y1, x1) +initscr(); tgoto("?", 0,0) ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15503: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:16259: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15506: \$? = $ac_status" >&5 + echo "$as_me:16262: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15509: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:16265: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15512: \$? = $ac_status" >&5 + echo "$as_me:16268: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_need_xopen_extension=none + cf_cv_ncurses_header=$cf_header; break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext conftest.$ac_ext +done + +fi +echo "$as_me:16279: result: $cf_cv_ncurses_header" >&5 +echo "${ECHO_T}$cf_cv_ncurses_header" >&6 + +if test "$cf_cv_ncurses_header" = none ; then + { { echo "$as_me:16283: error: No curses header-files found" >&5 +echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } +fi + +# cheat, to get the right #define's for HAVE_NCURSES_H, etc. + +for ac_header in $cf_cv_ncurses_header +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:16293: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 16299 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:16303: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:16309: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 + cat conftest.$ac_ext >&5 + eval "$as_ac_Header=no" +fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:16328: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <conftest.$ac_ext <<_ACEOF -#line 15522 "configure" -#include "confdefs.h" +fi +done -#define $cf_try_xopen_extension 1 -#include +echo "$as_me:16338: checking for terminfo header" >&5 +echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 +if test "${cf_cv_term_header+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +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 + +for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" +do +cat >conftest.$ac_ext <<_ACEOF +#line 16356 "configure" +#include "confdefs.h" +#include #include <${cf_cv_ncurses_header:-curses.h}> +#include <$cf_test> + int main (void) { - -#ifdef NCURSES_VERSION - cchar_t check; - int check2 = curs_set((int)sizeof(check)); -#endif - long x = winnstr(stdscr, "", 0); - int x1, y1; - getbegyx(stdscr, y1, x1) +int x = auto_left_margin; (void)x ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15544: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:16371: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15547: \$? = $ac_status" >&5 + echo "$as_me:16374: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15550: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:16377: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15553: \$? = $ac_status" >&5 + echo "$as_me:16380: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_need_xopen_extension=$cf_try_xopen_extension; break + + cf_cv_term_header="$cf_test" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - done -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + cf_cv_term_header=unknown fi -echo "$as_me:15567: result: $cf_cv_need_xopen_extension" >&5 -echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6 - -case $cf_cv_need_xopen_extension in -*_*) - - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-D$cf_cv_need_xopen_extension" - - ;; -esac +rm -f conftest.$ac_objext conftest.$ac_ext + test "$cf_cv_term_header" != unknown && break +done - ;; - esac fi +echo "$as_me:16396: result: $cf_cv_term_header" >&5 +echo "${ECHO_T}$cf_cv_term_header" >&6 -## substitute externally-installed PCRE library for our bundled version -echo "$as_me:15584: checking if you want to use installed version of pcre" >&5 -echo $ECHO_N "checking if you want to use installed version of pcre... $ECHO_C" >&6 - -# Check whether --with-pcre or --without-pcre was given. -if test "${with_pcre+set}" = set; then - withval="$with_pcre" - PCRE_HOME=$withval -else - PCRE_HOME=no -fi; -echo "$as_me:15594: result: $PCRE_HOME" >&5 -echo "${ECHO_T}$PCRE_HOME" >&6 - -cf_pcre_home=$PCRE_HOME -PCREDIR_MAKE= -PCREDIR_LIBS= -PCREDIR_CPPFLAGS= -case .$cf_pcre_home in #(vi -.no) #(vi - # setup to compile the bundled PCRE: -# . $srcdir/pcre/version.sh - - ;; -.yes) #(vi - PCREDIR_MAKE='#' - PCREDIR_LIBS="-lpcre" - ;; -.*) +# Set definitions to allow ifdef'ing to accommodate subdirectories -if test "x$prefix" != xNONE; then - cf_path_syntax="$prefix" -else - cf_path_syntax="$ac_default_prefix" -fi +case $cf_cv_term_header in +*term.h) -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 "$as_me:15638: error: expected a pathname, not \"$cf_pcre_home\"" >&5 -echo "$as_me: error: expected a pathname, not \"$cf_pcre_home\"" >&2;} - { (exit 1); exit 1; }; } - ;; -esac +cat >>confdefs.h <<\EOF +#define HAVE_TERM_H 1 +EOF - PCREDIR_MAKE='#' - PCREDIR_LIBS="-L${cf_pcre_home}/lib -lpcre" - PCREDIR_CPPFLAGS="-I${cf_pcre_home}/include" ;; esac -PCRE_MAKEFILE= -if test "$PCRE_HOME" = "no" ; then - LINK_SIZE="-DLINK_SIZE=2" - - UTF8="-DSUPPORT_UTF8" - UCP="-DSUPPORT_UCP" - - PCRE_MAKEFILE="$PCRE_MAKEFILE pcre/Makefile pcre/RunTest" -fi - -## debugging libraries (do this after other libraries) -debug_malloc=none - -echo "$as_me:15663: checking if you want to use dbmalloc for testing" >&5 -echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6 - -# Check whether --with-dbmalloc or --without-dbmalloc was given. -if test "${with_dbmalloc+set}" = set; then - withval="$with_dbmalloc" +case $cf_cv_term_header in +ncurses/term.h) -cat >>confdefs.h <>confdefs.h <<\EOF +#define HAVE_NCURSES_TERM_H 1 EOF - : ${with_cflags:=-g} - : ${with_no_leaks:=yes} - with_dbmalloc=yes -else - with_dbmalloc= -fi; -echo "$as_me:15680: result: ${with_dbmalloc:-no}" >&5 -echo "${ECHO_T}${with_dbmalloc:-no}" >&6 - -case .$with_cflags in -.*-g*) - case .$CFLAGS in - .*-g*) - ;; - *) - -cf_fix_cppflags=no -cf_new_cflags= -cf_new_cppflags= -cf_new_extra_cppflags= - -for cf_add_cflags in -g -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 - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - - continue - elif test "${cf_tst_cflags}" = "\"'" ; then - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - 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 - - test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " - cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" - - ;; - esac - ;; - *) - - test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " - cf_new_cflags="${cf_new_cflags}$cf_add_cflags" - - ;; - esac ;; -yes) - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" +ncursesw/term.h) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` +cat >>confdefs.h <<\EOF +#define HAVE_NCURSESW_TERM_H 1 +EOF - 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 +echo "$as_me:16428: checking for ncurses version" >&5 +echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 +if test "${cf_cv_ncurses_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else - test -n "$CFLAGS" && CFLAGS="$CFLAGS " - CFLAGS="${CFLAGS}$cf_new_cflags" + cf_cv_ncurses_version=no + cf_tempfile=out$$ + rm -f $cf_tempfile + if test "$cross_compiling" = yes; then -fi + # This will not work if the preprocessor splits the line after the + # Autoconf token. The 'unproto' program does that. + cat > conftest.$ac_ext < +#undef Autoconf +#ifdef NCURSES_VERSION +Autoconf NCURSES_VERSION +#else +#ifdef __NCURSES_H +Autoconf "old" +#endif +; +#endif +EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" + { (eval echo "$as_me:16454: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? + echo "$as_me:16457: \$? = $ac_status" >&5 + (exit $ac_status); } + 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" + rm -f conftest.out + fi -if test -n "$cf_new_cppflags" ; then +else + cat >conftest.$ac_ext <<_ACEOF +#line 16467 "configure" +#include "confdefs.h" - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" +#include <${cf_cv_ncurses_header:-curses.h}> +#include +int main(void) +{ + FILE *fp = fopen("$cf_tempfile", "w"); +#ifdef NCURSES_VERSION +# ifdef NCURSES_VERSION_PATCH + fprintf(fp, "%s.%d\n", NCURSES_VERSION, NCURSES_VERSION_PATCH); +# else + fprintf(fp, "%s\n", NCURSES_VERSION); +# endif +#else +# ifdef __NCURSES_H + fprintf(fp, "old\n"); +# else + make an error +# endif +#endif + ${cf_cv_main_return:-return}(0); +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:16492: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:16495: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:16497: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:16500: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_version=`cat $cf_tempfile` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi - -if test -n "$cf_new_extra_cppflags" ; then - - test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " - EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + rm -f $cf_tempfile fi +echo "$as_me:16514: result: $cf_cv_ncurses_version" >&5 +echo "${ECHO_T}$cf_cv_ncurses_version" >&6 +test "$cf_cv_ncurses_version" = no || +cat >>confdefs.h <<\EOF +#define NCURSES 1 +EOF - ;; - esac - ;; -esac +echo "$as_me:16521: checking if we have identified curses libraries" >&5 +echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line 16524 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> +int +main (void) +{ +initscr(); tgoto("?", 0,0) + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:16536: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:16539: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:16542: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:16545: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_result=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +echo "$as_me:16554: result: $cf_result" >&5 +echo "${ECHO_T}$cf_result" >&6 -if test "$with_dbmalloc" = yes ; then - echo "$as_me:15794: checking for dbmalloc.h" >&5 -echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6 -if test "${ac_cv_header_dbmalloc_h+set}" = set; then +if test "$cf_result" = no ; then +case $host_os in +freebsd*) + echo "$as_me:16560: checking for tgoto in -lmytinfo" >&5 +echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 +if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 15800 "configure" + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmytinfo $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 16568 "configure" #include "confdefs.h" -#include + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char tgoto (); +int +main (void) +{ +tgoto (); + ; + return 0; +} _ACEOF -if { (eval echo "$as_me:15804: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:16587: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:15810: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi + echo "$as_me:16590: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:16593: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:16596: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_mytinfo_tgoto=yes else - ac_cpp_err=yes + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_mytinfo_tgoto=no fi -if test -z "$ac_cpp_err"; then - ac_cv_header_dbmalloc_h=yes +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:16607: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 +if test $ac_cv_lib_mytinfo_tgoto = yes; then + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lmytinfo; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" + +fi + + ;; +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 + # term.h) for cur_colr + if test "x$cf_cv_screen" = "xcurses_colr" + then + echo "$as_me:16637: checking for initscr in -lcur_colr" >&5 +echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6 +if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcur_colr $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 16645 "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char initscr (); +int +main (void) +{ +initscr (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:16664: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:16667: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:16670: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:16673: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_cur_colr_initscr=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_header_dbmalloc_h=no +cat conftest.$ac_ext >&5 +ac_cv_lib_cur_colr_initscr=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15829: result: $ac_cv_header_dbmalloc_h" >&5 -echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6 -if test $ac_cv_header_dbmalloc_h = yes; then - echo "$as_me:15832: checking for debug_malloc in -ldbmalloc" >&5 -echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6 -if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then +echo "$as_me:16684: result: $ac_cv_lib_cur_colr_initscr" >&5 +echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6 +if test $ac_cv_lib_cur_colr_initscr = yes; then + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lcur_colr; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" + + ac_cv_func_initscr=yes + +else + + echo "$as_me:16708: checking for initscr in -lHcurses" >&5 +echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6 +if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-ldbmalloc $LIBS" +LIBS="-lHcurses $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 15840 "configure" +#line 16716 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15846,224 +16722,307 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char debug_malloc (); +char initscr (); int main (void) { -debug_malloc (); +initscr (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15859: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16735: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15862: \$? = $ac_status" >&5 + echo "$as_me:16738: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15865: \"$ac_try\"") >&5 + { (eval echo "$as_me:16741: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15868: \$? = $ac_status" >&5 + echo "$as_me:16744: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_dbmalloc_debug_malloc=yes + ac_cv_lib_Hcurses_initscr=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_dbmalloc_debug_malloc=no +ac_cv_lib_Hcurses_initscr=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15879: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 -echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6 -if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then - debug_malloc=DBMALLOC -fi - -fi - -fi - -echo "$as_me:15889: checking if you want to use dmalloc for testing" >&5 -echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6 +echo "$as_me:16755: result: $ac_cv_lib_Hcurses_initscr" >&5 +echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6 +if test $ac_cv_lib_Hcurses_initscr = yes; then -# Check whether --with-dmalloc or --without-dmalloc was given. -if test "${with_dmalloc+set}" = set; then - withval="$with_dmalloc" + # HP's header uses __HP_CURSES, but user claims _HP_CURSES. -cat >>confdefs.h <&5 -echo "${ECHO_T}${with_dmalloc:-no}" >&6 + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-D__HP_CURSES -D_HP_CURSES" -case .$with_cflags in -.*-g*) - case .$CFLAGS in - .*-g*) - ;; - *) + ac_cv_func_initscr=yes -cf_fix_cppflags=no -cf_new_cflags= -cf_new_cppflags= -cf_new_extra_cppflags= +fi -for cf_add_cflags in -g -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[^=]*='\''\"[^"]*//'` +fi - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes + fi + ;; +linux*) + case `arch 2>/dev/null` in + x86_64) + if test -d /lib64 + then - if test $cf_fix_cppflags = yes ; 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 - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" +echo "${as_me:-configure}:16813: testing adding $cf_add_libdir to library-path ..." 1>&5 - continue - elif test "${cf_tst_cflags}" = "\"'" ; then + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done +fi - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + else - continue +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 - ;; - 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'` + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 - ;; - esac +echo "${as_me:-configure}:16842: testing adding $cf_add_libdir to library-path ..." 1>&5 - test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " - cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done +fi - ;; - esac + fi ;; *) - test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " - cf_new_cflags="${cf_new_cflags}$cf_add_cflags" - - ;; - esac - ;; -yes) +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 - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" +echo "${as_me:-configure}:16873: testing adding $cf_add_libdir to library-path ..." 1>&5 - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done +fi - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=no + ;; + esac ;; -esac -done - -if test -n "$cf_new_cflags" ; then - - test -n "$CFLAGS" && CFLAGS="$CFLAGS " - CFLAGS="${CFLAGS}$cf_new_cflags" - -fi +sunos3*|sunos4*) + if test "x$cf_cv_screen" = "xcurses_5lib" + then + if test -d /usr/5lib ; then -if test -n "$cf_new_cppflags" ; 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 - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" +echo "${as_me:-configure}:16908: testing adding $cf_add_libdir to library-path ..." 1>&5 + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done fi -if test -n "$cf_new_extra_cppflags" ; then - - test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " - EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" - -fi +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lcurses -ltermcap; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" - ;; - esac + fi + fi + ac_cv_func_initscr=yes ;; esac -if test "$with_dmalloc" = yes ; then - echo "$as_me:16020: checking for dmalloc.h" >&5 -echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6 -if test "${ac_cv_header_dmalloc_h+set}" = set; then +if test ".$ac_cv_func_initscr" != .yes ; then + cf_save_LIBS="$LIBS" + + if test ".${cf_cv_ncurses_version:-no}" != .no + then + cf_check_list="ncurses curses cursesX" + else + cf_check_list="cursesX curses ncurses" + fi + + # Check for library containing tgoto. Do this before curses library + # because it may be needed to link the test-case for initscr. + if test "x$cf_term_lib" = x + then + echo "$as_me:16952: checking for tgoto" >&5 +echo $ECHO_N "checking for tgoto... $ECHO_C" >&6 +if test "${ac_cv_func_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 16026 "configure" +#line 16958 "configure" #include "confdefs.h" -#include +#define tgoto autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef tgoto + +#ifdef __cplusplus +extern "C" +#endif + +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char tgoto (void); + +int +main (void) +{ + +/* The GNU C library defines stubs 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_tgoto) || defined (__stub___tgoto) +#error found stub for tgoto +#endif + + return tgoto (); + ; + return 0; +} _ACEOF -if { (eval echo "$as_me:16030: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:16989: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:16036: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_cv_header_dmalloc_h=yes + echo "$as_me:16992: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:16995: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:16998: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_tgoto=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_header_dmalloc_h=no +cat conftest.$ac_ext >&5 +ac_cv_func_tgoto=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16055: result: $ac_cv_header_dmalloc_h" >&5 -echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6 -if test $ac_cv_header_dmalloc_h = yes; then - echo "$as_me:16058: checking for dmalloc_debug in -ldmalloc" >&5 -echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6 -if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then +echo "$as_me:17008: result: $ac_cv_func_tgoto" >&5 +echo "${ECHO_T}$ac_cv_func_tgoto" >&6 +if test $ac_cv_func_tgoto = yes; then + cf_term_lib=predefined +else + + for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown + do + as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh` +echo "$as_me:17017: checking for tgoto in -l$cf_term_lib" >&5 +echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-ldmalloc $LIBS" +LIBS="-l$cf_term_lib $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 16066 "configure" +#line 17025 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16072,858 +17031,848 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char dmalloc_debug (); +char tgoto (); int main (void) { -dmalloc_debug (); +tgoto (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16085: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17044: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16088: \$? = $ac_status" >&5 + echo "$as_me:17047: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16091: \"$ac_try\"") >&5 + { (eval echo "$as_me:17050: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16094: \$? = $ac_status" >&5 + echo "$as_me:17053: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_dmalloc_dmalloc_debug=yes + eval "$as_ac_Lib=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_dmalloc_dmalloc_debug=no +eval "$as_ac_Lib=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16105: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 -echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6 -if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then - debug_malloc=DMALLOC -fi +echo "$as_me:17064: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 +if test `eval echo '${'$as_ac_Lib'}'` = yes; then + + : ${cf_nculib_root:=$cf_term_lib} + break fi + done + fi -# Check whether --with-trace or --without-trace was given. -if test "${with_trace+set}" = set; then - withval="$with_trace" + fi - echo "$as_me:16119: checking for _tracef" >&5 -echo $ECHO_N "checking for _tracef... $ECHO_C" >&6 -if test "${ac_cv_func__tracef+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + # Check for library containing initscr + test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS" + if test "x$cf_curs_lib" = x + then + for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown + do + LIBS="-l$cf_curs_lib $cf_save_LIBS" + if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then + echo "$as_me:17087: checking if we can link with $cf_curs_lib library" >&5 +echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line 17090 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> +int +main (void) +{ +initscr() + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:17102: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:17105: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:17108: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:17111: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes else - cat >conftest.$ac_ext <<_ACEOF -#line 16125 "configure" + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_result=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + echo "$as_me:17120: result: $cf_result" >&5 +echo "${ECHO_T}$cf_result" >&6 + test $cf_result = yes && break + elif test "$cf_curs_lib" = "$cf_term_lib" ; then + cf_result=no + elif test "$cf_term_lib" != predefined ; then + echo "$as_me:17126: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 +echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line 17129 "configure" #include "confdefs.h" -#define _tracef autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef _tracef - -#ifdef __cplusplus -extern "C" -#endif - -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char _tracef (void); - +#include <${cf_cv_ncurses_header:-curses.h}> int main (void) { +initscr(); tgoto((char *)0, 0, 0); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:17141: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:17144: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:17147: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:17150: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=no +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 -/* The GNU C library defines stubs 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__tracef) || defined (__stub____tracef) -#error found stub for _tracef -#endif - - return _tracef (); + LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +#line 17159 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> +int +main (void) +{ +initscr() ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16156: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17171: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16159: \$? = $ac_status" >&5 + echo "$as_me:17174: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16162: \"$ac_try\"") >&5 + { (eval echo "$as_me:17177: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16165: \$? = $ac_status" >&5 + echo "$as_me:17180: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func__tracef=yes + cf_result=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_func__tracef=no +cf_result=error fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi -echo "$as_me:16175: result: $ac_cv_func__tracef" >&5 -echo "${ECHO_T}$ac_cv_func__tracef" >&6 -if test $ac_cv_func__tracef = yes; then - cat >>confdefs.h <<\EOF -#define HAVE__TRACEF 1 -EOF +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + echo "$as_me:17192: result: $cf_result" >&5 +echo "${ECHO_T}$cf_result" >&6 + test $cf_result != error && break + fi + done + fi + test $cf_curs_lib = unknown && { { echo "$as_me:17198: error: no curses library found" >&5 +echo "$as_me: error: no curses library found" >&2;} + { (exit 1); exit 1; }; } +fi +fi + +echo "$as_me:17204: checking definition to turn on extended curses functions" >&5 +echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6 +if test "${cf_cv_need_xopen_extension+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cf_cv_need_xopen_extension=unknown +cat >conftest.$ac_ext <<_ACEOF +#line 17212 "configure" +#include "confdefs.h" + +#include +#include <${cf_cv_ncurses_header:-curses.h}> +int +main (void) +{ + +#if defined(NCURSES_VERSION_PATCH) +#if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403) + make an error +#endif +#endif +#ifdef NCURSES_VERSION + cchar_t check; + int check2 = curs_set((int)sizeof(check)); +#endif + long x = winnstr(stdscr, "", 0); + int x1, y1; +#ifdef NCURSES_VERSION + (void)check2; +#endif + getbegyx(stdscr, y1, x1); + (void)x; + (void)y1; + (void)x1; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:17245: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:17248: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:17251: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:17254: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_need_xopen_extension=none else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 - as_ac_Lib=`echo "ac_cv_lib_${cf_with_screen}_g''__tracef" | $as_tr_sh` -echo "$as_me:16185: checking for _tracef in -l${cf_with_screen}_g" >&5 -echo $ECHO_N "checking for _tracef in -l${cf_with_screen}_g... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Lib+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-l${cf_with_screen}_g $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 16193 "configure" + for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR + do + cat >conftest.$ac_ext <<_ACEOF +#line 17264 "configure" #include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char _tracef (); +#define $cf_try_xopen_extension 1 +#include +#include <${cf_cv_ncurses_header:-curses.h}> int main (void) { -_tracef (); + +#ifdef NCURSES_VERSION + cchar_t check; + int check2 = curs_set((int)sizeof(check)); +#endif + long x = winnstr(stdscr, "", 0); + int x1, y1; + getbegyx(stdscr, y1, x1); +#ifdef NCURSES_VERSION + (void)check2; +#endif + (void)x; + (void)y1; + (void)x1; + ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16212: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17293: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16215: \$? = $ac_status" >&5 + echo "$as_me:17296: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16218: \"$ac_try\"") >&5 + { (eval echo "$as_me:17299: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16221: \$? = $ac_status" >&5 + echo "$as_me:17302: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$as_ac_Lib=yes" + cf_cv_need_xopen_extension=$cf_try_xopen_extension; break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -eval "$as_ac_Lib=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:16232: result: `eval echo '${'$as_ac_Lib'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 -if test `eval echo '${'$as_ac_Lib'}'` = yes; then - cat >>confdefs.h <<\EOF -#define HAVE__TRACEF 1 -EOF + done - LIBS=`echo "$LIBS" | sed -e s/-l${cf_with_screen}// -e s/-lcurses//` - LIBS="-l${cf_with_screen}_g $LIBS" - use_trace=yes - cat >>confdefs.h <<\EOF -#define USE_TRACE 1 -EOF +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - EXTRAO_DEP='' - EXTRAOBJS="$EXTRAOBJS \$(OBJDIR)/trace.o" -else - use_trace=no fi +echo "$as_me:17316: result: $cf_cv_need_xopen_extension" >&5 +echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6 + +case $cf_cv_need_xopen_extension in +*_*) + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-D$cf_cv_need_xopen_extension" + + ;; +esac + ;; + esac fi +## substitute externally-installed PCRE library for our bundled version +echo "$as_me:17333: checking if you want to use installed version of pcre" >&5 +echo $ECHO_N "checking if you want to use installed version of pcre... $ECHO_C" >&6 + +# Check whether --with-pcre or --without-pcre was given. +if test "${with_pcre+set}" = set; then + withval="$with_pcre" + PCRE_HOME=$withval else - use_trace=no + PCRE_HOME=no fi; -#AC_MSG_CHECKING(if you want debugging-trace) -#AC_MSG_RESULT($use_trace) +echo "$as_me:17343: result: $PCRE_HOME" >&5 +echo "${ECHO_T}$PCRE_HOME" >&6 -## options for miscellaneous definitions -echo "$as_me:16261: checking for domain-name" >&5 -echo $ECHO_N "checking for domain-name... $ECHO_C" >&6 +cf_pcre_home=$PCRE_HOME +PCREDIR_MAKE= +PCREDIR_LIBS= +PCREDIR_CPPFLAGS= -# Check whether --with-domain-name or --without-domain-name was given. -if test "${with_domain_name+set}" = set; then - withval="$with_domain_name" +case .$cf_pcre_home in #(vi +.no) #(vi + # setup to compile the bundled PCRE: +# . $srcdir/pcre/version.sh -else - withval="${DOMAIN_NAME}" -fi; test -n "$withval" && \ -case "$withval" in #(vi -yes) - { { echo "$as_me:16273: error: expected a value for --with-domain-name" >&5 -echo "$as_me: error: expected a value for --with-domain-name" >&2;} - { (exit 1); exit 1; }; } - ;; #(vi -no) withval="" - ;; -esac -DOMAIN_NAME="$withval" + ;; +.yes) #(vi -if test "$DOMAIN_NAME" != ""; then - cat >>confdefs.h <&5 -echo "${ECHO_T}$DOMAIN_NAME" >&6 +if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists libpcre2; then + test -n "$verbose" && echo " found package libpcre2" 1>&6 -if test "$USE_NNTP" = "yes" ; then -echo "$as_me:16292: checking for NNTP default-server" >&5 -echo $ECHO_N "checking for NNTP default-server... $ECHO_C" >&6 +echo "${as_me:-configure}:17366: testing found package libpcre2 ..." 1>&5 -# Check whether --with-nntp-default-server or --without-nntp-default-server was given. -if test "${with_nntp_default_server+set}" = set; then - withval="$with_nntp_default_server" + cf_pkgconfig_incs="`$PKG_CONFIG --cflags libpcre2 2>/dev/null`" + cf_pkgconfig_libs="`$PKG_CONFIG --libs libpcre2 2>/dev/null`" + test -n "$verbose" && echo " package libpcre2 CFLAGS: $cf_pkgconfig_incs" 1>&6 -else - withval="${NNTP_DEFAULT_SERVER-news.$DOMAIN_NAME}" -fi; test -z "$withval" && withval=no -case "$withval" in #(vi -yes) - { { echo "$as_me:16304: error: expected a value for --with-nntp-default-server" >&5 -echo "$as_me: error: expected a value for --with-nntp-default-server" >&2;} - { (exit 1); exit 1; }; } - ;; #(vi -no) withval="" - ;; -esac -NNTP_DEFAULT_SERVER="$withval" +echo "${as_me:-configure}:17372: testing package libpcre2 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 - if test "$NNTP_DEFAULT_SERVER" = "" ; then - if test "$DOMAIN_NAME" != "" ; then - test -z "$NNTP_DEFAULT_SERVER" && \ - case "$DOMAIN_NAME" in #((( - /*) - if test -r "$DOMAIN_NAME" ; then - NNTP_DEFAULT_SERVER="news.`cat $DOMAIN_NAME`" - else - NNTP_DEFAULT_SERVER="news" + test -n "$verbose" && echo " package libpcre2 LIBS: $cf_pkgconfig_libs" 1>&6 + +echo "${as_me:-configure}:17376: testing package libpcre2 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 + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue fi ;; - *) - NNTP_DEFAULT_SERVER="news.$DOMAIN_NAME" + esac + case "$CPPFLAGS" in + *$cf_add_cflags) ;; - esac - else - NNTP_DEFAULT_SERVER="news" - fi - fi -echo "$as_me:16332: result: $NNTP_DEFAULT_SERVER" >&5 -echo "${ECHO_T}$NNTP_DEFAULT_SERVER" >&6 -fi - -## These options are interdependent, so we delay defining them til now: -test -n "$NNTP_DEFAULT_SERVER" \ - && cat >>confdefs.h <>confdefs.h <>confdefs.h <>confdefs.h <>confdefs.h <&5 -echo $ECHO_N "checking whether to use MH style mail handling for mailgroups... $ECHO_C" >&6 + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" -# 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 - cat >>confdefs.h <<\EOF -#define HAVE_MH_MAIL_HANDLING 1 -EOF + ;; + esac + ;; +yes) - fi -else - enableval=no -fi; -echo "$as_me:16375: result: $enableval" >&5 -echo "${ECHO_T}$enableval" >&6 + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" -CAN_MAKEFILE= -CANDIR_MAKE= -echo "$as_me:16380: checking whether to use Cancel-Locks" >&5 -echo $ECHO_N "checking whether to use Cancel-Locks... $ECHO_C" >&6 + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` -# 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 - CANLIBS='-L../libcanlock -lcanlock' - CAN_MAKEFILE="libcanlock/Makefile" - cat >>confdefs.h <<\EOF -#define USE_CANLOCK 1 -EOF + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done - else - CANDIR_MAKE='#' - CANLIBS='' - fi -else - enableval=no - CANDIR_MAKE='#' - CANLIBS='' +if test -n "$cf_new_cflags" ; then -fi; -echo "$as_me:16404: result: $enableval" >&5 -echo "${ECHO_T}$enableval" >&6 + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" -## gsasl - used for AUTH SASL PLAIN -gsasl=no -echo "$as_me:16409: checking for gsasl.h" >&5 -echo $ECHO_N "checking for gsasl.h... $ECHO_C" >&6 -if test "${ac_cv_header_gsasl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 16415 "configure" -#include "confdefs.h" -#include -_ACEOF -if { (eval echo "$as_me:16419: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:16425: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_cv_header_gsasl_h=yes -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_header_gsasl_h=no fi -rm -f conftest.err conftest.$ac_ext -fi -echo "$as_me:16444: result: $ac_cv_header_gsasl_h" >&5 -echo "${ECHO_T}$ac_cv_header_gsasl_h" >&6 -if test $ac_cv_header_gsasl_h = yes; then - echo "$as_me:16447: checking for gsasl_check_version in -lgsasl" >&5 -echo $ECHO_N "checking for gsasl_check_version in -lgsasl... $ECHO_C" >&6 -if test "${ac_cv_lib_gsasl_gsasl_check_version+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lgsasl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 16455 "configure" -#include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gsasl_check_version (); -int -main (void) -{ -gsasl_check_version (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16474: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:16477: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16480: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:16483: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_gsasl_gsasl_check_version=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_gsasl_gsasl_check_version=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:16494: result: $ac_cv_lib_gsasl_gsasl_check_version" >&5 -echo "${ECHO_T}$ac_cv_lib_gsasl_gsasl_check_version" >&6 -if test $ac_cv_lib_gsasl_gsasl_check_version = yes; then - gsasl=yes -fi +if test -n "$cf_new_cppflags" ; then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" fi -if test "$gsasl" = "yes"; then +if test -n "$cf_new_extra_cppflags" ; then -# Check whether --enable-gsasl or --disable-gsasl was given. -if test "${enable_gsasl+set}" = set; then - enableval="$enable_gsasl" - test "$enableval" != no && enableval=yes - if test "$enableval" != "yes" ; then - USE_SASL=no - else - USE_SASL=yes + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" -cat >>confdefs.h <<\EOF -#define USE_SASL 1 -EOF +fi - LIBS="$LIBS -lgsasl" - fi -else - enableval=yes - USE_SASL=yes +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" -cat >>confdefs.h <<\EOF -#define USE_SASL 1 -EOF + : +else + cf_pkgconfig_incs= + cf_pkgconfig_libs= - LIBS="$LIBS -lgsasl" +if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists libpcre; then + test -n "$verbose" && echo " found package libpcre" 1>&6 -fi; -fi +echo "${as_me:-configure}:17500: testing found package libpcre ..." 1>&5 -echo "$as_me:16532: checking whether to enable 8-bit keycodes" >&5 -echo $ECHO_N "checking whether to enable 8-bit keycodes... $ECHO_C" >&6 + cf_pkgconfig_incs="`$PKG_CONFIG --cflags libpcre 2>/dev/null`" + cf_pkgconfig_libs="`$PKG_CONFIG --libs libpcre 2>/dev/null`" + test -n "$verbose" && echo " package libpcre CFLAGS: $cf_pkgconfig_incs" 1>&6 -# 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 - : - else - cat >>confdefs.h <<\EOF -#define HAVE_KEY_PREFIX 1 -EOF +echo "${as_me:-configure}:17506: testing package libpcre CFLAGS: $cf_pkgconfig_incs ..." 1>&5 - fi -else - enableval=yes - cat >>confdefs.h <<\EOF -#define HAVE_KEY_PREFIX 1 -EOF + test -n "$verbose" && echo " package libpcre LIBS: $cf_pkgconfig_libs" 1>&6 -fi; -echo "$as_me:16554: result: $enableval" >&5 -echo "${ECHO_T}$enableval" >&6 +echo "${as_me:-configure}:17510: testing package libpcre LIBS: $cf_pkgconfig_libs ..." 1>&5 -echo "$as_me:16557: checking whether to enable ANSI-color" >&5 -echo $ECHO_N "checking whether to enable ANSI-color... $ECHO_C" >&6 +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= -# 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 - : - fi -else - enableval=yes -fi; -use_color=$enableval -echo "$as_me:16571: result: $use_color" >&5 -echo "${ECHO_T}$use_color" >&6 +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[^=]*='\''\"[^"]*//'` -echo "$as_me:16574: checking whether to enable posting-etiquette" >&5 -echo $ECHO_N "checking whether to enable posting-etiquette... $ECHO_C" >&6 + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes -# 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 - cat >>confdefs.h <<\EOF -#define NO_ETIQUETTE 1 -EOF + if test $cf_fix_cppflags = yes ; then - fi -else - enableval=yes -fi; -echo "$as_me:16590: result: $enableval" >&5 -echo "${ECHO_T}$enableval" >&6 + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" -echo "$as_me:16593: checking whether to strictly observe RFC2047 and break long lines" >&5 -echo $ECHO_N "checking whether to strictly observe RFC2047 and break long lines... $ECHO_C" >&6 + continue + elif test "${cf_tst_cflags}" = "\"'" ; then -# 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" != no && enableval=yes - if test "$enableval" != "yes" ; then - : - else - cat >>confdefs.h <<\EOF -#define MIME_BREAK_LONG_LINES 1 -EOF + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - fi -else - enableval=yes - cat >>confdefs.h <<\EOF -#define MIME_BREAK_LONG_LINES 1 -EOF + 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/=.*//'` -fi; -echo "$as_me:16615: result: $enableval" >&5 -echo "${ECHO_T}$enableval" >&6 +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` -echo "$as_me:16618: checking whether to force MM_CHARSET obeyance when decoding mime" >&5 -echo $ECHO_N "checking whether to force MM_CHARSET obeyance when decoding mime... $ECHO_C" >&6 + ;; + esac -# 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 - : - else - cat >>confdefs.h <<\EOF -#define MIME_STRICT_CHARSET 1 -EOF + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" - fi -else - enableval=yes - cat >>confdefs.h <<\EOF -#define MIME_STRICT_CHARSET 1 -EOF + ;; + esac + ;; + *) -fi; -echo "$as_me:16640: result: $enableval" >&5 -echo "${ECHO_T}$enableval" >&6 + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" -echo "$as_me:16643: checking for MIME character-set" >&5 -echo $ECHO_N "checking for MIME character-set... $ECHO_C" >&6 + ;; + esac + ;; +yes) -# Check whether --with-mime-default-charset or --without-mime-default-charset was given. -if test "${with_mime_default_charset+set}" = set; then - withval="$with_mime_default_charset" + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" -else - withval="${MM_CHARSET-US-ASCII}" -fi; -case "$withval" in #(vi -yes|no) - { { echo "$as_me:16655: error: expected a value for --with-mime-default-charset" >&5 -echo "$as_me: error: expected a value for --with-mime-default-charset" >&2;} - { (exit 1); exit 1; }; } - ;; + 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 -MM_CHARSET="$withval" -cat >>confdefs.h <&5 -echo "${ECHO_T}$MM_CHARSET" >&6 +if test -n "$cf_new_cflags" ; then -echo "$as_me:16668: checking for default ISO/ASCII table" >&5 -echo $ECHO_N "checking for default ISO/ASCII table... $ECHO_C" >&6 + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" -# Check whether --with-iso-to-ascii or --without-iso-to-ascii was given. -if test "${with_iso_to_ascii+set}" = set; then - withval="$with_iso_to_ascii" +fi -else - withval="${DEFAULT_ISO2ASC--1}" -fi; -case "$withval" in #(vi -yes|no) - { { echo "$as_me:16680: error: expected a value for --with-iso-to-ascii" >&5 -echo "$as_me: error: expected a value for --with-iso-to-ascii" >&2;} - { (exit 1); exit 1; }; } - ;; -esac -DEFAULT_ISO2ASC="$withval" -cat >>confdefs.h <&5 -echo "${ECHO_T}$DEFAULT_ISO2ASC" >&6 + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" -echo "$as_me:16693: checking whether to enable locale support" >&5 -echo $ECHO_N "checking whether to enable locale support... $ECHO_C" >&6 +fi -# 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 - cat >>confdefs.h <<\EOF -#define NO_LOCALE 1 -EOF +if test -n "$cf_new_extra_cppflags" ; then - fi -else - enableval=yes -fi; -echo "$as_me:16709: result: $enableval" >&5 -echo "${ECHO_T}$enableval" >&6 + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" -echo "$as_me:16712: checking whether to enable posting" >&5 -echo $ECHO_N "checking whether to enable posting... $ECHO_C" >&6 +fi -# 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 - cat >>confdefs.h <<\EOF -#define NO_POSTING 1 -EOF +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" - fi + : else - enableval=yes -fi; -echo "$as_me:16728: result: $enableval" >&5 -echo "${ECHO_T}$enableval" >&6 - -echo "$as_me:16731: checking whether to enable shell escape" >&5 -echo $ECHO_N "checking whether to enable shell escape... $ECHO_C" >&6 + cf_pkgconfig_incs= + cf_pkgconfig_libs= -# 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 - cat >>confdefs.h <<\EOF -#define NO_SHELL_ESCAPE 1 -EOF + echo "$as_me:17631: checking for pcre_compile in -lpcre" >&5 +echo $ECHO_N "checking for pcre_compile in -lpcre... $ECHO_C" >&6 +if test "${ac_cv_lib_pcre_pcre_compile+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpcre $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 17639 "configure" +#include "confdefs.h" - fi +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char pcre_compile (); +int +main (void) +{ +pcre_compile (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:17658: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:17661: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:17664: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:17667: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_pcre_pcre_compile=yes else - enableval=yes -fi; -echo "$as_me:16747: result: $enableval" >&5 -echo "${ECHO_T}$enableval" >&6 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_pcre_pcre_compile=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:17678: result: $ac_cv_lib_pcre_pcre_compile" >&5 +echo "${ECHO_T}$ac_cv_lib_pcre_pcre_compile" >&6 +if test $ac_cv_lib_pcre_pcre_compile = yes; then + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lpcre; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" -echo "$as_me:16750: checking whether to have fascist newsadmin" >&5 -echo $ECHO_N "checking whether to have fascist newsadmin... $ECHO_C" >&6 + echo "$as_me:17698: checking for regcomp in -lpcre2-posix" >&5 +echo $ECHO_N "checking for regcomp in -lpcre2-posix... $ECHO_C" >&6 +if test "${ac_cv_lib_pcre2_posix_regcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpcre2-posix $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 17706 "configure" +#include "confdefs.h" -# 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 - cat >>confdefs.h <<\EOF -#define HAVE_FASCIST_NEWSADMIN 1 -EOF +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char regcomp (); +int +main (void) +{ +regcomp (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:17725: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:17728: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:17731: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:17734: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_pcre2_posix_regcomp=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_pcre2_posix_regcomp=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:17745: result: $ac_cv_lib_pcre2_posix_regcomp" >&5 +echo "${ECHO_T}$ac_cv_lib_pcre2_posix_regcomp" >&6 +if test $ac_cv_lib_pcre2_posix_regcomp = yes; then + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lpcre2-posix; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" - fi else - enableval=no -fi; -echo "$as_me:16766: result: $enableval" >&5 -echo "${ECHO_T}$enableval" >&6 -echo "$as_me:16769: checking whether to enable inverse video and highlighting" >&5 -echo $ECHO_N "checking whether to enable inverse video and highlighting... $ECHO_C" >&6 + echo "$as_me:17767: checking for regcomp in -lpcreposix" >&5 +echo $ECHO_N "checking for regcomp in -lpcreposix... $ECHO_C" >&6 +if test "${ac_cv_lib_pcreposix_regcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpcreposix $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 17775 "configure" +#include "confdefs.h" -# 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 - cat >>confdefs.h <<\EOF -#define USE_INVERSE_HACK 1 -EOF +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char regcomp (); +int +main (void) +{ +regcomp (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:17794: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:17797: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:17800: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:17803: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_pcreposix_regcomp=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_pcreposix_regcomp=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:17814: result: $ac_cv_lib_pcreposix_regcomp" >&5 +echo "${ECHO_T}$ac_cv_lib_pcreposix_regcomp" >&6 +if test $ac_cv_lib_pcreposix_regcomp = yes; then + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lpcreposix; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" - fi else - enableval=yes -fi; -echo "$as_me:16785: result: $enableval" >&5 -echo "${ECHO_T}$enableval" >&6 - -echo "$as_me:16788: checking whether to enable piping support" >&5 -echo $ECHO_N "checking whether to enable piping support... $ECHO_C" >&6 - -# 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 - cat >>confdefs.h <<\EOF -#define DONT_HAVE_PIPING 1 -EOF - fi -else - enableval=yes -fi; -echo "$as_me:16804: result: $enableval" >&5 -echo "${ECHO_T}$enableval" >&6 + cf_find_PCRE=no -echo "$as_me:16807: checking whether to enable printer support" >&5 -echo $ECHO_N "checking whether to enable printer support... $ECHO_C" >&6 +fi -# 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 - cat >>confdefs.h <<\EOF -#define DISABLE_PRINTING 1 -EOF +fi - fi else - enableval=yes -fi; -echo "$as_me:16823: result: $enableval" >&5 -echo "${ECHO_T}$enableval" >&6 - -echo "$as_me:16826: checking whether to unique tmp-files by appending .pid" >&5 -echo $ECHO_N "checking whether to unique tmp-files by appending .pid... $ECHO_C" >&6 - -# 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 - : - else - cat >>confdefs.h <<\EOF -#define APPEND_PID 1 -EOF - fi -else - enableval=yes - cat >>confdefs.h <<\EOF -#define APPEND_PID 1 -EOF + cf_find_PCRE=no -fi; -echo "$as_me:16848: result: $enableval" >&5 -echo "${ECHO_T}$enableval" >&6 +fi -echo "$as_me:16851: checking whether to fallback to XHDR XREF if XOVER isn't supported" >&5 -echo $ECHO_N "checking whether to fallback to XHDR XREF if XOVER isn't supported... $ECHO_C" >&6 +fi -# 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 - : - else - cat >>confdefs.h <<\EOF -#define XHDR_XREF 1 -EOF +fi - fi -else - enableval=yes - cat >>confdefs.h <<\EOF -#define XHDR_XREF 1 -EOF +CFLAGS="$cf_save_CFLAGS" +LIBS="$cf_save_LIBS" -fi; -echo "$as_me:16873: result: $enableval" >&5 -echo "${ECHO_T}$enableval" >&6 +cf_pcre_cppflags="$cf_pkgconfig_incs" +cf_pcre_libs="$cf_pkgconfig_libs" -### bypass a bug in old versions of leafnode & NNTPcache -echo "$as_me:16877: checking whether to send a GROUP command before a LISTGROUP" >&5 -echo $ECHO_N "checking whether to send a GROUP command before a LISTGROUP... $ECHO_C" >&6 +if test "$cf_find_PCRE" = yes; then -# 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 - cat >>confdefs.h <<\EOF -#define BROKEN_LISTGROUP 1 -EOF + PCREDIR_MAKE='#' + PCREDIR_LIBS="$cf_pcre_libs" + PCREDIR_CPPFLAGS="$cf_pcre_cppflags" - fi else - enableval=no -fi; -echo "$as_me:16893: result: $enableval" >&5 -echo "${ECHO_T}$enableval" >&6 - -### on some old systems the WIFEXITED()/WEXITSTATUS() macros do not work -echo "$as_me:16897: checking whether to ignore system()s return value" >&5 -echo $ECHO_N "checking whether to ignore system()s return value... $ECHO_C" >&6 -# 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 - cat >>confdefs.h <<\EOF -#define IGNORE_SYSTEM_STATUS 1 -EOF + test -n "$verbose" && echo " using bundled pcre because no installed pcre was found" 1>&6 - fi -else - enableval=no -fi; -echo "$as_me:16913: result: $enableval" >&5 -echo "${ECHO_T}$enableval" >&6 +echo "${as_me:-configure}:17868: testing using bundled pcre because no installed pcre was found ..." 1>&5 -### checks for the location of the system-wide default setting file -echo "$as_me:16917: checking for directory containing tin.defaults file" >&5 -echo $ECHO_N "checking for directory containing tin.defaults file... $ECHO_C" >&6 + cf_pcre_home=no -# Check whether --with-defaults-dir or --without-defaults-dir was given. -if test "${with_defaults_dir+set}" = set; then - withval="$with_defaults_dir" +fi -else - withval="${TIN_DEFAULTS_DIR:-/etc/tin}" -fi; if true ; then + ;; +.*) if test "x$prefix" != xNONE; then cf_path_syntax="$prefix" @@ -16931,7 +17880,7 @@ else cf_path_syntax="$ac_default_prefix" fi -case ".$withval" in +case ".$cf_pcre_home" in .\$\(*\)*|.\'*\'*) ;; ..|./*|.\\*) @@ -16939,3286 +17888,3604 @@ case ".$withval" in .[a-zA-Z]:[\\/]*) # OS/2 EMX ;; .\${*prefix}*|.\${*dir}*) - eval withval="$withval" - case ".$withval" in + eval cf_pcre_home="$cf_pcre_home" + case ".$cf_pcre_home" in .NONE/*) - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + cf_pcre_home=`echo $cf_pcre_home | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; .no|.NONE/*) - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + cf_pcre_home=`echo $cf_pcre_home | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:16953: error: expected a pathname, not \"$withval\"" >&5 -echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { { echo "$as_me:17902: error: expected a pathname, not \"$cf_pcre_home\"" >&5 +echo "$as_me: error: expected a pathname, not \"$cf_pcre_home\"" >&2;} { (exit 1); exit 1; }; } ;; esac + PCREDIR_MAKE='#' + PCREDIR_LIBS="-L${cf_pcre_home}/lib -lpcre" + PCREDIR_CPPFLAGS="-I${cf_pcre_home}/include" + ;; +esac + +PCRE_MAKEFILE= +if test "$cf_pcre_home" = "no" ; then + LINK_SIZE="-DLINK_SIZE=2" + + UTF8="-DSUPPORT_UTF8" + UCP="-DSUPPORT_UCP" + + PCRE_MAKEFILE="$PCRE_MAKEFILE pcre/Makefile pcre/RunTest" +fi + +## debugging libraries (do this after other libraries) +debug_malloc=none + +echo "$as_me:17927: checking if you want to use dbmalloc for testing" >&5 +echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6 + +# Check whether --with-dbmalloc or --without-dbmalloc was given. +if test "${with_dbmalloc+set}" = set; then + withval="$with_dbmalloc" + +cat >>confdefs.h <&5 +echo "${ECHO_T}${with_dbmalloc:-no}" >&6 + +case .$with_cflags in +.*-g*) + case .$CFLAGS in + .*-g*) + ;; + *) + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in -g +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 + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + 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 + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + + ;; + esac + ;; + *) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + + ;; + esac + ;; +yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + 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 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + fi -eval TIN_DEFAULTS_DIR="$withval" -echo "$as_me:16962: result: $TIN_DEFAULTS_DIR" >&5 -echo "${ECHO_T}$TIN_DEFAULTS_DIR" >&6 -cat >>confdefs.h <&5 -echo $ECHO_N "checking whether to enable IPv6... $ECHO_C" >&6 + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" -# Check whether --enable-ipv6 or --disable-ipv6 was given. -if test "${enable_ipv6+set}" = set; then - enableval="$enable_ipv6" - test "$enableval" != no && enableval=yes - if test "$enableval" != "yes" ; then - : - else - cat >>confdefs.h <<\EOF -#define ENABLE_IPV6 1 -EOF +fi - fi -else - enableval=yes - cat >>confdefs.h <<\EOF -#define ENABLE_IPV6 1 -EOF +if test -n "$cf_new_extra_cppflags" ; then -fi; -echo "$as_me:16991: result: $enableval" >&5 -echo "${ECHO_T}$enableval" >&6 -if test "$enableval" = "yes"; then + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" -echo "$as_me:16995: checking ipv6 stack type" >&5 -echo $ECHO_N "checking ipv6 stack type... $ECHO_C" >&6 -if test "${cf_cv_ipv6type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else +fi -cf_cv_ipv6type=unknown -for i in solaris inria kame linux-glibc linux-libinet6 toshiba v6d zeta -do - case $i in - solaris) - if test "SunOS" = "`uname -s`" - then - if test -f /usr/include/netinet/ip6.h - then - cf_cv_ipv6type=$i - fi - fi ;; - inria) - cat >conftest.$ac_ext <<_ACEOF -#line 17016 "configure" -#include "confdefs.h" + esac + ;; +esac -#include -#ifdef IPV6_INRIA_VERSION -yes -#endif +if test "$with_dbmalloc" = yes ; then + echo "$as_me:18058: checking for dbmalloc.h" >&5 +echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6 +if test "${ac_cv_header_dbmalloc_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 18064 "configure" +#include "confdefs.h" +#include _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "yes" >/dev/null 2>&1; then - cf_cv_ipv6type=$i +if { (eval echo "$as_me:18068: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:18074: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes fi -rm -rf conftest* - - ;; - kame) - cat >conftest.$ac_ext <<_ACEOF -#line 17033 "configure" +if test -z "$ac_cpp_err"; then + ac_cv_header_dbmalloc_h=yes +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_header_dbmalloc_h=no +fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:18093: result: $ac_cv_header_dbmalloc_h" >&5 +echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6 +if test $ac_cv_header_dbmalloc_h = yes; then + echo "$as_me:18096: checking for debug_malloc in -ldbmalloc" >&5 +echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6 +if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldbmalloc $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 18104 "configure" #include "confdefs.h" -#include -#ifdef __KAME__ -yes +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char debug_malloc (); +int +main (void) +{ +debug_malloc (); + ; + return 0; +} _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "yes" >/dev/null 2>&1; then - cf_cv_ipv6type=$i +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:18123: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:18126: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:18129: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:18132: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dbmalloc_debug_malloc=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_dbmalloc_debug_malloc=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:18143: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6 +if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then + debug_malloc=DBMALLOC fi -rm -rf conftest* - ;; - linux-glibc) - cat >conftest.$ac_ext <<_ACEOF -#line 17050 "configure" -#include "confdefs.h" +fi -#include -#if defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1 -yes -#endif -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "yes" >/dev/null 2>&1; then - cf_cv_ipv6type=$i fi -rm -rf conftest* - ;; - linux-libinet6) - if test -d /usr/inet6 - then - cf_cv_ipv6type=$i - elif test -f /usr/include/netinet/ip6.h - then - cf_cv_ipv6type=$i - fi - ;; - toshiba) - cat >conftest.$ac_ext <<_ACEOF -#line 17076 "configure" -#include "confdefs.h" +echo "$as_me:18153: checking if you want to use dmalloc for testing" >&5 +echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6 -#include -#ifdef _TOSHIBA_INET6 -yes -#endif -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "yes" >/dev/null 2>&1; then - cf_cv_ipv6type=$i -fi -rm -rf conftest* +# Check whether --with-dmalloc or --without-dmalloc was given. +if test "${with_dmalloc+set}" = set; then + withval="$with_dmalloc" + +cat >>confdefs.h <&5 +echo "${ECHO_T}${with_dmalloc:-no}" >&6 +case .$with_cflags in +.*-g*) + case .$CFLAGS in + .*-g*) ;; - v6d) - cat >conftest.$ac_ext <<_ACEOF -#line 17093 "configure" -#include "confdefs.h" + *) + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in -g +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 + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + 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'` -#include -#ifdef __V6D__ -yes -#endif -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "yes" >/dev/null 2>&1; then - cf_cv_ipv6type=$i -fi -rm -rf conftest* + ;; + esac + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + + ;; + esac ;; - zeta) - cat >conftest.$ac_ext <<_ACEOF -#line 17110 "configure" -#include "confdefs.h" + *) -#include -#ifdef _ZETA_MINAMI_INET6 -yes -#endif -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "yes" >/dev/null 2>&1; then - cf_cv_ipv6type=$i -fi -rm -rf conftest* + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" ;; esac - if test "$cf_cv_ipv6type" != "unknown"; then - break - fi + ;; +yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + 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 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + fi -echo "$as_me:17132: result: $cf_cv_ipv6type" >&5 -echo "${ECHO_T}$cf_cv_ipv6type" >&6 -cf_ipv6lib=none -cf_ipv6dir=none +if test -n "$cf_new_cppflags" ; then -echo "$as_me:17138: checking for IPv6 library if required" >&5 -echo $ECHO_N "checking for IPv6 library if required... $ECHO_C" >&6 -case $cf_cv_ipv6type in -solaris) - ;; -inria) - ;; -kame) - cf_ipv6lib=inet6 - cf_ipv6dir=v6 - ;; -linux-glibc) - ;; -linux-libinet6) - cf_ipv6lib=inet6 - cf_ipv6dir=inet6 - ;; -toshiba) - cf_ipv6lib=inet6 - cf_ipv6dir=v6 - ;; -v6d) - cf_ipv6lib=v6 - cf_ipv6dir=v6 - ;; -zeta) - cf_ipv6lib=inet6 - cf_ipv6dir=v6 + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + +fi + +if test -n "$cf_new_extra_cppflags" ; then + + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + +fi + + ;; + esac ;; esac -echo "$as_me:17168: result: $cf_ipv6lib" >&5 -echo "${ECHO_T}$cf_ipv6lib" >&6 -if test "$cf_ipv6lib" != "none"; then - - cat >conftest.$ac_ext <<_ACEOF -#line 17174 "configure" +if test "$with_dmalloc" = yes ; then + echo "$as_me:18284: checking for dmalloc.h" >&5 +echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6 +if test "${ac_cv_header_dmalloc_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 18290 "configure" +#include "confdefs.h" +#include +_ACEOF +if { (eval echo "$as_me:18294: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:18300: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_dmalloc_h=yes +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_header_dmalloc_h=no +fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:18319: result: $ac_cv_header_dmalloc_h" >&5 +echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6 +if test $ac_cv_header_dmalloc_h = yes; then + echo "$as_me:18322: checking for dmalloc_debug in -ldmalloc" >&5 +echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6 +if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldmalloc $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 18330 "configure" #include "confdefs.h" -#include -#include -#include -#include +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dmalloc_debug (); int main (void) { -getaddrinfo(0, 0, 0, 0) +dmalloc_debug (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17190: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18349: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17193: \$? = $ac_status" >&5 + echo "$as_me:18352: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17196: \"$ac_try\"") >&5 + { (eval echo "$as_me:18355: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17199: \$? = $ac_status" >&5 + echo "$as_me:18358: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - : + ac_cv_lib_dmalloc_dmalloc_debug=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - -cf_search= - -# collect the current set of include-directories from compiler flags -cf_header_path_list="" -if test -n "${CFLAGS}${CPPFLAGS}" ; then - for cf_header_path in $CPPFLAGS $CFLAGS - do - 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" && \ -test -d "$cf_header_path" && \ - { - test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" - test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" - test -d $cf_header_path/include/$cf_ipv6dir && cf_search="$cf_search $cf_header_path/include/$cf_ipv6dir" - test -d $cf_header_path/include/$cf_ipv6dir/include && cf_search="$cf_search $cf_header_path/include/$cf_ipv6dir/include" - test -d $cf_header_path/$cf_ipv6dir/include && cf_search="$cf_search $cf_header_path/$cf_ipv6dir/include" - test -d $cf_header_path/$cf_ipv6dir/include/$cf_ipv6dir && cf_search="$cf_search $cf_header_path/$cf_ipv6dir/include/$cf_ipv6dir" -} - - cf_header_path_list="$cf_header_path_list $cf_search" - ;; - esac - done +ac_cv_lib_dmalloc_dmalloc_debug=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:18369: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6 +if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then + debug_malloc=DMALLOC fi -# add the variations for the package we are looking for - -cf_search= - -test "x$prefix" != "xNONE" && \ -test -d "$prefix" && \ - { - test -n "$verbose" && echo " ... testing for include-directories under $prefix" - test -d $prefix/include && cf_search="$cf_search $prefix/include" - test -d $prefix/include/$cf_ipv6dir && cf_search="$cf_search $prefix/include/$cf_ipv6dir" - test -d $prefix/include/$cf_ipv6dir/include && cf_search="$cf_search $prefix/include/$cf_ipv6dir/include" - test -d $prefix/$cf_ipv6dir/include && cf_search="$cf_search $prefix/$cf_ipv6dir/include" - test -d $prefix/$cf_ipv6dir/include/$cf_ipv6dir && cf_search="$cf_search $prefix/$cf_ipv6dir/include/$cf_ipv6dir" -} +fi -for cf_subdir_prefix in \ - /usr \ - /usr/local \ - /usr/pkg \ - /opt \ - /opt/local \ - $HOME -do +fi -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" -} +# Check whether --with-trace or --without-trace was given. +if test "${with_trace+set}" = set; then + withval="$with_trace" -done + echo "$as_me:18383: checking for _tracef" >&5 +echo $ECHO_N "checking for _tracef... $ECHO_C" >&6 +if test "${ac_cv_func__tracef+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 18389 "configure" +#include "confdefs.h" +#define _tracef autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef _tracef -test "$includedir" != NONE && \ -test "$includedir" != "/usr/include" && \ -test -d "$includedir" && { - test -d $includedir && cf_search="$cf_search $includedir" - test -d $includedir/$cf_ipv6dir && cf_search="$cf_search $includedir/$cf_ipv6dir" -} +#ifdef __cplusplus +extern "C" +#endif -test "$oldincludedir" != NONE && \ -test "$oldincludedir" != "/usr/include" && \ -test -d "$oldincludedir" && { - test -d $oldincludedir && cf_search="$cf_search $oldincludedir" - test -d $oldincludedir/$cf_ipv6dir && cf_search="$cf_search $oldincludedir/$cf_ipv6dir" -} +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char _tracef (void); -cf_search="$cf_search $cf_header_path_list" +int +main (void) +{ - for cf_incdir in $cf_search - do - cf_header=$cf_incdir/netinet/ip6.h - if test -f $cf_header - then +/* The GNU C library defines stubs 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__tracef) || defined (__stub____tracef) +#error found stub for _tracef +#endif -if test -n "$cf_incdir" ; then - for cf_add_incdir in $cf_incdir - do - while test $cf_add_incdir != /usr/include - do - if test -d $cf_add_incdir - then - cf_have_incdir=no - if test -n "$CFLAGS$CPPFLAGS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_incdir in $CFLAGS $CPPFLAGS ; do - if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then - cf_have_incdir=yes; break - fi - done - fi + return _tracef (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:18420: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:18423: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:18426: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:18429: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func__tracef=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func__tracef=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:18439: result: $ac_cv_func__tracef" >&5 +echo "${ECHO_T}$ac_cv_func__tracef" >&6 +if test $ac_cv_func__tracef = yes; then - if test "$cf_have_incdir" = no ; then - if test "$cf_add_incdir" = /usr/local/include ; then - if test "$GCC" = yes - then - cf_save_CPPFLAGS=$CPPFLAGS +cat >>confdefs.h <<\EOF +#define HAVE__TRACEF 1 +EOF - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" +else - cat >conftest.$ac_ext <<_ACEOF -#line 17320 "configure" + as_ac_Lib=`echo "ac_cv_lib_${cf_with_screen}_g''__tracef" | $as_tr_sh` +echo "$as_me:18450: checking for _tracef in -l${cf_with_screen}_g" >&5 +echo $ECHO_N "checking for _tracef in -l${cf_with_screen}_g... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Lib+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-l${cf_with_screen}_g $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 18458 "configure" #include "confdefs.h" -#include + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char _tracef (); int main (void) { -printf("Hello") +_tracef (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:17332: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:18477: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17335: \$? = $ac_status" >&5 + echo "$as_me:18480: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17338: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:18483: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17341: \$? = $ac_status" >&5 + echo "$as_me:18486: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - : + eval "$as_ac_Lib=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_have_incdir=yes +eval "$as_ac_Lib=no" fi -rm -f conftest.$ac_objext conftest.$ac_ext - CPPFLAGS=$cf_save_CPPFLAGS +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:18497: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 +if test `eval echo '${'$as_ac_Lib'}'` = yes; then + cat >>confdefs.h <<\EOF +#define HAVE__TRACEF 1 +EOF + + LIBS=`echo "$LIBS" | sed -e s/-l${cf_with_screen}// -e s/-lcurses//` + LIBS="-l${cf_with_screen}_g $LIBS" + use_trace=yes + +cat >>confdefs.h <<\EOF +#define USE_TRACE 1 +EOF + + EXTRAO_DEP='' + EXTRAOBJS="$EXTRAOBJS \$(OBJDIR)/trace.o" +else + use_trace=no +fi + +fi + +else + use_trace=no +fi; +#AC_MSG_CHECKING(if you want debugging-trace) +#AC_MSG_RESULT($use_trace) + +## options for miscellaneous definitions +echo "$as_me:18527: checking for domain-name" >&5 +echo $ECHO_N "checking for domain-name... $ECHO_C" >&6 + +# Check whether --with-domain-name or --without-domain-name was given. +if test "${with_domain_name+set}" = set; then + withval="$with_domain_name" + +else + withval="${DOMAIN_NAME}" +fi; test -n "$withval" && \ +case "$withval" in #(vi +yes) + { { echo "$as_me:18539: error: expected a value for --with-domain-name" >&5 +echo "$as_me: error: expected a value for --with-domain-name" >&2;} + { (exit 1); exit 1; }; } + ;; #(vi +no) withval="" + ;; +esac +DOMAIN_NAME="$withval" + +if test "$DOMAIN_NAME" != ""; then + +cat >>confdefs.h <&5 +echo "${ECHO_T}$DOMAIN_NAME" >&6 + +if test "$USE_NNTP" = "yes" ; then +echo "$as_me:18559: checking for NNTP default-server" >&5 +echo $ECHO_N "checking for NNTP default-server... $ECHO_C" >&6 + +# Check whether --with-nntp-default-server or --without-nntp-default-server was given. +if test "${with_nntp_default_server+set}" = set; then + withval="$with_nntp_default_server" + +else + withval="${NNTP_DEFAULT_SERVER-news.$DOMAIN_NAME}" +fi; test -z "$withval" && withval=no +case "$withval" in #(vi +yes) + { { echo "$as_me:18571: error: expected a value for --with-nntp-default-server" >&5 +echo "$as_me: error: expected a value for --with-nntp-default-server" >&2;} + { (exit 1); exit 1; }; } + ;; #(vi +no) withval="" + ;; +esac +NNTP_DEFAULT_SERVER="$withval" + + if test "$NNTP_DEFAULT_SERVER" = "" ; then + if test "$DOMAIN_NAME" != "" ; then + test -z "$NNTP_DEFAULT_SERVER" && \ + case "$DOMAIN_NAME" in #((( + /*) + if test -r "$DOMAIN_NAME" ; then + NNTP_DEFAULT_SERVER="news.`cat $DOMAIN_NAME`" + else + NNTP_DEFAULT_SERVER="news" fi - fi - fi + ;; + *) + NNTP_DEFAULT_SERVER="news.$DOMAIN_NAME" + ;; + esac + else + NNTP_DEFAULT_SERVER="news" + fi + fi +echo "$as_me:18599: result: $NNTP_DEFAULT_SERVER" >&5 +echo "${ECHO_T}$NNTP_DEFAULT_SERVER" >&6 +fi + +## These options are interdependent, so we delay defining them til now: +test -n "$NNTP_DEFAULT_SERVER" \ + && +cat >>confdefs.h <>confdefs.h <>confdefs.h <>confdefs.h <>confdefs.h <&5 +echo $ECHO_N "checking whether to use MH style mail handling for mailgroups... $ECHO_C" >&6 + +# 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 + +cat >>confdefs.h <<\EOF +#define HAVE_MH_MAIL_HANDLING 1 +EOF + + fi +else + enableval=no +fi; +echo "$as_me:18645: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 + +echo "$as_me:18648: checking whether to use Cancel-Locks" >&5 +echo $ECHO_N "checking whether to use Cancel-Locks... $ECHO_C" >&6 + +# 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 + : + fi +else + enableval=no +fi; +echo "$as_me:18661: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 +USE_CANLOCK=$enableval - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 +if test "$USE_CANLOCK" = yes ; then + echo "$as_me:18666: checking whether to use installed canlock rather than bundled" >&5 +echo $ECHO_N "checking whether to use installed canlock rather than bundled... $ECHO_C" >&6 + +# Check whether --with-canlock or --without-canlock was given. +if test "${with_canlock+set}" = set; then + withval="$with_canlock" + CANLOCK_HOME=$withval +else + CANLOCK_HOME=$USE_CANLOCK +fi; + echo "$as_me:18676: result: $CANLOCK_HOME" >&5 +echo "${ECHO_T}$CANLOCK_HOME" >&6 -echo "${as_me:-configure}:17358: testing adding $cf_add_incdir to include-path ..." 1>&5 +cf_canlock_home=$CANLOCK_HOME +CANDIR_MAKE= +CANLIBS= +CAN_CPPFLAGS= +CAN_MAKEFILE= - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" +case .$cf_canlock_home in #(vi +.no) #(vi + test -n "$verbose" && echo " using bundled canlock" 1>&6 - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` - test "$cf_top_incdir" = "$cf_add_incdir" && break - cf_add_incdir="$cf_top_incdir" - else - break - fi - else - break - fi - done - done -fi +echo "${as_me:-configure}:18689: testing using bundled canlock ..." 1>&5 - test -n "$verbose" && echo " ... found $cf_header" 1>&6 - break - fi - test -n "$verbose" && echo " ... tested $cf_header" 1>&6 - done + CANLIBS='-L../libcanlock -lcanlock' + CAN_CPPFLAGS='-I$(top_builddir)/libcanlock/include -I$(top_srcdir)/libcanlock/include' + CAN_MAKEFILE='libcanlock/Makefile' + ;; +.yes) #(vi -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +cf_save_CFLAGS="$CFLAGS" +cf_save_LIBS="$LIBS" +cf_find_CANLOCK=yes - eval 'cf_cv_have_lib_'$cf_ipv6lib'=no' - cf_libdir="" - echo "$as_me:17386: checking for getaddrinfo" >&5 -echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6 -if test "${ac_cv_func_getaddrinfo+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 17392 "configure" -#include "confdefs.h" -#define getaddrinfo autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef getaddrinfo +if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists libcanlock3; then + test -n "$verbose" && echo " found package libcanlock3" 1>&6 -#ifdef __cplusplus -extern "C" -#endif +echo "${as_me:-configure}:18704: testing found package libcanlock3 ..." 1>&5 -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char getaddrinfo (void); + cf_pkgconfig_incs="`$PKG_CONFIG --cflags libcanlock3 2>/dev/null`" + cf_pkgconfig_libs="`$PKG_CONFIG --libs libcanlock3 2>/dev/null`" + test -n "$verbose" && echo " package libcanlock3 CFLAGS: $cf_pkgconfig_incs" 1>&6 -int -main (void) -{ +echo "${as_me:-configure}:18710: testing package libcanlock3 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 -/* The GNU C library defines stubs 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_getaddrinfo) || defined (__stub___getaddrinfo) -#error found stub for getaddrinfo -#endif + test -n "$verbose" && echo " package libcanlock3 LIBS: $cf_pkgconfig_libs" 1>&6 - return getaddrinfo (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17423: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:17426: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17429: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:17432: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_getaddrinfo=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_func_getaddrinfo=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:17442: result: $ac_cv_func_getaddrinfo" >&5 -echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6 -if test $ac_cv_func_getaddrinfo = yes; then - eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes' -else +echo "${as_me:-configure}:18714: testing package libcanlock3 LIBS: $cf_pkgconfig_libs ..." 1>&5 - cf_save_LIBS="$LIBS" - echo "$as_me:17449: checking for getaddrinfo in -l$cf_ipv6lib" >&5 -echo $ECHO_N "checking for getaddrinfo in -l$cf_ipv6lib... $ECHO_C" >&6 - LIBS="-l$cf_ipv6lib $LIBS" - cat >conftest.$ac_ext <<_ACEOF -#line 17453 "configure" -#include "confdefs.h" +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= -#include -#include -#include -#include -int -main (void) -{ -getaddrinfo(0, 0, 0, 0) - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17469: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:17472: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17475: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:17478: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:17480: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes' +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[^=]*='\''\"[^"]*//'` -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -echo "$as_me:17487: result: no" >&5 -echo "${ECHO_T}no" >&6 + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes -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 - -L*) - cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` + if test $cf_fix_cppflags = yes ; then -test "x$cf_library_path" != "xNONE" && \ -test -d "$cf_library_path" && \ - { - test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" - test -d $cf_library_path/lib && cf_search="$cf_search $cf_library_path/lib" - test -d $cf_library_path/lib/$cf_ipv6dir && cf_search="$cf_search $cf_library_path/lib/$cf_ipv6dir" - test -d $cf_library_path/lib/$cf_ipv6dir/lib && cf_search="$cf_search $cf_library_path/lib/$cf_ipv6dir/lib" - test -d $cf_library_path/$cf_ipv6dir/lib && cf_search="$cf_search $cf_library_path/$cf_ipv6dir/lib" - test -d $cf_library_path/$cf_ipv6dir/lib/$cf_ipv6dir && cf_search="$cf_search $cf_library_path/$cf_ipv6dir/lib/$cf_ipv6dir" -} + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_library_path_list="$cf_library_path_list $cf_search" + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + fi ;; esac - done -fi + 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/=.*//'` -cf_search= +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` -test "x$prefix" != "xNONE" && \ -test -d "$prefix" && \ - { - test -n "$verbose" && echo " ... testing for lib-directories under $prefix" - test -d $prefix/lib && cf_search="$cf_search $prefix/lib" - test -d $prefix/lib/$cf_ipv6dir && cf_search="$cf_search $prefix/lib/$cf_ipv6dir" - test -d $prefix/lib/$cf_ipv6dir/lib && cf_search="$cf_search $prefix/lib/$cf_ipv6dir/lib" - test -d $prefix/$cf_ipv6dir/lib && cf_search="$cf_search $prefix/$cf_ipv6dir/lib" - test -d $prefix/$cf_ipv6dir/lib/$cf_ipv6dir && cf_search="$cf_search $prefix/$cf_ipv6dir/lib/$cf_ipv6dir" -} + ;; + esac -for cf_subdir_prefix in \ - /usr \ - /usr/local \ - /usr/pkg \ - /opt \ - /opt/local \ - $HOME -do + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" -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" -} + ;; + esac + ;; + *) -done + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" -cf_search="$cf_library_path_list $cf_search" + ;; + esac + ;; +yes) - for cf_libdir in $cf_search - do - echo "$as_me:17555: checking for -l$cf_ipv6lib in $cf_libdir" >&5 -echo $ECHO_N "checking for -l$cf_ipv6lib in $cf_libdir... $ECHO_C" >&6 - LIBS="-L$cf_libdir -l$cf_ipv6lib $cf_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -#line 17559 "configure" -#include "confdefs.h" + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" -#include -#include -#include -#include -int -main (void) -{ -getaddrinfo(0, 0, 0, 0) - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17575: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:17578: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17581: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:17584: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:17586: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes' - break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -echo "$as_me:17593: result: no" >&5 -echo "${ECHO_T}no" >&6 - LIBS="$cf_save_LIBS" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - done + 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 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +if test -n "$cf_new_cppflags" ; then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" fi -eval 'cf_found_library=$cf_cv_have_lib_'$cf_ipv6lib +if test -n "$cf_new_extra_cppflags" ; then + + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" - if test $cf_found_library = no ; then - { { echo "$as_me:17608: error: No $cf_ipv6lib library found, cannot continue. You must fetch lib$cf_ipv6lib.a -from an appropriate IPv6 kit and compile beforehand." >&5 -echo "$as_me: error: No $cf_ipv6lib library found, cannot continue. You must fetch lib$cf_ipv6lib.a -from an appropriate IPv6 kit and compile beforehand." >&2;} - { (exit 1); exit 1; }; } - fi fi -echo "$as_me:17616: checking working getaddrinfo" >&5 -echo $ECHO_N "checking working getaddrinfo... $ECHO_C" >&6 -if test "${cf_cv_getaddrinfo+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" -if test "$cross_compiling" = yes; then - cf_cv_getaddrinfo=unknown + : else - cat >conftest.$ac_ext <<_ACEOF -#line 17626 "configure" -#include "confdefs.h" + cf_pkgconfig_incs= + cf_pkgconfig_libs= -#include -#include -#include -#include -#include +if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists libcanlock; then + test -n "$verbose" && echo " found package libcanlock" 1>&6 -#define expect(a,b) if (strcmp(a,b) != 0) goto bad +echo "${as_me:-configure}:18838: testing found package libcanlock ..." 1>&5 -int main(void) -{ - int passive, gaierr, inet4 = 0, inet6 = 0; - struct addrinfo hints, *ai, *aitop; - char straddr[INET6_ADDRSTRLEN], strport[16]; + cf_pkgconfig_incs="`$PKG_CONFIG --cflags libcanlock 2>/dev/null`" + cf_pkgconfig_libs="`$PKG_CONFIG --libs libcanlock 2>/dev/null`" + test -n "$verbose" && echo " package libcanlock CFLAGS: $cf_pkgconfig_incs" 1>&6 - for (passive = 0; passive <= 1; passive++) { - memset(&hints, 0, sizeof(hints)); - hints.ai_family = AF_UNSPEC; - hints.ai_flags = passive ? AI_PASSIVE : 0; - hints.ai_socktype = SOCK_STREAM; - if ((gaierr = getaddrinfo(NULL, "54321", &hints, &aitop)) != 0) { - (void)gai_strerror(gaierr); - goto bad; - } - for (ai = aitop; ai; ai = ai->ai_next) { - if (ai->ai_addr == NULL || - ai->ai_addrlen == 0 || - getnameinfo(ai->ai_addr, ai->ai_addrlen, - straddr, sizeof(straddr), strport, sizeof(strport), - NI_NUMERICHOST|NI_NUMERICSERV) != 0) { - goto bad; - } - switch (ai->ai_family) { - case AF_INET: - expect(strport, "54321"); - if (passive) { - expect(straddr, "0.0.0.0"); - } else { - expect(straddr, "127.0.0.1"); - } - inet4++; - break; - case AF_INET6: - expect(strport, "54321"); - if (passive) { - expect(straddr, "::"); - } else { - expect(straddr, "::1"); - } - inet6++; - break; - case AF_UNSPEC: - goto bad; - break; - default: - /* another family support? */ - break; - } - } - } +echo "${as_me:-configure}:18844: testing package libcanlock CFLAGS: $cf_pkgconfig_incs ..." 1>&5 - if (!(inet4 == 0 || inet4 == 2)) - goto bad; - if (!(inet6 == 0 || inet6 == 2)) - goto bad; + test -n "$verbose" && echo " package libcanlock LIBS: $cf_pkgconfig_libs" 1>&6 - if (aitop) - freeaddrinfo(aitop); - ${cf_cv_main_return:-return}(0); +echo "${as_me:-configure}:18848: testing package libcanlock LIBS: $cf_pkgconfig_libs ..." 1>&5 - bad: - if (aitop) - freeaddrinfo(aitop); - ${cf_cv_main_return:-return}(1); -} +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:17706: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:17709: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17711: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:17714: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_getaddrinfo=yes -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cf_cv_getaddrinfo=no -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi +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[^=]*='\''\"[^"]*//'` -fi -echo "$as_me:17727: result: $cf_cv_getaddrinfo" >&5 -echo "${ECHO_T}$cf_cv_getaddrinfo" >&6 -if test "$cf_cv_getaddrinfo" = yes ; then + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes -cat >>confdefs.h <<\EOF -#define HAVE_GAI_STRERROR 1 -EOF + if test $cf_fix_cppflags = yes ; then -cat >>confdefs.h <<\EOF -#define HAVE_GETADDRINFO 1 -EOF + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + 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 + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + + ;; + esac + ;; + *) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + + ;; + esac + ;; +yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + 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 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" fi -if test "$cf_cv_getaddrinfo" != "yes"; then - if test "$cf_cv_ipv6type" != "linux"; then - { echo "$as_me:17743: WARNING: You must get working getaddrinfo() function, -or you can specify \"--disable-ipv6\"" >&5 -echo "$as_me: WARNING: You must get working getaddrinfo() function, -or you can specify \"--disable-ipv6\"" >&2;} - else - { echo "$as_me:17748: WARNING: The getaddrinfo() implementation on your system seems be buggy. -You should upgrade your system library to the newest version -of GNU C library (aka glibc)." >&5 -echo "$as_me: WARNING: The getaddrinfo() implementation on your system seems be buggy. -You should upgrade your system library to the newest version -of GNU C library (aka glibc)." >&2;} - fi +if test -n "$cf_new_cppflags" ; then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + fi +if test -n "$cf_new_extra_cppflags" ; then + + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + fi -for ac_func in getaddrinfo getnameinfo -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:17762: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" + + : +else + cf_pkgconfig_incs= + cf_pkgconfig_libs= + + cf_pkgconfig_incs= + cf_pkgconfig_libs= + for cf_canlock_lib in canlock3 canlock + do + as_ac_Lib=`echo "ac_cv_lib_$cf_canlock_lib''_cl_clear_secret" | $as_tr_sh` +echo "$as_me:18974: checking for cl_clear_secret in -l$cf_canlock_lib" >&5 +echo $ECHO_N "checking for cl_clear_secret in -l$cf_canlock_lib... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 17768 "configure" + ac_check_lib_save_LIBS=$LIBS +LIBS="-l$cf_canlock_lib $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 18982 "configure" #include "confdefs.h" -#define $ac_func autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef $ac_func +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif - /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char $ac_func (void); - +char cl_clear_secret (); int main (void) { - -/* The GNU C library defines stubs for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -#error found stub for $ac_func -#endif - - return $ac_func (); +cl_clear_secret (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17799: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19001: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17802: \$? = $ac_status" >&5 + echo "$as_me:19004: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17805: \"$ac_try\"") >&5 + { (eval echo "$as_me:19007: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17808: \$? = $ac_status" >&5 + echo "$as_me:19010: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$as_ac_var=yes" + eval "$as_ac_Lib=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -eval "$as_ac_var=no" +eval "$as_ac_Lib=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:17818: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then +echo "$as_me:19021: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 +if test `eval echo '${'$as_ac_Lib'}'` = yes; then + + cf_pkgconfig_libs="-l$cf_canlock_lib" + break + +fi + + done + if test -z "$cf_pkgconfig_libs" ; then + cf_find_CANLOCK=no + else + +for ac_header in libcanlock-3/canlock.h canlock.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:19038: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 19044 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:19048: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:19054: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + eval "$as_ac_Header=no" +fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:19073: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 -echo $ECHO_N "checking whether to enable long article numbers... $ECHO_C" >&6 + fi -# Check whether --enable-long-article-numbers or --disable-long-article-numbers was given. -if test "${enable_long_article_numbers+set}" = set; then - enableval="$enable_long_article_numbers" - test "$enableval" != yes && enableval=no - if test "$enableval" != "no" ; then - cat >>confdefs.h <<\EOF -#define ENABLE_LONG_ARTICLE_NUMBERS 1 -EOF +fi - fi -else - enableval=no -fi; -echo "$as_me:17847: result: $enableval" >&5 -echo "${ECHO_T}$enableval" >&6 +fi -### checks for operator characteristics (should be the last option) -echo "$as_me:17851: checking whether to make a coffee while compiling" >&5 -echo $ECHO_N "checking whether to make a coffee while compiling... $ECHO_C" >&6 +CFLAGS="$cf_save_CFLAGS" +LIBS="$cf_save_LIBS" -# Check whether --with-coffee or --without-coffee was given. -if test "${with_coffee+set}" = set; then - withval="$with_coffee" - case "$withval" in - yes) - echo "$as_me:17859: result: yes - with milk - please!" >&5 -echo "${ECHO_T}yes - with milk - please!" >&6 - cat >>confdefs.h <<\EOF -#define HAVE_COFFEE 1 -EOF +cf_canlock_cppflags="$cf_pkgconfig_incs" +cf_canlock_libs="$cf_pkgconfig_libs" - ;; - *) - echo "$as_me:17867: result: no" >&5 -echo "${ECHO_T}no" >&6 - ;; - esac -else - echo "$as_me:17872: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi; +if test "$cf_find_CANLOCK" = yes; then -### checks for compiler characteristics + CANDIR_MAKE='#' + CANLIBS="$cf_canlock_libs" + CAN_CPPFLAGS="$cf_canlock_cppflags" + test -n "$verbose" && echo " using installed canlock" 1>&6 + +echo "${as_me:-configure}:19102: testing using installed canlock ..." 1>&5 -echo "$as_me:17878: checking for makeflags variable" >&5 -echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6 -if test "${cf_cv_makeflags+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 else - cf_cv_makeflags='' - for cf_option in '-${MAKEFLAGS}' '${MFLAGS}' - do - cat >cf_makeflags.tmp </dev/null | fgrep -v "ing directory" | sed -e 's,[ ]*$,,'` - case "$cf_result" in - .*k|.*kw) - cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null` - case "$cf_result" in - .*CC=*) cf_cv_makeflags= - ;; - *) cf_cv_makeflags=$cf_option - ;; - esac - break - ;; - .-) - ;; - *) + test -n "$verbose" && echo " using bundled canlock because no installed canlock was found" 1>&6 -echo "${as_me:-configure}:17908: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 +echo "${as_me:-configure}:19108: testing using bundled canlock because no installed canlock was found ..." 1>&5 - ;; - esac - done - rm -f cf_makeflags.tmp + CANLIBS='-L../libcanlock -lcanlock' + CAN_CPPFLAGS='-I$(top_builddir)/libcanlock/include -I$(top_srcdir)/libcanlock/include' + CAN_MAKEFILE='libcanlock/Makefile' fi -echo "$as_me:17916: result: $cf_cv_makeflags" >&5 -echo "${ECHO_T}$cf_cv_makeflags" >&6 - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_main_return=return - -echo "$as_me:17926: checking for an ANSI C-conforming const" >&5 -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 -if test "${ac_cv_c_const+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 17932 "configure" -#include "confdefs.h" - -int -main (void) -{ -/* FIXME: Include the comments suggested by Paul. */ -#ifndef __cplusplus - /* Ultrix mips cc rejects this. */ - typedef int charset[2]; - const charset x; - /* SunOS 4.1.1 cc rejects this. */ - char const *const *ccp; - char **p; - /* NEC SVR4.0.2 mips cc rejects this. */ - struct point {int x, y;}; - static struct point const zero = {0,0}; - /* AIX XL C 1.02.0.0 rejects this. - It does not let you subtract one const X* pointer from another in - an arm of an if-expression whose if-part is not a constant - expression */ - const char *g = "string"; - ccp = &g + (g ? g-g : 0); - /* HPUX 7.0 cc rejects these. */ - ++ccp; - p = (char**) ccp; - ccp = (char const *const *) p; - { /* SCO 3.2v4 cc rejects this. */ - char *t; - char const *s = 0 ? (char *) 0 : (char const *) 0; - *t++ = 0; - } - { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ - int x[] = {25, 17}; - const int *foo = &x[0]; - ++foo; - } - { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ - typedef const int *iptr; - iptr p = 0; - ++p; - } - { /* AIX XL C 1.02.0.0 rejects this saying - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; - } - { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; - } -#endif + ;; +.*) - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:17990: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:17993: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17996: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:17999: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_const=yes +if test "x$prefix" != xNONE; then + cf_path_syntax="$prefix" else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_c_const=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext + cf_path_syntax="$ac_default_prefix" fi -echo "$as_me:18009: result: $ac_cv_c_const" >&5 -echo "${ECHO_T}$ac_cv_c_const" >&6 -if test $ac_cv_c_const = no; then + +case ".$cf_canlock_home" in +.\$\(*\)*|.\'*\'*) + ;; +..|./*|.\\*) + ;; +.[a-zA-Z]:[\\/]*) # OS/2 EMX + ;; +.\${*prefix}*|.\${*dir}*) + eval cf_canlock_home="$cf_canlock_home" + case ".$cf_canlock_home" in + .NONE/*) + cf_canlock_home=`echo $cf_canlock_home | sed -e s%NONE%$cf_path_syntax%` + ;; + esac + ;; +.no|.NONE/*) + cf_canlock_home=`echo $cf_canlock_home | sed -e s%NONE%$cf_path_syntax%` + ;; +*) + { { echo "$as_me:19144: error: expected a pathname, not \"$cf_canlock_home\"" >&5 +echo "$as_me: error: expected a pathname, not \"$cf_canlock_home\"" >&2;} + { (exit 1); exit 1; }; } + ;; +esac + + CANDIR_MAKE='#' + CANLIBS="-L${cf_canlock_home}/lib -lcanlock" + CAN_CPPFLAGS="-I${cf_canlock_home}/include" + test -n "$verbose" && echo " using installed canlock $cf_canlock_home" 1>&6 + +echo "${as_me:-configure}:19155: testing using installed canlock $cf_canlock_home ..." 1>&5 + + ;; +esac cat >>confdefs.h <<\EOF -#define const +#define USE_CANLOCK 1 EOF +else + CANDIR_MAKE='#' fi -echo "$as_me:18019: checking for inline" >&5 -echo $ECHO_N "checking for inline... $ECHO_C" >&6 -if test "${ac_cv_c_inline+set}" = set; then +## gsasl - used for AUTH SASL PLAIN +gsasl=no +echo "$as_me:19170: checking for gsasl.h" >&5 +echo $ECHO_N "checking for gsasl.h... $ECHO_C" >&6 +if test "${ac_cv_header_gsasl_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_c_inline=no -for ac_kw in inline __inline__ __inline; do cat >conftest.$ac_ext <<_ACEOF -#line 18027 "configure" +#line 19176 "configure" #include "confdefs.h" -#ifndef __cplusplus -static $ac_kw int static_foo () {return 0; } -$ac_kw int foo () {return 0; } -#endif - +#include _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:18036: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:18039: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18042: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (eval echo "$as_me:19180: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - echo "$as_me:18045: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_inline=$ac_kw; break + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:19186: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_gsasl_h=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 + cat conftest.$ac_ext >&5 + ac_cv_header_gsasl_h=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -done - +rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:18056: result: $ac_cv_c_inline" >&5 -echo "${ECHO_T}$ac_cv_c_inline" >&6 -case $ac_cv_c_inline in - inline | yes) ;; - no) -cat >>confdefs.h <<\EOF -#define inline -EOF - ;; - *) cat >>confdefs.h <&5 -echo $ECHO_N "checking for ansi token expansion/substitution... $ECHO_C" >&6 -if test "${cf_cv_cpp_expands+set}" = set; then +echo "$as_me:19205: result: $ac_cv_header_gsasl_h" >&5 +echo "${ECHO_T}$ac_cv_header_gsasl_h" >&6 +if test $ac_cv_header_gsasl_h = yes; then + echo "$as_me:19208: checking for gsasl_check_version in -lgsasl" >&5 +echo $ECHO_N "checking for gsasl_check_version in -lgsasl... $ECHO_C" >&6 +if test "${ac_cv_lib_gsasl_gsasl_check_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat >conftest.$ac_ext <<_ACEOF -#line 18078 "configure" + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgsasl $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 19216 "configure" #include "confdefs.h" -#define string(n) #n +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char gsasl_check_version (); int main (void) { -char *s = string(token) +gsasl_check_version (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:18091: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:19235: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18094: \$? = $ac_status" >&5 + echo "$as_me:19238: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18097: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:19241: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18100: \$? = $ac_status" >&5 + echo "$as_me:19244: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_cpp_expands=yes + ac_cv_lib_gsasl_gsasl_check_version=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_cpp_expands=no +ac_cv_lib_gsasl_gsasl_check_version=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:19255: result: $ac_cv_lib_gsasl_gsasl_check_version" >&5 +echo "${ECHO_T}$ac_cv_lib_gsasl_gsasl_check_version" >&6 +if test $ac_cv_lib_gsasl_gsasl_check_version = yes; then + gsasl=yes fi -rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:18112: result: $cf_cv_cpp_expands" >&5 -echo "${ECHO_T}$cf_cv_cpp_expands" >&6 -test $cf_cv_cpp_expands = yes && cat >>confdefs.h <<\EOF -#define CPP_DOES_EXPAND 1 +if test "$gsasl" = "yes"; then + +# Check whether --enable-gsasl or --disable-gsasl was given. +if test "${enable_gsasl+set}" = set; then + enableval="$enable_gsasl" + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + USE_SASL=no + else + USE_SASL=yes + +cat >>confdefs.h <<\EOF +#define USE_SASL 1 EOF -echo "$as_me:18118: checking for ansi token concatenation" >&5 -echo $ECHO_N "checking for ansi token concatenation... $ECHO_C" >&6 -if test "${cf_cv_cpp_concats+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + LIBS="$LIBS -lgsasl" + fi +else + enableval=yes + USE_SASL=yes + +cat >>confdefs.h <<\EOF +#define USE_SASL 1 +EOF + + LIBS="$LIBS -lgsasl" + +fi; +fi + +echo "$as_me:19293: checking whether to enable 8-bit keycodes" >&5 +echo $ECHO_N "checking whether to enable 8-bit keycodes... $ECHO_C" >&6 + +# 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 + : + else + +cat >>confdefs.h <<\EOF +#define HAVE_KEY_PREFIX 1 +EOF + + fi else + enableval=yes - cat >conftest.$ac_ext <<_ACEOF -#line 18125 "configure" -#include "confdefs.h" +cat >>confdefs.h <<\EOF +#define HAVE_KEY_PREFIX 1 +EOF -#define concat(a,b) a ## b -int -main (void) -{ -char *firstlast = "y", *s = concat(first,last) - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:18138: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:18141: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18144: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:18147: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_cpp_concats=yes +fi; +echo "$as_me:19317: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 + +echo "$as_me:19320: checking whether to enable ANSI-color" >&5 +echo $ECHO_N "checking whether to enable ANSI-color... $ECHO_C" >&6 + +# 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 + : + fi else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cf_cv_cpp_concats=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext + enableval=yes +fi; +use_color=$enableval +echo "$as_me:19334: result: $use_color" >&5 +echo "${ECHO_T}$use_color" >&6 + +echo "$as_me:19337: checking whether to enable posting-etiquette" >&5 +echo $ECHO_N "checking whether to enable posting-etiquette... $ECHO_C" >&6 + +# 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 + +cat >>confdefs.h <<\EOF +#define NO_ETIQUETTE 1 +EOF + + fi +else + enableval=yes +fi; +echo "$as_me:19354: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 + +echo "$as_me:19357: checking whether to strictly observe RFC2047 and break long lines" >&5 +echo $ECHO_N "checking whether to strictly observe RFC2047 and break long lines... $ECHO_C" >&6 + +# 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" != no && enableval=yes + if test "$enableval" != "yes" ; then + : + else + +cat >>confdefs.h <<\EOF +#define MIME_BREAK_LONG_LINES 1 +EOF + + fi +else + enableval=yes + +cat >>confdefs.h <<\EOF +#define MIME_BREAK_LONG_LINES 1 +EOF + +fi; +echo "$as_me:19381: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 + +echo "$as_me:19384: checking whether to force MM_CHARSET obeyance when decoding mime" >&5 +echo $ECHO_N "checking whether to force MM_CHARSET obeyance when decoding mime... $ECHO_C" >&6 + +# 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 + : + else + +cat >>confdefs.h <<\EOF +#define MIME_STRICT_CHARSET 1 +EOF -fi + fi +else + enableval=yes -echo "$as_me:18159: result: $cf_cv_cpp_concats" >&5 -echo "${ECHO_T}$cf_cv_cpp_concats" >&6 -test $cf_cv_cpp_concats = yes && cat >>confdefs.h <<\EOF -#define CPP_DOES_CONCAT 1 +cat >>confdefs.h <<\EOF +#define MIME_STRICT_CHARSET 1 EOF -echo "$as_me:18165: checking if nested parameters work" >&5 -echo $ECHO_N "checking if nested parameters work... $ECHO_C" >&6 -if test "${cf_cv_nested_params+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else +fi; +echo "$as_me:19408: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line 18172 "configure" -#include "confdefs.h" +echo "$as_me:19411: checking for MIME character-set" >&5 +echo $ECHO_N "checking for MIME character-set... $ECHO_C" >&6 -int -main (void) -{ -extern void (*sigdisp(int sig, void (*func)(int sig)))(int sig) - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:18184: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:18187: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18190: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:18193: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_nested_params=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cf_cv_nested_params=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext +# Check whether --with-mime-default-charset or --without-mime-default-charset was given. +if test "${with_mime_default_charset+set}" = set; then + withval="$with_mime_default_charset" -fi +else + withval="${MM_CHARSET-US-ASCII}" +fi; +case "$withval" in #(vi +yes|no) + { { echo "$as_me:19423: error: expected a value for --with-mime-default-charset" >&5 +echo "$as_me: error: expected a value for --with-mime-default-charset" >&2;} + { (exit 1); exit 1; }; } + ;; +esac +MM_CHARSET="$withval" -echo "$as_me:18205: result: $cf_cv_nested_params" >&5 -echo "${ECHO_T}$cf_cv_nested_params" >&6 -test $cf_cv_nested_params = yes && cat >>confdefs.h <<\EOF -#define HAVE_NESTED_PARAMS 1 +cat >>confdefs.h <&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 18218 "configure" -#include "confdefs.h" -#include -#include -#include -#include +echo "$as_me:19434: result: $MM_CHARSET" >&5 +echo "${ECHO_T}$MM_CHARSET" >&6 -_ACEOF -if { (eval echo "$as_me:18226: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:18232: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_cv_header_stdc=yes -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_header_stdc=no -fi -rm -f conftest.err conftest.$ac_ext +echo "$as_me:19437: checking for default ISO/ASCII table" >&5 +echo $ECHO_N "checking for default ISO/ASCII table... $ECHO_C" >&6 -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -#line 18254 "configure" -#include "confdefs.h" -#include +# Check whether --with-iso-to-ascii or --without-iso-to-ascii was given. +if test "${with_iso_to_ascii+set}" = set; then + withval="$with_iso_to_ascii" -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then - : else - ac_cv_header_stdc=no -fi -rm -rf conftest* + withval="${DEFAULT_ISO2ASC--1}" +fi; +case "$withval" in #(vi +yes|no) + { { echo "$as_me:19449: error: expected a value for --with-iso-to-ascii" >&5 +echo "$as_me: error: expected a value for --with-iso-to-ascii" >&2;} + { (exit 1); exit 1; }; } + ;; +esac +DEFAULT_ISO2ASC="$withval" -fi +cat >>confdefs.h <conftest.$ac_ext <<_ACEOF -#line 18272 "configure" -#include "confdefs.h" -#include +echo "$as_me:19460: result: $DEFAULT_ISO2ASC" >&5 +echo "${ECHO_T}$DEFAULT_ISO2ASC" >&6 -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -rf conftest* +echo "$as_me:19463: checking whether to enable locale support" >&5 +echo $ECHO_N "checking whether to enable locale support... $ECHO_C" >&6 -fi +# 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 $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : -else - cat >conftest.$ac_ext <<_ACEOF -#line 18293 "configure" -#include "confdefs.h" -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif +cat >>confdefs.h <<\EOF +#define NO_LOCALE 1 +EOF -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main (void) -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - $ac_main_return(2); - $ac_main_return (0); -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:18319: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:18322: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:18324: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:18327: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : + fi else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_header_stdc=no -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -fi -fi -echo "$as_me:18340: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 -if test $ac_cv_header_stdc = yes; then + enableval=yes +fi; +echo "$as_me:19480: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 + +echo "$as_me:19483: checking whether to enable posting" >&5 +echo $ECHO_N "checking whether to enable posting... $ECHO_C" >&6 + +# 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 cat >>confdefs.h <<\EOF -#define STDC_HEADERS 1 +#define NO_POSTING 1 EOF -fi - -ac_header_dirent=no -for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do - as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -echo "$as_me:18353: checking for $ac_hdr that defines DIR" >&5 -echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + fi else - cat >conftest.$ac_ext <<_ACEOF -#line 18359 "configure" -#include "confdefs.h" -#include -#include <$ac_hdr> + enableval=yes +fi; +echo "$as_me:19500: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 -int -main (void) -{ -if ((DIR *) 0) -return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:18374: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:18377: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18380: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:18383: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$as_ac_Header=no" -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:18393: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <&5 +echo $ECHO_N "checking whether to enable shell escape... $ECHO_C" >&6 -ac_header_dirent=$ac_hdr; break -fi +# 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 -done -# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. -if test $ac_header_dirent = dirent.h; then - echo "$as_me:18406: checking for opendir in -ldir" >&5 -echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 -if test "${ac_cv_lib_dir_opendir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldir $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 18414 "configure" -#include "confdefs.h" +cat >>confdefs.h <<\EOF +#define NO_SHELL_ESCAPE 1 +EOF -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char opendir (); -int -main (void) -{ -opendir (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18433: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:18436: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18439: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:18442: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dir_opendir=yes + fi else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_dir_opendir=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:18453: result: $ac_cv_lib_dir_opendir" >&5 -echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 -if test $ac_cv_lib_dir_opendir = yes; then - LIBS="$LIBS -ldir" -fi + enableval=yes +fi; +echo "$as_me:19520: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 -else - echo "$as_me:18460: checking for opendir in -lx" >&5 -echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 -if test "${ac_cv_lib_x_opendir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lx $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 18468 "configure" -#include "confdefs.h" +echo "$as_me:19523: checking whether to have fascist newsadmin" >&5 +echo $ECHO_N "checking whether to have fascist newsadmin... $ECHO_C" >&6 -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char opendir (); -int -main (void) -{ -opendir (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18487: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:18490: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18493: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:18496: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_x_opendir=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_x_opendir=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:18507: result: $ac_cv_lib_x_opendir" >&5 -echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 -if test $ac_cv_lib_x_opendir = yes; then - LIBS="$LIBS -lx" -fi +# 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 -fi +cat >>confdefs.h <<\EOF +#define HAVE_FASCIST_NEWSADMIN 1 +EOF -echo "$as_me:18515: checking whether time.h and sys/time.h may both be included" >&5 -echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 -if test "${ac_cv_header_time+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + fi else - cat >conftest.$ac_ext <<_ACEOF -#line 18521 "configure" -#include "confdefs.h" -#include -#include -#include + enableval=no +fi; +echo "$as_me:19540: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 -int -main (void) -{ -if ((struct tm *) 0) -return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:18537: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:18540: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18543: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:18546: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_header_time=yes +echo "$as_me:19543: checking whether to enable inverse video and highlighting" >&5 +echo $ECHO_N "checking whether to enable inverse video and highlighting... $ECHO_C" >&6 + +# 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 + +cat >>confdefs.h <<\EOF +#define USE_INVERSE_HACK 1 +EOF + + fi else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_header_time=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:18556: result: $ac_cv_header_time" >&5 -echo "${ECHO_T}$ac_cv_header_time" >&6 -if test $ac_cv_header_time = yes; then + enableval=yes +fi; +echo "$as_me:19560: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 + +echo "$as_me:19563: checking whether to enable piping support" >&5 +echo $ECHO_N "checking whether to enable piping support... $ECHO_C" >&6 + +# 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 cat >>confdefs.h <<\EOF -#define TIME_WITH_SYS_TIME 1 +#define DONT_HAVE_PIPING 1 EOF -fi + fi +else + enableval=yes +fi; +echo "$as_me:19580: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 -echo "$as_me:18566: checking for sys/wait.h that is POSIX.1 compatible" >&5 -echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6 -if test "${ac_cv_header_sys_wait_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo "$as_me:19583: checking whether to enable printer support" >&5 +echo $ECHO_N "checking whether to enable printer support... $ECHO_C" >&6 + +# 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 + +cat >>confdefs.h <<\EOF +#define DISABLE_PRINTING 1 +EOF + + fi else - cat >conftest.$ac_ext <<_ACEOF -#line 18572 "configure" -#include "confdefs.h" -#include -#include -#ifndef WEXITSTATUS -# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) -#endif -#ifndef WIFEXITED -# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) -#endif + enableval=yes +fi; +echo "$as_me:19600: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 -int -main (void) -{ - int s; - wait (&s); - s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:18594: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:18597: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18600: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:18603: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_header_sys_wait_h=yes +echo "$as_me:19603: checking whether to unique tmp-files by appending .pid" >&5 +echo $ECHO_N "checking whether to unique tmp-files by appending .pid... $ECHO_C" >&6 + +# 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 + : + else + +cat >>confdefs.h <<\EOF +#define APPEND_PID 1 +EOF + + fi else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_header_sys_wait_h=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:18613: result: $ac_cv_header_sys_wait_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6 -if test $ac_cv_header_sys_wait_h = yes; then + enableval=yes cat >>confdefs.h <<\EOF -#define HAVE_SYS_WAIT_H 1 +#define APPEND_PID 1 EOF -fi +fi; +echo "$as_me:19627: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 -for cf_hdr in \ - argz.h \ - arpa/inet.h \ - curses.h \ - errno.h \ - fcntl.h \ - getopt.h \ - ioctl.h \ - inttypes.h \ - langinfo.h \ - libc.h \ - locale.h \ - malloc.h \ - netdb.h \ - netinet/in.h \ - netlib.h \ - nl_types.h \ - nomacros.h \ - paths.h \ - poll.h \ - prototypes.h \ - pwd.h \ - sgtty.h \ - socket.h \ - stdarg.h \ - stdbool.h \ - stddef.h \ - stdint.h \ - stdlib.h \ - string.h \ - strings.h \ - stropts.h \ - sys/bsdtypes.h \ - sys/errno.h \ - sys/file.h \ - sys/ioctl.h \ - sys/param.h \ - sys/poll.h \ - sys/ptem.h \ - sys/pty.h \ - sys/select.h \ - sys/stat.h \ - sys/stream.h \ - sys/socket.h \ - sys/time.h \ - sys/timeb.h \ - sys/times.h \ - sys/types.h \ - sys/utsname.h \ - term.h \ - termio.h \ - time.h \ - unistd.h \ - varargs.h \ - wchar.h \ - wctype.h \ +echo "$as_me:19630: checking whether to fallback to XHDR XREF if XOVER isn't supported" >&5 +echo $ECHO_N "checking whether to fallback to XHDR XREF if XOVER isn't supported... $ECHO_C" >&6 -do - echo "$as_me:18681: checking for $cf_hdr" >&5 -echo $ECHO_N "checking for $cf_hdr... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line 18684 "configure" -#include "confdefs.h" +# 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 + : + else -#include -#include <$cf_hdr> +cat >>confdefs.h <<\EOF +#define XHDR_XREF 1 +EOF -_ACEOF -if { (eval echo "$as_me:18691: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:18697: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - cf_found=yes + fi else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - cf_found=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:18715: result: $cf_found" >&5 -echo "${ECHO_T}$cf_found" >&6 -if test $cf_found = yes ; then - -cf_tr_hdr=`echo "$cf_hdr" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + enableval=yes - cat >>confdefs.h <>confdefs.h <<\EOF +#define XHDR_XREF 1 EOF -fi -done +fi; +echo "$as_me:19654: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 -### Checks that depend on existence-checks for headers +### bypass a bug in old versions of leafnode & NNTPcache +echo "$as_me:19658: checking whether to send a GROUP command before a LISTGROUP" >&5 +echo $ECHO_N "checking whether to send a GROUP command before a LISTGROUP... $ECHO_C" >&6 -for ac_header in \ -termio.h \ -termios.h \ -unistd.h \ -sys/ioctl.h \ -sys/termio.h \ +# 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 -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:18739: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +cat >>confdefs.h <<\EOF +#define BROKEN_LISTGROUP 1 +EOF + + fi else - cat >conftest.$ac_ext <<_ACEOF -#line 18745 "configure" -#include "confdefs.h" -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:18749: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:18755: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi + enableval=no +fi; +echo "$as_me:19675: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 + +### on some old systems the WIFEXITED()/WEXITSTATUS() macros do not work +echo "$as_me:19679: checking whether to ignore system()s return value" >&5 +echo $ECHO_N "checking whether to ignore system()s return value... $ECHO_C" >&6 + +# 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 + +cat >>confdefs.h <<\EOF +#define IGNORE_SYSTEM_STATUS 1 +EOF + + fi else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + enableval=no +fi; +echo "$as_me:19696: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 + +### checks for the location of the system-wide default setting file +echo "$as_me:19700: checking for directory containing tin.defaults file" >&5 +echo $ECHO_N "checking for directory containing tin.defaults file... $ECHO_C" >&6 + +# Check whether --with-defaults-dir or --without-defaults-dir was given. +if test "${with_defaults_dir+set}" = set; then + withval="$with_defaults_dir" + else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" -fi -rm -f conftest.err conftest.$ac_ext -fi -echo "$as_me:18774: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <&5 -echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line 18794 "configure" -#include "confdefs.h" -#include -int -main (void) -{ -struct termios foo; int x = foo.c_iflag - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:18806: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:18809: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18812: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:18815: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - termios_bad=no -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 + ;; +.no|.NONE/*) + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; +*) + { { echo "$as_me:19736: error: expected a pathname, not \"$withval\"" >&5 +echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +esac - cat >conftest.$ac_ext <<_ACEOF -#line 18823 "configure" -#include "confdefs.h" +fi +eval TIN_DEFAULTS_DIR="$withval" -#define _POSIX_SOURCE -#include -int -main (void) -{ -struct termios foo; int x = foo.c_iflag - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:18837: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:18840: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18843: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:18846: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - termios_bad=unknown -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -termios_bad=yes -cat >>confdefs.h <<\EOF -#define _POSIX_SOURCE 1 +echo "$as_me:19745: result: $TIN_DEFAULTS_DIR" >&5 +echo "${ECHO_T}$TIN_DEFAULTS_DIR" >&6 + +cat >>confdefs.h <&5 +echo $ECHO_N "checking whether to enable IPv6... $ECHO_C" >&6 + +# Check whether --enable-ipv6 or --disable-ipv6 was given. +if test "${enable_ipv6+set}" = set; then + enableval="$enable_ipv6" + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + : + else + +cat >>confdefs.h <<\EOF +#define ENABLE_IPV6 1 +EOF -fi -rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:18862: result: $termios_bad" >&5 -echo "${ECHO_T}$termios_bad" >&6 fi -fi +else + enableval=yes -echo "$as_me:18867: checking declaration of size-change" >&5 -echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6 -if test "${cf_cv_sizechange+set}" = set; then +cat >>confdefs.h <<\EOF +#define ENABLE_IPV6 1 +EOF + +fi; +echo "$as_me:19777: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 +if test "$enableval" = "yes"; then + +echo "$as_me:19781: checking ipv6 stack type" >&5 +echo $ECHO_N "checking ipv6 stack type... $ECHO_C" >&6 +if test "${cf_cv_ipv6type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cf_cv_sizechange=unknown - cf_save_CPPFLAGS="$CPPFLAGS" - -for cf_opts in "" "NEED_PTEM_H" +cf_cv_ipv6type=unknown +for i in solaris inria kame linux-glibc linux-libinet6 toshiba v6d zeta do + case $i in + solaris) + if test "SunOS" = "`uname -s`" + then + if test -f /usr/include/netinet/ip6.h + then + cf_cv_ipv6type=$i + fi + fi + ;; + inria) + cat >conftest.$ac_ext <<_ACEOF +#line 19802 "configure" +#include "confdefs.h" - CPPFLAGS="$cf_save_CPPFLAGS" - if test -n "$cf_opts" - then - - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-D$cf_opts" +#include +#ifdef IPV6_INRIA_VERSION +yes +#endif +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "yes" >/dev/null 2>&1; then + cf_cv_ipv6type=$i +fi +rm -rf conftest* - fi - cat >conftest.$ac_ext <<_ACEOF -#line 18888 "configure" + ;; + kame) + cat >conftest.$ac_ext <<_ACEOF +#line 19819 "configure" #include "confdefs.h" -#include -#ifdef HAVE_TERMIOS_H -#include -#else -#ifdef HAVE_TERMIO_H -#include -#endif + +#include +#ifdef __KAME__ +yes #endif +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "yes" >/dev/null 2>&1; then + cf_cv_ipv6type=$i +fi +rm -rf conftest* -#ifdef NEED_PTEM_H -/* This is a workaround for SCO: they neglected to define struct winsize in - * termios.h -- it's only in termio.h and ptem.h - */ -#include -#include + ;; + linux-glibc) + cat >conftest.$ac_ext <<_ACEOF +#line 19836 "configure" +#include "confdefs.h" + +#include +#if defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1 +yes #endif +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "yes" >/dev/null 2>&1; then + cf_cv_ipv6type=$i +fi +rm -rf conftest* -#ifdef HAVE_SYS_IOCTL_H -#include + ;; + linux-libinet6) + if test -d /usr/inet6 + then + cf_cv_ipv6type=$i + elif test -f /usr/include/netinet/ip6.h + then + cf_cv_ipv6type=$i + fi + ;; + toshiba) + cat >conftest.$ac_ext <<_ACEOF +#line 19862 "configure" +#include "confdefs.h" + +#include +#ifdef _TOSHIBA_INET6 +yes #endif +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "yes" >/dev/null 2>&1; then + cf_cv_ipv6type=$i +fi +rm -rf conftest* -int -main (void) -{ + ;; + v6d) + cat >conftest.$ac_ext <<_ACEOF +#line 19879 "configure" +#include "confdefs.h" -#ifdef TIOCGSIZE - struct ttysize win; /* SunOS 3.0... */ - int y = win.ts_lines; - int x = win.ts_cols; -#else -#ifdef TIOCGWINSZ - struct winsize win; /* everything else */ - int y = win.ws_row; - int x = win.ws_col; -#else - no TIOCGSIZE or TIOCGWINSZ -#endif /* TIOCGWINSZ */ -#endif /* TIOCGSIZE */ +#include +#ifdef __V6D__ +yes +#endif +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "yes" >/dev/null 2>&1; then + cf_cv_ipv6type=$i +fi +rm -rf conftest* - ; - return 0; -} + ;; + zeta) + cat >conftest.$ac_ext <<_ACEOF +#line 19896 "configure" +#include "confdefs.h" + +#include +#ifdef _ZETA_MINAMI_INET6 +yes +#endif _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:18934: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:18937: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18940: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:18943: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_sizechange=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cf_cv_sizechange=no +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "yes" >/dev/null 2>&1; then + cf_cv_ipv6type=$i fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -rf conftest* - CPPFLAGS="$cf_save_CPPFLAGS" - if test "$cf_cv_sizechange" = yes ; then - echo "size-change succeeded ($cf_opts)" >&5 - test -n "$cf_opts" && cf_cv_sizechange="$cf_opts" + ;; + esac + if test "$cf_cv_ipv6type" != "unknown"; then break fi done fi -echo "$as_me:18962: result: $cf_cv_sizechange" >&5 -echo "${ECHO_T}$cf_cv_sizechange" >&6 -if test "$cf_cv_sizechange" != no ; then - -cat >>confdefs.h <<\EOF -#define HAVE_SIZECHANGE 1 -EOF +echo "$as_me:19918: result: $cf_cv_ipv6type" >&5 +echo "${ECHO_T}$cf_cv_ipv6type" >&6 - case $cf_cv_sizechange in - NEED*) - cat >>confdefs.h <&5 +echo $ECHO_N "checking for IPv6 library if required... $ECHO_C" >&6 +case $cf_cv_ipv6type in +solaris) + ;; +inria) + ;; +kame) + cf_ipv6lib=inet6 + cf_ipv6dir=v6 + ;; +linux-glibc) + ;; +linux-libinet6) + cf_ipv6lib=inet6 + cf_ipv6dir=inet6 + ;; +toshiba) + cf_ipv6lib=inet6 + cf_ipv6dir=v6 + ;; +v6d) + cf_ipv6lib=v6 + cf_ipv6dir=v6 + ;; +zeta) + cf_ipv6lib=inet6 + cf_ipv6dir=v6 + ;; +esac +echo "$as_me:19954: result: $cf_ipv6lib" >&5 +echo "${ECHO_T}$cf_ipv6lib" >&6 -echo "$as_me:18980: checking if sys/time.h conflicts with sys/select.h" >&5 -echo $ECHO_N "checking if sys/time.h conflicts with sys/select.h... $ECHO_C" >&6 -if test "${cf_cv_sys_select_timeval+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else +if test "$cf_ipv6lib" != "none"; then -for cf_opts in no yes -do -cat >conftest.$ac_ext <<_ACEOF -#line 18989 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 19960 "configure" #include "confdefs.h" -#define yes 1 -#define no 0 -#if $cf_opts -#define timeval fake_timeval -#endif #include -#ifdef TIME_WITH_SYS_TIME -# include -# include -#else -# ifdef HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif -#undef timeval -#ifdef HAVE_SYS_SELECT_H -# include -#endif - +#include +#include +#include int main (void) { -struct timeval foo +getaddrinfo(0, 0, 0, 0) ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:19022: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:19976: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19025: \$? = $ac_status" >&5 + echo "$as_me:19979: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19028: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:19982: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19031: \$? = $ac_status" >&5 + echo "$as_me:19985: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_sys_select_timeval=$cf_opts - break + : else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_sys_select_timeval=no + +cf_search= + +# collect the current set of include-directories from compiler flags +cf_header_path_list="" +if test -n "${CFLAGS}${CPPFLAGS}" ; then + for cf_header_path in $CPPFLAGS $CFLAGS + do + 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" && \ +test -d "$cf_header_path" && \ + { + test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" + test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" + test -d $cf_header_path/include/$cf_ipv6dir && cf_search="$cf_search $cf_header_path/include/$cf_ipv6dir" + test -d $cf_header_path/include/$cf_ipv6dir/include && cf_search="$cf_search $cf_header_path/include/$cf_ipv6dir/include" + test -d $cf_header_path/$cf_ipv6dir/include && cf_search="$cf_search $cf_header_path/$cf_ipv6dir/include" + test -d $cf_header_path/$cf_ipv6dir/include/$cf_ipv6dir && cf_search="$cf_search $cf_header_path/$cf_ipv6dir/include/$cf_ipv6dir" +} + + cf_header_path_list="$cf_header_path_list $cf_search" + ;; + esac + done fi -rm -f conftest.$ac_objext conftest.$ac_ext + +# add the variations for the package we are looking for + +cf_search= + +test "x$prefix" != "xNONE" && \ +test -d "$prefix" && \ + { + test -n "$verbose" && echo " ... testing for include-directories under $prefix" + test -d $prefix/include && cf_search="$cf_search $prefix/include" + test -d $prefix/include/$cf_ipv6dir && cf_search="$cf_search $prefix/include/$cf_ipv6dir" + test -d $prefix/include/$cf_ipv6dir/include && cf_search="$cf_search $prefix/include/$cf_ipv6dir/include" + test -d $prefix/$cf_ipv6dir/include && cf_search="$cf_search $prefix/$cf_ipv6dir/include" + test -d $prefix/$cf_ipv6dir/include/$cf_ipv6dir && cf_search="$cf_search $prefix/$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 -fi +test "$includedir" != NONE && \ +test "$includedir" != "/usr/include" && \ +test -d "$includedir" && { + test -d $includedir && cf_search="$cf_search $includedir" + test -d $includedir/$cf_ipv6dir && cf_search="$cf_search $includedir/$cf_ipv6dir" +} -echo "$as_me:19045: result: $cf_cv_sys_select_timeval" >&5 -echo "${ECHO_T}$cf_cv_sys_select_timeval" >&6 -test $cf_cv_sys_select_timeval = yes && cat >>confdefs.h <<\EOF -#define NEED_TIMEVAL_FIX 1 -EOF +test "$oldincludedir" != NONE && \ +test "$oldincludedir" != "/usr/include" && \ +test -d "$oldincludedir" && { + test -d $oldincludedir && cf_search="$cf_search $oldincludedir" + test -d $oldincludedir/$cf_ipv6dir && cf_search="$cf_search $oldincludedir/$cf_ipv6dir" +} -echo "$as_me:19051: checking for va_copy" >&5 -echo $ECHO_N "checking for va_copy... $ECHO_C" >&6 -if test "${cf_cv_have_va_copy+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else +cf_search="$cf_search $cf_header_path_list" -cat >conftest.$ac_ext <<_ACEOF -#line 19058 "configure" -#include "confdefs.h" + for cf_incdir in $cf_search + do + cf_header=$cf_incdir/netinet/ip6.h + if test -f $cf_header + then -#include +if test -n "$cf_incdir" ; then + for cf_add_incdir in $cf_incdir + do + while test $cf_add_incdir != /usr/include + do + if test -d $cf_add_incdir + then + cf_have_incdir=no + if test -n "$CFLAGS$CPPFLAGS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then + cf_have_incdir=yes; break + fi + done + fi + + if test "$cf_have_incdir" = no ; then + if test "$cf_add_incdir" = /usr/local/include ; then + if test "$GCC" = yes + then + cf_save_CPPFLAGS=$CPPFLAGS + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +#line 20106 "configure" +#include "confdefs.h" +#include int main (void) { - - static va_list dst; - static va_list src; - va_copy(dst, src) +printf("Hello") ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19075: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:20118: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19078: \$? = $ac_status" >&5 + echo "$as_me:20121: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19081: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:20124: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19084: \$? = $ac_status" >&5 + echo "$as_me:20127: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_have_va_copy=yes + : else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_have_va_copy=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +cf_have_incdir=yes fi -echo "$as_me:19094: result: $cf_cv_have_va_copy" >&5 -echo "${ECHO_T}$cf_cv_have_va_copy" >&6 +rm -f conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$cf_save_CPPFLAGS + fi + fi + fi -if test "$cf_cv_have_va_copy" = yes; -then + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -cat >>confdefs.h <<\EOF -#define HAVE_VA_COPY 1 -EOF +echo "${as_me:-configure}:20144: testing adding $cf_add_incdir to include-path ..." 1>&5 -else # !cf_cv_have_va_copy + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" -echo "$as_me:19106: checking for __va_copy" >&5 -echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6 -if test "${cf_cv_have___va_copy+set}" = set; then + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + test "$cf_top_incdir" = "$cf_add_incdir" && break + cf_add_incdir="$cf_top_incdir" + else + break + fi + else + break + fi + done + done +fi + + test -n "$verbose" && echo " ... found $cf_header" 1>&6 + break + fi + test -n "$verbose" && echo " ... tested $cf_header" 1>&6 + done + +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + eval 'cf_cv_have_lib_'$cf_ipv6lib'=no' + cf_libdir="" + echo "$as_me:20172: checking for getaddrinfo" >&5 +echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6 +if test "${ac_cv_func_getaddrinfo+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - -cat >conftest.$ac_ext <<_ACEOF -#line 19113 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 20178 "configure" #include "confdefs.h" +#define getaddrinfo autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef getaddrinfo + +#ifdef __cplusplus +extern "C" +#endif -#include +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char getaddrinfo (void); int main (void) { - static va_list dst; - static va_list src; - __va_copy(dst, src) +/* The GNU C library defines stubs 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_getaddrinfo) || defined (__stub___getaddrinfo) +#error found stub for getaddrinfo +#endif + + return getaddrinfo (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19130: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20209: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19133: \$? = $ac_status" >&5 + echo "$as_me:20212: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19136: \"$ac_try\"") >&5 + { (eval echo "$as_me:20215: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19139: \$? = $ac_status" >&5 + echo "$as_me:20218: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_have___va_copy=yes + ac_cv_func_getaddrinfo=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_have___va_copy=no +ac_cv_func_getaddrinfo=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:19149: result: $cf_cv_have___va_copy" >&5 -echo "${ECHO_T}$cf_cv_have___va_copy" >&6 - -if test "$cf_cv_have___va_copy" = yes -then - -cat >>confdefs.h <<\EOF -#define HAVE___VA_COPY 1 -EOF - -else # !cf_cv_have___va_copy - -echo "$as_me:19161: checking for __builtin_va_copy" >&5 -echo $ECHO_N "checking for __builtin_va_copy... $ECHO_C" >&6 -if test "${cf_cv_have___builtin_va_copy+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo "$as_me:20228: result: $ac_cv_func_getaddrinfo" >&5 +echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6 +if test $ac_cv_func_getaddrinfo = yes; then + eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes' else -cat >conftest.$ac_ext <<_ACEOF -#line 19168 "configure" + cf_save_LIBS="$LIBS" + echo "$as_me:20235: checking for getaddrinfo in -l$cf_ipv6lib" >&5 +echo $ECHO_N "checking for getaddrinfo in -l$cf_ipv6lib... $ECHO_C" >&6 + LIBS="-l$cf_ipv6lib $LIBS" + cat >conftest.$ac_ext <<_ACEOF +#line 20239 "configure" #include "confdefs.h" -#include - +#include +#include +#include +#include int main (void) { - - static va_list dst; - static va_list src; - __builtin_va_copy(dst, src) +getaddrinfo(0, 0, 0, 0) ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19185: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20255: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19188: \$? = $ac_status" >&5 + echo "$as_me:20258: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19191: \"$ac_try\"") >&5 + { (eval echo "$as_me:20261: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19194: \$? = $ac_status" >&5 + echo "$as_me:20264: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_have___builtin_va_copy=yes + echo "$as_me:20266: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes' + else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_have___builtin_va_copy=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +echo "$as_me:20273: result: no" >&5 +echo "${ECHO_T}no" >&6 + +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 + -L*) + cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` + +test "x$cf_library_path" != "xNONE" && \ +test -d "$cf_library_path" && \ + { + test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" + test -d $cf_library_path/lib && cf_search="$cf_search $cf_library_path/lib" + test -d $cf_library_path/lib/$cf_ipv6dir && cf_search="$cf_search $cf_library_path/lib/$cf_ipv6dir" + test -d $cf_library_path/lib/$cf_ipv6dir/lib && cf_search="$cf_search $cf_library_path/lib/$cf_ipv6dir/lib" + test -d $cf_library_path/$cf_ipv6dir/lib && cf_search="$cf_search $cf_library_path/$cf_ipv6dir/lib" + test -d $cf_library_path/$cf_ipv6dir/lib/$cf_ipv6dir && cf_search="$cf_search $cf_library_path/$cf_ipv6dir/lib/$cf_ipv6dir" +} + + cf_library_path_list="$cf_library_path_list $cf_search" + ;; + esac + done fi -echo "$as_me:19204: result: $cf_cv_have___builtin_va_copy" >&5 -echo "${ECHO_T}$cf_cv_have___builtin_va_copy" >&6 -test "$cf_cv_have___builtin_va_copy" = yes && +cf_search= -cat >>confdefs.h <<\EOF -#define HAVE___BUILTIN_VA_COPY 1 -EOF +test "x$prefix" != "xNONE" && \ +test -d "$prefix" && \ + { + test -n "$verbose" && echo " ... testing for lib-directories under $prefix" + test -d $prefix/lib && cf_search="$cf_search $prefix/lib" + test -d $prefix/lib/$cf_ipv6dir && cf_search="$cf_search $prefix/lib/$cf_ipv6dir" + test -d $prefix/lib/$cf_ipv6dir/lib && cf_search="$cf_search $prefix/lib/$cf_ipv6dir/lib" + test -d $prefix/$cf_ipv6dir/lib && cf_search="$cf_search $prefix/$cf_ipv6dir/lib" + test -d $prefix/$cf_ipv6dir/lib/$cf_ipv6dir && cf_search="$cf_search $prefix/$cf_ipv6dir/lib/$cf_ipv6dir" +} -fi # cf_cv_have___va_copy +for cf_subdir_prefix in \ + /usr \ + /usr/local \ + /usr/pkg \ + /opt \ + /opt/local \ + $HOME +do -fi # cf_cv_have_va_copy +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" +} -case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy}" in -*yes*) - ;; +done -*) - echo "$as_me:19222: checking if we can simply copy va_list" >&5 -echo $ECHO_N "checking if we can simply copy va_list... $ECHO_C" >&6 -if test "${cf_cv_pointer_va_list+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else +cf_search="$cf_library_path_list $cf_search" -cat >conftest.$ac_ext <<_ACEOF -#line 19229 "configure" + for cf_libdir in $cf_search + do + echo "$as_me:20341: checking for -l$cf_ipv6lib in $cf_libdir" >&5 +echo $ECHO_N "checking for -l$cf_ipv6lib in $cf_libdir... $ECHO_C" >&6 + LIBS="-L$cf_libdir -l$cf_ipv6lib $cf_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +#line 20345 "configure" #include "confdefs.h" -#include - +#include +#include +#include +#include int main (void) { - - va_list dst; - va_list src; - dst = src +getaddrinfo(0, 0, 0, 0) ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19246: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20361: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19249: \$? = $ac_status" >&5 + echo "$as_me:20364: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19252: \"$ac_try\"") >&5 + { (eval echo "$as_me:20367: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19255: \$? = $ac_status" >&5 + echo "$as_me:20370: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_pointer_va_list=yes + echo "$as_me:20372: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes' + break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_pointer_va_list=no +echo "$as_me:20379: result: no" >&5 +echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + done + fi -echo "$as_me:19265: result: $cf_cv_pointer_va_list" >&5 -echo "${ECHO_T}$cf_cv_pointer_va_list" >&6 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - if test "$cf_cv_pointer_va_list" = no - then - echo "$as_me:19270: checking if we can copy va_list indirectly" >&5 -echo $ECHO_N "checking if we can copy va_list indirectly... $ECHO_C" >&6 -if test "${cf_cv_array_va_list+set}" = set; then +fi + +eval 'cf_found_library=$cf_cv_have_lib_'$cf_ipv6lib + + if test $cf_found_library = no ; then + { { echo "$as_me:20394: error: No $cf_ipv6lib library found, cannot continue. You must fetch lib$cf_ipv6lib.a +from an appropriate IPv6 kit and compile beforehand." >&5 +echo "$as_me: error: No $cf_ipv6lib library found, cannot continue. You must fetch lib$cf_ipv6lib.a +from an appropriate IPv6 kit and compile beforehand." >&2;} + { (exit 1); exit 1; }; } + fi +fi + +echo "$as_me:20402: checking working getaddrinfo" >&5 +echo $ECHO_N "checking working getaddrinfo... $ECHO_C" >&6 +if test "${cf_cv_getaddrinfo+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cat >conftest.$ac_ext <<_ACEOF -#line 19277 "configure" +if test "$cross_compiling" = yes; then + cf_cv_getaddrinfo=unknown +else + cat >conftest.$ac_ext <<_ACEOF +#line 20412 "configure" #include "confdefs.h" -#include +#include +#include +#include +#include +#include -int -main (void) +#define expect(a,b) if (strcmp(a,b) != 0) goto bad + +int main(void) { + int passive, gaierr, inet4 = 0, inet6 = 0; + struct addrinfo hints, *ai, *aitop; + char straddr[INET6_ADDRSTRLEN], strport[16]; - va_list dst; - va_list src; - *dst = *src - ; - return 0; + for (passive = 0; passive <= 1; passive++) { + memset(&hints, 0, sizeof(hints)); + hints.ai_family = AF_UNSPEC; + hints.ai_flags = passive ? AI_PASSIVE : 0; + hints.ai_socktype = SOCK_STREAM; + if ((gaierr = getaddrinfo(NULL, "54321", &hints, &aitop)) != 0) { + (void)gai_strerror(gaierr); + goto bad; + } + for (ai = aitop; ai; ai = ai->ai_next) { + if (ai->ai_addr == NULL || + ai->ai_addrlen == 0 || + getnameinfo(ai->ai_addr, ai->ai_addrlen, + straddr, sizeof(straddr), strport, sizeof(strport), + NI_NUMERICHOST|NI_NUMERICSERV) != 0) { + goto bad; + } + switch (ai->ai_family) { + case AF_INET: + expect(strport, "54321"); + if (passive) { + expect(straddr, "0.0.0.0"); + } else { + expect(straddr, "127.0.0.1"); + } + inet4++; + break; + case AF_INET6: + expect(strport, "54321"); + if (passive) { + expect(straddr, "::"); + } else { + expect(straddr, "::1"); + } + inet6++; + break; + case AF_UNSPEC: + goto bad; + break; + default: + /* another family support? */ + break; + } + } + } + + if (!(inet4 == 0 || inet4 == 2)) + goto bad; + if (!(inet6 == 0 || inet6 == 2)) + goto bad; + + if (aitop) + freeaddrinfo(aitop); + ${cf_cv_main_return:-return}(0); + + bad: + if (aitop) + freeaddrinfo(aitop); + ${cf_cv_main_return:-return}(1); } + _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19294: \"$ac_link\"") >&5 +rm -f conftest$ac_exeext +if { (eval echo "$as_me:20492: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19297: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19300: \"$ac_try\"") >&5 + echo "$as_me:20495: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:20497: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19303: \$? = $ac_status" >&5 + echo "$as_me:20500: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_array_va_list=yes + cf_cv_getaddrinfo=yes else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_array_va_list=no +cf_cv_getaddrinfo=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:19313: result: $cf_cv_array_va_list" >&5 -echo "${ECHO_T}$cf_cv_array_va_list" >&6 - test "$cf_cv_array_va_list" = yes && + +fi +echo "$as_me:20513: result: $cf_cv_getaddrinfo" >&5 +echo "${ECHO_T}$cf_cv_getaddrinfo" >&6 +if test "$cf_cv_getaddrinfo" = yes ; then + cat >>confdefs.h <<\EOF -#define ARRAY_VA_LIST 1 +#define HAVE_GAI_STRERROR 1 EOF - fi - ;; -esac - -### Checks for Datatypes. -# On IRIX 5.3, sys/types and inttypes.h are conflicting. +cat >>confdefs.h <<\EOF +#define HAVE_GETADDRINFO 1 +EOF -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:19331: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 19337 "configure" -#include "confdefs.h" -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:19343: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:19346: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19349: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:19352: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$as_ac_Header=no" fi -rm -f conftest.$ac_objext conftest.$ac_ext + +if test "$cf_cv_getaddrinfo" != "yes"; then + if test "$cf_cv_ipv6type" != "linux"; then + { echo "$as_me:20529: WARNING: You must get working getaddrinfo() function, +or you can specify \"--disable-ipv6\"" >&5 +echo "$as_me: WARNING: You must get working getaddrinfo() function, +or you can specify \"--disable-ipv6\"" >&2;} + else + { echo "$as_me:20534: WARNING: The getaddrinfo() implementation on your system seems be buggy. +You should upgrade your system library to the newest version +of GNU C library (aka glibc)." >&5 +echo "$as_me: WARNING: The getaddrinfo() implementation on your system seems be buggy. +You should upgrade your system library to the newest version +of GNU C library (aka glibc)." >&2;} + fi fi -echo "$as_me:19362: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <&5 -echo $ECHO_N "checking for gid_t... $ECHO_C" >&6 -if test "${ac_cv_type_gid_t+set}" = set; then +for ac_func in getaddrinfo getnameinfo +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:20548: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 19378 "configure" +#line 20554 "configure" #include "confdefs.h" -$ac_includes_default -int -main (void) -{ -if ((gid_t *) 0) - return 0; -if (sizeof (gid_t)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:19393: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:19396: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19399: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:19402: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_gid_t=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_type_gid_t=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:19412: result: $ac_cv_type_gid_t" >&5 -echo "${ECHO_T}$ac_cv_type_gid_t" >&6 -if test $ac_cv_type_gid_t = yes; then - : -else +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func -cat >>confdefs.h <&5 -echo $ECHO_N "checking for mode_t... $ECHO_C" >&6 -if test "${ac_cv_type_mode_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 19430 "configure" -#include "confdefs.h" -$ac_includes_default int main (void) { -if ((mode_t *) 0) - return 0; -if (sizeof (mode_t)) - return 0; + +/* The GNU C library defines stubs for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#error found stub for $ac_func +#endif + + return $ac_func (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:19445: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:20585: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19448: \$? = $ac_status" >&5 + echo "$as_me:20588: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19451: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:20591: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19454: \$? = $ac_status" >&5 + echo "$as_me:20594: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_mode_t=yes + eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_type_mode_t=no +eval "$as_ac_var=no" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:19464: result: $ac_cv_type_mode_t" >&5 -echo "${ECHO_T}$ac_cv_type_mode_t" >&6 -if test $ac_cv_type_mode_t = yes; then - : -else - -cat >>confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5 -echo $ECHO_N "checking for off_t... $ECHO_C" >&6 -if test "${ac_cv_type_off_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 19482 "configure" -#include "confdefs.h" -$ac_includes_default -int -main (void) -{ -if ((off_t *) 0) - return 0; -if (sizeof (off_t)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:19497: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:19500: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19503: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:19506: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_off_t=yes +### should we use 64 bit article numbers if possible? +echo "$as_me:20617: checking whether to enable long article numbers" >&5 +echo $ECHO_N "checking whether to enable long article numbers... $ECHO_C" >&6 + +# Check whether --enable-long-article-numbers or --disable-long-article-numbers was given. +if test "${enable_long_article_numbers+set}" = set; then + enableval="$enable_long_article_numbers" + test "$enableval" != yes && enableval=no + if test "$enableval" != "no" ; then + +cat >>confdefs.h <<\EOF +#define ENABLE_LONG_ARTICLE_NUMBERS 1 +EOF + + fi else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_type_off_t=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:19516: result: $ac_cv_type_off_t" >&5 -echo "${ECHO_T}$ac_cv_type_off_t" >&6 -if test $ac_cv_type_off_t = yes; then - : + enableval=no +fi; +echo "$as_me:20634: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 + +### checks for operator characteristics (should be the last option) +echo "$as_me:20638: checking whether to make a coffee while compiling" >&5 +echo $ECHO_N "checking whether to make a coffee while compiling... $ECHO_C" >&6 + +# Check whether --with-coffee or --without-coffee was given. +if test "${with_coffee+set}" = set; then + withval="$with_coffee" + case "$withval" in + yes) + echo "$as_me:20646: result: yes - with milk - please!" >&5 +echo "${ECHO_T}yes - with milk - please!" >&6 + +cat >>confdefs.h <<\EOF +#define HAVE_COFFEE 1 +EOF + + ;; + *) + echo "$as_me:20655: result: no" >&5 +echo "${ECHO_T}no" >&6 + ;; + esac else + echo "$as_me:20660: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi; -cat >>confdefs.h <&5 +echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6 +if test "${cf_cv_makeflags+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cf_cv_makeflags='' + for cf_option in '-${MAKEFLAGS}' '${MFLAGS}' + do + cat >cf_makeflags.tmp </dev/null | fgrep -v "ing directory" | sed -e 's,[ ]*$,,'` + case "$cf_result" in + .*k|.*kw) + cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null` + case "$cf_result" in + .*CC=*) cf_cv_makeflags= + ;; + *) cf_cv_makeflags=$cf_option + ;; + esac + break + ;; + .-) + ;; + *) + +echo "${as_me:-configure}:20696: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 + + ;; + esac + done + rm -f cf_makeflags.tmp fi +echo "$as_me:20704: result: $cf_cv_makeflags" >&5 +echo "${ECHO_T}$cf_cv_makeflags" >&6 -echo "$as_me:19528: checking for pid_t" >&5 -echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 -if test "${ac_cv_type_pid_t+set}" = set; then +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_main_return=return + +echo "$as_me:20714: checking for an ANSI C-conforming const" >&5 +echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 +if test "${ac_cv_c_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 19534 "configure" +#line 20720 "configure" #include "confdefs.h" -$ac_includes_default + int main (void) { -if ((pid_t *) 0) - return 0; -if (sizeof (pid_t)) - return 0; +/* FIXME: Include the comments suggested by Paul. */ +#ifndef __cplusplus + /* Ultrix mips cc rejects this. */ + typedef int charset[2]; + const charset x; + /* SunOS 4.1.1 cc rejects this. */ + char const *const *ccp; + char **p; + /* NEC SVR4.0.2 mips cc rejects this. */ + struct point {int x, y;}; + static struct point const zero = {0,0}; + /* AIX XL C 1.02.0.0 rejects this. + It does not let you subtract one const X* pointer from another in + an arm of an if-expression whose if-part is not a constant + expression */ + const char *g = "string"; + ccp = &g + (g ? g-g : 0); + /* HPUX 7.0 cc rejects these. */ + ++ccp; + p = (char**) ccp; + ccp = (char const *const *) p; + { /* SCO 3.2v4 cc rejects this. */ + char *t; + char const *s = 0 ? (char *) 0 : (char const *) 0; + + *t++ = 0; + } + { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ + int x[] = {25, 17}; + const int *foo = &x[0]; + ++foo; + } + { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ + typedef const int *iptr; + iptr p = 0; + ++p; + } + { /* AIX XL C 1.02.0.0 rejects this saying + "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ + struct s { int j; const int *ap[3]; }; + struct s *b; b->j = 5; + } + { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; + } +#endif + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19549: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20778: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19552: \$? = $ac_status" >&5 + echo "$as_me:20781: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19555: \"$ac_try\"") >&5 + { (eval echo "$as_me:20784: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19558: \$? = $ac_status" >&5 + echo "$as_me:20787: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_pid_t=yes + ac_cv_c_const=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_type_pid_t=no +ac_cv_c_const=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:19568: result: $ac_cv_type_pid_t" >&5 -echo "${ECHO_T}$ac_cv_type_pid_t" >&6 -if test $ac_cv_type_pid_t = yes; then - : -else +echo "$as_me:20797: result: $ac_cv_c_const" >&5 +echo "${ECHO_T}$ac_cv_c_const" >&6 +if test $ac_cv_c_const = no; then -cat >>confdefs.h <>confdefs.h <<\EOF +#define const EOF fi -echo "$as_me:19580: checking for size_t" >&5 -echo $ECHO_N "checking for size_t... $ECHO_C" >&6 -if test "${ac_cv_type_size_t+set}" = set; then +echo "$as_me:20807: checking for inline" >&5 +echo $ECHO_N "checking for inline... $ECHO_C" >&6 +if test "${ac_cv_c_inline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + ac_cv_c_inline=no +for ac_kw in inline __inline__ __inline; do cat >conftest.$ac_ext <<_ACEOF -#line 19586 "configure" +#line 20815 "configure" #include "confdefs.h" -$ac_includes_default -int -main (void) -{ -if ((size_t *) 0) - return 0; -if (sizeof (size_t)) - return 0; - ; - return 0; -} +#ifndef __cplusplus +static $ac_kw int static_foo () {return 0; } +$ac_kw int foo () {return 0; } +#endif + _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19601: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20824: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19604: \$? = $ac_status" >&5 + echo "$as_me:20827: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19607: \"$ac_try\"") >&5 + { (eval echo "$as_me:20830: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19610: \$? = $ac_status" >&5 + echo "$as_me:20833: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_size_t=yes + ac_cv_c_inline=$ac_kw; break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_type_size_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:19620: result: $ac_cv_type_size_t" >&5 -echo "${ECHO_T}$ac_cv_type_size_t" >&6 -if test $ac_cv_type_size_t = yes; then - : -else - -cat >>confdefs.h <&5 +echo "${ECHO_T}$ac_cv_c_inline" >&6 +case $ac_cv_c_inline in + inline | yes) ;; + no) +cat >>confdefs.h <<\EOF +#define inline +EOF + ;; + *) cat >>confdefs.h <&5 -echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6 -if test "${ac_cv_type_ssize_t+set}" = set; then +echo "$as_me:20859: checking for ansi token expansion/substitution" >&5 +echo $ECHO_N "checking for ansi token expansion/substitution... $ECHO_C" >&6 +if test "${cf_cv_cpp_expands+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 19638 "configure" + + cat >conftest.$ac_ext <<_ACEOF +#line 20866 "configure" #include "confdefs.h" -$ac_includes_default + +#define string(n) #n int main (void) { -if ((ssize_t *) 0) - return 0; -if (sizeof (ssize_t)) - return 0; +char *s = string(token) ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19653: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20879: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19656: \$? = $ac_status" >&5 + echo "$as_me:20882: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19659: \"$ac_try\"") >&5 + { (eval echo "$as_me:20885: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19662: \$? = $ac_status" >&5 + echo "$as_me:20888: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_ssize_t=yes + cf_cv_cpp_expands=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_type_ssize_t=no +cf_cv_cpp_expands=no fi rm -f conftest.$ac_objext conftest.$ac_ext + fi -echo "$as_me:19672: result: $ac_cv_type_ssize_t" >&5 -echo "${ECHO_T}$ac_cv_type_ssize_t" >&6 -if test $ac_cv_type_ssize_t = yes; then - : -else -cat >>confdefs.h <&5 +echo "${ECHO_T}$cf_cv_cpp_expands" >&6 +test $cf_cv_cpp_expands = yes && +cat >>confdefs.h <<\EOF +#define CPP_DOES_EXPAND 1 EOF -fi - -echo "$as_me:19684: checking for time_t" >&5 -echo $ECHO_N "checking for time_t... $ECHO_C" >&6 -if test "${ac_cv_type_time_t+set}" = set; then +echo "$as_me:20907: checking for ansi token concatenation" >&5 +echo $ECHO_N "checking for ansi token concatenation... $ECHO_C" >&6 +if test "${cf_cv_cpp_concats+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 19690 "configure" + + cat >conftest.$ac_ext <<_ACEOF +#line 20914 "configure" #include "confdefs.h" -$ac_includes_default + +#define concat(a,b) a ## b int main (void) { -if ((time_t *) 0) - return 0; -if (sizeof (time_t)) - return 0; +char *firstlast = "y", *s = concat(first,last) ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19705: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20927: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19708: \$? = $ac_status" >&5 + echo "$as_me:20930: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19711: \"$ac_try\"") >&5 + { (eval echo "$as_me:20933: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19714: \$? = $ac_status" >&5 + echo "$as_me:20936: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_time_t=yes + cf_cv_cpp_concats=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_type_time_t=no +cf_cv_cpp_concats=no fi rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:19724: result: $ac_cv_type_time_t" >&5 -echo "${ECHO_T}$ac_cv_type_time_t" >&6 -if test $ac_cv_type_time_t = yes; then - : -else - -cat >>confdefs.h <conftest.$ac_ext <<_ACEOF -#line 19737 "configure" -#include "confdefs.h" -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "in_addr_t" >/dev/null 2>&1; then - : -else - - cat >conftest.$ac_ext <<_ACEOF -#line 19748 "configure" -#include "confdefs.h" -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "in_addr_t" >/dev/null 2>&1; then - : -else +echo "$as_me:20948: result: $cf_cv_cpp_concats" >&5 +echo "${ECHO_T}$cf_cv_cpp_concats" >&6 +test $cf_cv_cpp_concats = yes && +cat >>confdefs.h <<\EOF +#define CPP_DOES_CONCAT 1 +EOF - echo "$as_me:19758: checking for in_addr_t" >&5 -echo $ECHO_N "checking for in_addr_t... $ECHO_C" >&6 -if test "${ac_cv_type_in_addr_t+set}" = set; then +echo "$as_me:20955: checking if nested parameters work" >&5 +echo $ECHO_N "checking if nested parameters work... $ECHO_C" >&6 +if test "${cf_cv_nested_params+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 19764 "configure" + + cat >conftest.$ac_ext <<_ACEOF +#line 20962 "configure" #include "confdefs.h" -$ac_includes_default + int main (void) { -if ((in_addr_t *) 0) - return 0; -if (sizeof (in_addr_t)) - return 0; +extern void (*sigdisp(int sig, void (*func)(int sig)))(int sig) ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19779: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20974: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19782: \$? = $ac_status" >&5 + echo "$as_me:20977: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19785: \"$ac_try\"") >&5 + { (eval echo "$as_me:20980: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19788: \$? = $ac_status" >&5 + echo "$as_me:20983: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_in_addr_t=yes + cf_cv_nested_params=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_type_in_addr_t=no +cf_cv_nested_params=no fi rm -f conftest.$ac_objext conftest.$ac_ext + fi -echo "$as_me:19798: result: $ac_cv_type_in_addr_t" >&5 -echo "${ECHO_T}$ac_cv_type_in_addr_t" >&6 -if test $ac_cv_type_in_addr_t = yes; then - : -else -cat >>confdefs.h <&5 +echo "${ECHO_T}$cf_cv_nested_params" >&6 +test $cf_cv_nested_params = yes && +cat >>confdefs.h <<\EOF +#define HAVE_NESTED_PARAMS 1 EOF -fi +### Checks for header files. +echo "$as_me:21003: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 21009 "configure" +#include "confdefs.h" +#include +#include +#include +#include +_ACEOF +if { (eval echo "$as_me:21017: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:21023: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes fi -rm -rf conftest* - +if test -z "$ac_cpp_err"; then + ac_cv_header_stdc=yes +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_header_stdc=no fi -rm -rf conftest* +rm -f conftest.err conftest.$ac_ext -echo "$as_me:19816: checking for uid_t in sys/types.h" >&5 -echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6 -if test "${ac_cv_type_uid_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 19822 "configure" +#line 21045 "configure" #include "confdefs.h" -#include +#include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "uid_t" >/dev/null 2>&1; then - ac_cv_type_uid_t=yes + egrep "memchr" >/dev/null 2>&1; then + : else - ac_cv_type_uid_t=no + ac_cv_header_stdc=no fi rm -rf conftest* fi -echo "$as_me:19836: result: $ac_cv_type_uid_t" >&5 -echo "${ECHO_T}$ac_cv_type_uid_t" >&6 -if test $ac_cv_type_uid_t = no; then -cat >>confdefs.h <<\EOF -#define uid_t int -EOF +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 <<_ACEOF +#line 21063 "configure" +#include "confdefs.h" +#include -cat >>confdefs.h <<\EOF -#define gid_t int -EOF +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "free" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -rf conftest* fi -echo "$as_me:19850: checking for quad_t" >&5 -echo $ECHO_N "checking for quad_t... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line 19853 "configure" +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then + : +else + cat >conftest.$ac_ext <<_ACEOF +#line 21084 "configure" #include "confdefs.h" +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif -#include -#if 0 -#include -#include -#endif /* 0 */ - +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) int main (void) { -quad_t x; x = 0 - ; - return 0; + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + $ac_main_return(2); + $ac_main_return (0); } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:19871: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest$ac_exeext +if { (eval echo "$as_me:21110: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19874: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19877: \"$ac_try\"") >&5 + echo "$as_me:21113: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:21115: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19880: \$? = $ac_status" >&5 + echo "$as_me:21118: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_quad_t=yes + : else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_quad_t=no +ac_cv_header_stdc=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:19889: result: $ac_cv_quad_t" >&5 -echo "${ECHO_T}$ac_cv_quad_t" >&6 -if test $ac_cv_quad_t = yes; then - cat >>confdefs.h <<\EOF -#define HAVE_QUAD_T 1 +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +fi +echo "$as_me:21131: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6 +if test $ac_cv_header_stdc = yes; then + +cat >>confdefs.h <<\EOF +#define STDC_HEADERS 1 EOF fi -echo "$as_me:19898: checking for long long" >&5 -echo $ECHO_N "checking for long long... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line 19901 "configure" +ac_header_dirent=no +for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do + as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +echo "$as_me:21144: checking for $ac_hdr that defines DIR" >&5 +echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 21150 "configure" #include "confdefs.h" - #include +#include <$ac_hdr> int main (void) { -long long x; x = 0 +if ((DIR *) 0) +return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19915: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21165: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19918: \$? = $ac_status" >&5 + echo "$as_me:21168: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19921: \"$ac_try\"") >&5 + { (eval echo "$as_me:21171: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19924: \$? = $ac_status" >&5 + echo "$as_me:21174: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_long_long=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_long_long=no +eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:19933: result: $ac_cv_long_long" >&5 -echo "${ECHO_T}$ac_cv_long_long" >&6 -if test $ac_cv_long_long = yes; then - cat >>confdefs.h <<\EOF -#define HAVE_LONG_LONG 1 +fi +echo "$as_me:21184: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 -echo $ECHO_N "checking for int_least64_t... $ECHO_C" >&6 +done +# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. +if test $ac_header_dirent = dirent.h; then + echo "$as_me:21197: checking for opendir in -ldir" >&5 +echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 +if test "${ac_cv_lib_dir_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldir $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 19945 "configure" +#line 21205 "configure" #include "confdefs.h" -#ifdef HAVE_STDINT_H -#include -#endif -#ifdef HAVE_HAVE_INTTYPES_H -#include +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" #endif - +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char opendir (); int main (void) { -int_least64_t x; x = 0 +opendir (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:19964: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:21224: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19967: \$? = $ac_status" >&5 + echo "$as_me:21227: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19970: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:21230: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19973: \$? = $ac_status" >&5 + echo "$as_me:21233: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_int_least64_t=yes + ac_cv_lib_dir_opendir=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_int_least64_t=no +ac_cv_lib_dir_opendir=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:21244: result: $ac_cv_lib_dir_opendir" >&5 +echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 +if test $ac_cv_lib_dir_opendir = yes; then + LIBS="$LIBS -ldir" fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:19982: result: $ac_cv_int_least64_t" >&5 -echo "${ECHO_T}$ac_cv_int_least64_t" >&6 -if test $ac_cv_int_least64_t = yes; then - cat >>confdefs.h <<\EOF -#define HAVE_INT_LEAST64_T 1 -EOF - echo "$as_me:19989: checking for INT64_C" >&5 -echo $ECHO_N "checking for INT64_C... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line 19992 "configure" +else + echo "$as_me:21251: checking for opendir in -lx" >&5 +echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 +if test "${ac_cv_lib_x_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lx $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 21259 "configure" #include "confdefs.h" -#ifdef HAVE_STDINT_H -#include -#endif -#ifdef HAVE_HAVE_INTTYPES_H -#include +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" #endif - +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char opendir (); int main (void) { -int_least64_t x; x = INT64_C(0) +opendir (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:20011: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:21278: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20014: \$? = $ac_status" >&5 + echo "$as_me:21281: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20017: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:21284: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20020: \$? = $ac_status" >&5 + echo "$as_me:21287: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_int64_c=yes + ac_cv_lib_x_opendir=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_int64_c=no +ac_cv_lib_x_opendir=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:21298: result: $ac_cv_lib_x_opendir" >&5 +echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 +if test $ac_cv_lib_x_opendir = yes; then + LIBS="$LIBS -lx" fi -rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:20029: result: $ac_cv_int64_c" >&5 -echo "${ECHO_T}$ac_cv_int64_c" >&6 - if test $ac_cv_int64_c = yes; then - cat >>confdefs.h <<\EOF -#define HAVE_INT64_C 1 -EOF - fi fi -echo "$as_me:20039: checking for nl_item" >&5 -echo $ECHO_N "checking for nl_item... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line 20042 "configure" +echo "$as_me:21306: checking whether time.h and sys/time.h may both be included" >&5 +echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 +if test "${ac_cv_header_time+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 21312 "configure" #include "confdefs.h" - -#ifdef HAVE_LANGINFO_H -#include -#else -#ifdef HAVE_NL_TYPES_H -#include -#endif -#endif +#include +#include +#include int main (void) { -nl_item x; x = 0 +if ((struct tm *) 0) +return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20062: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21328: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20065: \$? = $ac_status" >&5 + echo "$as_me:21331: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20068: \"$ac_try\"") >&5 + { (eval echo "$as_me:21334: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20071: \$? = $ac_status" >&5 + echo "$as_me:21337: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_nl_item=yes + ac_cv_header_time=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_nl_item=no +ac_cv_header_time=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:20080: result: $ac_cv_nl_item" >&5 -echo "${ECHO_T}$ac_cv_nl_item" >&6 -if test $ac_cv_nl_item = yes; then - cat >>confdefs.h <<\EOF -#define HAVE_NL_ITEM 1 +fi +echo "$as_me:21347: result: $ac_cv_header_time" >&5 +echo "${ECHO_T}$ac_cv_header_time" >&6 +if test $ac_cv_header_time = yes; then + +cat >>confdefs.h <<\EOF +#define TIME_WITH_SYS_TIME 1 EOF fi -### Checks for libraries. -# libuu/uudeview -# only define HAVE_LIBUU and HAVE_UUDEVIEW_H if both are found -echo "$as_me:20092: checking for UUInitialize in -luu" >&5 -echo $ECHO_N "checking for UUInitialize in -luu... $ECHO_C" >&6 -if test "${ac_cv_lib_uu_UUInitialize+set}" = set; then +echo "$as_me:21357: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6 +if test "${ac_cv_header_sys_wait_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-luu $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 20100 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 21363 "configure" #include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" +#include +#include +#ifndef WEXITSTATUS +# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char UUInitialize (); +#ifndef WIFEXITED +# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) +#endif + int main (void) { -UUInitialize (); + int s; + wait (&s); + s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20119: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:21385: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20122: \$? = $ac_status" >&5 + echo "$as_me:21388: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20125: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:21391: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20128: \$? = $ac_status" >&5 + echo "$as_me:21394: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_uu_UUInitialize=yes + ac_cv_header_sys_wait_h=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_uu_UUInitialize=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:20139: result: $ac_cv_lib_uu_UUInitialize" >&5 -echo "${ECHO_T}$ac_cv_lib_uu_UUInitialize" >&6 -if test $ac_cv_lib_uu_UUInitialize = yes; then - echo "$as_me:20142: checking for uudeview.h" >&5 -echo $ECHO_N "checking for uudeview.h... $ECHO_C" >&6 -if test "${ac_cv_header_uudeview_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 20148 "configure" -#include "confdefs.h" -#include -_ACEOF -if { (eval echo "$as_me:20152: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:20158: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_cv_header_uudeview_h=yes -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_header_uudeview_h=no +ac_cv_header_sys_wait_h=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:20177: result: $ac_cv_header_uudeview_h" >&5 -echo "${ECHO_T}$ac_cv_header_uudeview_h" >&6 -if test $ac_cv_header_uudeview_h = yes; then - cat >>confdefs.h <<\EOF -#define HAVE_LIBUU 1 -EOF +echo "$as_me:21404: result: $ac_cv_header_sys_wait_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6 +if test $ac_cv_header_sys_wait_h = yes; then - cat >>confdefs.h <<\EOF -#define HAVE_UUDEVIEW_H 1 +cat >>confdefs.h <<\EOF +#define HAVE_SYS_WAIT_H 1 EOF - LIBS="$LIBS -luu" - fi -fi +for cf_hdr in \ + argz.h \ + arpa/inet.h \ + curses.h \ + errno.h \ + fcntl.h \ + getopt.h \ + ioctl.h \ + inttypes.h \ + langinfo.h \ + libc.h \ + locale.h \ + malloc.h \ + netdb.h \ + netinet/in.h \ + netlib.h \ + nl_types.h \ + nomacros.h \ + paths.h \ + poll.h \ + prototypes.h \ + pwd.h \ + sgtty.h \ + socket.h \ + stdarg.h \ + stdbool.h \ + stddef.h \ + stdint.h \ + stdlib.h \ + string.h \ + strings.h \ + stropts.h \ + sys/bsdtypes.h \ + sys/errno.h \ + sys/file.h \ + sys/ioctl.h \ + sys/param.h \ + sys/poll.h \ + sys/ptem.h \ + sys/pty.h \ + sys/select.h \ + sys/stat.h \ + sys/stream.h \ + sys/socket.h \ + sys/time.h \ + sys/timeb.h \ + sys/times.h \ + sys/types.h \ + sys/utsname.h \ + term.h \ + termio.h \ + time.h \ + unistd.h \ + varargs.h \ + wchar.h \ + wctype.h \ -# ICU - International Components for Unicode -# TODO: do separate checks for -# - unorm_normalize() # deprecated since ICU 56 -# - uidna_IDNToUnicode() # deprecated since ICU 56 -# - ubidi_open() -# and for IDNA2008 -# - uidna_openUTS46() -# - uidna_nameToUnicode() -# - unorm2_normalize() -cf_try_icuuc="no" -cf_try_icuuc46="no" -echo "$as_me:20205: checking for unicode/unorm.h" >&5 -echo $ECHO_N "checking for unicode/unorm.h... $ECHO_C" >&6 -if test "${ac_cv_header_unicode_unorm_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 20211 "configure" +do + echo "$as_me:21472: checking for $cf_hdr" >&5 +echo $ECHO_N "checking for $cf_hdr... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line 21475 "configure" #include "confdefs.h" -#include + +#include +#include <$cf_hdr> + _ACEOF -if { (eval echo "$as_me:20215: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:21482: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:20221: \$? = $ac_status" >&5 + echo "$as_me:21488: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -20229,35 +21496,54 @@ else ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - ac_cv_header_unicode_unorm_h=yes + cf_found=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - ac_cv_header_unicode_unorm_h=no + cf_found=no fi rm -f conftest.err conftest.$ac_ext +echo "$as_me:21506: result: $cf_found" >&5 +echo "${ECHO_T}$cf_found" >&6 +if test $cf_found = yes ; then + +cf_tr_hdr=`echo "$cf_hdr" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + cat >>confdefs.h <&5 -echo "${ECHO_T}$ac_cv_header_unicode_unorm_h" >&6 -if test $ac_cv_header_unicode_unorm_h = yes; then +done - echo "$as_me:20244: checking for unicode/ustring.h" >&5 -echo $ECHO_N "checking for unicode/ustring.h... $ECHO_C" >&6 -if test "${ac_cv_header_unicode_ustring_h+set}" = set; then +### Checks that depend on existence-checks for headers + +for ac_header in \ +termio.h \ +termios.h \ +unistd.h \ +sys/ioctl.h \ +sys/termio.h \ + +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:21530: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 20250 "configure" +#line 21536 "configure" #include "confdefs.h" -#include +#include <$ac_header> _ACEOF -if { (eval echo "$as_me:20254: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:21540: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:20260: \$? = $ac_status" >&5 + echo "$as_me:21546: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -20268,2228 +21554,2151 @@ else ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - ac_cv_header_unicode_ustring_h=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - ac_cv_header_unicode_ustring_h=no + eval "$as_ac_Header=no" fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:20279: result: $ac_cv_header_unicode_ustring_h" >&5 -echo "${ECHO_T}$ac_cv_header_unicode_ustring_h" >&6 -if test $ac_cv_header_unicode_ustring_h = yes; then - - cat >>confdefs.h <<\EOF -#define HAVE_UNICODE_UNORM_H 1 +echo "$as_me:21565: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <>confdefs.h <<\EOF -#define HAVE_UNICODE_USTRING_H 1 -EOF +fi +done - echo "$as_me:20291: checking for unorm_normalize in libicuuc" >&5 -echo $ECHO_N "checking for unorm_normalize in libicuuc... $ECHO_C" >&6 - cf_save_LIBS="$LIBS" - cf_try_icuuc="no" - LIBS="$LIBS -licuuc" - cat >conftest.$ac_ext <<_ACEOF -#line 20297 "configure" +if test "$ac_cv_header_termios_h" = yes ; then + case "$CFLAGS $CPPFLAGS" in + *-D_POSIX_SOURCE*) + termios_bad=dunno ;; + *) termios_bad=maybe ;; + esac + if test "$termios_bad" = maybe ; then + echo "$as_me:21582: checking whether termios.h needs _POSIX_SOURCE" >&5 +echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line 21585 "configure" #include "confdefs.h" -#include +#include int main (void) { - - int32_t needed, ustr = NULL; - UErrorCode status; - needed = unorm_normalize(ustr, -1, UNORM_DEFAULT, 0, NULL, 0, &status); +struct termios foo; int x = foo.c_iflag = 1; (void)x ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20312: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:21597: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20315: \$? = $ac_status" >&5 + echo "$as_me:21600: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20318: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:21603: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20321: \$? = $ac_status" >&5 + echo "$as_me:21606: \$? = $ac_status" >&5 (exit $ac_status); }; }; then + termios_bad=no +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 - cat >>confdefs.h <<\EOF -#define HAVE_LIBICUUC 1 -EOF + cat >conftest.$ac_ext <<_ACEOF +#line 21614 "configure" +#include "confdefs.h" - cf_try_icuuc="yes" +#define _POSIX_SOURCE +#include +int +main (void) +{ +struct termios foo; int x = foo.c_iflag = 2; (void)x + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:21628: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:21631: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:21634: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:21637: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + termios_bad=unknown else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -LIBS=$cf_save_LIBS +termios_bad=yes +cat >>confdefs.h <<\EOF +#define _POSIX_SOURCE 1 +EOF fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:20336: result: $cf_try_icuuc" >&5 -echo "${ECHO_T}$cf_try_icuuc" >&6 - cf_save_LIBS="$LIBS" - echo "$as_me:20339: checking for unicode/uidna.h" >&5 -echo $ECHO_N "checking for unicode/uidna.h... $ECHO_C" >&6 -if test "${ac_cv_header_unicode_uidna_h+set}" = set; then +rm -f conftest.$ac_objext conftest.$ac_ext + +fi +rm -f conftest.$ac_objext conftest.$ac_ext + echo "$as_me:21653: result: $termios_bad" >&5 +echo "${ECHO_T}$termios_bad" >&6 + fi +fi + +echo "$as_me:21658: checking declaration of size-change" >&5 +echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6 +if test "${cf_cv_sizechange+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 20345 "configure" + + cf_cv_sizechange=unknown + cf_save_CPPFLAGS="$CPPFLAGS" + +for cf_opts in "" "NEED_PTEM_H" +do + + CPPFLAGS="$cf_save_CPPFLAGS" + if test -n "$cf_opts" + then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-D$cf_opts" + + fi + cat >conftest.$ac_ext <<_ACEOF +#line 21679 "configure" #include "confdefs.h" -#include +#include +#ifdef HAVE_TERMIOS_H +#include +#else +#ifdef HAVE_TERMIO_H +#include +#endif +#endif + +#ifdef NEED_PTEM_H +/* This is a workaround for SCO: they neglected to define struct winsize in + * termios.h -- it's only in termio.h and ptem.h + */ +#include +#include +#endif + +#ifdef HAVE_SYS_IOCTL_H +#include +#endif + +int +main (void) +{ + +#ifdef TIOCGSIZE + struct ttysize win; /* SunOS 3.0... */ + int y = win.ts_lines = 2; + int x = win.ts_cols = 1; + (void)y; + (void)x; +#else +#ifdef TIOCGWINSZ + struct winsize win; /* everything else */ + int y = win.ws_row = 2; + int x = win.ws_col = 1; + (void)y; + (void)x; +#else + no TIOCGSIZE or TIOCGWINSZ +#endif /* TIOCGWINSZ */ +#endif /* TIOCGSIZE */ + + ; + return 0; +} _ACEOF -if { (eval echo "$as_me:20349: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:21729: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:20355: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi + echo "$as_me:21732: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:21735: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:21738: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_sizechange=yes else - ac_cpp_err=yes + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_sizechange=no fi -if test -z "$ac_cpp_err"; then - ac_cv_header_unicode_uidna_h=yes +rm -f conftest.$ac_objext conftest.$ac_ext + + CPPFLAGS="$cf_save_CPPFLAGS" + if test "$cf_cv_sizechange" = yes ; then + echo "size-change succeeded ($cf_opts)" >&5 + test -n "$cf_opts" && cf_cv_sizechange="$cf_opts" + break + fi +done + +fi +echo "$as_me:21757: result: $cf_cv_sizechange" >&5 +echo "${ECHO_T}$cf_cv_sizechange" >&6 +if test "$cf_cv_sizechange" != no ; then + +cat >>confdefs.h <<\EOF +#define HAVE_SIZECHANGE 1 +EOF + + case $cf_cv_sizechange in + NEED*) + cat >>confdefs.h <&5 +echo $ECHO_N "checking if sys/time.h conflicts with sys/select.h... $ECHO_C" >&6 +if test "${cf_cv_sys_select_timeval+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +for cf_opts in no yes +do +cat >conftest.$ac_ext <<_ACEOF +#line 21784 "configure" +#include "confdefs.h" + +#define yes 1 +#define no 0 +#if $cf_opts +#define timeval fake_timeval +#endif +#include +#ifdef TIME_WITH_SYS_TIME +# include +# include +#else +# ifdef HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif +#undef timeval +#ifdef HAVE_SYS_SELECT_H +# include +#endif + +int +main (void) +{ +struct timeval foo + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:21817: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:21820: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:21823: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:21826: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_sys_select_timeval=$cf_opts + break else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_header_unicode_uidna_h=no +cat conftest.$ac_ext >&5 +cf_cv_sys_select_timeval=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext +done + fi -echo "$as_me:20374: result: $ac_cv_header_unicode_uidna_h" >&5 -echo "${ECHO_T}$ac_cv_header_unicode_uidna_h" >&6 -if test $ac_cv_header_unicode_uidna_h = yes; then - cat >>confdefs.h <<\EOF -#define HAVE_UNICODE_UIDNA_H 1 +echo "$as_me:21840: result: $cf_cv_sys_select_timeval" >&5 +echo "${ECHO_T}$cf_cv_sys_select_timeval" >&6 +test $cf_cv_sys_select_timeval = yes && +cat >>confdefs.h <<\EOF +#define NEED_TIMEVAL_FIX 1 EOF -fi +echo "$as_me:21847: checking for va_copy" >&5 +echo $ECHO_N "checking for va_copy... $ECHO_C" >&6 +if test "${cf_cv_have_va_copy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else - echo "$as_me:20384: checking for uidna_nameToUnicode in libicuuc" >&5 -echo $ECHO_N "checking for uidna_nameToUnicode in libicuuc... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line 20387 "configure" +cat >conftest.$ac_ext <<_ACEOF +#line 21854 "configure" #include "confdefs.h" -#include - #include + +#include + int main (void) { - UErrorCode status = U_ZERO_ERROR; - UIDNAInfo info = UIDNA_INFO_INITIALIZER; - UIDNA *uts46; - uidna_openUTS46(UNORM_DEFAULT, &status); - uidna_nameToUnicode(uts46, NULL, 0, NULL, 0, &info, &status); - uidna_close(uts46); + static va_list dst; + static va_list src; + va_copy(dst, src) ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20406: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21871: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20409: \$? = $ac_status" >&5 + echo "$as_me:21874: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20412: \"$ac_try\"") >&5 + { (eval echo "$as_me:21877: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20415: \$? = $ac_status" >&5 + echo "$as_me:21880: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - cat >>confdefs.h <<\EOF -#define HAVE_LIBICUUC_46_API 1 -EOF - - cf_try_icuuc46="yes" + cf_cv_have_va_copy=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -LIBS=$cf_save_LIBS - +cf_cv_have_va_copy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:20430: result: $cf_try_icuuc46" >&5 -echo "${ECHO_T}$cf_try_icuuc46" >&6 - echo "$as_me:20432: checking for unicode/ubidi.h" >&5 -echo $ECHO_N "checking for unicode/ubidi.h... $ECHO_C" >&6 -if test "${ac_cv_header_unicode_ubidi_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 20438 "configure" -#include "confdefs.h" -#include -_ACEOF -if { (eval echo "$as_me:20442: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:20448: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_cv_header_unicode_ubidi_h=yes -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_header_unicode_ubidi_h=no fi -rm -f conftest.err conftest.$ac_ext -fi -echo "$as_me:20467: result: $ac_cv_header_unicode_ubidi_h" >&5 -echo "${ECHO_T}$ac_cv_header_unicode_ubidi_h" >&6 -if test $ac_cv_header_unicode_ubidi_h = yes; then - - cat >>confdefs.h <<\EOF -#define HAVE_UNICODE_UBIDI_H 1 -EOF +echo "$as_me:21890: result: $cf_cv_have_va_copy" >&5 +echo "${ECHO_T}$cf_cv_have_va_copy" >&6 -fi +if test "$cf_cv_have_va_copy" = yes; +then -fi +cat >>confdefs.h <<\EOF +#define HAVE_VA_COPY 1 +EOF -fi +else # !cf_cv_have_va_copy -# IDNA2008 -echo "$as_me:20482: checking for unicode/unorm2.h" >&5 -echo $ECHO_N "checking for unicode/unorm2.h... $ECHO_C" >&6 -if test "${ac_cv_header_unicode_unorm2_h+set}" = set; then +echo "$as_me:21902: checking for __va_copy" >&5 +echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6 +if test "${cf_cv_have___va_copy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 20488 "configure" + +cat >conftest.$ac_ext <<_ACEOF +#line 21909 "configure" #include "confdefs.h" -#include + +#include + +int +main (void) +{ + + static va_list dst; + static va_list src; + __va_copy(dst, src) + ; + return 0; +} _ACEOF -if { (eval echo "$as_me:20492: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:21926: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:20498: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_cv_header_unicode_unorm2_h=yes + echo "$as_me:21929: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:21932: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:21935: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have___va_copy=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_header_unicode_unorm2_h=no +cat conftest.$ac_ext >&5 +cf_cv_have___va_copy=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:20517: result: $ac_cv_header_unicode_unorm2_h" >&5 -echo "${ECHO_T}$ac_cv_header_unicode_unorm2_h" >&6 -if test $ac_cv_header_unicode_unorm2_h = yes; then +echo "$as_me:21945: result: $cf_cv_have___va_copy" >&5 +echo "${ECHO_T}$cf_cv_have___va_copy" >&6 - cat >>confdefs.h <<\EOF -#define HAVE_UNICODE_UNORM2_H 1 +if test "$cf_cv_have___va_copy" = yes +then + +cat >>confdefs.h <<\EOF +#define HAVE___VA_COPY 1 EOF -fi +else # !cf_cv_have___va_copy -# without icuuc try GNU libunistring for normalization -if test $cf_try_icuuc = no ; then - echo "$as_me:20529: checking for unitypes.h" >&5 -echo $ECHO_N "checking for unitypes.h... $ECHO_C" >&6 -if test "${ac_cv_header_unitypes_h+set}" = set; then +echo "$as_me:21957: checking for __builtin_va_copy" >&5 +echo $ECHO_N "checking for __builtin_va_copy... $ECHO_C" >&6 +if test "${cf_cv_have___builtin_va_copy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 20535 "configure" -#include "confdefs.h" -#include -_ACEOF -if { (eval echo "$as_me:20539: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:20545: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_cv_header_unitypes_h=yes -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_header_unitypes_h=no -fi -rm -f conftest.err conftest.$ac_ext -fi -echo "$as_me:20564: result: $ac_cv_header_unitypes_h" >&5 -echo "${ECHO_T}$ac_cv_header_unitypes_h" >&6 -if test $ac_cv_header_unitypes_h = yes; then - echo "$as_me:20568: checking for uninorm.h" >&5 -echo $ECHO_N "checking for uninorm.h... $ECHO_C" >&6 -if test "${ac_cv_header_uninorm_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 20574 "configure" +cat >conftest.$ac_ext <<_ACEOF +#line 21964 "configure" #include "confdefs.h" -#include + +#include + +int +main (void) +{ + + static va_list dst; + static va_list src; + __builtin_va_copy(dst, src) + ; + return 0; +} _ACEOF -if { (eval echo "$as_me:20578: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:21981: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:20584: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_cv_header_uninorm_h=yes + echo "$as_me:21984: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:21987: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:21990: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have___builtin_va_copy=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_header_uninorm_h=no +cat conftest.$ac_ext >&5 +cf_cv_have___builtin_va_copy=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:20603: result: $ac_cv_header_uninorm_h" >&5 -echo "${ECHO_T}$ac_cv_header_uninorm_h" >&6 -if test $ac_cv_header_uninorm_h = yes; then +echo "$as_me:22000: result: $cf_cv_have___builtin_va_copy" >&5 +echo "${ECHO_T}$cf_cv_have___builtin_va_copy" >&6 - cat >>confdefs.h <<\EOF -#define HAVE_UNITYPES_H 1 +test "$cf_cv_have___builtin_va_copy" = yes && + +cat >>confdefs.h <<\EOF +#define HAVE___BUILTIN_VA_COPY 1 EOF - cat >>confdefs.h <<\EOF -#define HAVE_UNINORM_H 1 -EOF +fi # cf_cv_have___va_copy + +fi # cf_cv_have_va_copy + +case "${cf_cv_have_va_copy}${cf_cv_have___va_copy}${cf_cv_have___builtin_va_copy}" in +*yes*) + ;; + +*) + echo "$as_me:22018: checking if we can simply copy va_list" >&5 +echo $ECHO_N "checking if we can simply copy va_list... $ECHO_C" >&6 +if test "${cf_cv_pointer_va_list+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else - echo "$as_me:20615: checking for u8_normalize in libunistring" >&5 -echo $ECHO_N "checking for u8_normalize in libunistring... $ECHO_C" >&6 - cf_save_LIBS="$LIBS" - cf_try_unistring="no" - LIBS="$LIBS -lunistring" - cat >conftest.$ac_ext <<_ACEOF -#line 20621 "configure" +cat >conftest.$ac_ext <<_ACEOF +#line 22025 "configure" #include "confdefs.h" -#include - #include + +#include + int main (void) { - size_t ol = 0; - u8_normalize(UNINORM_NFC, (uint8_t *) "x", 2, NULL, &ol); + va_list dst; + va_list src; + dst = src ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20636: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22042: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20639: \$? = $ac_status" >&5 + echo "$as_me:22045: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20642: \"$ac_try\"") >&5 + { (eval echo "$as_me:22048: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20645: \$? = $ac_status" >&5 + echo "$as_me:22051: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - cat >>confdefs.h <<\EOF -#define HAVE_LIBUNISTRING 1 -EOF - - cf_try_unistring="yes" + cf_cv_pointer_va_list=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -LIBS=$cf_save_LIBS - +cf_cv_pointer_va_list=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:20660: result: $cf_try_unistring" >&5 -echo "${ECHO_T}$cf_try_unistring" >&6 - -fi - -fi - fi +echo "$as_me:22061: result: $cf_cv_pointer_va_list" >&5 +echo "${ECHO_T}$cf_cv_pointer_va_list" >&6 -# without icuuc try libidn for Internationalized Domain Names / IDN 2003 -# TODO: check for libidn2 -if test $cf_try_icuuc = no ; then - echo "$as_me:20672: checking for stringprep_check_version in -lidn" >&5 -echo $ECHO_N "checking for stringprep_check_version in -lidn... $ECHO_C" >&6 -if test "${ac_cv_lib_idn_stringprep_check_version+set}" = set; then + if test "$cf_cv_pointer_va_list" = no + then + echo "$as_me:22066: checking if we can copy va_list indirectly" >&5 +echo $ECHO_N "checking if we can copy va_list indirectly... $ECHO_C" >&6 +if test "${cf_cv_array_va_list+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lidn $LIBS" + cat >conftest.$ac_ext <<_ACEOF -#line 20680 "configure" +#line 22073 "configure" #include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char stringprep_check_version (); +#include + int main (void) { -stringprep_check_version (); + + va_list dst; + va_list src; + *dst = *src ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20699: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22090: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20702: \$? = $ac_status" >&5 + echo "$as_me:22093: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20705: \"$ac_try\"") >&5 + { (eval echo "$as_me:22096: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20708: \$? = $ac_status" >&5 + echo "$as_me:22099: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_idn_stringprep_check_version=yes + cf_cv_array_va_list=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_idn_stringprep_check_version=no +cf_cv_array_va_list=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:20719: result: $ac_cv_lib_idn_stringprep_check_version" >&5 -echo "${ECHO_T}$ac_cv_lib_idn_stringprep_check_version" >&6 -if test $ac_cv_lib_idn_stringprep_check_version = yes; then - echo "$as_me:20722: checking for stringprep.h" >&5 -echo $ECHO_N "checking for stringprep.h... $ECHO_C" >&6 -if test "${ac_cv_header_stringprep_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 20728 "configure" -#include "confdefs.h" -#include -_ACEOF -if { (eval echo "$as_me:20732: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:20738: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_cv_header_stringprep_h=yes -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_header_stringprep_h=no -fi -rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:20757: result: $ac_cv_header_stringprep_h" >&5 -echo "${ECHO_T}$ac_cv_header_stringprep_h" >&6 -if test $ac_cv_header_stringprep_h = yes; then - - cat >>confdefs.h <<\EOF -#define HAVE_STRINGPREP_H 1 +echo "$as_me:22109: result: $cf_cv_array_va_list" >&5 +echo "${ECHO_T}$cf_cv_array_va_list" >&6 + test "$cf_cv_array_va_list" = yes && +cat >>confdefs.h <<\EOF +#define ARRAY_VA_LIST 1 EOF - echo "$as_me:20765: checking for idna.h" >&5 -echo $ECHO_N "checking for idna.h... $ECHO_C" >&6 -if test "${ac_cv_header_idna_h+set}" = set; then + fi + ;; +esac + +### Checks for Datatypes. +# On IRIX 5.3, sys/types and inttypes.h are conflicting. + +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:22127: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 20771 "configure" +#line 22133 "configure" #include "confdefs.h" -#include +$ac_includes_default +#include <$ac_header> _ACEOF -if { (eval echo "$as_me:20775: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:22139: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:20781: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_cv_header_idna_h=yes + echo "$as_me:22142: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:22145: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:22148: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_header_idna_h=no +cat conftest.$ac_ext >&5 +eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:20800: result: $ac_cv_header_idna_h" >&5 -echo "${ECHO_T}$ac_cv_header_idna_h" >&6 -if test $ac_cv_header_idna_h = yes; then - - cat >>confdefs.h <<\EOF -#define HAVE_IDNA_H 1 +echo "$as_me:22158: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 -echo $ECHO_N "checking for idna_to_unicode_lzlz in -lidn... $ECHO_C" >&6 -if test "${ac_cv_lib_idn_idna_to_unicode_lzlz+set}" = set; then +fi +done + +echo "$as_me:22168: checking for gid_t" >&5 +echo $ECHO_N "checking for gid_t... $ECHO_C" >&6 +if test "${ac_cv_type_gid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lidn $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 20816 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 22174 "configure" #include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char idna_to_unicode_lzlz (); +$ac_includes_default int main (void) { -idna_to_unicode_lzlz (); +if ((gid_t *) 0) + return 0; +if (sizeof (gid_t)) + return 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20835: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:22189: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20838: \$? = $ac_status" >&5 + echo "$as_me:22192: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20841: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:22195: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20844: \$? = $ac_status" >&5 + echo "$as_me:22198: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_idn_idna_to_unicode_lzlz=yes + ac_cv_type_gid_t=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_idn_idna_to_unicode_lzlz=no +ac_cv_type_gid_t=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:20855: result: $ac_cv_lib_idn_idna_to_unicode_lzlz" >&5 -echo "${ECHO_T}$ac_cv_lib_idn_idna_to_unicode_lzlz" >&6 -if test $ac_cv_lib_idn_idna_to_unicode_lzlz = yes; then - - cat >>confdefs.h <<\EOF -#define HAVE_IDNA_TO_UNICODE_LZLZ 1 -EOF - - echo "$as_me:20863: checking for IDNA_USE_STD3_ASCII_RULES" >&5 -echo $ECHO_N "checking for IDNA_USE_STD3_ASCII_RULES... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line 20866 "configure" -#include "confdefs.h" -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "IDNA_USE_STD3_ASCII_RULES" >/dev/null 2>&1; then - - cat >>confdefs.h <<\EOF -#define HAVE_IDNA_USE_STD3_ASCII_RULES 1 -EOF - - echo "$as_me:20878: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +echo "$as_me:22208: result: $ac_cv_type_gid_t" >&5 +echo "${ECHO_T}$ac_cv_type_gid_t" >&6 +if test $ac_cv_type_gid_t = yes; then + : else - echo "$as_me:20881: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi -rm -rf conftest* +cat >>confdefs.h <&5 -echo $ECHO_N "checking for idna_strerror in -lidn... $ECHO_C" >&6 -if test "${ac_cv_lib_idn_idna_strerror+set}" = set; then +echo "$as_me:22220: checking for mode_t" >&5 +echo $ECHO_N "checking for mode_t... $ECHO_C" >&6 +if test "${ac_cv_type_mode_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lidn $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 20897 "configure" -#include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char idna_strerror (); + cat >conftest.$ac_ext <<_ACEOF +#line 22226 "configure" +#include "confdefs.h" +$ac_includes_default int main (void) { -idna_strerror (); +if ((mode_t *) 0) + return 0; +if (sizeof (mode_t)) + return 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20916: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:22241: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20919: \$? = $ac_status" >&5 + echo "$as_me:22244: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20922: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:22247: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20925: \$? = $ac_status" >&5 + echo "$as_me:22250: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_idn_idna_strerror=yes + ac_cv_type_mode_t=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_idn_idna_strerror=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:20936: result: $ac_cv_lib_idn_idna_strerror" >&5 -echo "${ECHO_T}$ac_cv_lib_idn_idna_strerror" >&6 -if test $ac_cv_lib_idn_idna_strerror = yes; then - - cat >>confdefs.h <<\EOF -#define HAVE_IDNA_STRERROR 1 -EOF - +ac_cv_type_mode_t=no fi - +rm -f conftest.$ac_objext conftest.$ac_ext fi +echo "$as_me:22260: result: $ac_cv_type_mode_t" >&5 +echo "${ECHO_T}$ac_cv_type_mode_t" >&6 +if test $ac_cv_type_mode_t = yes; then + : +else - cat >>confdefs.h <<\EOF -#define HAVE_LIBIDN 1 +cat >>confdefs.h <&5 -echo $ECHO_N "checking for idn_decodename in -lidnkit... $ECHO_C" >&6 -if test "${ac_cv_lib_idnkit_idn_decodename+set}" = set; then +echo "$as_me:22272: checking for off_t" >&5 +echo $ECHO_N "checking for off_t... $ECHO_C" >&6 +if test "${ac_cv_type_off_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lidnkit $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 20969 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 22278 "configure" #include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char idn_decodename (); +$ac_includes_default int main (void) { -idn_decodename (); +if ((off_t *) 0) + return 0; +if (sizeof (off_t)) + return 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20988: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:22293: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20991: \$? = $ac_status" >&5 + echo "$as_me:22296: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20994: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:22299: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20997: \$? = $ac_status" >&5 + echo "$as_me:22302: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_idnkit_idn_decodename=yes + ac_cv_type_off_t=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_idnkit_idn_decodename=no +ac_cv_type_off_t=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:21008: result: $ac_cv_lib_idnkit_idn_decodename" >&5 -echo "${ECHO_T}$ac_cv_lib_idnkit_idn_decodename" >&6 -if test $ac_cv_lib_idnkit_idn_decodename = yes; then +echo "$as_me:22312: result: $ac_cv_type_off_t" >&5 +echo "${ECHO_T}$ac_cv_type_off_t" >&6 +if test $ac_cv_type_off_t = yes; then + : +else - echo "$as_me:21012: checking for idn/api.h" >&5 -echo $ECHO_N "checking for idn/api.h... $ECHO_C" >&6 -if test "${ac_cv_header_idn_api_h+set}" = set; then +cat >>confdefs.h <&5 +echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 +if test "${ac_cv_type_pid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 21018 "configure" -#include "confdefs.h" -#include -_ACEOF -if { (eval echo "$as_me:21022: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:21028: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_cv_header_idn_api_h=yes -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_header_idn_api_h=no -fi -rm -f conftest.err conftest.$ac_ext -fi -echo "$as_me:21047: result: $ac_cv_header_idn_api_h" >&5 -echo "${ECHO_T}$ac_cv_header_idn_api_h" >&6 -if test $ac_cv_header_idn_api_h = yes; then - - echo "$as_me:21051: checking for IDN_DECODE_LOOKUP" >&5 -echo $ECHO_N "checking for IDN_DECODE_LOOKUP... $ECHO_C" >&6 - cf_save_LIBS="$LIBS" - LIBS="$LIBS -lidnkit" - cat >conftest.$ac_ext <<_ACEOF -#line 21056 "configure" +#line 22330 "configure" #include "confdefs.h" -#include - #include +$ac_includes_default int main (void) { - - idn_result_t rs; - char in[255], out[255]; - strcpy(in, "xn--brenfe-fta9a2q.de"); - rs = idn_decodename(IDN_DECODE_LOOKUP, &in, &out, 254); - idn_result_tostring(rs); +if ((pid_t *) 0) + return 0; +if (sizeof (pid_t)) + return 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21074: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:22345: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21077: \$? = $ac_status" >&5 + echo "$as_me:22348: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21080: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:22351: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21083: \$? = $ac_status" >&5 + echo "$as_me:22354: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - cat >>confdefs.h <<\EOF -#define HAVE_LIBIDNKIT 1 -EOF - - cat >>confdefs.h <<\EOF -#define HAVE_IDN_API_H 1 -EOF - - cat >>confdefs.h <<\EOF -#define HAVE_IDN_DECODENAME 1 -EOF - - echo "$as_me:21098: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + ac_cv_type_pid_t=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - - LIBS=$cf_save_LIBS - echo "$as_me:21105: result: no" >&5 -echo "${ECHO_T}no" >&6 - +ac_cv_type_pid_t=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - +rm -f conftest.$ac_objext conftest.$ac_ext fi +echo "$as_me:22364: result: $ac_cv_type_pid_t" >&5 +echo "${ECHO_T}$ac_cv_type_pid_t" >&6 +if test $ac_cv_type_pid_t = yes; then + : +else -fi +cat >>confdefs.h <&5 +echo $ECHO_N "checking for size_t... $ECHO_C" >&6 +if test "${ac_cv_type_size_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - -cf_cv_termlib=none -cat >conftest.$ac_ext <<_ACEOF -#line 21125 "configure" -#include "confdefs.h" - -int -main (void) -{ -char *x=(char*)tgoto("",0,0) - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21137: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:21140: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21143: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:21146: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then cat >conftest.$ac_ext <<_ACEOF -#line 21149 "configure" +#line 22382 "configure" #include "confdefs.h" - +$ac_includes_default int main (void) { -int x=tigetstr("") +if ((size_t *) 0) + return 0; +if (sizeof (size_t)) + return 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21161: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:22397: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21164: \$? = $ac_status" >&5 + echo "$as_me:22400: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21167: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:22403: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21170: \$? = $ac_status" >&5 + echo "$as_me:22406: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_termlib=terminfo + ac_cv_type_size_t=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_termlib=termcap +ac_cv_type_size_t=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - test -n "$verbose" && echo " using functions in predefined $cf_cv_termlib LIBS" 1>&6 +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:22416: result: $ac_cv_type_size_t" >&5 +echo "${ECHO_T}$ac_cv_type_size_t" >&6 +if test $ac_cv_type_size_t = yes; then + : +else -echo "${as_me:-configure}:21181: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5 +cat >>confdefs.h <&5 -cat conftest.$ac_ext >&5 +fi -if test "$cf_cv_termlib" = none; then - # FreeBSD's linker gives bogus results for AC_CHECK_LIB, saying that - # tgetstr lives in -lcurses when it is only an unsatisfied extern. - cf_save_LIBS="$LIBS" - for cf_lib in tinfo curses ncurses termlib termcap - do - LIBS="-l$cf_lib $cf_save_LIBS" - for cf_func in tigetstr tgetstr - do - echo "$as_me:21196: checking for $cf_func in -l$cf_lib" >&5 -echo $ECHO_N "checking for $cf_func in -l$cf_lib... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line 21199 "configure" +echo "$as_me:22428: checking for ssize_t" >&5 +echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6 +if test "${ac_cv_type_ssize_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 22434 "configure" #include "confdefs.h" - +$ac_includes_default int main (void) { -int x=$cf_func("") +if ((ssize_t *) 0) + return 0; +if (sizeof (ssize_t)) + return 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21211: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:22449: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21214: \$? = $ac_status" >&5 + echo "$as_me:22452: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21217: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:22455: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21220: \$? = $ac_status" >&5 + echo "$as_me:22458: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_result=yes + ac_cv_type_ssize_t=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_result=no +ac_cv_type_ssize_t=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:21229: result: $cf_result" >&5 -echo "${ECHO_T}$cf_result" >&6 - if test "$cf_result" = yes ; then - if test "$cf_func" = tigetstr ; then - cf_cv_termlib=terminfo - else - cf_cv_termlib=termcap - fi - break - fi - done - test "$cf_result" = yes && break - done - test "$cf_result" = no && LIBS="$cf_save_LIBS" +rm -f conftest.$ac_objext conftest.$ac_ext fi -if test "$cf_cv_termlib" = none; then - # allow curses library for broken AIX system. - echo "$as_me:21246: checking for initscr in -lcurses" >&5 -echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6 -if test "${ac_cv_lib_curses_initscr+set}" = set; then +echo "$as_me:22468: result: $ac_cv_type_ssize_t" >&5 +echo "${ECHO_T}$ac_cv_type_ssize_t" >&6 +if test $ac_cv_type_ssize_t = yes; then + : +else + +cat >>confdefs.h <&5 +echo $ECHO_N "checking for time_t... $ECHO_C" >&6 +if test "${ac_cv_type_time_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcurses $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 21254 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 22486 "configure" #include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char initscr (); +$ac_includes_default int main (void) { -initscr (); +if ((time_t *) 0) + return 0; +if (sizeof (time_t)) + return 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21273: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:22501: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21276: \$? = $ac_status" >&5 + echo "$as_me:22504: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21279: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:22507: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21282: \$? = $ac_status" >&5 + echo "$as_me:22510: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_curses_initscr=yes + ac_cv_type_time_t=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_curses_initscr=no +ac_cv_type_time_t=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:21293: result: $ac_cv_lib_curses_initscr" >&5 -echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6 -if test $ac_cv_lib_curses_initscr = yes; then +echo "$as_me:22520: result: $ac_cv_type_time_t" >&5 +echo "${ECHO_T}$ac_cv_type_time_t" >&6 +if test $ac_cv_type_time_t = yes; then + : +else -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" +cat >>confdefs.h <&5 -echo $ECHO_N "checking for tgoto in -ltermcap... $ECHO_C" >&6 -if test "${ac_cv_lib_termcap_tgoto+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ltermcap $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 21323 "configure" +#line 22533 "configure" #include "confdefs.h" +#include -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char tgoto (); +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "in_addr_t" >/dev/null 2>&1; then + : +else + + cat >conftest.$ac_ext <<_ACEOF +#line 22544 "configure" +#include "confdefs.h" +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "in_addr_t" >/dev/null 2>&1; then + : +else + + echo "$as_me:22554: checking for in_addr_t" >&5 +echo $ECHO_N "checking for in_addr_t... $ECHO_C" >&6 +if test "${ac_cv_type_in_addr_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 22560 "configure" +#include "confdefs.h" +$ac_includes_default int main (void) { -tgoto (); +if ((in_addr_t *) 0) + return 0; +if (sizeof (in_addr_t)) + return 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21342: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:22575: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21345: \$? = $ac_status" >&5 + echo "$as_me:22578: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21348: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:22581: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21351: \$? = $ac_status" >&5 + echo "$as_me:22584: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_termcap_tgoto=yes + ac_cv_type_in_addr_t=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_termcap_tgoto=no +ac_cv_type_in_addr_t=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:21362: result: $ac_cv_lib_termcap_tgoto" >&5 -echo "${ECHO_T}$ac_cv_lib_termcap_tgoto" >&6 -if test $ac_cv_lib_termcap_tgoto = yes; then +echo "$as_me:22594: result: $ac_cv_type_in_addr_t" >&5 +echo "${ECHO_T}$ac_cv_type_in_addr_t" >&6 +if test $ac_cv_type_in_addr_t = yes; then + : +else + +cat >>confdefs.h <&5 -echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;} +rm -rf conftest* + +echo "$as_me:22612: checking for uid_t in sys/types.h" >&5 +echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6 +if test "${ac_cv_type_uid_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 22618 "configure" +#include "confdefs.h" +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "uid_t" >/dev/null 2>&1; then + ac_cv_type_uid_t=yes +else + ac_cv_type_uid_t=no fi +rm -rf conftest* fi +echo "$as_me:22632: result: $ac_cv_type_uid_t" >&5 +echo "${ECHO_T}$ac_cv_type_uid_t" >&6 +if test $ac_cv_type_uid_t = no; then - # terminfo-based termcap interfaces may be prototyped in , - # which may/may not be compatible with - echo "$as_me:21397: checking if we should include termcap.h" >&5 -echo $ECHO_N "checking if we should include termcap.h... $ECHO_C" >&6 - cf_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -I$srcdir/include" - cat >conftest.$ac_ext <<_ACEOF -#line 21402 "configure" +cat >>confdefs.h <<\EOF +#define uid_t int +EOF + +cat >>confdefs.h <<\EOF +#define gid_t int +EOF + +fi + +echo "$as_me:22646: checking for quad_t" >&5 +echo $ECHO_N "checking for quad_t... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line 22649 "configure" #include "confdefs.h" -#define HAVE_TERMCAP_H 1 -#include +#include +#if 0 +#include +#include +#endif /* 0 */ + int main (void) { - -#ifdef NCURSES_VERSION -make an error -#endif - +quad_t x; x = 0 ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:21420: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22667: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21423: \$? = $ac_status" >&5 + echo "$as_me:22670: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21426: \"$ac_try\"") >&5 + { (eval echo "$as_me:22673: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21429: \$? = $ac_status" >&5 + echo "$as_me:22676: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_result=yes + ac_cv_quad_t=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_result=no +ac_cv_quad_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:21438: result: $cf_result" >&5 -echo "${ECHO_T}$cf_result" >&6 - CFLAGS="$cf_save_CFLAGS" - test $cf_result = yes && cat >>confdefs.h <<\EOF -#define HAVE_TERMCAP_H 1 -EOF - -echo "$as_me:21445: checking for term.h" >&5 -echo $ECHO_N "checking for term.h... $ECHO_C" >&6 -if test "${cf_cv_term_header+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -# If we found , look for , but always look -# for if we do not find the variant. - -cf_header_list="term.h ncurses/term.h ncursesw/term.h" - -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" - ;; -esac +echo "$as_me:22685: result: $ac_cv_quad_t" >&5 +echo "${ECHO_T}$ac_cv_quad_t" >&6 +if test $ac_cv_quad_t = yes; then -for cf_header in $cf_header_list -do - cat >conftest.$ac_ext <<_ACEOF -#line 21466 "configure" +cat >>confdefs.h <<\EOF +#define HAVE_QUAD_T 1 +EOF + +fi + +echo "$as_me:22695: checking for long long" >&5 +echo $ECHO_N "checking for long long... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line 22698 "configure" #include "confdefs.h" -#include <${cf_cv_ncurses_header:-curses.h}> -#include <${cf_header}> +#include + int main (void) { -WINDOW *x +long long x; x = 0 ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:21480: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22712: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21483: \$? = $ac_status" >&5 + echo "$as_me:22715: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21486: \"$ac_try\"") >&5 + { (eval echo "$as_me:22718: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21489: \$? = $ac_status" >&5 + echo "$as_me:22721: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_term_header=$cf_header - break + ac_cv_long_long=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_term_header=no +ac_cv_long_long=no fi rm -f conftest.$ac_objext conftest.$ac_ext -done +echo "$as_me:22730: result: $ac_cv_long_long" >&5 +echo "${ECHO_T}$ac_cv_long_long" >&6 +if test $ac_cv_long_long = yes; then -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 <<_ACEOF -#line 21508 "configure" +cat >>confdefs.h <<\EOF +#define HAVE_LONG_LONG 1 +EOF + +fi + +echo "$as_me:22740: checking for int_least64_t" >&5 +echo $ECHO_N "checking for int_least64_t... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line 22743 "configure" #include "confdefs.h" -#include <${cf_cv_ncurses_header:-curses.h}> -#ifdef NCURSES_VERSION -#include <${cf_header}> -#else -make an error +#ifdef HAVE_STDINT_H +#include +#endif +#ifdef HAVE_HAVE_INTTYPES_H +#include #endif + int main (void) { -WINDOW *x +int_least64_t x; x = 0 ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:21526: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22762: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21529: \$? = $ac_status" >&5 + echo "$as_me:22765: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21532: \"$ac_try\"") >&5 + { (eval echo "$as_me:22768: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21535: \$? = $ac_status" >&5 + echo "$as_me:22771: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_term_header=$cf_header - break + ac_cv_int_least64_t=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_term_header=no +ac_cv_int_least64_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext - done - ;; -esac - -fi -echo "$as_me:21550: result: $cf_cv_term_header" >&5 -echo "${ECHO_T}$cf_cv_term_header" >&6 - -case $cf_cv_term_header in -term.h) - -cat >>confdefs.h <<\EOF -#define HAVE_TERM_H 1 -EOF - - ;; -ncurses/term.h) - -cat >>confdefs.h <<\EOF -#define HAVE_NCURSES_TERM_H 1 -EOF - - ;; -ncursesw/term.h) +echo "$as_me:22780: result: $ac_cv_int_least64_t" >&5 +echo "${ECHO_T}$ac_cv_int_least64_t" >&6 +if test $ac_cv_int_least64_t = yes; then cat >>confdefs.h <<\EOF -#define HAVE_NCURSESW_TERM_H 1 +#define HAVE_INT_LEAST64_T 1 EOF - ;; -esac - -echo "$as_me:21577: checking if we should include curses.h or termcap.h" >&5 -echo $ECHO_N "checking if we should include curses.h or termcap.h... $ECHO_C" >&6 -if test "${cf_cv_need_curses_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -cf_save_CPPFLAGS="$CPPFLAGS" -cf_cv_need_curses_h=no - -for cf_t_opts in "" "NEED_TERMCAP_H" -do -for cf_c_opts in "" "NEED_CURSES_H" -do + echo "$as_me:22788: checking for INT64_C" >&5 +echo $ECHO_N "checking for INT64_C... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line 22791 "configure" +#include "confdefs.h" - CPPFLAGS="$cf_save_CPPFLAGS $CHECK_DECL_FLAG" - test -n "$cf_c_opts" && CPPFLAGS="$CPPFLAGS -D$cf_c_opts" - test -n "$cf_t_opts" && CPPFLAGS="$CPPFLAGS -D$cf_t_opts" +#ifdef HAVE_STDINT_H +#include +#endif +#ifdef HAVE_HAVE_INTTYPES_H +#include +#endif - cat >conftest.$ac_ext <<_ACEOF -#line 21596 "configure" -#include "confdefs.h" -/* $cf_c_opts $cf_t_opts */ -$CHECK_DECL_HDRS int main (void) { -char *x = (char *)tgoto("") +int_least64_t x; x = INT64_C(0) ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21609: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:22810: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21612: \$? = $ac_status" >&5 + echo "$as_me:22813: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21615: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:22816: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21618: \$? = $ac_status" >&5 + echo "$as_me:22819: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - test "$cf_cv_need_curses_h" = no && { - cf_cv_need_curses_h=maybe - cf_ok_c_opts=$cf_c_opts - cf_ok_t_opts=$cf_t_opts - } + ac_cv_int64_c=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "Recompiling with corrected call (C:$cf_c_opts, T:$cf_t_opts)" >&5 - cat >conftest.$ac_ext <<_ACEOF -#line 21630 "configure" +ac_cv_int64_c=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext + echo "$as_me:22828: result: $ac_cv_int64_c" >&5 +echo "${ECHO_T}$ac_cv_int64_c" >&6 + if test $ac_cv_int64_c = yes; then + +cat >>confdefs.h <<\EOF +#define HAVE_INT64_C 1 +EOF + + fi +fi + +echo "$as_me:22839: checking for nl_item" >&5 +echo $ECHO_N "checking for nl_item... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line 22842 "configure" #include "confdefs.h" -$CHECK_DECL_HDRS +#ifdef HAVE_LANGINFO_H +#include +#else +#ifdef HAVE_NL_TYPES_H +#include +#endif +#endif + int main (void) { -char *x = (char *)tgoto("",0,0) +nl_item x; x = 0 ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21643: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:22862: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21646: \$? = $ac_status" >&5 + echo "$as_me:22865: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21649: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:22868: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21652: \$? = $ac_status" >&5 + echo "$as_me:22871: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_need_curses_h=yes - cf_ok_c_opts=$cf_c_opts - cf_ok_t_opts=$cf_t_opts + ac_cv_nl_item=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 +ac_cv_nl_item=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - - CPPFLAGS="$cf_save_CPPFLAGS" - test "$cf_cv_need_curses_h" = yes && break -done - test "$cf_cv_need_curses_h" = yes && break -done - -if test "$cf_cv_need_curses_h" != no ; then - echo "Curses/termcap test = $cf_cv_need_curses_h (C:$cf_ok_c_opts, T:$cf_ok_t_opts)" >&5 - if test -n "$cf_ok_c_opts" ; then - if test -n "$cf_ok_t_opts" ; then - cf_cv_need_curses_h=both - else - cf_cv_need_curses_h=curses.h - fi - elif test -n "$cf_ok_t_opts" ; then - cf_cv_need_curses_h=termcap.h - elif test "$cf_cv_term_header" != no ; then - cf_cv_need_curses_h=term.h - else - cf_cv_need_curses_h=no - fi -fi - -fi -echo "$as_me:21689: result: $cf_cv_need_curses_h" >&5 -echo "${ECHO_T}$cf_cv_need_curses_h" >&6 - -case $cf_cv_need_curses_h in -both) - -cat >>confdefs.h <>confdefs.h <>confdefs.h <>confdefs.h <&5 +echo "${ECHO_T}$ac_cv_nl_item" >&6 +if test $ac_cv_nl_item = yes; then -cat >>confdefs.h <>confdefs.h <<\EOF +#define HAVE_NL_ITEM 1 EOF - ;; -esac +fi -echo "$as_me:21727: checking declaration of tputs 3rd param" >&5 -echo $ECHO_N "checking declaration of tputs 3rd param... $ECHO_C" >&6 -if test "${cf_cv_type_outchar+set}" = set; then +### Checks for libraries. +# libuu/uudeview +# only define HAVE_LIBUU and HAVE_UUDEVIEW_H if both are found +echo "$as_me:22893: checking for UUInitialize in -luu" >&5 +echo $ECHO_N "checking for UUInitialize in -luu... $ECHO_C" >&6 +if test "${ac_cv_lib_uu_UUInitialize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - -cf_cv_type_outchar="int OutChar(int)" -cf_cv_found=no -cf_save_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG" - -for P in int void; do -for Q in int void; do -for R in int char; do -for S in "" const; do - -echo "${as_me:-configure}:21743: testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5 - - cat >conftest.$ac_ext <<_ACEOF -#line 21746 "configure" + ac_check_lib_save_LIBS=$LIBS +LIBS="-luu $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 22901 "configure" #include "confdefs.h" -$CHECK_DECL_HDRS + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char UUInitialize (); int main (void) { -extern $Q OutChar($R); - extern $P tputs ($S char *string, int nlines, $Q (*_f)($R)); - tputs("", 1, OutChar) +UUInitialize (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:21760: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:22920: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21763: \$? = $ac_status" >&5 + echo "$as_me:22923: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21766: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:22926: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21769: \$? = $ac_status" >&5 + echo "$as_me:22929: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_type_outchar="$Q OutChar($R)" - cf_cv_found=yes - break + ac_cv_lib_uu_UUInitialize=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 +ac_cv_lib_uu_UUInitialize=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -done - test $cf_cv_found = yes && break -done - test $cf_cv_found = yes && break -done - test $cf_cv_found = yes && break -done - +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21788: result: $cf_cv_type_outchar" >&5 -echo "${ECHO_T}$cf_cv_type_outchar" >&6 - -case $cf_cv_type_outchar in -int*) +echo "$as_me:22940: result: $ac_cv_lib_uu_UUInitialize" >&5 +echo "${ECHO_T}$ac_cv_lib_uu_UUInitialize" >&6 +if test $ac_cv_lib_uu_UUInitialize = yes; then + echo "$as_me:22943: checking for uudeview.h" >&5 +echo $ECHO_N "checking for uudeview.h... $ECHO_C" >&6 +if test "${ac_cv_header_uudeview_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 22949 "configure" +#include "confdefs.h" +#include +_ACEOF +if { (eval echo "$as_me:22953: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:22959: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_uudeview_h=yes +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_header_uudeview_h=no +fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:22978: result: $ac_cv_header_uudeview_h" >&5 +echo "${ECHO_T}$ac_cv_header_uudeview_h" >&6 +if test $ac_cv_header_uudeview_h = yes; then cat >>confdefs.h <<\EOF -#define OUTC_RETURN 1 +#define HAVE_LIBUU 1 EOF - ;; -esac -case $cf_cv_type_outchar in -*char*) - cat >>confdefs.h <<\EOF -#define OUTC_ARGS char c +#define HAVE_UUDEVIEW_H 1 EOF - ;; -esac + LIBS="$LIBS -luu" -CPPFLAGS="$cf_save_CPPFLAGS" +fi fi -cf_tc_funcs= -cf_tc_externs= -if test ".$cf_cv_termlib" = .terminfo ; then - cat >>confdefs.h <<\EOF -#define USE_TERMINFO 1 -EOF +# ICU - International Components for Unicode +# TODO: do separate checks for +# - unorm_normalize() # deprecated since ICU 56 +# - uidna_IDNToUnicode() # deprecated since ICU 56 +# - ubidi_open() +# and for IDNA2008 +# - uidna_openUTS46() +# - uidna_nameToUnicode() +# - unorm2_normalize() +# get $CFLAGS/$LDFLAGS from pkg-config icu-uc if possible +cf_try_icuuc="no" +cf_try_icuuc46="no" +echo "$as_me:23008: checking for unicode/unorm.h" >&5 +echo $ECHO_N "checking for unicode/unorm.h... $ECHO_C" >&6 +if test "${ac_cv_header_unicode_unorm_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 23014 "configure" +#include "confdefs.h" +#include +_ACEOF +if { (eval echo "$as_me:23018: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:23024: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_unicode_unorm_h=yes +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_header_unicode_unorm_h=no +fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:23043: result: $ac_cv_header_unicode_unorm_h" >&5 +echo "${ECHO_T}$ac_cv_header_unicode_unorm_h" >&6 +if test $ac_cv_header_unicode_unorm_h = yes; then - cf_tc_funcs="tigetint tigetnum tparam tparm" - cf_tc_externs="$cf_tc_funcs tgoto tigetstr tputs tigetflag" -elif test ".$cf_cv_termlib" = .termcap ; then - # BSD 'tputs()' may need 'PC' to be set. - cat >conftest.$ac_ext <<_ACEOF -#line 21826 "configure" + echo "$as_me:23047: checking for unicode/ustring.h" >&5 +echo $ECHO_N "checking for unicode/ustring.h... $ECHO_C" >&6 +if test "${ac_cv_header_unicode_ustring_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 23053 "configure" #include "confdefs.h" +#include +_ACEOF +if { (eval echo "$as_me:23057: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:23063: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_unicode_ustring_h=yes +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_header_unicode_ustring_h=no +fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:23082: result: $ac_cv_header_unicode_ustring_h" >&5 +echo "${ECHO_T}$ac_cv_header_unicode_ustring_h" >&6 +if test $ac_cv_header_unicode_ustring_h = yes; then +cat >>confdefs.h <<\EOF +#define HAVE_UNICODE_UNORM_H 1 +EOF + +cat >>confdefs.h <<\EOF +#define HAVE_UNICODE_USTRING_H 1 +EOF + + echo "$as_me:23094: checking for unorm_normalize in libicuuc" >&5 +echo $ECHO_N "checking for unorm_normalize in libicuuc... $ECHO_C" >&6 + cf_save_LIBS="$LIBS" + cf_try_icuuc="no" + LIBS="$LIBS -licuuc" + cat >conftest.$ac_ext <<_ACEOF +#line 23100 "configure" +#include "confdefs.h" +#include int main (void) { -extern char PC; PC = 0 + + int32_t needed, ustr = NULL; + UErrorCode status; + needed = unorm_normalize(ustr, -1, UNORM_DEFAULT, 0, NULL, 0, &status); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21838: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23115: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21841: \$? = $ac_status" >&5 + echo "$as_me:23118: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21844: \"$ac_try\"") >&5 + { (eval echo "$as_me:23121: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21847: \$? = $ac_status" >&5 + echo "$as_me:23124: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cat >>confdefs.h <<\EOF -#define HAVE_EXTERN_TCAP_PC 1 + +cat >>confdefs.h <<\EOF +#define HAVE_LIBICUUC 1 EOF + cf_try_icuuc="yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 +LIBS=$cf_save_LIBS + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - cf_tc_funcs="tgetint tgetnum tparam tparm" - cf_tc_externs="$cf_tc_funcs tgoto tgetstr tputs tgetent tgetflag" -fi - -### Checks for external-data - -echo "$as_me:21864: checking if external errno is declared" >&5 -echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6 -if test "${cf_cv_dcl_errno+set}" = set; then + echo "$as_me:23139: result: $cf_try_icuuc" >&5 +echo "${ECHO_T}$cf_try_icuuc" >&6 + cf_save_LIBS="$LIBS" + echo "$as_me:23142: checking for unicode/uidna.h" >&5 +echo $ECHO_N "checking for unicode/uidna.h... $ECHO_C" >&6 +if test "${ac_cv_header_unicode_uidna_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat >conftest.$ac_ext <<_ACEOF -#line 21871 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 23148 "configure" #include "confdefs.h" - -#ifdef HAVE_STDLIB_H -#include -#endif -#include -#include -#include -int -main (void) -{ -int x = (int) errno - ; - return 0; -} +#include _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:21889: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:21892: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21895: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (eval echo "$as_me:23152: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - echo "$as_me:21898: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_dcl_errno=yes + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:23158: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_unicode_uidna_h=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cf_cv_dcl_errno=no + cat conftest.$ac_ext >&5 + ac_cv_header_unicode_uidna_h=no fi -rm -f conftest.$ac_objext conftest.$ac_ext - +rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:21909: result: $cf_cv_dcl_errno" >&5 -echo "${ECHO_T}$cf_cv_dcl_errno" >&6 - -if test "$cf_cv_dcl_errno" = no ; then - -cf_result=`echo "decl_errno" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` +echo "$as_me:23177: result: $ac_cv_header_unicode_uidna_h" >&5 +echo "${ECHO_T}$ac_cv_header_unicode_uidna_h" >&6 +if test $ac_cv_header_unicode_uidna_h = yes; then - cat >>confdefs.h <>confdefs.h <<\EOF +#define HAVE_UNICODE_UIDNA_H 1 EOF fi -# It's possible (for near-UNIX clones) that the data doesn't exist - -echo "$as_me:21924: checking if external errno exists" >&5 -echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6 -if test "${cf_cv_have_errno+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - cat >conftest.$ac_ext <<_ACEOF -#line 21931 "configure" + echo "$as_me:23187: checking for uidna_nameToUnicode in libicuuc" >&5 +echo $ECHO_N "checking for uidna_nameToUnicode in libicuuc... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line 23190 "configure" #include "confdefs.h" - -#undef errno -extern int errno; - +#include + #include int main (void) { -errno = 2 + + UErrorCode status = U_ZERO_ERROR; + UIDNAInfo info = UIDNA_INFO_INITIALIZER; + UIDNA *uts46; + uidna_openUTS46(UNORM_DEFAULT, &status); + uidna_nameToUnicode(uts46, NULL, 0, NULL, 0, &info, &status); + uidna_close(uts46); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21946: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23209: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21949: \$? = $ac_status" >&5 + echo "$as_me:23212: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21952: \"$ac_try\"") >&5 + { (eval echo "$as_me:23215: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21955: \$? = $ac_status" >&5 + echo "$as_me:23218: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_have_errno=yes + +cat >>confdefs.h <<\EOF +#define HAVE_LIBICUUC_46_API 1 +EOF + + cf_try_icuuc46="yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_have_errno=no +LIBS=$cf_save_LIBS + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - + echo "$as_me:23233: result: $cf_try_icuuc46" >&5 +echo "${ECHO_T}$cf_try_icuuc46" >&6 + echo "$as_me:23235: checking for unicode/ubidi.h" >&5 +echo $ECHO_N "checking for unicode/ubidi.h... $ECHO_C" >&6 +if test "${ac_cv_header_unicode_ubidi_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 23241 "configure" +#include "confdefs.h" +#include +_ACEOF +if { (eval echo "$as_me:23245: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:23251: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes fi -echo "$as_me:21966: result: $cf_cv_have_errno" >&5 -echo "${ECHO_T}$cf_cv_have_errno" >&6 +if test -z "$ac_cpp_err"; then + ac_cv_header_unicode_ubidi_h=yes +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_header_unicode_ubidi_h=no +fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:23270: result: $ac_cv_header_unicode_ubidi_h" >&5 +echo "${ECHO_T}$ac_cv_header_unicode_ubidi_h" >&6 +if test $ac_cv_header_unicode_ubidi_h = yes; then -if test "$cf_cv_have_errno" = yes ; then +cat >>confdefs.h <<\EOF +#define HAVE_UNICODE_UBIDI_H 1 +EOF -cf_result=`echo "have_errno" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` +fi - cat >>confdefs.h <&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +# IDNA2008 +echo "$as_me:23285: checking for unicode/unorm2.h" >&5 +echo $ECHO_N "checking for unicode/unorm2.h... $ECHO_C" >&6 +if test "${ac_cv_header_unicode_unorm2_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 21988 "configure" +#line 23291 "configure" #include "confdefs.h" -#define $ac_func autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef $ac_func - -#ifdef __cplusplus -extern "C" -#endif - -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (void); - -int -main (void) -{ - -/* The GNU C library defines stubs for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -#error found stub for $ac_func -#endif - - return $ac_func (); - ; - return 0; -} +#include _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22019: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:22022: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22025: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (eval echo "$as_me:23295: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - echo "$as_me:22028: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:23301: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_unicode_unorm2_h=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$as_ac_var=no" + cat conftest.$ac_ext >&5 + ac_cv_header_unicode_unorm2_h=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:22038: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<\EOF -#define HAVE_STRERROR 1 +echo "$as_me:23320: result: $ac_cv_header_unicode_unorm2_h" >&5 +echo "${ECHO_T}$ac_cv_header_unicode_unorm2_h" >&6 +if test $ac_cv_header_unicode_unorm2_h = yes; then + +cat >>confdefs.h <<\EOF +#define HAVE_UNICODE_UNORM2_H 1 EOF -else +fi -echo "$as_me:22050: checking if external sys_nerr is declared" >&5 -echo $ECHO_N "checking if external sys_nerr is declared... $ECHO_C" >&6 -if test "${cf_cv_dcl_sys_nerr+set}" = set; then +# without icuuc try GNU libunistring for normalization +if test $cf_try_icuuc = no ; then + echo "$as_me:23332: checking for unitypes.h" >&5 +echo $ECHO_N "checking for unitypes.h... $ECHO_C" >&6 +if test "${ac_cv_header_unitypes_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat >conftest.$ac_ext <<_ACEOF -#line 22057 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 23338 "configure" #include "confdefs.h" - -#ifdef HAVE_STDLIB_H -#include -#endif -#include -#include -#include -int -main (void) -{ -int x = (int) sys_nerr - ; - return 0; -} +#include _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:22075: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +if { (eval echo "$as_me:23342: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - echo "$as_me:22078: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:22081: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:23348: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_unitypes_h=yes +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_header_unitypes_h=no +fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:23367: result: $ac_cv_header_unitypes_h" >&5 +echo "${ECHO_T}$ac_cv_header_unitypes_h" >&6 +if test $ac_cv_header_unitypes_h = yes; then + + echo "$as_me:23371: checking for uninorm.h" >&5 +echo $ECHO_N "checking for uninorm.h... $ECHO_C" >&6 +if test "${ac_cv_header_uninorm_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 23377 "configure" +#include "confdefs.h" +#include +_ACEOF +if { (eval echo "$as_me:23381: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - echo "$as_me:22084: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_dcl_sys_nerr=yes + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:23387: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_uninorm_h=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cf_cv_dcl_sys_nerr=no + cat conftest.$ac_ext >&5 + ac_cv_header_uninorm_h=no fi -rm -f conftest.$ac_objext conftest.$ac_ext - +rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:22095: result: $cf_cv_dcl_sys_nerr" >&5 -echo "${ECHO_T}$cf_cv_dcl_sys_nerr" >&6 - -if test "$cf_cv_dcl_sys_nerr" = no ; then - -cf_result=`echo "decl_sys_nerr" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` +echo "$as_me:23406: result: $ac_cv_header_uninorm_h" >&5 +echo "${ECHO_T}$ac_cv_header_uninorm_h" >&6 +if test $ac_cv_header_uninorm_h = yes; then - cat >>confdefs.h <>confdefs.h <<\EOF +#define HAVE_UNITYPES_H 1 EOF -fi - -# It's possible (for near-UNIX clones) that the data doesn't exist - -echo "$as_me:22110: checking if external sys_nerr exists" >&5 -echo $ECHO_N "checking if external sys_nerr exists... $ECHO_C" >&6 -if test "${cf_cv_have_sys_nerr+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else +cat >>confdefs.h <<\EOF +#define HAVE_UNINORM_H 1 +EOF - cat >conftest.$ac_ext <<_ACEOF -#line 22117 "configure" + echo "$as_me:23418: checking for u8_normalize in libunistring" >&5 +echo $ECHO_N "checking for u8_normalize in libunistring... $ECHO_C" >&6 + cf_save_LIBS="$LIBS" + cf_try_unistring="no" + LIBS="$LIBS -lunistring" + cat >conftest.$ac_ext <<_ACEOF +#line 23424 "configure" #include "confdefs.h" - -#undef sys_nerr -extern int sys_nerr; - +#include + #include int main (void) { -sys_nerr = 2 + + size_t ol = 0; + u8_normalize(UNINORM_NFC, (uint8_t *) "x", 2, NULL, &ol); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22132: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23439: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22135: \$? = $ac_status" >&5 + echo "$as_me:23442: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22138: \"$ac_try\"") >&5 + { (eval echo "$as_me:23445: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22141: \$? = $ac_status" >&5 + echo "$as_me:23448: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_have_sys_nerr=yes + +cat >>confdefs.h <<\EOF +#define HAVE_LIBUNISTRING 1 +EOF + + cf_try_unistring="yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_have_sys_nerr=no +LIBS=$cf_save_LIBS + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + echo "$as_me:23463: result: $cf_try_unistring" >&5 +echo "${ECHO_T}$cf_try_unistring" >&6 fi -echo "$as_me:22152: result: $cf_cv_have_sys_nerr" >&5 -echo "${ECHO_T}$cf_cv_have_sys_nerr" >&6 - -if test "$cf_cv_have_sys_nerr" = yes ; then -cf_result=`echo "have_sys_nerr" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - - cat >>confdefs.h <&5 -echo $ECHO_N "checking if external sys_errlist is declared... $ECHO_C" >&6 -if test "${cf_cv_dcl_sys_errlist+set}" = set; then +# without icuuc try libidn for Internationalized Domain Names / IDN 2003 +# TODO: check for libidn2 +# get $CFLAGS/$LDFLAGS from pkg-config libidn[2] if possible +if test $cf_try_icuuc = no ; then + echo "$as_me:23476: checking for stringprep_check_version in -lidn" >&5 +echo $ECHO_N "checking for stringprep_check_version in -lidn... $ECHO_C" >&6 +if test "${ac_cv_lib_idn_stringprep_check_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat >conftest.$ac_ext <<_ACEOF -#line 22172 "configure" + ac_check_lib_save_LIBS=$LIBS +LIBS="-lidn $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 23484 "configure" #include "confdefs.h" -#ifdef HAVE_STDLIB_H -#include +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" #endif -#include -#include -#include +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char stringprep_check_version (); int main (void) { -int x = (int) sys_errlist +stringprep_check_version (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:22190: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:23503: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22193: \$? = $ac_status" >&5 + echo "$as_me:23506: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:22196: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:23509: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22199: \$? = $ac_status" >&5 + echo "$as_me:23512: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_dcl_sys_errlist=yes + ac_cv_lib_idn_stringprep_check_version=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_dcl_sys_errlist=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext - +ac_cv_lib_idn_stringprep_check_version=no fi -echo "$as_me:22210: result: $cf_cv_dcl_sys_errlist" >&5 -echo "${ECHO_T}$cf_cv_dcl_sys_errlist" >&6 - -if test "$cf_cv_dcl_sys_errlist" = no ; then - -cf_result=`echo "decl_sys_errlist" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - - cat >>confdefs.h <&5 -echo $ECHO_N "checking if external sys_errlist exists... $ECHO_C" >&6 -if test "${cf_cv_have_sys_errlist+set}" = set; then +echo "$as_me:23523: result: $ac_cv_lib_idn_stringprep_check_version" >&5 +echo "${ECHO_T}$ac_cv_lib_idn_stringprep_check_version" >&6 +if test $ac_cv_lib_idn_stringprep_check_version = yes; then + echo "$as_me:23526: checking for stringprep.h" >&5 +echo $ECHO_N "checking for stringprep.h... $ECHO_C" >&6 +if test "${ac_cv_header_stringprep_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat >conftest.$ac_ext <<_ACEOF -#line 22232 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 23532 "configure" #include "confdefs.h" - -#undef sys_errlist -extern int sys_errlist; - -int -main (void) -{ -sys_errlist = 2 - ; - return 0; -} +#include _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22247: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:22250: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22253: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (eval echo "$as_me:23536: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - echo "$as_me:22256: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_have_sys_errlist=yes + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:23542: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cf_cv_have_sys_errlist=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - -fi -echo "$as_me:22267: result: $cf_cv_have_sys_errlist" >&5 -echo "${ECHO_T}$cf_cv_have_sys_errlist" >&6 - -if test "$cf_cv_have_sys_errlist" = yes ; then - -cf_result=`echo "have_sys_errlist" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - - cat >>confdefs.h <&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +if test -z "$ac_cpp_err"; then + ac_cv_header_stringprep_h=yes +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_header_stringprep_h=no +fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:23561: result: $ac_cv_header_stringprep_h" >&5 +echo "${ECHO_T}$ac_cv_header_stringprep_h" >&6 +if test $ac_cv_header_stringprep_h = yes; then + +cat >>confdefs.h <<\EOF +#define HAVE_STRINGPREP_H 1 +EOF + + echo "$as_me:23569: checking for idna.h" >&5 +echo $ECHO_N "checking for idna.h... $ECHO_C" >&6 +if test "${ac_cv_header_idna_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 22359 "configure" +#line 23575 "configure" #include "confdefs.h" -#define $ac_func autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef $ac_func - -#ifdef __cplusplus -extern "C" -#endif - -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (void); - -int -main (void) -{ - -/* The GNU C library defines stubs for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -#error found stub for $ac_func -#endif - - return $ac_func (); - ; - return 0; -} +#include _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22390: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:22393: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22396: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (eval echo "$as_me:23579: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - echo "$as_me:22399: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:23585: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_idna_h=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$as_ac_var=no" + cat conftest.$ac_ext >&5 + ac_cv_header_idna_h=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:22409: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <&5 +echo "${ECHO_T}$ac_cv_header_idna_h" >&6 +if test $ac_cv_header_idna_h = yes; then -fi -done +cat >>confdefs.h <<\EOF +#define HAVE_IDNA_H 1 +EOF -echo "$as_me:22419: checking for flock" >&5 -echo $ECHO_N "checking for flock... $ECHO_C" >&6 -if test "${ac_cv_func_flock+set}" = set; then + echo "$as_me:23612: checking for idna_to_unicode_lzlz in -lidn" >&5 +echo $ECHO_N "checking for idna_to_unicode_lzlz in -lidn... $ECHO_C" >&6 +if test "${ac_cv_lib_idn_idna_to_unicode_lzlz+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 22425 "configure" + ac_check_lib_save_LIBS=$LIBS +LIBS="-lidn $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 23620 "configure" #include "confdefs.h" -#define flock autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef flock +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif - /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char flock (void); - +char idna_to_unicode_lzlz (); int main (void) { - -/* The GNU C library defines stubs 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_flock) || defined (__stub___flock) -#error found stub for flock -#endif - - return flock (); +idna_to_unicode_lzlz (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22456: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23639: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22459: \$? = $ac_status" >&5 + echo "$as_me:23642: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22462: \"$ac_try\"") >&5 + { (eval echo "$as_me:23645: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22465: \$? = $ac_status" >&5 + echo "$as_me:23648: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func_flock=yes + ac_cv_lib_idn_idna_to_unicode_lzlz=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_func_flock=no +ac_cv_lib_idn_idna_to_unicode_lzlz=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22475: result: $ac_cv_func_flock" >&5 -echo "${ECHO_T}$ac_cv_func_flock" >&6 -if test $ac_cv_func_flock = yes; then - cat >>confdefs.h <<\EOF -#define HAVE_FLOCK 1 +echo "$as_me:23659: result: $ac_cv_lib_idn_idna_to_unicode_lzlz" >&5 +echo "${ECHO_T}$ac_cv_lib_idn_idna_to_unicode_lzlz" >&6 +if test $ac_cv_lib_idn_idna_to_unicode_lzlz = yes; then + +cat >>confdefs.h <<\EOF +#define HAVE_IDNA_TO_UNICODE_LZLZ 1 +EOF + + echo "$as_me:23667: checking for IDNA_USE_STD3_ASCII_RULES" >&5 +echo $ECHO_N "checking for IDNA_USE_STD3_ASCII_RULES... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line 23670 "configure" +#include "confdefs.h" +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "IDNA_USE_STD3_ASCII_RULES" >/dev/null 2>&1; then + +cat >>confdefs.h <<\EOF +#define HAVE_IDNA_USE_STD3_ASCII_RULES 1 EOF + echo "$as_me:23682: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else + echo "$as_me:23685: result: no" >&5 +echo "${ECHO_T}no" >&6 - echo "$as_me:22484: checking for flock in -lbsd" >&5 -echo $ECHO_N "checking for flock in -lbsd... $ECHO_C" >&6 -if test "${ac_cv_lib_bsd_flock+set}" = set; then +fi +rm -rf conftest* + +fi + + echo "$as_me:23693: checking for idna_strerror in -lidn" >&5 +echo $ECHO_N "checking for idna_strerror in -lidn... $ECHO_C" >&6 +if test "${ac_cv_lib_idn_idna_strerror+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lbsd $LIBS" +LIBS="-lidn $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 22492 "configure" +#line 23701 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -22498,3338 +23707,3124 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char flock (); +char idna_strerror (); int main (void) { -flock (); +idna_strerror (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22511: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23720: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22514: \$? = $ac_status" >&5 + echo "$as_me:23723: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22517: \"$ac_try\"") >&5 + { (eval echo "$as_me:23726: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22520: \$? = $ac_status" >&5 + echo "$as_me:23729: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_bsd_flock=yes + ac_cv_lib_idn_idna_strerror=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_bsd_flock=no +ac_cv_lib_idn_idna_strerror=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22531: result: $ac_cv_lib_bsd_flock" >&5 -echo "${ECHO_T}$ac_cv_lib_bsd_flock" >&6 -if test $ac_cv_lib_bsd_flock = yes; then - cat >>confdefs.h <<\EOF -#define HAVE_FLOCK 1 +echo "$as_me:23740: result: $ac_cv_lib_idn_idna_strerror" >&5 +echo "${ECHO_T}$ac_cv_lib_idn_idna_strerror" >&6 +if test $ac_cv_lib_idn_idna_strerror = yes; then + +cat >>confdefs.h <<\EOF +#define HAVE_IDNA_STRERROR 1 EOF - LIBS="$LIBS -lbsd" fi fi -# clock_gettime() / librt -echo "$as_me:22544: checking for clock_gettime" >&5 -echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6 -if test "${ac_cv_func_clock_gettime+set}" = set; then +cat >>confdefs.h <<\EOF +#define HAVE_LIBIDN 1 +EOF + + LIBS="$LIBS -lidn" + +fi + +fi + +fi + +# libidnkit - Internationalized Domain Names / IDN 2008 +echo "$as_me:23765: checking for idn_decodename in -lidnkit" >&5 +echo $ECHO_N "checking for idn_decodename in -lidnkit... $ECHO_C" >&6 +if test "${ac_cv_lib_idnkit_idn_decodename+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 22550 "configure" + ac_check_lib_save_LIBS=$LIBS +LIBS="-lidnkit $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 23773 "configure" #include "confdefs.h" -#define clock_gettime autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef clock_gettime +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif - /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char clock_gettime (void); - +char idn_decodename (); int main (void) { - -/* The GNU C library defines stubs for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_clock_gettime) || defined (__stub___clock_gettime) -#error found stub for clock_gettime -#endif - - return clock_gettime (); +idn_decodename (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22581: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23792: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22584: \$? = $ac_status" >&5 + echo "$as_me:23795: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22587: \"$ac_try\"") >&5 + { (eval echo "$as_me:23798: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22590: \$? = $ac_status" >&5 + echo "$as_me:23801: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func_clock_gettime=yes + ac_cv_lib_idnkit_idn_decodename=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_func_clock_gettime=no +ac_cv_lib_idnkit_idn_decodename=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22600: result: $ac_cv_func_clock_gettime" >&5 -echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6 -if test $ac_cv_func_clock_gettime = yes; then - cat >>confdefs.h <<\EOF -#define HAVE_CLOCK_GETTIME 1 -EOF - -else +echo "$as_me:23812: result: $ac_cv_lib_idnkit_idn_decodename" >&5 +echo "${ECHO_T}$ac_cv_lib_idnkit_idn_decodename" >&6 +if test $ac_cv_lib_idnkit_idn_decodename = yes; then - echo "$as_me:22609: checking for clock_gettime in -lrt" >&5 -echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6 -if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then + echo "$as_me:23816: checking for idn/api.h" >&5 +echo $ECHO_N "checking for idn/api.h... $ECHO_C" >&6 +if test "${ac_cv_header_idn_api_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lrt $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 22617 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 23822 "configure" #include "confdefs.h" +#include +_ACEOF +if { (eval echo "$as_me:23826: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:23832: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_idn_api_h=yes +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_header_idn_api_h=no +fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:23851: result: $ac_cv_header_idn_api_h" >&5 +echo "${ECHO_T}$ac_cv_header_idn_api_h" >&6 +if test $ac_cv_header_idn_api_h = yes; then -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char clock_gettime (); + echo "$as_me:23855: checking for IDN_DECODE_LOOKUP" >&5 +echo $ECHO_N "checking for IDN_DECODE_LOOKUP... $ECHO_C" >&6 + cf_save_LIBS="$LIBS" + LIBS="$LIBS -lidnkit" + cat >conftest.$ac_ext <<_ACEOF +#line 23860 "configure" +#include "confdefs.h" +#include + #include int main (void) { -clock_gettime (); + + idn_result_t rs; + char in[255], out[255]; + strcpy(in, "xn--brenfe-fta9a2q.de"); + rs = idn_decodename(IDN_DECODE_LOOKUP, &in, &out, 254); + idn_result_tostring(rs); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22636: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23878: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22639: \$? = $ac_status" >&5 + echo "$as_me:23881: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22642: \"$ac_try\"") >&5 + { (eval echo "$as_me:23884: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22645: \$? = $ac_status" >&5 + echo "$as_me:23887: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_rt_clock_gettime=yes + +cat >>confdefs.h <<\EOF +#define HAVE_LIBIDNKIT 1 +EOF + +cat >>confdefs.h <<\EOF +#define HAVE_IDN_API_H 1 +EOF + +cat >>confdefs.h <<\EOF +#define HAVE_IDN_DECODENAME 1 +EOF + + echo "$as_me:23902: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_rt_clock_gettime=no + + LIBS=$cf_save_LIBS + echo "$as_me:23909: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:22656: result: $ac_cv_lib_rt_clock_gettime" >&5 -echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6 -if test $ac_cv_lib_rt_clock_gettime = yes; then - cat >>confdefs.h <<\EOF -#define HAVE_CLOCK_GETTIME 1 -EOF - - LIBS="$LIBS -lrt" fi fi -echo "$as_me:22669: checking for memset_s" >&5 -echo $ECHO_N "checking for memset_s... $ECHO_C" >&6 -if test "$cross_compiling" = yes; then - echo "$as_me:22672: result: unknown" >&5 -echo "${ECHO_T}unknown" >&6 +if test $use_curses != no ; then + cf_cv_termlib=$cf_with_screen +else +if test "${cf_cv_termlib+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 22677 "configure" + +cf_cv_termlib=none +cat >conftest.$ac_ext <<_ACEOF +#line 23929 "configure" #include "confdefs.h" -/* Request C11 Annex K */ -#define __STDC_WANT_LIB_EXT1__ 1 -#include -#include -int main() +int +main (void) { - char buf[10] = { 1 }; - if (memset_s((void*) buf, (size_t) 100, 0, (size_t) 1)) - return(-1); +char *x=(char*)tgoto("",0,0) + ; + return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:22692: \"$ac_link\"") >&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:23941: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22695: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:22697: \"$ac_try\"") >&5 + echo "$as_me:23944: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:23947: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22700: \$? = $ac_status" >&5 + echo "$as_me:23950: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - echo "$as_me:22703: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - cat >>confdefs.h <<\EOF -#define HAVE_MEMSET_S 1 -EOF - -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -echo "$as_me:22713: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - echo "$as_me:22719: checking for wide char and multibyte support" >&5 -echo $ECHO_N "checking for wide char and multibyte support... $ECHO_C" >&6 -if test "${am_cv_multibyte_able+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else cat >conftest.$ac_ext <<_ACEOF -#line 22725 "configure" +#line 23953 "configure" #include "confdefs.h" -#include -#ifdef HAVE_STDLIB_H -# include -#endif /* HAVE_STDLIB_H */ -#ifdef HAVE_WCHAR_H -# include -#endif /* HAVE_WCHAR_H */ -#ifdef HAVE_WCTYPE_H -# include -#endif /* HAVE_WCTYPE_H */ int main (void) { -const char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0x00}; - char ocb[5]; - wchar_t wcb[5]; - wchar_t wcb2[5]; - wchar_t format[3]; - - putwc(0, 0); - fputwc(0, 0); - fwide(0, 0); - mbtowc(wcb, icb, MB_CUR_MAX); - mbstowcs(wcb, icb, 5); - (void) iswalnum((wint_t) wcb[0]); - (void) iswcntrl((wint_t) wcb[0]); - (void) iswdigit((wint_t) wcb[0]); - (void) iswgraph((wint_t) wcb[0]); - (void) iswprint((wint_t) wcb[0]); - (void) iswspace((wint_t) wcb[0]); - (void) towupper((wint_t) wcb[0]); - /* (void) iswupper((wint_t) wcb[0]); */ - /* (void) towlower((wint_t) wcb[0]); */ - /* (void) iswlower((wint_t) wcb[0]); */ - (void) iswalpha((wint_t) wcb[0]); - /* (void) iswblank((wint_t) wcb[0]); */ - /* (void) iswpunct((wint_t) wcb[0]); */ - /* (void) iswxdigit((wint_t) wcb[0]); */ - /* (void) iswctype((wint_t) wcb[0], wctype("print")); */ - /* (void) towctranse((wint_t) wcb[0], wctrans("toupper")); */ - (void) wcslen(wcb); - /* (void) wcsnlen(wcb, 4); */ - wcwidth((wint_t) wcb[0]); - wcswidth(wcb, 5); - wcstombs(ocb, wcb, 5); - wctomb(ocb, wcb[0]); - wcscat(wcb2, wcb); - wcscpy(wcb2, wcb); - mbstowcs(format, "%s", 2); - swprintf(wcb, 5, format, "test"); - wcsncat(wcb2, wcb, 5); +int x=tigetstr("") ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22784: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23965: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22787: \$? = $ac_status" >&5 + echo "$as_me:23968: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22790: \"$ac_try\"") >&5 + { (eval echo "$as_me:23971: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22793: \$? = $ac_status" >&5 + echo "$as_me:23974: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - am_cv_multibyte_able=yes + cf_cv_termlib=terminfo else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_save_LIBS="$LIBS" - LIBS="-lutf8 $LIBS" - cat >conftest.$ac_ext <<_ACEOF -#line 22802 "configure" +cf_cv_termlib=termcap +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + test -n "$verbose" && echo " using functions in predefined $cf_cv_termlib LIBS" 1>&6 + +echo "${as_me:-configure}:23985: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5 + +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + +if test "$cf_cv_termlib" = none; then + # FreeBSD's linker gives bogus results for AC_CHECK_LIB, saying that + # tgetstr lives in -lcurses when it is only an unsatisfied extern. + cf_save_LIBS="$LIBS" + for cf_lib in tinfo curses ncurses termlib termcap + do + LIBS="-l$cf_lib $cf_save_LIBS" + for cf_func in tigetstr tgetstr + do + echo "$as_me:24000: checking for $cf_func in -l$cf_lib" >&5 +echo $ECHO_N "checking for $cf_func in -l$cf_lib... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line 24003 "configure" #include "confdefs.h" -#include + int main (void) { -const char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0x00}; - char ocb[5]; - wchar_t wcb[5]; - wchar_t wcb2[5]; - wchar_t format[3]; - - putwc(0, 0); - fputwc(0, 0); - fwide(0, 0); - mbtowc(wcb, icb, MB_CUR_MAX); - mbstowcs(wcb, icb, 5); - (void) iswalnum((wint_t) wcb[0]); - (void) iswcntrl((wint_t) wcb[0]); - (void) iswdigit((wint_t) wcb[0]); - (void) iswgraph((wint_t) wcb[0]); - (void) iswprint((wint_t) wcb[0]); - (void) iswspace((wint_t) wcb[0]); - (void) towupper((wint_t) wcb[0]); - /* (void) iswupper((wint_t) wcb[0]); */ - /* (void) towlower((wint_t) wcb[0]); */ - /* (void) iswlower((wint_t) wcb[0]); */ - (void) iswalpha((wint_t) wcb[0]); - /* (void) iswblank((wint_t) wcb[0]); */ - /* (void) iswpunct((wint_t) wcb[0]); */ - /* (void) iswxdigit((wint_t) wcb[0]); */ - /* (void) iswctype((wint_t) wcb[0], wctype("print")); */ - /* (void) towctranse((wint_t) wcb[0], wctrans("toupper")); */ - (void) wcslen(wcb); - /* (void) wcsnlen(wcb, 4); */ - wcwidth((wint_t) wcb[0]); - wcswidth(wcb, 5); - wcstombs(ocb, wcb, 5); - wctomb(ocb, wcb[0]); - wcscat(wcb2, wcb); - wcscpy(wcb2, wcb); - mbstowcs(format, "%s", 2); - swprintf(wcb, 5, format, "test"); - wcsncat(wcb2, wcb, 5); +int x=$cf_func("") ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22851: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24015: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22854: \$? = $ac_status" >&5 + echo "$as_me:24018: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22857: \"$ac_try\"") >&5 + { (eval echo "$as_me:24021: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22860: \$? = $ac_status" >&5 + echo "$as_me:24024: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - am_cv_multibyte_able=libutf8 + cf_result=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -am_cv_multibyte_able=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS="$cf_save_LIBS" - +cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - + echo "$as_me:24033: result: $cf_result" >&5 +echo "${ECHO_T}$cf_result" >&6 + if test "$cf_result" = yes ; then + if test "$cf_func" = tigetstr ; then + cf_cv_termlib=terminfo + else + cf_cv_termlib=termcap + fi + break + fi + done + test "$cf_result" = yes && break + done + test "$cf_result" = no && LIBS="$cf_save_LIBS" fi -echo "$as_me:22875: result: $am_cv_multibyte_able" >&5 -echo "${ECHO_T}$am_cv_multibyte_able" >&6 - if test "$am_cv_multibyte_able" != no; then - if test "$am_cv_multibyte_able" = libutf8; then - cat >>confdefs.h <<\EOF -#define HAVE_LIBUTF8_H 1 -EOF - - LIBS="-lutf8 $LIBS" - fi - -cat >>confdefs.h <<\EOF -#define MULTIBYTE_ABLE 1 -EOF - - fi - -echo "$as_me:22892: checking if gettimeofday takes two arguments" >&5 -echo $ECHO_N "checking if gettimeofday takes two arguments... $ECHO_C" >&6 +if test "$cf_cv_termlib" = none; then + # allow curses library for broken AIX system. + echo "$as_me:24050: checking for initscr in -lcurses" >&5 +echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6 +if test "${ac_cv_lib_curses_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcurses $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 22895 "configure" +#line 24058 "configure" #include "confdefs.h" -#if HAVE_SYS_TIME_H -#include +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char initscr (); int main (void) { -struct timeval *tv; -struct timezone *tz; -gettimeofday(&tv, &tz); +initscr (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:22912: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:24077: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22915: \$? = $ac_status" >&5 + echo "$as_me:24080: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:22918: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:24083: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22921: \$? = $ac_status" >&5 + echo "$as_me:24086: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func_gettimeofday_2args=yes + ac_cv_lib_curses_initscr=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_func_gettimeofday_2args=no +ac_cv_lib_curses_initscr=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:22930: result: $ac_cv_func_gettimeofday_2args" >&5 -echo "${ECHO_T}$ac_cv_func_gettimeofday_2args" >&6 -if test $ac_cv_func_gettimeofday_2args = yes; then - cat >>confdefs.h <<\EOF -#define GETTIMEOFDAY_2ARGS 1 -EOF +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:24097: result: $ac_cv_lib_curses_initscr" >&5 +echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6 +if test $ac_cv_lib_curses_initscr = yes; then + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lcurses; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" fi -echo "$as_me:22939: checking return type of signal handlers" >&5 -echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 -if test "${ac_cv_type_signal+set}" = set; then + echo "$as_me:24119: checking for tgoto in -ltermcap" >&5 +echo $ECHO_N "checking for tgoto in -ltermcap... $ECHO_C" >&6 +if test "${ac_cv_lib_termcap_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 22945 "configure" + ac_check_lib_save_LIBS=$LIBS +LIBS="-ltermcap $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 24127 "configure" #include "confdefs.h" -#include -#include -#ifdef signal -# undef signal -#endif + +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus -extern "C" void (*signal (int, void (*)(int)))(int); -#else -void (*signal ()) (); +extern "C" #endif - +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char tgoto (); int main (void) { -int i; +tgoto (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:22967: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:24146: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22970: \$? = $ac_status" >&5 + echo "$as_me:24149: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:22973: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:24152: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22976: \$? = $ac_status" >&5 + echo "$as_me:24155: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_signal=void + ac_cv_lib_termcap_tgoto=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_type_signal=int +ac_cv_lib_termcap_tgoto=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22986: result: $ac_cv_type_signal" >&5 -echo "${ECHO_T}$ac_cv_type_signal" >&6 +echo "$as_me:24166: result: $ac_cv_lib_termcap_tgoto" >&5 +echo "${ECHO_T}$ac_cv_lib_termcap_tgoto" >&6 +if test $ac_cv_lib_termcap_tgoto = yes; then -cat >>confdefs.h <&5 -echo $ECHO_N "checking declaration of signal arguments... $ECHO_C" >&6 -if test "${cf_cv_sig_args+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else +fi -cf_cv_sig_args= -for cf_test in "int sig" "int sig, ..." -do +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +if test "$cf_cv_termlib" = none; then + { echo "$as_me:24193: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5 +echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;} +fi + +fi + + # terminfo-based termcap interfaces may be prototyped in , + # which may/may not be compatible with + echo "$as_me:24201: checking if we should include termcap.h" >&5 +echo $ECHO_N "checking if we should include termcap.h... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -I$srcdir/include" cat >conftest.$ac_ext <<_ACEOF -#line 23003 "configure" +#line 24206 "configure" #include "confdefs.h" -#include +#define HAVE_TERMCAP_H 1 +#include int main (void) { -extern RETSIGTYPE catch($cf_test); signal(SIGINT, catch) + +#ifdef NCURSES_VERSION +make an error +#endif + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:23016: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:24224: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23019: \$? = $ac_status" >&5 + echo "$as_me:24227: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:23022: \"$ac_try\"") >&5 + { (eval echo "$as_me:24230: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23025: \$? = $ac_status" >&5 + echo "$as_me:24233: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_sig_args="$cf_test";break + cf_result=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 +cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -done - -fi - -echo "$as_me:23037: result: $cf_cv_sig_args" >&5 -echo "${ECHO_T}$cf_cv_sig_args" >&6 -cat >>confdefs.h <&5 +echo "${ECHO_T}$cf_result" >&6 + CFLAGS="$cf_save_CFLAGS" + test $cf_result = yes && +cat >>confdefs.h <<\EOF +#define HAVE_TERMCAP_H 1 EOF -if test "$ac_cv_func_sigaction" = yes; then - -echo "$as_me:23045: checking whether sigaction needs _POSIX_SOURCE" >&5 -echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6 -if test "${cf_cv_sigact_bad+set}" = set; then +echo "$as_me:24250: checking for term.h" >&5 +echo $ECHO_N "checking for term.h... $ECHO_C" >&6 +if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cat >conftest.$ac_ext <<_ACEOF -#line 23052 "configure" +# If we found , look for , but always look +# for if we do not find the variant. + +cf_header_list="term.h ncurses/term.h ncursesw/term.h" + +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" + ;; +esac + +for cf_header in $cf_header_list +do + cat >conftest.$ac_ext <<_ACEOF +#line 24271 "configure" #include "confdefs.h" -#include -#include +#include <${cf_cv_ncurses_header:-curses.h}> +#include <${cf_header}> int main (void) { -struct sigaction act +WINDOW *x; (void)x ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:23066: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:24285: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23069: \$? = $ac_status" >&5 + echo "$as_me:24288: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:23072: \"$ac_try\"") >&5 + { (eval echo "$as_me:24291: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23075: \$? = $ac_status" >&5 + echo "$as_me:24294: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_sigact_bad=no + cf_cv_term_header=$cf_header + break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_sigact_bad=yes +cf_cv_term_header=no fi rm -f conftest.$ac_objext conftest.$ac_ext +done -fi -echo "$as_me:23086: result: $cf_cv_sigact_bad" >&5 -echo "${ECHO_T}$cf_cv_sigact_bad" >&6 - -test "$cf_cv_sigact_bad" = yes && cat >>confdefs.h <<\EOF -#define SVR4_ACTION 1 -EOF - -echo "$as_me:23093: checking if we have sigaction/related functions" >&5 -echo $ECHO_N "checking if we have sigaction/related functions... $ECHO_C" >&6 -if test "${cf_cv_sigaction_funcs+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -cat >conftest.$ac_ext <<_ACEOF -#line 23100 "configure" +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 <<_ACEOF +#line 24313 "configure" #include "confdefs.h" -#ifdef SVR4_ACTION -#define _POSIX_SOURCE +#include <${cf_cv_ncurses_header:-curses.h}> +#ifdef NCURSES_VERSION +#include <${cf_header}> +#else +make an error #endif -#include -#include int main (void) { - - RETSIGTYPE (*func)(SIG_ARGS) = SIG_IGN; - struct sigaction sa, osa; - sa.sa_handler = func; - sa.sa_flags = 0; - sigemptyset (&sa.sa_mask); - sigaction (SIGBUS,&sa,&osa); +WINDOW *x; (void)x ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23123: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:24331: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23126: \$? = $ac_status" >&5 + echo "$as_me:24334: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23129: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:23132: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_sigaction_funcs=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cf_cv_sigaction_funcs=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:23142: result: $cf_cv_sigaction_funcs" >&5 -echo "${ECHO_T}$cf_cv_sigaction_funcs" >&6 - -test "$cf_cv_sigaction_funcs" = yes && cat >>confdefs.h <<\EOF -#define HAVE_POSIX_JC 1 -EOF - -fi - -echo "$as_me:23151: checking for fork" >&5 -echo $ECHO_N "checking for fork... $ECHO_C" >&6 -if test "${cf_cv_func_fork+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -if test "$cross_compiling" = yes; then - cf_cv_func_fork=unknown -else - cat >conftest.$ac_ext <<_ACEOF -#line 23161 "configure" -#include "confdefs.h" - -int main() -{ - if (fork() < 0) - ${cf_cv_main_return:-return}(1); - ${cf_cv_main_return:-return}(0); -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:23172: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:23175: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:23177: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:24337: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23180: \$? = $ac_status" >&5 + echo "$as_me:24340: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_func_fork=yes + cf_cv_term_header=$cf_header + break else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_func_fork=no -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +cf_cv_term_header=no fi +rm -f conftest.$ac_objext conftest.$ac_ext + done + ;; +esac fi -echo "$as_me:23193: result: $cf_cv_func_fork" >&5 -echo "${ECHO_T}$cf_cv_func_fork" >&6 -test $cf_cv_func_fork = yes && cat >>confdefs.h <<\EOF -#define HAVE_FORK 1 +echo "$as_me:24355: result: $cf_cv_term_header" >&5 +echo "${ECHO_T}$cf_cv_term_header" >&6 + +case $cf_cv_term_header in +term.h) + +cat >>confdefs.h <<\EOF +#define HAVE_TERM_H 1 EOF -echo "$as_me:23199: checking for memmove" >&5 -echo $ECHO_N "checking for memmove... $ECHO_C" >&6 -if test "${ac_cv_func_memmove+set}" = set; then + ;; +ncurses/term.h) + +cat >>confdefs.h <<\EOF +#define HAVE_NCURSES_TERM_H 1 +EOF + + ;; +ncursesw/term.h) + +cat >>confdefs.h <<\EOF +#define HAVE_NCURSESW_TERM_H 1 +EOF + + ;; +esac + +echo "$as_me:24382: checking if we should include curses.h or termcap.h" >&5 +echo $ECHO_N "checking if we should include curses.h or termcap.h... $ECHO_C" >&6 +if test "${cf_cv_need_curses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 23205 "configure" -#include "confdefs.h" -#define memmove autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef memmove -#ifdef __cplusplus -extern "C" -#endif +cf_save_CPPFLAGS="$CPPFLAGS" +cf_cv_need_curses_h=no -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char memmove (void); +for cf_t_opts in "" "NEED_TERMCAP_H" +do +for cf_c_opts in "" "NEED_CURSES_H" +do + + CPPFLAGS="$cf_save_CPPFLAGS $CHECK_DECL_FLAG" + test -n "$cf_c_opts" && CPPFLAGS="$CPPFLAGS -D$cf_c_opts" + test -n "$cf_t_opts" && CPPFLAGS="$CPPFLAGS -D$cf_t_opts" + cat >conftest.$ac_ext <<_ACEOF +#line 24401 "configure" +#include "confdefs.h" +/* $cf_c_opts $cf_t_opts */ +$CHECK_DECL_HDRS int main (void) { - -/* The GNU C library defines stubs 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_memmove) || defined (__stub___memmove) -#error found stub for memmove -#endif - - return memmove (); +char *x = (char *)tgoto("") ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23236: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24414: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23239: \$? = $ac_status" >&5 + echo "$as_me:24417: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23242: \"$ac_try\"") >&5 + { (eval echo "$as_me:24420: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23245: \$? = $ac_status" >&5 + echo "$as_me:24423: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func_memmove=yes + test "$cf_cv_need_curses_h" = no && { + cf_cv_need_curses_h=maybe + cf_ok_c_opts=$cf_c_opts + cf_ok_t_opts=$cf_t_opts + } else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_func_memmove=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:23255: result: $ac_cv_func_memmove" >&5 -echo "${ECHO_T}$ac_cv_func_memmove" >&6 -if test $ac_cv_func_memmove = yes; then - : -else - -echo "$as_me:23261: checking for bcopy" >&5 -echo $ECHO_N "checking for bcopy... $ECHO_C" >&6 -if test "${ac_cv_func_bcopy+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 23267 "configure" +echo "Recompiling with corrected call (C:$cf_c_opts, T:$cf_t_opts)" >&5 + cat >conftest.$ac_ext <<_ACEOF +#line 24435 "configure" #include "confdefs.h" -#define bcopy autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef bcopy - -#ifdef __cplusplus -extern "C" -#endif - -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char bcopy (void); +$CHECK_DECL_HDRS int main (void) { - -/* The GNU C library defines stubs 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_bcopy) || defined (__stub___bcopy) -#error found stub for bcopy -#endif - - return bcopy (); +char *x = (char *)tgoto("",0,0) ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23298: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24448: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23301: \$? = $ac_status" >&5 + echo "$as_me:24451: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23304: \"$ac_try\"") >&5 + { (eval echo "$as_me:24454: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23307: \$? = $ac_status" >&5 + echo "$as_me:24457: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func_bcopy=yes + cf_cv_need_curses_h=yes + cf_ok_c_opts=$cf_c_opts + cf_ok_t_opts=$cf_t_opts else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_func_bcopy=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:23317: result: $ac_cv_func_bcopy" >&5 -echo "${ECHO_T}$ac_cv_func_bcopy" >&6 -if test $ac_cv_func_bcopy = yes; then - - echo "$as_me:23321: checking if bcopy does overlapping moves" >&5 -echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6 -if test "${cf_cv_good_bcopy+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - if test "$cross_compiling" = yes; then - cf_cv_good_bcopy=unknown -else - cat >conftest.$ac_ext <<_ACEOF -#line 23331 "configure" -#include "confdefs.h" +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -int main(void) { - static char data[] = "abcdefghijklmnopqrstuwwxyz"; - char temp[40]; - bcopy(data, temp, sizeof(data)); - bcopy(temp+10, temp, 15); - bcopy(temp+5, temp+15, 10); - ${cf_cv_main_return:-return} (strcmp(temp, "klmnopqrstuwwxypqrstuwwxyz")); -} + CPPFLAGS="$cf_save_CPPFLAGS" + test "$cf_cv_need_curses_h" = yes && break +done + test "$cf_cv_need_curses_h" = yes && break +done -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:23345: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:23348: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:23350: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:23353: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_good_bcopy=yes -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cf_cv_good_bcopy=no -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +if test "$cf_cv_need_curses_h" != no ; then + echo "Curses/termcap test = $cf_cv_need_curses_h (C:$cf_ok_c_opts, T:$cf_ok_t_opts)" >&5 + if test -n "$cf_ok_c_opts" ; then + if test -n "$cf_ok_t_opts" ; then + cf_cv_need_curses_h=both + else + cf_cv_need_curses_h=curses.h + fi + elif test -n "$cf_ok_t_opts" ; then + cf_cv_need_curses_h=termcap.h + elif test "$cf_cv_term_header" != no ; then + cf_cv_need_curses_h=term.h + else + cf_cv_need_curses_h=no + fi fi fi -echo "$as_me:23366: result: $cf_cv_good_bcopy" >&5 -echo "${ECHO_T}$cf_cv_good_bcopy" >&6 +echo "$as_me:24494: result: $cf_cv_need_curses_h" >&5 +echo "${ECHO_T}$cf_cv_need_curses_h" >&6 -else - cf_cv_good_bcopy=no -fi +case $cf_cv_need_curses_h in +both) - if test "$cf_cv_good_bcopy" = yes ; then +cat >>confdefs.h <>confdefs.h <<\EOF -#define USE_OK_BCOPY 1 +cat >>confdefs.h <>confdefs.h <<\EOF -#define USE_MY_MEMMOVE 1 +cat >>confdefs.h <>confdefs.h <&5 -echo $ECHO_N "checking if select expects int * arguments... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line 23392 "configure" -#include "confdefs.h" -#include + ;; +termcap.h) -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "select\(.*, *int *\*," >/dev/null 2>&1; then - cat >>confdefs.h <<\EOF -#define HAVE_SELECT_INTP 1 +cat >>confdefs.h <&5 -echo "${ECHO_T}yes" >&6 -else - echo "$as_me:23405: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi -rm -rf conftest* + ;; +esac -echo "$as_me:23411: checking whether closedir returns void" >&5 -echo $ECHO_N "checking whether closedir returns void... $ECHO_C" >&6 -if test "${ac_cv_func_closedir_void+set}" = set; then +echo "$as_me:24532: checking declaration of tputs 3rd param" >&5 +echo $ECHO_N "checking declaration of tputs 3rd param... $ECHO_C" >&6 +if test "${cf_cv_type_outchar+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$cross_compiling" = yes; then - ac_cv_func_closedir_void=yes -else - cat >conftest.$ac_ext <<_ACEOF -#line 23420 "configure" -#include "confdefs.h" -$ac_includes_default -#include <$ac_header_dirent> -#ifndef __cplusplus -int closedir (); -#endif +cf_cv_type_outchar="int OutChar(int)" +cf_cv_found=no +cf_save_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG" + +for P in int void; do +for Q in int void; do +for R in int char; do +for S in "" const; do + +echo "${as_me:-configure}:24548: testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5 + + cat >conftest.$ac_ext <<_ACEOF +#line 24551 "configure" +#include "confdefs.h" +$CHECK_DECL_HDRS int main (void) { -$ac_main_return (closedir (opendir (".")) != 0); +extern $Q OutChar($R); + extern $P tputs ($S char *string, int nlines, $Q (*_f)($R)); + tputs("", 1, OutChar) ; return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:23437: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:24565: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23440: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:23442: \"$ac_try\"") >&5 + echo "$as_me:24568: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:24571: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23445: \$? = $ac_status" >&5 + echo "$as_me:24574: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func_closedir_void=no + cf_cv_type_outchar="$Q OutChar($R)" + cf_cv_found=yes + break else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_func_closedir_void=yes -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi +rm -f conftest.$ac_objext conftest.$ac_ext +done + test $cf_cv_found = yes && break +done + test $cf_cv_found = yes && break +done + test $cf_cv_found = yes && break +done + fi -echo "$as_me:23457: result: $ac_cv_func_closedir_void" >&5 -echo "${ECHO_T}$ac_cv_func_closedir_void" >&6 -if test $ac_cv_func_closedir_void = yes; then +echo "$as_me:24593: result: $cf_cv_type_outchar" >&5 +echo "${ECHO_T}$cf_cv_type_outchar" >&6 + +case $cf_cv_type_outchar in +int*) cat >>confdefs.h <<\EOF -#define CLOSEDIR_VOID 1 +#define OUTC_RETURN 1 +EOF + + ;; +esac +case $cf_cv_type_outchar in +*char*) + +cat >>confdefs.h <<\EOF +#define OUTC_ARGS char c EOF + ;; +esac + +CPPFLAGS="$cf_save_CPPFLAGS" + fi -# autoconf 2.5x assumes setvbuf is not reversed when cross-compiling -if test "$cross_compiling" != yes ; then - echo "$as_me:23469: checking whether setvbuf arguments are reversed" >&5 -echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6 -if test "${ac_cv_func_setvbuf_reversed+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - { { echo "$as_me:23475: error: cannot run test program while cross compiling" >&5 -echo "$as_me: error: cannot run test program while cross compiling" >&2;} - { (exit 1); exit 1; }; } -else - cat >conftest.$ac_ext <<_ACEOF -#line 23480 "configure" +cf_tc_funcs= +cf_tc_externs= +if test ".$cf_cv_termlib" = .terminfo ; then + +cat >>confdefs.h <<\EOF +#define USE_TERMINFO 1 +EOF + + cf_tc_funcs="tigetint tigetnum tparam tparm" + cf_tc_externs="$cf_tc_funcs tgoto tigetstr tputs tigetflag" +elif test ".$cf_cv_termlib" = .termcap ; then + # BSD 'tputs()' may need 'PC' to be set. + cat >conftest.$ac_ext <<_ACEOF +#line 24632 "configure" #include "confdefs.h" -#include -/* If setvbuf has the reversed format, exit 0. */ + int main (void) { - /* This call has the arguments reversed. - A reversed system may check and see that the address of main - is not _IOLBF, _IONBF, or _IOFBF, and return nonzero. */ - if (setvbuf(stdout, _IOLBF, (char *) main, BUFSIZ) != 0) - $ac_main_return(1); - putc('\r', stdout); - $ac_main_return(0); /* Non-reversed systems segv here. */ +extern char PC; PC = 0 + ; + return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:23497: \"$ac_link\"") >&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:24644: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23500: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:23502: \"$ac_try\"") >&5 + echo "$as_me:24647: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:24650: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23505: \$? = $ac_status" >&5 + echo "$as_me:24653: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func_setvbuf_reversed=yes -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_func_setvbuf_reversed=no -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -rm -f core core.* *.core -fi -echo "$as_me:23518: result: $ac_cv_func_setvbuf_reversed" >&5 -echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6 -if test $ac_cv_func_setvbuf_reversed = yes; then cat >>confdefs.h <<\EOF -#define SETVBUF_REVERSED 1 +#define HAVE_EXTERN_TCAP_PC 1 EOF +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi - +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + cf_tc_funcs="tgetint tgetnum tparam tparm" + cf_tc_externs="$cf_tc_funcs tgoto tgetstr tputs tgetent tgetflag" fi -### Checks for network library functions. - -for ac_func in \ - gai_strerror \ - getaddrinfo \ - gethostname \ - gethostbyname \ - getservbyname \ - inet_addr \ - inet_ntoa \ - strncasecmp \ +### Checks for external-data -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:23544: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +echo "$as_me:24671: checking if external errno is declared" >&5 +echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6 +if test "${cf_cv_dcl_errno+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 23550 "configure" + + cat >conftest.$ac_ext <<_ACEOF +#line 24678 "configure" #include "confdefs.h" -#define $ac_func autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef $ac_func -#ifdef __cplusplus -extern "C" +#ifdef HAVE_STDLIB_H +#include #endif - -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (void); - +#include +#include +#include int main (void) { - -/* The GNU C library defines stubs for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -#error found stub for $ac_func -#endif - - return $ac_func (); +int x = (int) errno; (void)x ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23581: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:24696: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23584: \$? = $ac_status" >&5 + echo "$as_me:24699: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23587: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:24702: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23590: \$? = $ac_status" >&5 + echo "$as_me:24705: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$as_ac_var=yes" + cf_cv_dcl_errno=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -eval "$as_ac_var=no" +cf_cv_dcl_errno=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext + fi -echo "$as_me:23600: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <&5 +echo "${ECHO_T}$cf_cv_dcl_errno" >&6 + +if test "$cf_cv_dcl_errno" = no ; then + +cf_result=`echo "decl_errno" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + cat >>confdefs.h <&5 -echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6 -if test "${cf_cv_type_sigaction+set}" = set; then +# It's possible (for near-UNIX clones) that the data doesn't exist + +echo "$as_me:24731: checking if external errno exists" >&5 +echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6 +if test "${cf_cv_have_errno+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 23617 "configure" +#line 24738 "configure" #include "confdefs.h" -#include +#undef errno +extern int errno; + int main (void) { -sigaction_t x +errno = 2 ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:23630: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:24753: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23633: \$? = $ac_status" >&5 + echo "$as_me:24756: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:23636: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:24759: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23639: \$? = $ac_status" >&5 + echo "$as_me:24762: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_type_sigaction=yes + cf_cv_have_errno=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_type_sigaction=no +cf_cv_have_errno=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +echo "$as_me:24773: result: $cf_cv_have_errno" >&5 +echo "${ECHO_T}$cf_cv_have_errno" >&6 -echo "$as_me:23650: result: $cf_cv_type_sigaction" >&5 -echo "${ECHO_T}$cf_cv_type_sigaction" >&6 -test "$cf_cv_type_sigaction" = yes && -cat >>confdefs.h <<\EOF -#define HAVE_TYPE_SIGACTION 1 +if test "$cf_cv_have_errno" = yes ; then + +cf_result=`echo "have_errno" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + cat >>confdefs.h <&5 -echo $ECHO_N "checking for nonconflicting termios.h... $ECHO_C" >&6 -if test "${cf_cv_use_termios_h+set}" = set; then +fi + +for ac_func in strerror +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:24789: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat >conftest.$ac_ext <<_ACEOF -#line 23664 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 24795 "configure" #include "confdefs.h" +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func -#ifdef HAVE_IOCTL_H -# include -#else -# ifdef HAVE_SYS_IOCTL_H -# include -# endif +#ifdef __cplusplus +extern "C" #endif -#if !defined(sun) || !defined(NL0) -#include -#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (void); int main (void) { - struct termios save_tty; - (void) tcsetattr (0, TCSANOW, &save_tty); - (void) tcgetattr (0, &save_tty) +/* The GNU C library defines stubs for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#error found stub for $ac_func +#endif + + return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23691: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24826: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23694: \$? = $ac_status" >&5 + echo "$as_me:24829: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23697: \"$ac_try\"") >&5 + { (eval echo "$as_me:24832: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23700: \$? = $ac_status" >&5 + echo "$as_me:24835: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_use_termios_h=yes + eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_use_termios_h=no +eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi - -echo "$as_me:23712: result: $cf_cv_use_termios_h" >&5 -echo "${ECHO_T}$cf_cv_use_termios_h" >&6 -if test $cf_cv_use_termios_h = yes; then - cat >>confdefs.h <<\EOF -#define HAVE_TERMIOS_H 1 -EOF - - cat >>confdefs.h <<\EOF -#define HAVE_TCGETATTR 1 +echo "$as_me:24845: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <>confdefs.h <<\EOF -#define HAVE_TCSETATTR 1 + cat >>confdefs.h <<\EOF +#define HAVE_STRERROR 1 EOF -fi +else -echo "$as_me:23729: checking for passwd.pw_gecos" >&5 -echo $ECHO_N "checking for passwd.pw_gecos... $ECHO_C" >&6 -if test "${cf_cv_pw_gecos+set}" = set; then +echo "$as_me:24857: checking if external sys_nerr is declared" >&5 +echo $ECHO_N "checking if external sys_nerr is declared... $ECHO_C" >&6 +if test "${cf_cv_dcl_sys_nerr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 23736 "configure" +#line 24864 "configure" #include "confdefs.h" -#include - +#ifdef HAVE_STDLIB_H +#include +#endif +#include +#include +#include int main (void) { - - struct passwd foo; - char bar = foo.pw_gecos +int x = (int) sys_nerr; (void)x ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:23752: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:24882: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23755: \$? = $ac_status" >&5 + echo "$as_me:24885: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:23758: \"$ac_try\"") >&5 + { (eval echo "$as_me:24888: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23761: \$? = $ac_status" >&5 + echo "$as_me:24891: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_pw_gecos=yes + cf_cv_dcl_sys_nerr=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_pw_gecos=no +cf_cv_dcl_sys_nerr=no fi rm -f conftest.$ac_objext conftest.$ac_ext + fi -echo "$as_me:23771: result: $cf_cv_pw_gecos" >&5 -echo "${ECHO_T}$cf_cv_pw_gecos" >&6 -test $cf_cv_pw_gecos = no && cat >>confdefs.h <<\EOF -#define DONT_HAVE_PW_GECOS 1 +echo "$as_me:24902: result: $cf_cv_dcl_sys_nerr" >&5 +echo "${ECHO_T}$cf_cv_dcl_sys_nerr" >&6 + +if test "$cf_cv_dcl_sys_nerr" = no ; then + +cf_result=`echo "decl_sys_nerr" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + cat >>confdefs.h <&5 -echo $ECHO_N "checking for tm.tm_gmtoff... $ECHO_C" >&6 -if test "${cf_cv_tm_gmtoff+set}" = set; then +fi + +# It's possible (for near-UNIX clones) that the data doesn't exist + +echo "$as_me:24917: checking if external sys_nerr exists" >&5 +echo $ECHO_N "checking if external sys_nerr exists... $ECHO_C" >&6 +if test "${cf_cv_have_sys_nerr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 23784 "configure" +#line 24924 "configure" #include "confdefs.h" -#ifdef TIME_WITH_SYS_TIME -# include -# include -#else -# ifdef HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif +#undef sys_nerr +extern int sys_nerr; int main (void) { - - struct tm foo; - long bar = foo.tm_gmtoff +sys_nerr = 2 ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:23809: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:24939: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23812: \$? = $ac_status" >&5 + echo "$as_me:24942: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:23815: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:24945: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23818: \$? = $ac_status" >&5 + echo "$as_me:24948: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_tm_gmtoff=yes + cf_cv_have_sys_nerr=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_tm_gmtoff=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext +cf_cv_have_sys_nerr=no fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -echo "$as_me:23829: result: $cf_cv_tm_gmtoff" >&5 -echo "${ECHO_T}$cf_cv_tm_gmtoff" >&6 -test $cf_cv_tm_gmtoff = no && -cat >>confdefs.h <<\EOF -#define DONT_HAVE_TM_GMTOFF 1 -EOF - -echo "$as_me:23836: checking for long file names" >&5 -echo $ECHO_N "checking for long file names... $ECHO_C" >&6 -if test "${ac_cv_sys_long_file_names+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_sys_long_file_names=yes -# Test for long file names in all the places we know might matter: -# . the current directory, where building will happen -# $prefix/lib where we will be installing things -# $exec_prefix/lib likewise -# eval it to expand exec_prefix. -# $TMPDIR if set, where it might want to write temporary files -# if $TMPDIR is not set: -# /tmp where it might want to write temporary files -# /var/tmp likewise -# /usr/tmp likewise -if test -n "$TMPDIR" && test -d "$TMPDIR" && test -w "$TMPDIR"; then - ac_tmpdirs=$TMPDIR -else - ac_tmpdirs='/tmp /var/tmp /usr/tmp' -fi -for ac_dir in . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do - test -d $ac_dir || continue - test -w $ac_dir || continue # It is less confusing to not echo anything here. - ac_xdir=$ac_dir/cf$$ - (umask 077 && mkdir $ac_xdir 2>/dev/null) || continue - ac_tf1=$ac_xdir/conftest9012345 - ac_tf2=$ac_xdir/conftest9012346 - (echo 1 >$ac_tf1) 2>/dev/null - (echo 2 >$ac_tf2) 2>/dev/null - ac_val=`cat $ac_tf1 2>/dev/null` - if test ! -f $ac_tf1 || test "$ac_val" != 1; then - ac_cv_sys_long_file_names=no - rm -rf $ac_xdir 2>/dev/null - break - fi - rm -rf $ac_xdir 2>/dev/null -done fi -echo "$as_me:23875: result: $ac_cv_sys_long_file_names" >&5 -echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6 -if test $ac_cv_sys_long_file_names = yes; then +echo "$as_me:24959: result: $cf_cv_have_sys_nerr" >&5 +echo "${ECHO_T}$cf_cv_have_sys_nerr" >&6 -cat >>confdefs.h <<\EOF -#define HAVE_LONG_FILE_NAMES 1 -EOF +if test "$cf_cv_have_sys_nerr" = yes ; then -fi +cf_result=`echo "have_sys_nerr" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -for ac_header in sys/wait.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:23888: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 23894 "configure" -#include "confdefs.h" -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:23898: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:23904: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" -fi -rm -f conftest.err conftest.$ac_ext -fi -echo "$as_me:23923: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <>confdefs.h <&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +echo "$as_me:24972: checking if external sys_errlist is declared" >&5 +echo $ECHO_N "checking if external sys_errlist is declared... $ECHO_C" >&6 +if test "${cf_cv_dcl_sys_errlist+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 23950 "configure" + + cat >conftest.$ac_ext <<_ACEOF +#line 24979 "configure" #include "confdefs.h" -#include <$ac_header> + +#ifdef HAVE_STDLIB_H +#include +#endif +#include +#include +#include +int +main (void) +{ +int x = (int) sys_errlist; (void)x + ; + return 0; +} _ACEOF -if { (eval echo "$as_me:23954: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:24997: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:23960: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + echo "$as_me:25000: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:25003: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:25006: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_dcl_sys_errlist=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" +cat conftest.$ac_ext >&5 +cf_cv_dcl_sys_errlist=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext + fi -echo "$as_me:23979: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <&5 +echo "${ECHO_T}$cf_cv_dcl_sys_errlist" >&6 + +if test "$cf_cv_dcl_sys_errlist" = no ; then + +cf_result=`echo "decl_sys_errlist" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + cat >>confdefs.h <&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +# It's possible (for near-UNIX clones) that the data doesn't exist + +echo "$as_me:25032: checking if external sys_errlist exists" >&5 +echo $ECHO_N "checking if external sys_errlist exists... $ECHO_C" >&6 +if test "${cf_cv_have_sys_errlist+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 23998 "configure" + + cat >conftest.$ac_ext <<_ACEOF +#line 25039 "configure" #include "confdefs.h" -#include <$ac_header> + +#undef sys_errlist +extern int sys_errlist; + +int +main (void) +{ +sys_errlist = 2 + ; + return 0; +} _ACEOF -if { (eval echo "$as_me:24002: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:25054: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:24008: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + echo "$as_me:25057: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:25060: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:25063: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_sys_errlist=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" +cat conftest.$ac_ext >&5 +cf_cv_have_sys_errlist=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi -echo "$as_me:24027: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <&5 +echo "${ECHO_T}$cf_cv_have_sys_errlist" >&6 + +if test "$cf_cv_have_sys_errlist" = yes ; then + +cf_result=`echo "have_sys_errlist" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + cat >>confdefs.h <&5 -echo $ECHO_N "checking for union wait... $ECHO_C" >&6 -if test "${cf_cv_type_unionwait+set}" = set; then +### Checks for library functions. + +for ac_func in \ + alarm \ + atoi \ + atol \ + atoll \ + atoq \ + bcopy \ + chmod \ + execlp \ + explicit_bzero \ + explicit_memset \ + fchmod \ + fcntl \ + fdopen \ + fork \ + ftime \ + ftruncate \ + fsync \ + getcwd \ + gettimeofday \ + getwd \ + inet_aton \ + is_xterm \ + isascii \ + lockf \ + memcmp \ + memcpy \ + memmove \ + memset \ + mkdir \ + mkfifo \ + mktemp \ + mkstemp \ + nl_langinfo \ + poll \ + putenv \ + rewinddir \ + resizeterm \ + select \ + setenv \ + setlocale \ + settz \ + setvbuf \ + sigaction \ + snprintf \ + stpcpy \ + strchr \ + strcasecmp \ + strcasestr \ + strdup \ + strftime \ + strpbrk \ + strrchr \ + strrstr \ + strsep \ + strstr \ + strtol \ + strtoll \ + tmpfile \ + tzset \ + uname \ + unlink \ + use_default_colors \ + usleep \ + vsnprintf \ + waitpid \ +$cf_tc_funcs +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:25161: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat >conftest.$ac_ext <<_ACEOF -#line 24056 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 25167 "configure" #include "confdefs.h" -$cf_wait_headers +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func + +#ifdef __cplusplus +extern "C" +#endif + +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (void); + int main (void) { -int x; - int y = WEXITSTATUS(x); - int z = WTERMSIG(x); - wait(&x); +/* The GNU C library defines stubs for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#error found stub for $ac_func +#endif + + return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:24072: \"$ac_link\"") >&5 +if { (eval echo "$as_me:25198: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24075: \$? = $ac_status" >&5 + echo "$as_me:25201: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:24078: \"$ac_try\"") >&5 + { (eval echo "$as_me:25204: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24081: \$? = $ac_status" >&5 + echo "$as_me:25207: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_type_unionwait=no - echo compiles ok w/o union wait 1>&5 - + eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:25217: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <conftest.$ac_ext <<_ACEOF -#line 24091 "configure" +fi +done + +echo "$as_me:25227: checking for flock" >&5 +echo $ECHO_N "checking for flock... $ECHO_C" >&6 +if test "${ac_cv_func_flock+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 25233 "configure" #include "confdefs.h" -$cf_wait_headers +#define flock autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef flock + +#ifdef __cplusplus +extern "C" +#endif + +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char flock (void); + int main (void) { -union wait x; -#ifdef WEXITSTATUS - int y = WEXITSTATUS(x); -#endif -#ifdef WTERMSIG - int z = WTERMSIG(x); + +/* The GNU C library defines stubs 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_flock) || defined (__stub___flock) +#error found stub for flock #endif - wait(&x); + return flock (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:24111: \"$ac_link\"") >&5 +if { (eval echo "$as_me:25264: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24114: \$? = $ac_status" >&5 + echo "$as_me:25267: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:24117: \"$ac_try\"") >&5 + { (eval echo "$as_me:25270: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24120: \$? = $ac_status" >&5 + echo "$as_me:25273: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_type_unionwait=yes - echo compiles ok with union wait and possibly macros too 1>&5 - + ac_cv_func_flock=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_type_unionwait=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +ac_cv_func_flock=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi +echo "$as_me:25283: result: $ac_cv_func_flock" >&5 +echo "${ECHO_T}$ac_cv_func_flock" >&6 +if test $ac_cv_func_flock = yes; then -echo "$as_me:24135: result: $cf_cv_type_unionwait" >&5 -echo "${ECHO_T}$cf_cv_type_unionwait" >&6 -test $cf_cv_type_unionwait = yes && cat >>confdefs.h <<\EOF -#define HAVE_TYPE_UNIONWAIT 1 +#define HAVE_FLOCK 1 EOF -echo "$as_me:24142: checking if the system function returns usable child-status" >&5 -echo $ECHO_N "checking if the system function returns usable child-status... $ECHO_C" >&6 -if test "${cf_cv_system_status+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$cross_compiling" = yes; then - cf_cv_system_status=unknown + echo "$as_me:25293: checking for flock in -lbsd" >&5 +echo $ECHO_N "checking for flock in -lbsd... $ECHO_C" >&6 +if test "${ac_cv_lib_bsd_flock+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 24152 "configure" + ac_check_lib_save_LIBS=$LIBS +LIBS="-lbsd $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 25301 "configure" #include "confdefs.h" -#include -#include -#if HAVE_SYS_WAIT_H -#include -#endif - -RETSIGTYPE signal_handler (int sig) -{ -#if HAVE_TYPE_UNIONWAIT - union wait wait_status; -#else - int wait_status = 1; +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" #endif - int system_status; - wait (&wait_status); - system_status = WEXITSTATUS(wait_status); /* should be nonzero */ - ${cf_cv_main_return:-return}(system_status != 23); -} - -int main() +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char flock (); +int +main (void) { - /* this looks weird, but apparently the SIGCHLD gets there first on - * machines where 'system()' doesn't return a usable code, so ... - */ - signal (SIGCHLD, signal_handler); - system("exit 23"); - ${cf_cv_main_return:-return}(1); +flock (); + ; + return 0; } - -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:24186: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:24189: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:24191: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:24194: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_system_status=no -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -if test "$cross_compiling" = yes; then - cf_cv_system_status=unknown -else - cat >conftest.$ac_ext <<_ACEOF -#line 24205 "configure" -#include "confdefs.h" -int main() { ${cf_cv_main_return:-return}(system("exit 23") != (23 << 8)); } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:24210: \"$ac_link\"") >&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:25320: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24213: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:24215: \"$ac_try\"") >&5 + echo "$as_me:25323: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:25326: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24218: \$? = $ac_status" >&5 + echo "$as_me:25329: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_system_status=yes + ac_cv_lib_bsd_flock=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_system_status=unknown -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +ac_cv_lib_bsd_flock=no fi - +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi - -echo "$as_me:24235: result: $cf_cv_system_status" >&5 -echo "${ECHO_T}$cf_cv_system_status" >&6 -test $cf_cv_system_status = no && cat >>confdefs.h <<\EOF -#define USE_SYSTEM_STATUS 1 -EOF - -# Check if we are trying to use curses+color, but cannot -if test $use_color = yes ; then - if test $use_curses = no ; then - cat >>confdefs.h <<\EOF -#define HAVE_COLOR 1 +echo "$as_me:25340: result: $ac_cv_lib_bsd_flock" >&5 +echo "${ECHO_T}$ac_cv_lib_bsd_flock" >&6 +if test $ac_cv_lib_bsd_flock = yes; then + cat >>confdefs.h <<\EOF +#define HAVE_FLOCK 1 EOF - elif test $cf_with_screen = pdcurses ; then - cat >>confdefs.h <<\EOF -#define HAVE_COLOR 1 -EOF + LIBS="$LIBS -lbsd" +fi - else +fi -if test "$cf_cv_ncurses_version" != no ; then -echo "$as_me:24256: checking for obsolete/broken version of ncurses" >&5 -echo $ECHO_N "checking for obsolete/broken version of ncurses... $ECHO_C" >&6 -if test "${cf_cv_ncurses_broken+set}" = set; then +# clock_gettime() / librt +echo "$as_me:25353: checking for clock_gettime" >&5 +echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6 +if test "${ac_cv_func_clock_gettime+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - -cat >conftest.$ac_ext <<_ACEOF -#line 24263 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 25359 "configure" #include "confdefs.h" +#define clock_gettime autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef clock_gettime + +#ifdef __cplusplus +extern "C" +#endif + +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char clock_gettime (void); -#include <${cf_cv_ncurses_header:-curses.h}> int main (void) { -#if defined(NCURSES_VERSION) && defined(wgetbkgd) - make an error -#else - int x = 1 +/* The GNU C library defines stubs for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_clock_gettime) || defined (__stub___clock_gettime) +#error found stub for clock_gettime #endif + return clock_gettime (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:24282: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:25390: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24285: \$? = $ac_status" >&5 + echo "$as_me:25393: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:24288: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:25396: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24291: \$? = $ac_status" >&5 + echo "$as_me:25399: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_ncurses_broken=no + ac_cv_func_clock_gettime=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_ncurses_broken=yes +ac_cv_func_clock_gettime=no fi -rm -f conftest.$ac_objext conftest.$ac_ext - +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - -echo "$as_me:24303: result: $cf_cv_ncurses_broken" >&5 -echo "${ECHO_T}$cf_cv_ncurses_broken" >&6 -if test "$cf_cv_ncurses_broken" = yes ; then - { echo "$as_me:24306: WARNING: hmm... you should get an up-to-date version of ncurses" >&5 -echo "$as_me: WARNING: hmm... you should get an up-to-date version of ncurses" >&2;} +echo "$as_me:25409: result: $ac_cv_func_clock_gettime" >&5 +echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6 +if test $ac_cv_func_clock_gettime = yes; then cat >>confdefs.h <<\EOF -#define NCURSES_BROKEN 1 +#define HAVE_CLOCK_GETTIME 1 EOF -fi -fi +else -echo "$as_me:24316: checking if curses supports color attributes" >&5 -echo $ECHO_N "checking if curses supports color attributes... $ECHO_C" >&6 -if test "${cf_cv_color_curses+set}" = set; then + echo "$as_me:25419: checking for clock_gettime in -lrt" >&5 +echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6 +if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat >conftest.$ac_ext <<_ACEOF -#line 24323 "configure" + ac_check_lib_save_LIBS=$LIBS +LIBS="-lrt $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 25427 "configure" #include "confdefs.h" -#include <${cf_cv_ncurses_header:-curses.h}> - +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char clock_gettime (); int main (void) { -chtype x = COLOR_BLUE; - has_colors(); - start_color(); -#ifndef NCURSES_BROKEN - wbkgd(curscr, getbkgd(stdscr)); /* X/Open XPG4 aka SVr4 Curses */ -#endif - +clock_gettime (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:24343: \"$ac_link\"") >&5 +if { (eval echo "$as_me:25446: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24346: \$? = $ac_status" >&5 + echo "$as_me:25449: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:24349: \"$ac_try\"") >&5 + { (eval echo "$as_me:25452: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24352: \$? = $ac_status" >&5 + echo "$as_me:25455: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_color_curses=yes + ac_cv_lib_rt_clock_gettime=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_color_curses=no +ac_cv_lib_rt_clock_gettime=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - +LIBS=$ac_check_lib_save_LIBS fi - -echo "$as_me:24364: result: $cf_cv_color_curses" >&5 -echo "${ECHO_T}$cf_cv_color_curses" >&6 -if test $cf_cv_color_curses = yes ; then - -cat >>confdefs.h <<\EOF -#define COLOR_CURSES 1 -EOF - - test ".$cf_cv_ncurses_broken" != .yes && -cat >>confdefs.h <<\EOF -#define HAVE_GETBKGD 1 +echo "$as_me:25466: result: $ac_cv_lib_rt_clock_gettime" >&5 +echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6 +if test $ac_cv_lib_rt_clock_gettime = yes; then + cat >>confdefs.h <<\EOF +#define HAVE_CLOCK_GETTIME 1 EOF -fi - - if test $cf_cv_color_curses = yes ; then - cat >>confdefs.h <<\EOF -#define HAVE_COLOR 1 -EOF + LIBS="$LIBS -lrt" - else - { echo "$as_me:24385: WARNING: This curses library does not support color" >&5 -echo "$as_me: WARNING: This curses library does not support color" >&2;} - fi - fi fi -# GCC and Apollo compilers are quite noisy about signal constants (quiet them). -if test -n "$GCC"; then - check_sig_const=yes -elif test -f /sys/dm/dm ; then - check_sig_const=yes -elif test -f /sys/dm/spm ; then - check_sig_const=yes -else - check_sig_const=no fi -if test $check_sig_const = yes ; then - -echo "$as_me:24404: checking for redefinable signal constants" >&5 -echo $ECHO_N "checking for redefinable signal constants... $ECHO_C" >&6 -if test "${cf_cv_sig_const+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -cf_cv_sig_const=no -if test -n "$cf_cv_sig_args"; then - cf_test=`echo $cf_cv_sig_args|sed -e s/sig//` - if test "$cross_compiling" = yes; then - cf_cv_sig_const=unknown +echo "$as_me:25479: checking for memset_s" >&5 +echo $ECHO_N "checking for memset_s... $ECHO_C" >&6 +if test "$cross_compiling" = yes; then + echo "$as_me:25482: result: unknown" >&5 +echo "${ECHO_T}unknown" >&6 + else cat >conftest.$ac_ext <<_ACEOF -#line 24417 "configure" +#line 25487 "configure" #include "confdefs.h" -#define NEW_DFL ((RETSIGTYPE (*)($cf_test))0) -#define NEW_IGN ((RETSIGTYPE (*)($cf_test))1) -#define NEW_ERR ((RETSIGTYPE (*)($cf_test))-1) - -#include - +/* Request C11 Annex K */ +#define __STDC_WANT_LIB_EXT1__ 1 +#include +#include int main() { - if (NEW_DFL != SIG_DFL - || NEW_IGN != SIG_IGN - || NEW_ERR != SIG_ERR - /* at least one system won't let me redefine these! */ -#undef SIG_DFL -#undef SIG_IGN -#undef SIG_ERR -#define SIG_DFL NEW_DFL -#define SIG_IGN NEW_IGN -#define SIG_ERR NEW_ERR - || NEW_DFL != SIG_DFL) - ${cf_cv_main_return:-return}(1); - signal(SIGINT, SIG_DFL); - ${cf_cv_main_return:-return}(0); + char buf[10] = { 1 }; + if (memset_s((void*) buf, (size_t) 100, 0, (size_t) 1)) + return(-1); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:24445: \"$ac_link\"") >&5 +if { (eval echo "$as_me:25502: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24448: \$? = $ac_status" >&5 + echo "$as_me:25505: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:24450: \"$ac_try\"") >&5 + { (eval echo "$as_me:25507: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24453: \$? = $ac_status" >&5 + echo "$as_me:25510: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_sig_const=yes + + echo "$as_me:25513: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + +cat >>confdefs.h <<\EOF +#define HAVE_MEMSET_S 1 +EOF + else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_sig_const=no +echo "$as_me:25524: result: no" >&5 +echo "${ECHO_T}no" >&6 fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -fi - -fi - -echo "$as_me:24468: result: $cf_cv_sig_const" >&5 -echo "${ECHO_T}$cf_cv_sig_const" >&6 -test "$cf_cv_sig_const" = yes && cat >>confdefs.h <<\EOF -#define DECL_SIG_CONST 1 -EOF - -fi -echo "$as_me:24476: checking for ANSI qsort" >&5 -echo $ECHO_N "checking for ANSI qsort... $ECHO_C" >&6 -if test "${cf_cv_comptype+set}" = set; then + echo "$as_me:25530: checking for wide char and multibyte support" >&5 +echo $ECHO_N "checking for wide char and multibyte support... $ECHO_C" >&6 +if test "${am_cv_multibyte_able+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat >conftest.$ac_ext <<_ACEOF -#line 24483 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 25536 "configure" #include "confdefs.h" - +#include #ifdef HAVE_STDLIB_H -#include -#endif +# include +#endif /* HAVE_STDLIB_H */ +#ifdef HAVE_WCHAR_H +# include +#endif /* HAVE_WCHAR_H */ +#ifdef HAVE_WCTYPE_H +# include +#endif /* HAVE_WCTYPE_H */ + int main (void) { -extern int compare(const void *, const void *); - char *foo = "string"; - qsort(foo, sizeof(foo)/sizeof(*foo), sizeof(*foo), compare) +const char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0x00}; + char ocb[5]; + wchar_t wcb[5]; + wchar_t wcb2[5]; + wchar_t format[3]; + + putwc(0, 0); + fputwc(0, 0); + fwide(0, 0); + mbtowc(wcb, icb, MB_CUR_MAX); + mbstowcs(wcb, icb, 5); + (void) iswalnum((wint_t) wcb[0]); + (void) iswcntrl((wint_t) wcb[0]); + (void) iswdigit((wint_t) wcb[0]); + (void) iswgraph((wint_t) wcb[0]); + (void) iswprint((wint_t) wcb[0]); + (void) iswspace((wint_t) wcb[0]); + (void) towupper((wint_t) wcb[0]); + /* (void) iswupper((wint_t) wcb[0]); */ + /* (void) towlower((wint_t) wcb[0]); */ + /* (void) iswlower((wint_t) wcb[0]); */ + (void) iswalpha((wint_t) wcb[0]); + /* (void) iswblank((wint_t) wcb[0]); */ + /* (void) iswpunct((wint_t) wcb[0]); */ + /* (void) iswxdigit((wint_t) wcb[0]); */ + /* (void) iswctype((wint_t) wcb[0], wctype("print")); */ + /* (void) towctranse((wint_t) wcb[0], wctrans("toupper")); */ + (void) wcslen(wcb); + /* (void) wcsnlen(wcb, 4); */ + wcwidth((wint_t) wcb[0]); + wcswidth(wcb, 5); + wcstombs(ocb, wcb, 5); + wctomb(ocb, wcb[0]); + wcscat(wcb2, wcb); + wcscpy(wcb2, wcb); + mbstowcs(format, "%s", 2); + swprintf(wcb, 5, format, "test"); + wcsncat(wcb2, wcb, 5); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:24500: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:25595: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24503: \$? = $ac_status" >&5 + echo "$as_me:25598: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:24506: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:25601: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24509: \$? = $ac_status" >&5 + echo "$as_me:25604: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_comptype=yes + am_cv_multibyte_able=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_comptype=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext - -fi - -echo "$as_me:24521: result: $cf_cv_comptype" >&5 -echo "${ECHO_T}$cf_cv_comptype" >&6 -if test $cf_cv_comptype = yes; then - cat >>confdefs.h <<\EOF -#define HAVE_COMPTYPE_VOID 1 -EOF - -else - cat >>confdefs.h <<\EOF -#define HAVE_COMPTYPE_CHAR 1 -EOF - -fi - -echo "$as_me:24535: checking if application can dump core" >&5 -echo $ECHO_N "checking if application can dump core... $ECHO_C" >&6 -if test "${cf_cv_corefile+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - if test "$cross_compiling" = yes; then - cf_cv_corefile=unknown -else - cat >conftest.$ac_ext <<_ACEOF -#line 24545 "configure" +cf_save_LIBS="$LIBS" + LIBS="-lutf8 $LIBS" + cat >conftest.$ac_ext <<_ACEOF +#line 25613 "configure" #include "confdefs.h" - -#include -#include -#include -int found() -{ - struct stat sb; - return ((stat("core", &sb) == 0 /* UNIX */ - || stat("conftest.core", &sb) == 0 /* FreeBSD */ - ) - && ((sb.st_mode & S_IFMT) == S_IFREG)); -} -int main() +#include +int +main (void) { -#ifdef __amiga__ -/* Nicholas d'Alterio (nagd@ic.ac.uk) reports that the check for ability to - * core dump causes the machine to crash - reason unknown (gcc 2.7.2) - */ - ${cf_cv_main_return:-return}(1); -#else - int pid, status; - if (found()) - unlink("core"); - if (found()) - ${cf_cv_main_return:-return}(1); - if ((pid = fork()) != 0) { - while (wait(&status) <= 0) - ; - } else { - abort(); /* this will dump core, if anything will */ - } - if (found()) { - unlink("core"); - ${cf_cv_main_return:-return}(0); - } - ${cf_cv_main_return:-return}(1); -#endif +const char icb[5] = {0xa4, 0xa4, 0xa4, 0xe5, 0x00}; + char ocb[5]; + wchar_t wcb[5]; + wchar_t wcb2[5]; + wchar_t format[3]; + + putwc(0, 0); + fputwc(0, 0); + fwide(0, 0); + mbtowc(wcb, icb, MB_CUR_MAX); + mbstowcs(wcb, icb, 5); + (void) iswalnum((wint_t) wcb[0]); + (void) iswcntrl((wint_t) wcb[0]); + (void) iswdigit((wint_t) wcb[0]); + (void) iswgraph((wint_t) wcb[0]); + (void) iswprint((wint_t) wcb[0]); + (void) iswspace((wint_t) wcb[0]); + (void) towupper((wint_t) wcb[0]); + /* (void) iswupper((wint_t) wcb[0]); */ + /* (void) towlower((wint_t) wcb[0]); */ + /* (void) iswlower((wint_t) wcb[0]); */ + (void) iswalpha((wint_t) wcb[0]); + /* (void) iswblank((wint_t) wcb[0]); */ + /* (void) iswpunct((wint_t) wcb[0]); */ + /* (void) iswxdigit((wint_t) wcb[0]); */ + /* (void) iswctype((wint_t) wcb[0], wctype("print")); */ + /* (void) towctranse((wint_t) wcb[0], wctrans("toupper")); */ + (void) wcslen(wcb); + /* (void) wcsnlen(wcb, 4); */ + wcwidth((wint_t) wcb[0]); + wcswidth(wcb, 5); + wcstombs(ocb, wcb, 5); + wctomb(ocb, wcb[0]); + wcscat(wcb2, wcb); + wcscpy(wcb2, wcb); + mbstowcs(format, "%s", 2); + swprintf(wcb, 5, format, "test"); + wcsncat(wcb2, wcb, 5); + ; + return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:24587: \"$ac_link\"") >&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:25662: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24590: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:24592: \"$ac_try\"") >&5 + echo "$as_me:25665: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:25668: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24595: \$? = $ac_status" >&5 + echo "$as_me:25671: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_corefile=yes + am_cv_multibyte_able=libutf8 else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_corefile=no -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi +am_cv_multibyte_able=no fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS="$cf_save_LIBS" -echo "$as_me:24608: result: $cf_cv_corefile" >&5 -echo "${ECHO_T}$cf_cv_corefile" >&6 -test $cf_cv_corefile = yes && cat >>confdefs.h <<\EOF -#define HAVE_COREFILE 1 -EOF - -### test this last, since it uses a partly-built autoconf.h -# Setup includes for test-program to verify declarations -CHECK_DECL_FLAG="-I$srcdir/include -I$srcdir/pcre" -CHECK_DECL_HDRS=' -#define __CPROTO__ -#define HAVE_CONFDEFS_H -#include ' -TIN_DECL_HDRS="$CHECK_DECL_HDRS" - -for ac_func in \ - errno \ - getenv \ - getlogin \ - getpwnam \ - popen \ - strchr \ - strcasestr \ - strsep \ - tmpfile \ +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -do +fi +echo "$as_me:25686: result: $am_cv_multibyte_able" >&5 +echo "${ECHO_T}$am_cv_multibyte_able" >&6 + if test "$am_cv_multibyte_able" != no; then + if test "$am_cv_multibyte_able" = libutf8; then -ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` +cat >>confdefs.h <<\EOF +#define HAVE_LIBUTF8_H 1 +EOF -echo "$as_me:24638: checking for missing \"${ac_func}\" extern" >&5 -echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6 -if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else + LIBS="-lutf8 $LIBS" + fi -echo "${as_me:-configure}:24644: testing for missing "${ac_func}" external ..." 1>&5 +cat >>confdefs.h <<\EOF +#define MULTIBYTE_ABLE 1 +EOF -cf_save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS $CHECK_DECL_FLAG" + fi + +echo "$as_me:25704: checking if gettimeofday takes two arguments" >&5 +echo $ECHO_N "checking if gettimeofday takes two arguments... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 24649 "configure" +#line 25707 "configure" #include "confdefs.h" -$CHECK_DECL_HDRS - -#undef ${ac_func} -struct zowie { int a; double b; struct zowie *c; char d; }; -extern struct zowie *${ac_func}(); - +#if HAVE_SYS_TIME_H +#include +#endif int main (void) { - +struct timeval *tv; +struct timezone *tz; +gettimeofday(&tv, &tz); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:24667: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:25724: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24670: \$? = $ac_status" >&5 + echo "$as_me:25727: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:24673: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:25730: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24676: \$? = $ac_status" >&5 + echo "$as_me:25733: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - if test -n "$CHECK_DECL_HDRS" ; then -# try to work around system headers which are infested with non-standard syntax + ac_cv_func_gettimeofday_2args=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_gettimeofday_2args=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:25742: result: $ac_cv_func_gettimeofday_2args" >&5 +echo "${ECHO_T}$ac_cv_func_gettimeofday_2args" >&6 +if test $ac_cv_func_gettimeofday_2args = yes; then -cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` +cat >>confdefs.h <<\EOF +#define GETTIMEOFDAY_2ARGS 1 +EOF -cat >conftest.$ac_ext <<_ACEOF -#line 24684 "configure" -#include "confdefs.h" +fi -#define DECL_${cf_1_up} -$CHECK_DECL_HDRS +echo "$as_me:25752: checking return type of signal handlers" >&5 +echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 +if test "${ac_cv_type_signal+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 25758 "configure" +#include "confdefs.h" +#include +#include +#ifdef signal +# undef signal +#endif +#ifdef __cplusplus +extern "C" void (*signal (int, void (*)(int)))(int); +#else +void (*signal ()) (); +#endif int main (void) { -long x = 0 +int i; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:24699: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:25780: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24702: \$? = $ac_status" >&5 + echo "$as_me:25783: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:24705: \"$ac_try\"") >&5 + { (eval echo "$as_me:25786: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24708: \$? = $ac_status" >&5 + echo "$as_me:25789: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval 'cf_cv_func_'${ac_func}'=yes' + ac_cv_type_signal=void else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -eval 'cf_cv_func_'${ac_func}'=no' +ac_cv_type_signal=int fi rm -f conftest.$ac_objext conftest.$ac_ext -else -eval 'cf_cv_func_'${ac_func}'=yes' -fi - -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval 'cf_cv_func_'${ac_func}'=no' -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -CFLAGS="$cf_save_CFLAGS" - fi +echo "$as_me:25799: result: $ac_cv_type_signal" >&5 +echo "${ECHO_T}$ac_cv_type_signal" >&6 -eval 'cf_result=$cf_cv_func_'${ac_func} -echo "$as_me:24732: result: $cf_result" >&5 -echo "${ECHO_T}$cf_result" >&6 -test $cf_result = yes && cat >>confdefs.h <>confdefs.h <&5 -echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6 -if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then +echo "$as_me:25806: checking declaration of signal arguments" >&5 +echo $ECHO_N "checking declaration of signal arguments... $ECHO_C" >&6 +if test "${cf_cv_sig_args+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "${as_me:-configure}:24759: testing for missing "${ac_func}" external ..." 1>&5 - -cf_save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS $CHECK_DECL_FLAG" -cat >conftest.$ac_ext <<_ACEOF -#line 24764 "configure" +cf_cv_sig_args= +for cf_test in "int sig" "int sig, ..." +do + cat >conftest.$ac_ext <<_ACEOF +#line 25816 "configure" #include "confdefs.h" -$CHECK_DECL_HDRS - -#undef ${ac_func} -struct zowie { int a; double b; struct zowie *c; char d; }; -extern struct zowie *${ac_func}(); - +#include int main (void) { - +extern RETSIGTYPE catch($cf_test); signal(SIGINT, catch) ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:24782: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:25829: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24785: \$? = $ac_status" >&5 + echo "$as_me:25832: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:24788: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:25835: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24791: \$? = $ac_status" >&5 + echo "$as_me:25838: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - if test -n "$CHECK_DECL_HDRS" ; then -# try to work around system headers which are infested with non-standard syntax + cf_cv_sig_args="$cf_test";break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext conftest.$ac_ext +done -cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` +fi + +echo "$as_me:25850: result: $cf_cv_sig_args" >&5 +echo "${ECHO_T}$cf_cv_sig_args" >&6 + +cat >>confdefs.h <&5 +echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6 +if test "${cf_cv_sigact_bad+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else cat >conftest.$ac_ext <<_ACEOF -#line 24799 "configure" +#line 25866 "configure" #include "confdefs.h" -#define DECL_${cf_1_up} -$CHECK_DECL_HDRS - +#include +#include int main (void) { -long x = 0 +struct sigaction act ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:24814: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:25880: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24817: \$? = $ac_status" >&5 + echo "$as_me:25883: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:24820: \"$ac_try\"") >&5 + { (eval echo "$as_me:25886: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24823: \$? = $ac_status" >&5 + echo "$as_me:25889: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval 'cf_cv_func_'${ac_func}'=yes' + cf_cv_sigact_bad=no else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -eval 'cf_cv_func_'${ac_func}'=no' +cf_cv_sigact_bad=yes fi rm -f conftest.$ac_objext conftest.$ac_ext -else -eval 'cf_cv_func_'${ac_func}'=yes' -fi - -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval 'cf_cv_func_'${ac_func}'=no' -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -CFLAGS="$cf_save_CFLAGS" fi +echo "$as_me:25900: result: $cf_cv_sigact_bad" >&5 +echo "${ECHO_T}$cf_cv_sigact_bad" >&6 -eval 'cf_result=$cf_cv_func_'${ac_func} -echo "$as_me:24847: result: $cf_result" >&5 -echo "${ECHO_T}$cf_result" >&6 -test $cf_result = yes && cat >>confdefs.h <>confdefs.h <<\EOF +#define SVR4_ACTION 1 EOF -done +echo "$as_me:25908: checking if we have sigaction/related functions" >&5 +echo $ECHO_N "checking if we have sigaction/related functions... $ECHO_C" >&6 +if test "${cf_cv_sigaction_funcs+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else -if test $use_curses = no ; then -CHECK_DECL_HDRS="$TIN_DECL_HDRS -#include " -for ac_func in \ - tgetstr \ - tgoto \ +cat >conftest.$ac_ext <<_ACEOF +#line 25915 "configure" +#include "confdefs.h" + +#ifdef SVR4_ACTION +#define _POSIX_SOURCE +#endif +#include +#include +int +main (void) +{ + + RETSIGTYPE (*func)(SIG_ARGS) = SIG_IGN; + struct sigaction sa, osa; + sa.sa_handler = func; + sa.sa_flags = 0; + sigemptyset (&sa.sa_mask); + sigaction (SIGBUS,&sa,&osa); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:25938: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:25941: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:25944: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:25947: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_sigaction_funcs=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_sigaction_funcs=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:25957: result: $cf_cv_sigaction_funcs" >&5 +echo "${ECHO_T}$cf_cv_sigaction_funcs" >&6 -do +test "$cf_cv_sigaction_funcs" = yes && +cat >>confdefs.h <<\EOF +#define HAVE_POSIX_JC 1 +EOF -ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` +fi -echo "$as_me:24866: checking for missing \"${ac_func}\" extern" >&5 -echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6 -if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then +echo "$as_me:25967: checking for fork" >&5 +echo $ECHO_N "checking for fork... $ECHO_C" >&6 +if test "${cf_cv_func_fork+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "${as_me:-configure}:24872: testing for missing "${ac_func}" external ..." 1>&5 - -cf_save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS $CHECK_DECL_FLAG" -cat >conftest.$ac_ext <<_ACEOF -#line 24877 "configure" +if test "$cross_compiling" = yes; then + cf_cv_func_fork=unknown +else + cat >conftest.$ac_ext <<_ACEOF +#line 25977 "configure" #include "confdefs.h" -$CHECK_DECL_HDRS - -#undef ${ac_func} -struct zowie { int a; double b; struct zowie *c; char d; }; -extern struct zowie *${ac_func}(); - -int -main (void) +int main() { - - ; - return 0; + if (fork() < 0) + ${cf_cv_main_return:-return}(1); + ${cf_cv_main_return:-return}(0); } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:24895: \"$ac_link\"") >&5 +rm -f conftest$ac_exeext +if { (eval echo "$as_me:25988: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24898: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:24901: \"$ac_try\"") >&5 + echo "$as_me:25991: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:25993: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24904: \$? = $ac_status" >&5 + echo "$as_me:25996: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - if test -n "$CHECK_DECL_HDRS" ; then -# try to work around system headers which are infested with non-standard syntax + cf_cv_func_fork=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_func_fork=no +fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi -cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` +fi +echo "$as_me:26009: result: $cf_cv_func_fork" >&5 +echo "${ECHO_T}$cf_cv_func_fork" >&6 +test $cf_cv_func_fork = yes && cat >>confdefs.h <<\EOF +#define HAVE_FORK 1 +EOF -cat >conftest.$ac_ext <<_ACEOF -#line 24912 "configure" +echo "$as_me:26015: checking for memmove" >&5 +echo $ECHO_N "checking for memmove... $ECHO_C" >&6 +if test "${ac_cv_func_memmove+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 26021 "configure" #include "confdefs.h" +#define memmove autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef memmove -#define DECL_${cf_1_up} -$CHECK_DECL_HDRS +#ifdef __cplusplus +extern "C" +#endif + +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char memmove (void); int main (void) { -long x = 0 + +/* The GNU C library defines stubs 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_memmove) || defined (__stub___memmove) +#error found stub for memmove +#endif + + return memmove (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:24927: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:26052: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24930: \$? = $ac_status" >&5 + echo "$as_me:26055: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:24933: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:26058: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24936: \$? = $ac_status" >&5 + echo "$as_me:26061: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval 'cf_cv_func_'${ac_func}'=yes' -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval 'cf_cv_func_'${ac_func}'=no' -fi -rm -f conftest.$ac_objext conftest.$ac_ext -else -eval 'cf_cv_func_'${ac_func}'=yes' -fi - + ac_cv_func_memmove=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -eval 'cf_cv_func_'${ac_func}'=no' +ac_cv_func_memmove=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -CFLAGS="$cf_save_CFLAGS" - -fi - -eval 'cf_result=$cf_cv_func_'${ac_func} -echo "$as_me:24960: result: $cf_result" >&5 -echo "${ECHO_T}$cf_result" >&6 -test $cf_result = yes && cat >>confdefs.h <&5 +echo "${ECHO_T}$ac_cv_func_memmove" >&6 +if test $ac_cv_func_memmove = yes; then + : +else -if test $with_decl_check = yes; then -CHECK_DECL_HDRS="$TIN_DECL_HDRS" -for ac_func in \ - _flsbuf \ - alarm \ - atoi \ - atol \ - atoll \ - atoq \ - bcopy \ - bzero \ - calloc \ - fchmod \ - fclose \ - fdopen \ - fflush \ - fgetc \ - fileno \ - fprintf \ - fputc \ - fputs \ - fread \ - free \ - fseek \ - fwrite \ - getcwd \ - getopt \ - getwd \ - heapsort \ - ioctl \ - isascii \ - kill \ - malloc \ - memset \ - mkstemp \ - mktemp \ - pclose \ - perror \ - printf \ - putenv \ - qsort \ - realloc \ - rename \ - rewind \ - select \ - setenv \ - snprintf \ - sscanf \ - strcasecmp \ - strftime \ - strncasecmp \ - strtol \ - strtoll \ - system \ - time \ - tolower \ - toupper \ - ungetc \ - usleep \ - vsprintf \ - vsnprintf \ - -do - -ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - -echo "$as_me:25036: checking for missing \"${ac_func}\" extern" >&5 -echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6 -if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then +echo "$as_me:26077: checking for bcopy" >&5 +echo $ECHO_N "checking for bcopy... $ECHO_C" >&6 +if test "${ac_cv_func_bcopy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - -echo "${as_me:-configure}:25042: testing for missing "${ac_func}" external ..." 1>&5 - -cf_save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS $CHECK_DECL_FLAG" -cat >conftest.$ac_ext <<_ACEOF -#line 25047 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 26083 "configure" #include "confdefs.h" +#define bcopy autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef bcopy -$CHECK_DECL_HDRS +#ifdef __cplusplus +extern "C" +#endif -#undef ${ac_func} -struct zowie { int a; double b; struct zowie *c; char d; }; -extern struct zowie *${ac_func}(); +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char bcopy (void); int main (void) { +/* The GNU C library defines stubs 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_bcopy) || defined (__stub___bcopy) +#error found stub for bcopy +#endif + + return bcopy (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:25065: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26114: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25068: \$? = $ac_status" >&5 + echo "$as_me:26117: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:25071: \"$ac_try\"") >&5 + { (eval echo "$as_me:26120: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25074: \$? = $ac_status" >&5 + echo "$as_me:26123: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - if test -n "$CHECK_DECL_HDRS" ; then -# try to work around system headers which are infested with non-standard syntax + ac_cv_func_bcopy=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_bcopy=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:26133: result: $ac_cv_func_bcopy" >&5 +echo "${ECHO_T}$ac_cv_func_bcopy" >&6 +if test $ac_cv_func_bcopy = yes; then -cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + echo "$as_me:26137: checking if bcopy does overlapping moves" >&5 +echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6 +if test "${cf_cv_good_bcopy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else -cat >conftest.$ac_ext <<_ACEOF -#line 25082 "configure" + if test "$cross_compiling" = yes; then + cf_cv_good_bcopy=unknown +else + cat >conftest.$ac_ext <<_ACEOF +#line 26147 "configure" #include "confdefs.h" -#define DECL_${cf_1_up} -$CHECK_DECL_HDRS - -int -main (void) -{ -long x = 0 - ; - return 0; +int main(void) { + static char data[] = "abcdefghijklmnopqrstuwwxyz"; + char temp[40]; + bcopy(data, temp, sizeof(data)); + bcopy(temp+10, temp, 15); + bcopy(temp+5, temp+15, 10); + ${cf_cv_main_return:-return} (strcmp(temp, "klmnopqrstuwwxypqrstuwwxyz")); } + _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:25097: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest$ac_exeext +if { (eval echo "$as_me:26161: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25100: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:25103: \"$ac_try\"") >&5 + echo "$as_me:26164: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:26166: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25106: \$? = $ac_status" >&5 + echo "$as_me:26169: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval 'cf_cv_func_'${ac_func}'=yes' + cf_cv_good_bcopy=yes else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -eval 'cf_cv_func_'${ac_func}'=no' +cf_cv_good_bcopy=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -else -eval 'cf_cv_func_'${ac_func}'=yes' +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval 'cf_cv_func_'${ac_func}'=no' fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -CFLAGS="$cf_save_CFLAGS" +echo "$as_me:26182: result: $cf_cv_good_bcopy" >&5 +echo "${ECHO_T}$cf_cv_good_bcopy" >&6 +else + cf_cv_good_bcopy=no fi -eval 'cf_result=$cf_cv_func_'${ac_func} -echo "$as_me:25130: result: $cf_result" >&5 -echo "${ECHO_T}$cf_result" >&6 -test $cf_result = yes && cat >>confdefs.h <>confdefs.h <<\EOF +#define USE_OK_BCOPY 1 +EOF -if test $use_curses = no ; then -CHECK_DECL_HDRS="$TIN_DECL_HDRS -#include " -for ac_func in $cf_tc_externs -do + else -ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` +cat >>confdefs.h <<\EOF +#define USE_MY_MEMMOVE 1 +EOF -echo "$as_me:25146: checking for missing \"${ac_func}\" extern" >&5 -echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6 -if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else + fi -echo "${as_me:-configure}:25152: testing for missing "${ac_func}" external ..." 1>&5 +fi -cf_save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS $CHECK_DECL_FLAG" +echo "$as_me:26205: checking if select expects int * arguments" >&5 +echo $ECHO_N "checking if select expects int * arguments... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 25157 "configure" +#line 26208 "configure" #include "confdefs.h" +#include -$CHECK_DECL_HDRS +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "select\(.*, *int *\*," >/dev/null 2>&1; then -#undef ${ac_func} -struct zowie { int a; double b; struct zowie *c; char d; }; -extern struct zowie *${ac_func}(); +cat >>confdefs.h <<\EOF +#define HAVE_SELECT_INTP 1 +EOF + echo "$as_me:26219: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else + echo "$as_me:26222: result: no" >&5 +echo "${ECHO_T}no" >&6 + +fi +rm -rf conftest* + +echo "$as_me:26228: checking whether closedir returns void" >&5 +echo $ECHO_N "checking whether closedir returns void... $ECHO_C" >&6 +if test "${ac_cv_func_closedir_void+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + ac_cv_func_closedir_void=yes +else + cat >conftest.$ac_ext <<_ACEOF +#line 26237 "configure" +#include "confdefs.h" +$ac_includes_default +#include <$ac_header_dirent> +#ifndef __cplusplus +int closedir (); +#endif int main (void) { - +$ac_main_return (closedir (opendir (".")) != 0); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:25175: \"$ac_link\"") >&5 +rm -f conftest$ac_exeext +if { (eval echo "$as_me:26254: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25178: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:25181: \"$ac_try\"") >&5 + echo "$as_me:26257: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:26259: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25184: \$? = $ac_status" >&5 + echo "$as_me:26262: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - if test -n "$CHECK_DECL_HDRS" ; then -# try to work around system headers which are infested with non-standard syntax - -cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + ac_cv_func_closedir_void=no +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_closedir_void=yes +fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +echo "$as_me:26274: result: $ac_cv_func_closedir_void" >&5 +echo "${ECHO_T}$ac_cv_func_closedir_void" >&6 +if test $ac_cv_func_closedir_void = yes; then -cat >conftest.$ac_ext <<_ACEOF -#line 25192 "configure" -#include "confdefs.h" +cat >>confdefs.h <<\EOF +#define CLOSEDIR_VOID 1 +EOF -#define DECL_${cf_1_up} -$CHECK_DECL_HDRS +fi +# autoconf 2.5x assumes setvbuf is not reversed when cross-compiling +if test "$cross_compiling" != yes ; then + echo "$as_me:26286: checking whether setvbuf arguments are reversed" >&5 +echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6 +if test "${ac_cv_func_setvbuf_reversed+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + { { echo "$as_me:26292: error: cannot run test program while cross compiling" >&5 +echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } +else + cat >conftest.$ac_ext <<_ACEOF +#line 26297 "configure" +#include "confdefs.h" +#include +/* If setvbuf has the reversed format, exit 0. */ int main (void) { -long x = 0 - ; - return 0; + /* This call has the arguments reversed. + A reversed system may check and see that the address of main + is not _IOLBF, _IONBF, or _IOFBF, and return nonzero. */ + if (setvbuf(stdout, _IOLBF, (char *) main, BUFSIZ) != 0) + $ac_main_return(1); + putc('\r', stdout); + $ac_main_return(0); /* Non-reversed systems segv here. */ } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:25207: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest$ac_exeext +if { (eval echo "$as_me:26314: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25210: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:25213: \"$ac_try\"") >&5 + echo "$as_me:26317: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:26319: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25216: \$? = $ac_status" >&5 + echo "$as_me:26322: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval 'cf_cv_func_'${ac_func}'=yes' + ac_cv_func_setvbuf_reversed=yes else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -eval 'cf_cv_func_'${ac_func}'=no' -fi -rm -f conftest.$ac_objext conftest.$ac_ext -else -eval 'cf_cv_func_'${ac_func}'=yes' +ac_cv_func_setvbuf_reversed=no fi - -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval 'cf_cv_func_'${ac_func}'=no' +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -CFLAGS="$cf_save_CFLAGS" - +rm -f core core.* *.core fi +echo "$as_me:26335: result: $ac_cv_func_setvbuf_reversed" >&5 +echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6 +if test $ac_cv_func_setvbuf_reversed = yes; then -eval 'cf_result=$cf_cv_func_'${ac_func} -echo "$as_me:25240: result: $cf_result" >&5 -echo "${ECHO_T}$cf_result" >&6 -test $cf_result = yes && cat >>confdefs.h <>confdefs.h <<\EOF +#define SETVBUF_REVERSED 1 EOF -done +fi fi -CHECK_DECL_HDRS="$TIN_DECL_HDRS -#include " +### Checks for network library functions. + for ac_func in \ - connect \ + gai_strerror \ + getaddrinfo \ gethostname \ + gethostbyname \ + getservbyname \ + inet_addr \ + inet_ntoa \ + strncasecmp \ do - -ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - -echo "$as_me:25260: checking for missing \"${ac_func}\" extern" >&5 -echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6 -if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:26361: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - -echo "${as_me:-configure}:25266: testing for missing "${ac_func}" external ..." 1>&5 - -cf_save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS $CHECK_DECL_FLAG" -cat >conftest.$ac_ext <<_ACEOF -#line 25271 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 26367 "configure" #include "confdefs.h" +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func -$CHECK_DECL_HDRS +#ifdef __cplusplus +extern "C" +#endif -#undef ${ac_func} -struct zowie { int a; double b; struct zowie *c; char d; }; -extern struct zowie *${ac_func}(); +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (void); int main (void) { +/* The GNU C library defines stubs for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#error found stub for $ac_func +#endif + + return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:25289: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26398: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25292: \$? = $ac_status" >&5 + echo "$as_me:26401: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:25295: \"$ac_try\"") >&5 + { (eval echo "$as_me:26404: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25298: \$? = $ac_status" >&5 + echo "$as_me:26407: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - if test -n "$CHECK_DECL_HDRS" ; then -# try to work around system headers which are infested with non-standard syntax + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:26417: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5 +echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6 +if test "${cf_cv_type_sigaction+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else -cat >conftest.$ac_ext <<_ACEOF -#line 25306 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 26434 "configure" #include "confdefs.h" -#define DECL_${cf_1_up} -$CHECK_DECL_HDRS - +#include int main (void) { -long x = 0 +sigaction_t x ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:25321: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:26447: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25324: \$? = $ac_status" >&5 + echo "$as_me:26450: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:25327: \"$ac_try\"") >&5 + { (eval echo "$as_me:26453: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25330: \$? = $ac_status" >&5 + echo "$as_me:26456: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval 'cf_cv_func_'${ac_func}'=yes' + cf_cv_type_sigaction=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -eval 'cf_cv_func_'${ac_func}'=no' +cf_cv_type_sigaction=no fi rm -f conftest.$ac_objext conftest.$ac_ext -else -eval 'cf_cv_func_'${ac_func}'=yes' -fi - -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval 'cf_cv_func_'${ac_func}'=no' -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -CFLAGS="$cf_save_CFLAGS" - fi -eval 'cf_result=$cf_cv_func_'${ac_func} -echo "$as_me:25354: result: $cf_result" >&5 -echo "${ECHO_T}$cf_result" >&6 -test $cf_result = yes && cat >>confdefs.h <&5 +echo "${ECHO_T}$cf_cv_type_sigaction" >&6 +test "$cf_cv_type_sigaction" = yes && +cat >>confdefs.h <<\EOF +#define HAVE_TYPE_SIGACTION 1 EOF -done - -fi - -echo "$as_me:25364: checking for working TIOCGWINSZ" >&5 -echo $ECHO_N "checking for working TIOCGWINSZ... $ECHO_C" >&6 -if test "${cf_cv_use_tiocgwinsz+set}" = set; then +echo "$as_me:26474: checking for nonconflicting termios.h" >&5 +echo $ECHO_N "checking for nonconflicting termios.h... $ECHO_C" >&6 +if test "${cf_cv_use_termios_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cf_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -D__CPROTO__ $CHECK_DECL_FLAG" - if test "$cross_compiling" = yes; then - cf_cv_use_tiocgwinsz=unknown -else - cat >conftest.$ac_ext <<_ACEOF -#line 25376 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 26481 "configure" #include "confdefs.h" -$CHECK_DECL_HDRS -int main() -{ - int fd; - for (fd = 0; fd <= 2; fd++) { /* try in/out/err in case redirected */ -#ifdef TIOCGSIZE - struct ttysize size; - if (ioctl (0, TIOCGSIZE, &size) == 0 - && size.ts_lines > 0 - && size.ts_cols > 0) - ${cf_cv_main_return:-return}(0); +#ifdef HAVE_IOCTL_H +# include #else - struct winsize size; - if (ioctl(0, TIOCGWINSZ, &size) == 0 - && size.ws_row > 0 - && size.ws_col > 0) - ${cf_cv_main_return:-return}(0); +# ifdef HAVE_SYS_IOCTL_H +# include +# endif #endif - } - ${cf_cv_main_return:-return}(0); /* we cannot guarantee this is run interactively */ + +#if !defined(sun) || !defined(NL0) +#include +#endif + +int +main (void) +{ + + struct termios save_tty; + (void) tcsetattr (0, TCSANOW, &save_tty); + (void) tcgetattr (0, &save_tty) + ; + return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:25402: \"$ac_link\"") >&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:26508: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25405: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:25407: \"$ac_try\"") >&5 + echo "$as_me:26511: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:26514: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25410: \$? = $ac_status" >&5 + echo "$as_me:26517: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_use_tiocgwinsz=yes + cf_cv_use_termios_h=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_use_tiocgwinsz=no -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +cf_cv_use_termios_h=no fi - rm -f autoconf.h - CFLAGS="$cf_save_CFLAGS" +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi -echo "$as_me:25425: result: $cf_cv_use_tiocgwinsz" >&5 -echo "${ECHO_T}$cf_cv_use_tiocgwinsz" >&6 -test $cf_cv_use_tiocgwinsz != yes && cat >>confdefs.h <<\EOF -#define DONT_HAVE_SIGWINCH 1 -EOF +echo "$as_me:26529: result: $cf_cv_use_termios_h" >&5 +echo "${ECHO_T}$cf_cv_use_termios_h" >&6 +if test $cf_cv_use_termios_h = yes; then -### append special libraries that get in the way of testing -case $debug_malloc in -DBMALLOC) - cat >>confdefs.h <<\EOF -#define USE_DBMALLOC 1 +cat >>confdefs.h <<\EOF +#define HAVE_TERMIOS_H 1 EOF - LIBS="$LIBS -ldbmalloc" - ;; -DMALLOC) - cat >>confdefs.h <<\EOF -#define USE_DMALLOC 1 +cat >>confdefs.h <<\EOF +#define HAVE_TCGETATTR 1 EOF - LIBS="$LIBS -ldmalloc" - ;; -esac - -### Use gettext -### this also calls AM_LANGINFO_CODESET and AM_ICONV -### so we don't need to do the tests ourselves. -if test -n "$ac_tool_prefix"; then - # 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 "$as_me:25455: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -echo "$as_me:25470: found $ac_dir/$ac_word" >&5 -break -done +cat >>confdefs.h <<\EOF +#define HAVE_TCSETATTR 1 +EOF fi -fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - echo "$as_me:25478: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6 -else - echo "$as_me:25481: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi -fi -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -echo "$as_me:25490: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then +echo "$as_me:26547: checking for passwd.pw_gecos" >&5 +echo $ECHO_N "checking for passwd.pw_gecos... $ECHO_C" >&6 +if test "${cf_cv_pw_gecos+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_RANLIB="ranlib" -echo "$as_me:25505: found $ac_dir/$ac_word" >&5 -break -done - test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" -fi -fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - echo "$as_me:25514: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6 -else - echo "$as_me:25517: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi + cat >conftest.$ac_ext <<_ACEOF +#line 26554 "configure" +#include "confdefs.h" - RANLIB=$ac_ct_RANLIB -else - RANLIB="$ac_cv_prog_RANLIB" -fi +#include -# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works -# for constant arguments. Useless! -echo "$as_me:25528: checking for working alloca.h" >&5 -echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6 -if test "${ac_cv_working_alloca_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 25534 "configure" -#include "confdefs.h" -#include int main (void) { -char *p = (char *) alloca (2 * sizeof (int)); + + struct passwd foo; + char bar = foo.pw_gecos ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:25546: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:26570: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25549: \$? = $ac_status" >&5 + echo "$as_me:26573: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:25552: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:26576: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25555: \$? = $ac_status" >&5 + echo "$as_me:26579: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_working_alloca_h=yes + cf_cv_pw_gecos=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_working_alloca_h=no +cf_cv_pw_gecos=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:25565: result: $ac_cv_working_alloca_h" >&5 -echo "${ECHO_T}$ac_cv_working_alloca_h" >&6 -if test $ac_cv_working_alloca_h = yes; then - +echo "$as_me:26589: result: $cf_cv_pw_gecos" >&5 +echo "${ECHO_T}$cf_cv_pw_gecos" >&6 +test $cf_cv_pw_gecos = no && cat >>confdefs.h <<\EOF -#define HAVE_ALLOCA_H 1 +#define DONT_HAVE_PW_GECOS 1 EOF -fi - -echo "$as_me:25575: checking for alloca" >&5 -echo $ECHO_N "checking for alloca... $ECHO_C" >&6 -if test "${ac_cv_func_alloca_works+set}" = set; then +echo "$as_me:26596: checking for tm.tm_gmtoff" >&5 +echo $ECHO_N "checking for tm.tm_gmtoff... $ECHO_C" >&6 +if test "${cf_cv_tm_gmtoff+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 25581 "configure" + + cat >conftest.$ac_ext <<_ACEOF +#line 26603 "configure" #include "confdefs.h" -#ifdef __GNUC__ -# define alloca __builtin_alloca -#else -# ifdef _MSC_VER -# include -# define alloca _alloca -# else -# if HAVE_ALLOCA_H -# include -# else -# ifdef _AIX - #pragma alloca -# else -# ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -# endif -# endif -# endif -# endif + +#ifdef TIME_WITH_SYS_TIME +# include +# include +#else +# ifdef HAVE_SYS_TIME_H +# include +# else +# include +# endif #endif int main (void) { -char *p = (char *) alloca (1); + + struct tm foo; + long bar = foo.tm_gmtoff ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:25613: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:26628: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25616: \$? = $ac_status" >&5 + echo "$as_me:26631: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:25619: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:26634: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25622: \$? = $ac_status" >&5 + echo "$as_me:26637: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func_alloca_works=yes + cf_cv_tm_gmtoff=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_func_alloca_works=no +cf_cv_tm_gmtoff=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:25632: result: $ac_cv_func_alloca_works" >&5 -echo "${ECHO_T}$ac_cv_func_alloca_works" >&6 - -if test $ac_cv_func_alloca_works = yes; then +echo "$as_me:26648: result: $cf_cv_tm_gmtoff" >&5 +echo "${ECHO_T}$cf_cv_tm_gmtoff" >&6 +test $cf_cv_tm_gmtoff = no && cat >>confdefs.h <<\EOF -#define HAVE_ALLOCA 1 +#define DONT_HAVE_TM_GMTOFF 1 EOF +echo "$as_me:26655: checking for long file names" >&5 +echo $ECHO_N "checking for long file names... $ECHO_C" >&6 +if test "${ac_cv_sys_long_file_names+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - # The SVR3 libPW and SVR4 libucb both contain incompatible functions -# that cause trouble. Some versions do not even contain alloca or -# contain a buggy version. If you still want to use their alloca, -# use ar to extract alloca.o from them instead of compiling alloca.c. - -ALLOCA=alloca.$ac_objext + ac_cv_sys_long_file_names=yes +# Test for long file names in all the places we know might matter: +# . the current directory, where building will happen +# $prefix/lib where we will be installing things +# $exec_prefix/lib likewise +# eval it to expand exec_prefix. +# $TMPDIR if set, where it might want to write temporary files +# if $TMPDIR is not set: +# /tmp where it might want to write temporary files +# /var/tmp likewise +# /usr/tmp likewise +if test -n "$TMPDIR" && test -d "$TMPDIR" && test -w "$TMPDIR"; then + ac_tmpdirs=$TMPDIR +else + ac_tmpdirs='/tmp /var/tmp /usr/tmp' +fi +for ac_dir in . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do + test -d $ac_dir || continue + test -w $ac_dir || continue # It is less confusing to not echo anything here. + ac_xdir=$ac_dir/cf$$ + (umask 077 && mkdir $ac_xdir 2>/dev/null) || continue + ac_tf1=$ac_xdir/conftest9012345 + ac_tf2=$ac_xdir/conftest9012346 + (echo 1 >$ac_tf1) 2>/dev/null + (echo 2 >$ac_tf2) 2>/dev/null + ac_val=`cat $ac_tf1 2>/dev/null` + if test ! -f $ac_tf1 || test "$ac_val" != 1; then + ac_cv_sys_long_file_names=no + rm -rf $ac_xdir 2>/dev/null + break + fi + rm -rf $ac_xdir 2>/dev/null +done +fi +echo "$as_me:26694: result: $ac_cv_sys_long_file_names" >&5 +echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6 +if test $ac_cv_sys_long_file_names = yes; then cat >>confdefs.h <<\EOF -#define C_ALLOCA 1 +#define HAVE_LONG_FILE_NAMES 1 EOF -echo "$as_me:25653: checking whether \`alloca.c' needs Cray hooks" >&5 -echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6 -if test "${ac_cv_os_cray+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 25659 "configure" -#include "confdefs.h" -#if defined(CRAY) && ! defined(CRAY2) -webecray -#else -wenotbecray -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "webecray" >/dev/null 2>&1; then - ac_cv_os_cray=yes -else - ac_cv_os_cray=no fi -rm -rf conftest* -fi -echo "$as_me:25677: result: $ac_cv_os_cray" >&5 -echo "${ECHO_T}$ac_cv_os_cray" >&6 -if test $ac_cv_os_cray = yes; then - for ac_func in _getb67 GETB67 getb67; do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:25682: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +for ac_header in sys/wait.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:26707: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 25688 "configure" +#line 26713 "configure" #include "confdefs.h" -#define $ac_func autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef $ac_func - -#ifdef __cplusplus -extern "C" -#endif - -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (void); - -int -main (void) -{ - -/* The GNU C library defines stubs for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -#error found stub for $ac_func -#endif - - return $ac_func (); - ; - return 0; -} +#include <$ac_header> _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:25719: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:25722: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:25725: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (eval echo "$as_me:26717: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - echo "$as_me:25728: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:26723: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$as_ac_var=no" + cat conftest.$ac_ext >&5 + eval "$as_ac_Header=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:25738: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - -cat >>confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 -echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6 -if test "${ac_cv_c_stack_direction+set}" = set; then +for ac_header in wait.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:26763: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$cross_compiling" = yes; then - ac_cv_c_stack_direction=0 -else cat >conftest.$ac_ext <<_ACEOF -#line 25761 "configure" +#line 26769 "configure" #include "confdefs.h" -int -find_stack_direction (void) -{ - static char *addr = 0; - auto char dummy; - if (addr == 0) - { - addr = &dummy; - return find_stack_direction (); - } - else - return (&dummy > addr) ? 1 : -1; -} - -int -main (void) -{ - $ac_main_return (find_stack_direction () < 0); -} +#include <$ac_header> _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:25784: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:25787: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:25789: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (eval echo "$as_me:26773: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - echo "$as_me:25792: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_stack_direction=1 + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:26779: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_c_stack_direction=-1 + ac_cpp_err=yes fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + eval "$as_ac_Header=no" fi +rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:25804: result: $ac_cv_c_stack_direction" >&5 -echo "${ECHO_T}$ac_cv_c_stack_direction" >&6 - -cat >>confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 +echo "$as_me:26811: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 25822 "configure" +#line 26817 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:25826: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:26821: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:25832: \$? = $ac_status" >&5 + echo "$as_me:26827: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -25848,7 +26843,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:25851: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:26846: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +if test $ac_cv_header_wait_h = yes; then +cf_wait_headers="$cf_wait_headers +#include +" +fi +if test $ac_cv_header_waitstatus_h = yes; then +cf_wait_headers="$cf_wait_headers +#include +" +fi +fi + +echo "$as_me:26868: checking for union wait" >&5 +echo $ECHO_N "checking for union wait... $ECHO_C" >&6 +if test "${cf_cv_type_unionwait+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 25870 "configure" + + cat >conftest.$ac_ext <<_ACEOF +#line 26875 "configure" #include "confdefs.h" -#define $ac_func autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef $ac_func +$cf_wait_headers +int +main (void) +{ +int x; + int y = WEXITSTATUS(x); + int z = WTERMSIG(x); + wait(&x); + (void)x; + (void)y; + (void)z; -#ifdef __cplusplus -extern "C" -#endif + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:26894: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:26897: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:26900: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:26903: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_type_unionwait=no + echo compiles ok w/o union wait 1>&5 -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (void); +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + cat >conftest.$ac_ext <<_ACEOF +#line 26913 "configure" +#include "confdefs.h" +$cf_wait_headers int main (void) { - -/* The GNU C library defines stubs for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -#error found stub for $ac_func +union wait x; +#ifdef WEXITSTATUS + int y = WEXITSTATUS(x); +#endif +#ifdef WTERMSIG + int z = WTERMSIG(x); +#endif + wait(&x); + (void)x; +#ifdef WEXITSTATUS + (void)y; +#endif +#ifdef WTERMSIG + (void)z; #endif - return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:25901: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26940: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25904: \$? = $ac_status" >&5 + echo "$as_me:26943: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:25907: \"$ac_try\"") >&5 + { (eval echo "$as_me:26946: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25910: \$? = $ac_status" >&5 + echo "$as_me:26949: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$as_ac_var=yes" + cf_cv_type_unionwait=yes + echo compiles ok with union wait and possibly macros too 1>&5 + else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -eval "$as_ac_var=no" +cf_cv_type_unionwait=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:25920: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <&5 -echo $ECHO_N "checking for working mmap... $ECHO_C" >&6 -if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then +echo "$as_me:26964: result: $cf_cv_type_unionwait" >&5 +echo "${ECHO_T}$cf_cv_type_unionwait" >&6 +test $cf_cv_type_unionwait = yes && +cat >>confdefs.h <<\EOF +#define HAVE_TYPE_UNIONWAIT 1 +EOF + +echo "$as_me:26971: checking if the system function returns usable child-status" >&5 +echo $ECHO_N "checking if the system function returns usable child-status... $ECHO_C" >&6 +if test "${cf_cv_system_status+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$cross_compiling" = yes; then - ac_cv_func_mmap_fixed_mapped=no + + if test "$cross_compiling" = yes; then + cf_cv_system_status=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 25939 "configure" +#line 26981 "configure" #include "confdefs.h" -$ac_includes_default -/* Thanks to Mike Haertel and Jim Avera for this test. - Here is a matrix of mmap possibilities: - mmap private not fixed - mmap private fixed at somewhere currently unmapped - mmap private fixed at somewhere already mapped - mmap shared not fixed - mmap shared fixed at somewhere currently unmapped - mmap shared fixed at somewhere already mapped - For private mappings, we should verify that changes cannot be read() - back from the file, nor mmap's back from the file at a different - address. (There have been systems where private was not correctly - implemented like the infamous i386 svr4.0, and systems where the - VM page cache was not coherent with the file system buffer cache - like early versions of FreeBSD and possibly contemporary NetBSD.) - For shared mappings, we should conversely verify that changes get - propagated back to all the places they're supposed to be. - - Grep wants private fixed already mapped. - The main things grep needs to know about mmap are: - * does it exist and is it safe to write into the mmap'd area - * how to use it (BSD variants) */ -#include -#include +#include +#include +#if HAVE_SYS_WAIT_H +#include +#endif -#if !STDC_HEADERS && !HAVE_STDLIB_H -char *malloc (); +RETSIGTYPE signal_handler (int sig) +{ +#if HAVE_TYPE_UNIONWAIT + union wait wait_status; +#else + int wait_status = 1; #endif + int system_status; + wait (&wait_status); + system_status = WEXITSTATUS(wait_status); /* should be nonzero */ + ${cf_cv_main_return:-return}(system_status != 23); +} -/* This mess was copied from the GNU getpagesize.h. */ -#if !HAVE_GETPAGESIZE -/* Assume that all systems that can run configure have sys/param.h. */ -# if !HAVE_SYS_PARAM_H -# define HAVE_SYS_PARAM_H 1 -# endif +int main() +{ + /* this looks weird, but apparently the SIGCHLD gets there first on + * machines where 'system()' doesn't return a usable code, so ... + */ + signal (SIGCHLD, signal_handler); + system("exit 23"); + ${cf_cv_main_return:-return}(1); +} -# ifdef _SC_PAGESIZE -# define getpagesize() sysconf(_SC_PAGESIZE) -# else /* no _SC_PAGESIZE */ -# if HAVE_SYS_PARAM_H -# include -# ifdef EXEC_PAGESIZE -# define getpagesize() EXEC_PAGESIZE -# else /* no EXEC_PAGESIZE */ -# ifdef NBPG -# define getpagesize() NBPG * CLSIZE -# ifndef CLSIZE -# define CLSIZE 1 -# endif /* no CLSIZE */ -# else /* no NBPG */ -# ifdef NBPC -# define getpagesize() NBPC -# else /* no NBPC */ -# ifdef PAGESIZE -# define getpagesize() PAGESIZE -# endif /* PAGESIZE */ -# endif /* no NBPC */ -# endif /* no NBPG */ -# endif /* no EXEC_PAGESIZE */ -# else /* no HAVE_SYS_PARAM_H */ -# define getpagesize() 8192 /* punt totally */ -# endif /* no HAVE_SYS_PARAM_H */ -# endif /* no _SC_PAGESIZE */ +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:27015: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:27018: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:27020: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:27023: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_system_status=no +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +if test "$cross_compiling" = yes; then + cf_cv_system_status=unknown +else + cat >conftest.$ac_ext <<_ACEOF +#line 27034 "configure" +#include "confdefs.h" +int main() { ${cf_cv_main_return:-return}(system("exit 23") != (23 << 8)); } +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:27039: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:27042: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:27044: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:27047: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_system_status=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_system_status=unknown +fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + +fi + +echo "$as_me:27064: result: $cf_cv_system_status" >&5 +echo "${ECHO_T}$cf_cv_system_status" >&6 +test $cf_cv_system_status = no && +cat >>confdefs.h <<\EOF +#define USE_SYSTEM_STATUS 1 +EOF + +# Check if we are trying to use curses+color, but cannot +if test $use_color = yes ; then + if test $use_curses = no ; then + +cat >>confdefs.h <<\EOF +#define HAVE_COLOR 1 +EOF + + elif test $cf_with_screen = pdcurses ; then + cat >>confdefs.h <<\EOF +#define HAVE_COLOR 1 +EOF + + else + +if test "$cf_cv_ncurses_version" != no ; then +echo "$as_me:27087: checking for obsolete/broken version of ncurses" >&5 +echo $ECHO_N "checking for obsolete/broken version of ncurses... $ECHO_C" >&6 +if test "${cf_cv_ncurses_broken+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else -#endif /* no HAVE_GETPAGESIZE */ +cat >conftest.$ac_ext <<_ACEOF +#line 27094 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> int main (void) { - char *data, *data2, *data3; - int i, pagesize; - int fd; - - pagesize = getpagesize (); - - /* First, make a file with some known garbage in it. */ - data = (char *) malloc (pagesize); - if (!data) - $ac_main_return (1); - for (i = 0; i < pagesize; ++i) - *(data + i) = rand (); - umask (0); - fd = creat ("conftest.mmap", 0600); - if (fd < 0) - $ac_main_return (1); - if (write (fd, data, pagesize) != pagesize) - $ac_main_return (1); - close (fd); - /* Next, try to mmap the file at a fixed address which already has - something else allocated at it. If we can, also make sure that - we see the same garbage. */ - fd = open ("conftest.mmap", O_RDWR); - if (fd < 0) - $ac_main_return (1); - data2 = (char *) malloc (2 * pagesize); - if (!data2) - $ac_main_return (1); - data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1); - if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_FIXED, fd, 0L)) - $ac_main_return (1); - for (i = 0; i < pagesize; ++i) - if (*(data + i) != *(data2 + i)) - $ac_main_return (1); +#if defined(NCURSES_VERSION) && defined(wgetbkgd) + make an error +#else + int x = 1 +#endif - /* Finally, make sure that changes to the mapped area do not - percolate back to the file as seen by read(). (This is a bug on - some variants of i386 svr4.0.) */ - for (i = 0; i < pagesize; ++i) - *(data2 + i) = *(data2 + i) + 1; - data3 = (char *) malloc (pagesize); - if (!data3) - $ac_main_return (1); - if (read (fd, data3, pagesize) != pagesize) - $ac_main_return (1); - for (i = 0; i < pagesize; ++i) - if (*(data + i) != *(data3 + i)) - $ac_main_return (1); - close (fd); - $ac_main_return (0); + ; + return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:26066: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:27113: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26069: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:26071: \"$ac_try\"") >&5 + echo "$as_me:27116: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:27119: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26074: \$? = $ac_status" >&5 + echo "$as_me:27122: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func_mmap_fixed_mapped=yes + cf_cv_ncurses_broken=no else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_func_mmap_fixed_mapped=no -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +cf_cv_ncurses_broken=yes fi +rm -f conftest.$ac_objext conftest.$ac_ext + fi -echo "$as_me:26086: result: $ac_cv_func_mmap_fixed_mapped" >&5 -echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6 -if test $ac_cv_func_mmap_fixed_mapped = yes; then + +echo "$as_me:27134: result: $cf_cv_ncurses_broken" >&5 +echo "${ECHO_T}$cf_cv_ncurses_broken" >&6 +if test "$cf_cv_ncurses_broken" = yes ; then + { echo "$as_me:27137: WARNING: hmm... you should get an up-to-date version of ncurses" >&5 +echo "$as_me: WARNING: hmm... you should get an up-to-date version of ncurses" >&2;} cat >>confdefs.h <<\EOF -#define HAVE_MMAP 1 +#define NCURSES_BROKEN 1 EOF fi -rm -f conftest.mmap +fi -echo "$as_me:26097: checking whether we are using the GNU C Library 2.1 or newer" >&5 -echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6 -if test "${ac_cv_gnu_library_2_1+set}" = set; then +echo "$as_me:27147: checking if curses supports color attributes" >&5 +echo $ECHO_N "checking if curses supports color attributes... $ECHO_C" >&6 +if test "${cf_cv_color_curses+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 26103 "configure" + + cat >conftest.$ac_ext <<_ACEOF +#line 27154 "configure" #include "confdefs.h" -#include -#ifdef __GNU_LIBRARY__ - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) - Lucky GNU user - #endif +#include <${cf_cv_ncurses_header:-curses.h}> + +int +main (void) +{ +chtype x = COLOR_BLUE; + has_colors(); + start_color(); +#ifndef NCURSES_BROKEN + wbkgd(curscr, getbkgd(stdscr)); /* X/Open XPG4 aka SVr4 Curses */ #endif + ; + return 0; +} _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "Lucky GNU user" >/dev/null 2>&1; then - ac_cv_gnu_library_2_1=yes +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:27174: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:27177: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:27180: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:27183: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_color_curses=yes else - ac_cv_gnu_library_2_1=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_color_curses=no fi -rm -rf conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:26123: result: $ac_cv_gnu_library_2_1" >&5 -echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6 - GLIBC21="$ac_cv_gnu_library_2_1" +echo "$as_me:27195: result: $cf_cv_color_curses" >&5 +echo "${ECHO_T}$cf_cv_color_curses" >&6 +if test $cf_cv_color_curses = yes ; then -cf_makefile=Makefile +cat >>confdefs.h <<\EOF +#define COLOR_CURSES 1 +EOF -test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && echo *.po|sed -e 's/\.po//g' -e 's/*//'` + test ".$cf_cv_ncurses_broken" != .yes && +cat >>confdefs.h <<\EOF +#define HAVE_GETBKGD 1 +EOF -# Allow override of "config.h" definition: -: ${CONFIG_H:=config.h} +fi -if test -z "$PACKAGE" ; then - { { echo "$as_me:26136: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&5 -echo "$as_me: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&2;} - { (exit 1); exit 1; }; } + if test $cf_cv_color_curses = yes ; then + cat >>confdefs.h <<\EOF +#define HAVE_COLOR 1 +EOF + + else + { echo "$as_me:27216: WARNING: This curses library does not support color" >&5 +echo "$as_me: WARNING: This curses library does not support color" >&2;} + fi + fi fi -if test -z "$VERSION" ; then -if test -f $srcdir/VERSION ; then - VERSION=`sed -e '2,$d' $srcdir/VERSION|cut -f1` +# GCC and Apollo compilers are quite noisy about signal constants (quiet them). +if test -n "$GCC"; then + check_sig_const=yes +elif test -f /sys/dm/dm ; then + check_sig_const=yes +elif test -f /sys/dm/spm ; then + check_sig_const=yes else - VERSION=unknown -fi + check_sig_const=no fi -for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ -stdlib.h string.h unistd.h sys/param.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:26153: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if test $check_sig_const = yes ; then + +echo "$as_me:27235: checking for redefinable signal constants" >&5 +echo $ECHO_N "checking for redefinable signal constants... $ECHO_C" >&6 +if test "${cf_cv_sig_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + +cf_cv_sig_const=no +if test -n "$cf_cv_sig_args"; then + cf_test=`echo $cf_cv_sig_args|sed -e s/sig//` + if test "$cross_compiling" = yes; then + cf_cv_sig_const=unknown +else cat >conftest.$ac_ext <<_ACEOF -#line 26159 "configure" +#line 27248 "configure" #include "confdefs.h" -#include <$ac_header> + +#define NEW_DFL ((RETSIGTYPE (*)($cf_test))0) +#define NEW_IGN ((RETSIGTYPE (*)($cf_test))1) +#define NEW_ERR ((RETSIGTYPE (*)($cf_test))-1) + +#include + +int main() +{ + if (NEW_DFL != SIG_DFL + || NEW_IGN != SIG_IGN + || NEW_ERR != SIG_ERR + /* at least one system won't let me redefine these! */ +#undef SIG_DFL +#undef SIG_IGN +#undef SIG_ERR +#define SIG_DFL NEW_DFL +#define SIG_IGN NEW_IGN +#define SIG_ERR NEW_ERR + || NEW_DFL != SIG_DFL) + ${cf_cv_main_return:-return}(1); + signal(SIGINT, SIG_DFL); + ${cf_cv_main_return:-return}(0); +} _ACEOF -if { (eval echo "$as_me:26163: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +rm -f conftest$ac_exeext +if { (eval echo "$as_me:27276: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:26169: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi + echo "$as_me:27279: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:27281: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:27284: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_sig_const=yes else - ac_cpp_err=yes + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_sig_const=no fi -if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:26188: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <&5 +echo "${ECHO_T}$cf_cv_sig_const" >&6 +test "$cf_cv_sig_const" = yes && +cat >>confdefs.h <<\EOF +#define DECL_SIG_CONST 1 EOF fi -done -for ac_func in feof_unlocked fgets_unlocked getcwd getegid geteuid \ -getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \ -strdup strtoul tsearch __argz_count __argz_stringify __argz_next -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:26203: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +echo "$as_me:27308: checking for ANSI qsort" >&5 +echo $ECHO_N "checking for ANSI qsort... $ECHO_C" >&6 +if test "${cf_cv_comptype+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 26209 "configure" + + cat >conftest.$ac_ext <<_ACEOF +#line 27315 "configure" #include "confdefs.h" -#define $ac_func autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef $ac_func -#ifdef __cplusplus -extern "C" +#ifdef HAVE_STDLIB_H +#include #endif - -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (void); - int main (void) { - -/* The GNU C library defines stubs for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -#error found stub for $ac_func -#endif - - return $ac_func (); +extern int compare(const void *, const void *); + char *foo = "string"; + qsort(foo, sizeof(foo)/sizeof(*foo), sizeof(*foo), compare) ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:26240: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:27332: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26243: \$? = $ac_status" >&5 + echo "$as_me:27335: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:26246: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:27338: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26249: \$? = $ac_status" >&5 + echo "$as_me:27341: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$as_ac_var=yes" + cf_cv_comptype=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -eval "$as_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +cf_cv_comptype=no fi -echo "$as_me:26259: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <&5 +echo "${ECHO_T}$cf_cv_comptype" >&6 +if test $cf_cv_comptype = yes; then -case "$withval" in -no) - ;; -yes) - ;; -*) +cat >>confdefs.h <<\EOF +#define HAVE_COMPTYPE_VOID 1 +EOF -for cf_searchpath in `echo "$withval" | tr $PATH_SEPARATOR ' '`; do - if test -d $cf_searchpath/include; then +else -if test -n "$cf_searchpath/include" ; then - for cf_add_incdir in $cf_searchpath/include - do - while test $cf_add_incdir != /usr/include - do - if test -d $cf_add_incdir - then - cf_have_incdir=no - if test -n "$CFLAGS$CPPFLAGS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_incdir in $CFLAGS $CPPFLAGS ; do - if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then - cf_have_incdir=yes; break - fi - done - fi +cat >>confdefs.h <<\EOF +#define HAVE_COMPTYPE_CHAR 1 +EOF - if test "$cf_have_incdir" = no ; then - if test "$cf_add_incdir" = /usr/local/include ; then - if test "$GCC" = yes - then - cf_save_CPPFLAGS=$CPPFLAGS +fi - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" +echo "$as_me:27369: checking if application can dump core" >&5 +echo $ECHO_N "checking if application can dump core... $ECHO_C" >&6 +if test "${cf_cv_corefile+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else - cat >conftest.$ac_ext <<_ACEOF -#line 26310 "configure" + if test "$cross_compiling" = yes; then + cf_cv_corefile=unknown +else + cat >conftest.$ac_ext <<_ACEOF +#line 27379 "configure" #include "confdefs.h" -#include -int -main (void) + +#include +#include +#include +int found() { -printf("Hello") - ; - return 0; + struct stat sb; + return ((stat("core", &sb) == 0 /* UNIX */ + || stat("conftest.core", &sb) == 0 /* FreeBSD */ + ) + && ((sb.st_mode & S_IFMT) == S_IFREG)); +} +int main() +{ +#ifdef __amiga__ +/* Nicholas d'Alterio (nagd@ic.ac.uk) reports that the check for ability to + * core dump causes the machine to crash - reason unknown (gcc 2.7.2) + */ + ${cf_cv_main_return:-return}(1); +#else + int pid, status; + if (found()) + unlink("core"); + if (found()) + ${cf_cv_main_return:-return}(1); + if ((pid = fork()) != 0) { + while (wait(&status) <= 0) + ; + } else { + abort(); /* this will dump core, if anything will */ + } + if (found()) { + unlink("core"); + ${cf_cv_main_return:-return}(0); + } + ${cf_cv_main_return:-return}(1); +#endif } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:26322: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest$ac_exeext +if { (eval echo "$as_me:27421: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:26325: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:26328: \"$ac_try\"") >&5 + echo "$as_me:27424: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:27426: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26331: \$? = $ac_status" >&5 + echo "$as_me:27429: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - : + cf_cv_corefile=yes else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_have_incdir=yes +cf_cv_corefile=no +fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi fi -rm -f conftest.$ac_objext conftest.$ac_ext - CPPFLAGS=$cf_save_CPPFLAGS - fi - fi - fi - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 +echo "$as_me:27442: result: $cf_cv_corefile" >&5 +echo "${ECHO_T}$cf_cv_corefile" >&6 +test $cf_cv_corefile = yes && +cat >>confdefs.h <<\EOF +#define HAVE_COREFILE 1 +EOF -echo "${as_me:-configure}:26348: testing adding $cf_add_incdir to include-path ..." 1>&5 +### test this last, since it uses a partly-built autoconf.h +# Setup includes for test-program to verify declarations +CHECK_DECL_FLAG="-I$srcdir/include -I$srcdir/pcre" +CHECK_DECL_HDRS=' +#define __CPROTO__ +#define HAVE_CONFDEFS_H +#include ' +TIN_DECL_HDRS="$CHECK_DECL_HDRS" - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" +for ac_func in \ + errno \ + getenv \ + getlogin \ + getpwnam \ + popen \ + strchr \ + strcasestr \ + strsep \ + tmpfile \ - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` - test "$cf_top_incdir" = "$cf_add_incdir" && break - cf_add_incdir="$cf_top_incdir" - else - break - fi - else - break - fi - done - done -fi +do - elif test -d $cf_searchpath/../include ; then +ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -if test -n "$cf_searchpath/../include" ; then - for cf_add_incdir in $cf_searchpath/../include - do - while test $cf_add_incdir != /usr/include - do - if test -d $cf_add_incdir - then - cf_have_incdir=no - if test -n "$CFLAGS$CPPFLAGS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_incdir in $CFLAGS $CPPFLAGS ; do - if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then - cf_have_incdir=yes; break - fi - done - fi +echo "$as_me:27473: checking for missing \"${ac_func}\" extern" >&5 +echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6 +if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else - if test "$cf_have_incdir" = no ; then - if test "$cf_add_incdir" = /usr/local/include ; then - if test "$GCC" = yes - then - cf_save_CPPFLAGS=$CPPFLAGS +echo "${as_me:-configure}:27479: testing for missing "${ac_func}" external ..." 1>&5 + +cf_save_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS $CHECK_DECL_FLAG" +cat >conftest.$ac_ext <<_ACEOF +#line 27484 "configure" +#include "confdefs.h" + +$CHECK_DECL_HDRS + +#undef ${ac_func} +struct zowie { int a; double b; struct zowie *c; char d; }; +extern struct zowie *${ac_func}(); + +int +main (void) +{ - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:27502: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:27505: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:27508: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:27511: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + if test -n "$CHECK_DECL_HDRS" ; then +# try to work around system headers which are infested with non-standard syntax - cat >conftest.$ac_ext <<_ACEOF -#line 26394 "configure" +cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + +cat >conftest.$ac_ext <<_ACEOF +#line 27519 "configure" #include "confdefs.h" -#include + +#define DECL_${cf_1_up} +$CHECK_DECL_HDRS + int main (void) { -printf("Hello") +long x = 0 ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:26406: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:27534: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26409: \$? = $ac_status" >&5 + echo "$as_me:27537: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:26412: \"$ac_try\"") >&5 + { (eval echo "$as_me:27540: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26415: \$? = $ac_status" >&5 + echo "$as_me:27543: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - : + eval 'cf_cv_func_'${ac_func}'=yes' else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_have_incdir=yes +eval 'cf_cv_func_'${ac_func}'=no' fi rm -f conftest.$ac_objext conftest.$ac_ext - CPPFLAGS=$cf_save_CPPFLAGS - fi - fi - fi - - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - -echo "${as_me:-configure}:26432: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` - test "$cf_top_incdir" = "$cf_add_incdir" && break - cf_add_incdir="$cf_top_incdir" - else - break - fi - else - break - fi - done - done +else +eval 'cf_cv_func_'${ac_func}'=yes' fi - else -{ { echo "$as_me:26450: error: cannot find libiconv under $withval" >&5 -echo "$as_me: error: cannot find libiconv under $withval" >&2;} - { (exit 1); exit 1; }; } - 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 - -echo "${as_me:-configure}:26475: testing adding $cf_add_libdir to library-path ..." 1>&5 - - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi - fi - done +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval 'cf_cv_func_'${ac_func}'=no' fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +CFLAGS="$cf_save_CFLAGS" - 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 - -echo "${as_me:-configure}:26504: testing adding $cf_add_libdir to library-path ..." 1>&5 - - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi - fi - done fi - else -{ { echo "$as_me:26513: error: cannot find libiconv under $withval" >&5 -echo "$as_me: error: cannot find libiconv under $withval" >&2;} - { (exit 1); exit 1; }; } - fi +eval 'cf_result=$cf_cv_func_'${ac_func} +echo "$as_me:27567: result: $cf_result" >&5 +echo "${ECHO_T}$cf_result" >&6 +test $cf_result = yes && cat >>confdefs.h <&5 -echo $ECHO_N "checking for iconv... $ECHO_C" >&6 -if test "${am_cv_func_iconv+set}" = set; then +ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + +echo "$as_me:27588: checking for missing \"${ac_func}\" extern" >&5 +echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6 +if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -# If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these -# will be set on completion of the AC_TRY_LINK below. -cf_cv_header_path_iconv= -cf_cv_library_path_iconv= - -echo "${as_me:-configure}:26535: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5 - -cf_save_LIBS="$LIBS" +echo "${as_me:-configure}:27594: testing for missing "${ac_func}" external ..." 1>&5 +cf_save_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS $CHECK_DECL_FLAG" cat >conftest.$ac_ext <<_ACEOF -#line 26540 "configure" +#line 27599 "configure" #include "confdefs.h" -#include -#include +$CHECK_DECL_HDRS + +#undef ${ac_func} +struct zowie { int a; double b; struct zowie *c; char d; }; +extern struct zowie *${ac_func}(); int main (void) { - iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); - ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:26559: \"$ac_link\"") >&5 +if { (eval echo "$as_me:27617: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:26562: \$? = $ac_status" >&5 + echo "$as_me:27620: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:26565: \"$ac_try\"") >&5 + { (eval echo "$as_me:27623: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26568: \$? = $ac_status" >&5 + echo "$as_me:27626: \$? = $ac_status" >&5 (exit $ac_status); }; }; then + if test -n "$CHECK_DECL_HDRS" ; then +# try to work around system headers which are infested with non-standard syntax - cf_cv_find_linkage_iconv=yes - cf_cv_header_path_iconv=/usr/include - cf_cv_library_path_iconv=/usr/lib - -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - -LIBS="-liconv $cf_save_LIBS" +cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cat >conftest.$ac_ext <<_ACEOF -#line 26582 "configure" +#line 27634 "configure" #include "confdefs.h" -#include -#include +#define DECL_${cf_1_up} +$CHECK_DECL_HDRS int main (void) { - - iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); - +long x = 0 ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:26601: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:27649: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26604: \$? = $ac_status" >&5 + echo "$as_me:27652: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:26607: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:27655: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26610: \$? = $ac_status" >&5 + echo "$as_me:27658: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - cf_cv_find_linkage_iconv=yes - cf_cv_header_path_iconv=/usr/include - cf_cv_library_path_iconv=/usr/lib - cf_cv_library_file_iconv="-liconv" - + eval 'cf_cv_func_'${ac_func}'=yes' else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 +eval 'cf_cv_func_'${ac_func}'=no' +fi +rm -f conftest.$ac_objext conftest.$ac_ext +else +eval 'cf_cv_func_'${ac_func}'=yes' +fi - cf_cv_find_linkage_iconv=no - LIBS="$cf_save_LIBS" - - test -n "$verbose" && echo " find linkage for iconv library" 1>&6 - -echo "${as_me:-configure}:26627: testing find linkage for iconv library ..." 1>&5 - -echo "${as_me:-configure}:26629: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5 - - cf_save_CPPFLAGS="$CPPFLAGS" - cf_test_CPPFLAGS="$CPPFLAGS" - -cf_search= - -# collect the current set of include-directories from compiler flags -cf_header_path_list="" -if test -n "${CFLAGS}${CPPFLAGS}" ; then - for cf_header_path in $CPPFLAGS $CFLAGS - do - 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" && \ -test -d "$cf_header_path" && \ - { - test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" - test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" - test -d $cf_header_path/include/iconv && cf_search="$cf_search $cf_header_path/include/iconv" - test -d $cf_header_path/include/iconv/include && cf_search="$cf_search $cf_header_path/include/iconv/include" - test -d $cf_header_path/iconv/include && cf_search="$cf_search $cf_header_path/iconv/include" - test -d $cf_header_path/iconv/include/iconv && cf_search="$cf_search $cf_header_path/iconv/include/iconv" -} +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval 'cf_cv_func_'${ac_func}'=no' +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +CFLAGS="$cf_save_CFLAGS" - cf_header_path_list="$cf_header_path_list $cf_search" - ;; - esac - done fi -# add the variations for the package we are looking for +eval 'cf_result=$cf_cv_func_'${ac_func} +echo "$as_me:27682: result: $cf_result" >&5 +echo "${ECHO_T}$cf_result" >&6 +test $cf_result = yes && cat >>confdefs.h <&5 +echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6 +if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else -test "$includedir" != NONE && \ -test "$includedir" != "/usr/include" && \ -test -d "$includedir" && { - test -d $includedir && cf_search="$cf_search $includedir" - test -d $includedir/iconv && cf_search="$cf_search $includedir/iconv" -} +echo "${as_me:-configure}:27707: testing for missing "${ac_func}" external ..." 1>&5 -test "$oldincludedir" != NONE && \ -test "$oldincludedir" != "/usr/include" && \ -test -d "$oldincludedir" && { - test -d $oldincludedir && cf_search="$cf_search $oldincludedir" - test -d $oldincludedir/iconv && cf_search="$cf_search $oldincludedir/iconv" -} +cf_save_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS $CHECK_DECL_FLAG" +cat >conftest.$ac_ext <<_ACEOF +#line 27712 "configure" +#include "confdefs.h" -cf_search="$cf_search $cf_header_path_list" +$CHECK_DECL_HDRS - 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 +#undef ${ac_func} +struct zowie { int a; double b; struct zowie *c; char d; }; +extern struct zowie *${ac_func}(); -echo "${as_me:-configure}:26720: testing ... testing $cf_cv_header_path_iconv ..." 1>&5 +int +main (void) +{ - CPPFLAGS="$cf_save_CPPFLAGS" + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:27730: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:27733: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:27736: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:27739: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + if test -n "$CHECK_DECL_HDRS" ; then +# try to work around system headers which are infested with non-standard syntax - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_iconv" +cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >conftest.$ac_ext <<_ACEOF -#line 26728 "configure" +cat >conftest.$ac_ext <<_ACEOF +#line 27747 "configure" #include "confdefs.h" -#include -#include +#define DECL_${cf_1_up} +$CHECK_DECL_HDRS int main (void) { - - iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); - +long x = 0 ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:26747: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:27762: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26750: \$? = $ac_status" >&5 + echo "$as_me:27765: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:26753: \"$ac_try\"") >&5 + { (eval echo "$as_me:27768: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26756: \$? = $ac_status" >&5 + echo "$as_me:27771: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - test -n "$verbose" && echo " ... found iconv headers in $cf_cv_header_path_iconv" 1>&6 - -echo "${as_me:-configure}:26761: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5 - - cf_cv_find_linkage_iconv=maybe - cf_test_CPPFLAGS="$CPPFLAGS" - break + eval 'cf_cv_func_'${ac_func}'=yes' else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - - CPPFLAGS="$cf_save_CPPFLAGS" - +eval 'cf_cv_func_'${ac_func}'=no' fi rm -f conftest.$ac_objext conftest.$ac_ext - fi - done - - if test "$cf_cv_find_linkage_iconv" = maybe ; then - -echo "${as_me:-configure}:26779: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5 +else +eval 'cf_cv_func_'${ac_func}'=yes' +fi - cf_save_LIBS="$LIBS" - cf_save_LDFLAGS="$LDFLAGS" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval 'cf_cv_func_'${ac_func}'=no' +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +CFLAGS="$cf_save_CFLAGS" - if test "$cf_cv_find_linkage_iconv" != yes ; then +fi -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 - -L*) - cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` +eval 'cf_result=$cf_cv_func_'${ac_func} +echo "$as_me:27795: result: $cf_result" >&5 +echo "${ECHO_T}$cf_result" >&6 +test $cf_result = yes && cat >>confdefs.h <&6 - -echo "${as_me:-configure}:26854: testing ... testing $cf_cv_library_path_iconv ..." 1>&5 +ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - CPPFLAGS="$cf_test_CPPFLAGS" - LIBS="-liconv $cf_save_LIBS" - LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_iconv" - cat >conftest.$ac_ext <<_ACEOF -#line 26860 "configure" +echo "$as_me:27871: checking for missing \"${ac_func}\" extern" >&5 +echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6 +if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +echo "${as_me:-configure}:27877: testing for missing "${ac_func}" external ..." 1>&5 + +cf_save_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS $CHECK_DECL_FLAG" +cat >conftest.$ac_ext <<_ACEOF +#line 27882 "configure" #include "confdefs.h" -#include -#include +$CHECK_DECL_HDRS + +#undef ${ac_func} +struct zowie { int a; double b; struct zowie *c; char d; }; +extern struct zowie *${ac_func}(); int main (void) { - iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); - ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:26879: \"$ac_link\"") >&5 +if { (eval echo "$as_me:27900: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:26882: \$? = $ac_status" >&5 + echo "$as_me:27903: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:26885: \"$ac_try\"") >&5 + { (eval echo "$as_me:27906: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26888: \$? = $ac_status" >&5 + echo "$as_me:27909: \$? = $ac_status" >&5 (exit $ac_status); }; }; then + if test -n "$CHECK_DECL_HDRS" ; then +# try to work around system headers which are infested with non-standard syntax - test -n "$verbose" && echo " ... found iconv library in $cf_cv_library_path_iconv" 1>&6 - -echo "${as_me:-configure}:26893: 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 -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - - CPPFLAGS="$cf_save_CPPFLAGS" - LIBS="$cf_save_LIBS" - LDFLAGS="$cf_save_LDFLAGS" - -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi - done - CPPFLAGS="$cf_save_CPPFLAGS" - LDFLAGS="$cf_save_LDFLAGS" - fi - - else - cf_cv_find_linkage_iconv=no - fi - -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - -LIBS="$cf_save_LIBS" - -if test "$cf_cv_find_linkage_iconv" = yes ; then -am_cv_func_iconv=yes -else -am_cv_func_iconv="no, consider installing GNU libiconv" -fi - -fi -echo "$as_me:26933: result: $am_cv_func_iconv" >&5 -echo "${ECHO_T}$am_cv_func_iconv" >&6 - - if test "$am_cv_func_iconv" = yes; then - -cat >>confdefs.h <<\EOF -#define HAVE_ICONV 1 -EOF - - echo "$as_me:26942: checking if the declaration of iconv() needs const." >&5 -echo $ECHO_N "checking if the declaration of iconv() needs const.... $ECHO_C" >&6 -if test "${am_cv_proto_iconv_const+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else +cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >conftest.$ac_ext <<_ACEOF -#line 26949 "configure" +cat >conftest.$ac_ext <<_ACEOF +#line 27917 "configure" #include "confdefs.h" -#include -#include - -extern -#ifdef __cplusplus -"C" -#endif -#if defined(__STDC__) || defined(__cplusplus) -size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); -#else -size_t iconv(); -#endif +#define DECL_${cf_1_up} +$CHECK_DECL_HDRS int main (void) { - +long x = 0 ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:26974: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:27932: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26977: \$? = $ac_status" >&5 + echo "$as_me:27935: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:26980: \"$ac_try\"") >&5 + { (eval echo "$as_me:27938: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26983: \$? = $ac_status" >&5 + echo "$as_me:27941: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - am_cv_proto_iconv_const=no + eval 'cf_cv_func_'${ac_func}'=yes' else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -am_cv_proto_iconv_const=yes +eval 'cf_cv_func_'${ac_func}'=no' fi rm -f conftest.$ac_objext conftest.$ac_ext +else +eval 'cf_cv_func_'${ac_func}'=yes' fi -echo "$as_me:26993: result: $am_cv_proto_iconv_const" >&5 -echo "${ECHO_T}$am_cv_proto_iconv_const" >&6 - if test "$am_cv_proto_iconv_const" = yes ; then - am_cv_proto_iconv_arg1="const" - else - am_cv_proto_iconv_arg1="" - fi +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval 'cf_cv_func_'${ac_func}'=no' +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +CFLAGS="$cf_save_CFLAGS" -cat >>confdefs.h <&5 +echo "${ECHO_T}$cf_result" >&6 +test $cf_result = yes && cat >>confdefs.h <&5 +echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6 +if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" +echo "${as_me:-configure}:27987: testing for missing "${ac_func}" external ..." 1>&5 - cat >conftest.$ac_ext <<_ACEOF -#line 27038 "configure" +cf_save_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS $CHECK_DECL_FLAG" +cat >conftest.$ac_ext <<_ACEOF +#line 27992 "configure" #include "confdefs.h" -#include + +$CHECK_DECL_HDRS + +#undef ${ac_func} +struct zowie { int a; double b; struct zowie *c; char d; }; +extern struct zowie *${ac_func}(); + int main (void) { -printf("Hello") + ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:27050: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:28010: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:27053: \$? = $ac_status" >&5 + echo "$as_me:28013: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:27056: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:28016: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27059: \$? = $ac_status" >&5 + echo "$as_me:28019: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cf_have_incdir=yes -fi -rm -f conftest.$ac_objext conftest.$ac_ext - CPPFLAGS=$cf_save_CPPFLAGS - fi - fi - fi - - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - -echo "${as_me:-configure}:27076: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` - test "$cf_top_incdir" = "$cf_add_incdir" && break - cf_add_incdir="$cf_top_incdir" - else - break - fi - else - break - fi - done - done -fi - - if test -n "$cf_cv_library_file_iconv" ; then - 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 - -echo "${as_me:-configure}:27115: testing adding $cf_add_libdir to library-path ..." 1>&5 - - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi - fi - done -fi + if test -n "$CHECK_DECL_HDRS" ; then +# try to work around system headers which are infested with non-standard syntax - fi - fi +cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -echo "$as_me:27126: checking for nl_langinfo and CODESET" >&5 -echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 -if test "${am_cv_langinfo_codeset+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 27132 "configure" +cat >conftest.$ac_ext <<_ACEOF +#line 28027 "configure" #include "confdefs.h" -#include + +#define DECL_${cf_1_up} +$CHECK_DECL_HDRS + int main (void) { -char* cs = nl_langinfo(CODESET); +long x = 0 ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:27144: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:28042: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:27147: \$? = $ac_status" >&5 + echo "$as_me:28045: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:27150: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:28048: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27153: \$? = $ac_status" >&5 + echo "$as_me:28051: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - am_cv_langinfo_codeset=yes + eval 'cf_cv_func_'${ac_func}'=yes' else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -am_cv_langinfo_codeset=no +eval 'cf_cv_func_'${ac_func}'=no' +fi +rm -f conftest.$ac_objext conftest.$ac_ext +else +eval 'cf_cv_func_'${ac_func}'=yes' +fi + +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval 'cf_cv_func_'${ac_func}'=no' fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +CFLAGS="$cf_save_CFLAGS" fi -echo "$as_me:27164: result: $am_cv_langinfo_codeset" >&5 -echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 - if test $am_cv_langinfo_codeset = yes; then -cat >>confdefs.h <<\EOF -#define HAVE_LANGINFO_CODESET 1 +eval 'cf_result=$cf_cv_func_'${ac_func} +echo "$as_me:28075: result: $cf_result" >&5 +echo "${ECHO_T}$cf_result" >&6 +test $cf_result = yes && cat >>confdefs.h <&5 -echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6 -if test "${am_cv_val_LC_MESSAGES+set}" = set; then +fi + +CHECK_DECL_HDRS="$TIN_DECL_HDRS +#include " +for ac_func in \ + connect \ + gethostname \ + +do + +ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + +echo "$as_me:28095: checking for missing \"${ac_func}\" extern" >&5 +echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6 +if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 27181 "configure" + +echo "${as_me:-configure}:28101: testing for missing "${ac_func}" external ..." 1>&5 + +cf_save_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS $CHECK_DECL_FLAG" +cat >conftest.$ac_ext <<_ACEOF +#line 28106 "configure" #include "confdefs.h" -#include + +$CHECK_DECL_HDRS + +#undef ${ac_func} +struct zowie { int a; double b; struct zowie *c; char d; }; +extern struct zowie *${ac_func}(); + int main (void) { -return LC_MESSAGES + ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:27193: \"$ac_link\"") >&5 +if { (eval echo "$as_me:28124: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:27196: \$? = $ac_status" >&5 + echo "$as_me:28127: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:27199: \"$ac_try\"") >&5 + { (eval echo "$as_me:28130: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27202: \$? = $ac_status" >&5 + echo "$as_me:28133: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - am_cv_val_LC_MESSAGES=yes + if test -n "$CHECK_DECL_HDRS" ; then +# try to work around system headers which are infested with non-standard syntax + +cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + +cat >conftest.$ac_ext <<_ACEOF +#line 28141 "configure" +#include "confdefs.h" + +#define DECL_${cf_1_up} +$CHECK_DECL_HDRS + +int +main (void) +{ +long x = 0 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:28156: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:28159: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:28162: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:28165: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval 'cf_cv_func_'${ac_func}'=yes' else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -am_cv_val_LC_MESSAGES=no +eval 'cf_cv_func_'${ac_func}'=no' +fi +rm -f conftest.$ac_objext conftest.$ac_ext +else +eval 'cf_cv_func_'${ac_func}'=yes' +fi + +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval 'cf_cv_func_'${ac_func}'=no' fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +CFLAGS="$cf_save_CFLAGS" + fi -echo "$as_me:27212: result: $am_cv_val_LC_MESSAGES" >&5 -echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6 - if test $am_cv_val_LC_MESSAGES = yes; then -cat >>confdefs.h <<\EOF -#define HAVE_LC_MESSAGES 1 +eval 'cf_result=$cf_cv_func_'${ac_func} +echo "$as_me:28189: result: $cf_result" >&5 +echo "${ECHO_T}$cf_result" >&6 +test $cf_result = yes && cat >>confdefs.h <&5 -echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6 -# Check whether --enable-nls or --disable-nls was given. -if test "${enable_nls+set}" = set; then - enableval="$enable_nls" - USE_NLS=$enableval +echo "$as_me:28199: checking for working TIOCGWINSZ" >&5 +echo $ECHO_N "checking for working TIOCGWINSZ... $ECHO_C" >&6 +if test "${cf_cv_use_tiocgwinsz+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - USE_NLS=yes -fi; - echo "$as_me:27232: result: $USE_NLS" >&5 -echo "${ECHO_T}$USE_NLS" >&6 - BUILD_INCLUDED_LIBINTL=no - USE_INCLUDED_LIBINTL=no - INTLLIBS= + cf_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -D__CPROTO__ $CHECK_DECL_FLAG" + if test "$cross_compiling" = yes; then + cf_cv_use_tiocgwinsz=unknown +else + cat >conftest.$ac_ext <<_ACEOF +#line 28211 "configure" +#include "confdefs.h" - if test "$USE_NLS" = "yes"; then - POSUB=po +$CHECK_DECL_HDRS +int main() +{ + int fd; + for (fd = 0; fd <= 2; fd++) { /* try in/out/err in case redirected */ +#ifdef TIOCGSIZE + struct ttysize size; + if (ioctl (0, TIOCGSIZE, &size) == 0 + && size.ts_lines > 0 + && size.ts_cols > 0) + ${cf_cv_main_return:-return}(0); +#else + struct winsize size; + if (ioctl(0, TIOCGWINSZ, &size) == 0 + && size.ws_row > 0 + && size.ws_col > 0) + ${cf_cv_main_return:-return}(0); +#endif + } + ${cf_cv_main_return:-return}(0); /* we cannot guarantee this is run interactively */ +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:28237: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:28240: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:28242: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:28245: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_use_tiocgwinsz=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_use_tiocgwinsz=no +fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + rm -f autoconf.h + CFLAGS="$cf_save_CFLAGS" +fi +echo "$as_me:28260: result: $cf_cv_use_tiocgwinsz" >&5 +echo "${ECHO_T}$cf_cv_use_tiocgwinsz" >&6 +test $cf_cv_use_tiocgwinsz != yes && cat >>confdefs.h <<\EOF -#define ENABLE_NLS 1 +#define DONT_HAVE_SIGWINCH 1 EOF - echo "$as_me:27246: checking whether included gettext is requested" >&5 -echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6 - -# Check whether --with-included-gettext or --without-included-gettext was given. -if test "${with_included_gettext+set}" = set; then - withval="$with_included_gettext" - nls_cv_force_use_gnu_gettext=$withval -else - nls_cv_force_use_gnu_gettext=no -fi; - echo "$as_me:27256: result: $nls_cv_force_use_gnu_gettext" >&5 -echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6 - - nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" - if test "$nls_cv_force_use_gnu_gettext" != "yes"; then - CATOBJEXT=NONE - - cf_save_msgfmt_path="$MSGFMT" - cf_save_xgettext_path="$XGETTEXT" +### append special libraries that get in the way of testing +case $debug_malloc in +DBMALLOC) + cat >>confdefs.h <<\EOF +#define USE_DBMALLOC 1 +EOF - # Extract the first word of "msgfmt", so it can be a program name with args. + LIBS="$LIBS -ldbmalloc" + ;; +DMALLOC) + cat >>confdefs.h <<\EOF +#define USE_DMALLOC 1 +EOF -set dummy msgfmt; ac_word=$2 -echo "$as_me:27269: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_MSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&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=. - if test -f $ac_dir/$ac_word$ac_exeext; then - if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1; then - ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exeext" - break - fi - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" - ;; + LIBS="$LIBS -ldmalloc" + ;; esac -fi -MSGFMT="$ac_cv_path_MSGFMT" -if test "$MSGFMT" != ":"; then - echo "$as_me:27296: result: $MSGFMT" >&5 -echo "${ECHO_T}$MSGFMT" >&6 -else - echo "$as_me:27299: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - # Extract the first word of "gmsgfmt", so it can be a program name with args. -set dummy gmsgfmt; ac_word=$2 -echo "$as_me:27305: checking for $ac_word" >&5 +### Use gettext +### this also calls AM_LANGINFO_CODESET and AM_ICONV +### so we don't need to do the tests ourselves. +if test -n "$ac_tool_prefix"; then + # 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 "$as_me:28291: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_GMSGFMT+set}" = set; then +if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $GMSGFMT in - [\\/]* | ?:[\\/]*) - ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. - ;; - *) + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else ac_save_IFS=$IFS; IFS=$ac_path_separator ac_dummy="$PATH" for ac_dir in $ac_dummy; do IFS=$ac_save_IFS test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_GMSGFMT="$ac_dir/$ac_word" - echo "$as_me:27322: found $ac_dir/$ac_word" >&5 - break -fi + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" +echo "$as_me:28306: found $ac_dir/$ac_word" >&5 +break done - test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" - ;; -esac fi -GMSGFMT=$ac_cv_path_GMSGFMT - -if test -n "$GMSGFMT"; then - echo "$as_me:27334: result: $GMSGFMT" >&5 -echo "${ECHO_T}$GMSGFMT" >&6 +fi +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + echo "$as_me:28314: result: $RANLIB" >&5 +echo "${ECHO_T}$RANLIB" >&6 else - echo "$as_me:27337: result: no" >&5 + echo "$as_me:28317: result: no" >&5 echo "${ECHO_T}no" >&6 fi - # Extract the first word of "xgettext", so it can be a program name with args. - -set dummy xgettext; ac_word=$2 -echo "$as_me:27344: checking for $ac_word" >&5 +fi +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +echo "$as_me:28326: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_XGETTEXT+set}" = set; then +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&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=. - if test -f $ac_dir/$ac_word$ac_exeext; then - if $ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1; then - ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exeext" - break - fi - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" - ;; -esac + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_ac_ct_RANLIB="ranlib" +echo "$as_me:28341: found $ac_dir/$ac_word" >&5 +break +done + + test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" fi -XGETTEXT="$ac_cv_path_XGETTEXT" -if test "$XGETTEXT" != ":"; then - echo "$as_me:27371: result: $XGETTEXT" >&5 -echo "${ECHO_T}$XGETTEXT" >&6 +fi +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + echo "$as_me:28350: result: $ac_ct_RANLIB" >&5 +echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$as_me:27374: result: no" >&5 + echo "$as_me:28353: result: no" >&5 echo "${ECHO_T}no" >&6 fi - cf_save_OPTS_1="$CPPFLAGS" - if test "x$cf_save_msgfmt_path" = "x$MSGFMT" && \ - test "x$cf_save_xgettext_path" = "x$XGETTEXT" ; then - -cf_fix_cppflags=no -cf_new_cflags= -cf_new_cppflags= -cf_new_extra_cppflags= - -for cf_add_cflags in -DIGNORE_MSGFMT_HACK -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 - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - - continue - elif test "${cf_tst_cflags}" = "\"'" ; then - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - 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 - - test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " - cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" - - ;; - esac - ;; - *) - - test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " - cf_new_cflags="${cf_new_cflags}$cf_add_cflags" - - ;; - esac - ;; -yes) - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - 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 - - test -n "$CFLAGS" && CFLAGS="$CFLAGS " - CFLAGS="${CFLAGS}$cf_new_cflags" - + RANLIB=$ac_ct_RANLIB +else + RANLIB="$ac_cv_prog_RANLIB" fi -if test -n "$cf_new_cppflags" ; then - - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" - +# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works +# for constant arguments. Useless! +echo "$as_me:28364: checking for working alloca.h" >&5 +echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6 +if test "${ac_cv_working_alloca_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 28370 "configure" +#include "confdefs.h" +#include +int +main (void) +{ +char *p = (char *) alloca (2 * sizeof (int)); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:28382: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:28385: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:28388: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:28391: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_working_alloca_h=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_working_alloca_h=no fi - -if test -n "$cf_new_extra_cppflags" ; then - - test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " - EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" - +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi +echo "$as_me:28401: result: $ac_cv_working_alloca_h" >&5 +echo "${ECHO_T}$ac_cv_working_alloca_h" >&6 +if test $ac_cv_working_alloca_h = yes; then - fi - - cf_save_LIBS_1="$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" - -# If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these -# will be set on completion of the AC_TRY_LINK below. -cf_cv_header_path_intl= -cf_cv_library_path_intl= - -echo "${as_me:-configure}:27505: testing Starting FIND_LINKAGE(intl,) ..." 1>&5 +cat >>confdefs.h <<\EOF +#define HAVE_ALLOCA_H 1 +EOF -cf_save_LIBS="$LIBS" +fi -cat >conftest.$ac_ext <<_ACEOF -#line 27510 "configure" +echo "$as_me:28411: checking for alloca" >&5 +echo $ECHO_N "checking for alloca... $ECHO_C" >&6 +if test "${ac_cv_func_alloca_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 28417 "configure" #include "confdefs.h" - -#include -extern int _nl_msg_cat_cntr; +#ifdef __GNUC__ +# define alloca __builtin_alloca +#else +# ifdef _MSC_VER +# include +# define alloca _alloca +# else +# if HAVE_ALLOCA_H +# include +# else +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca /* predefined by HP cc +Olibcalls */ +char *alloca (); +# endif +# endif +# endif +# endif +#endif int main (void) { - - bindtextdomain ("", ""); - return (int) gettext ("") - -#ifndef IGNORE_MSGFMT_HACK - + _nl_msg_cat_cntr -#endif - +char *p = (char *) alloca (1); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:27532: \"$ac_link\"") >&5 +if { (eval echo "$as_me:28449: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:27535: \$? = $ac_status" >&5 + echo "$as_me:28452: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:27538: \"$ac_try\"") >&5 + { (eval echo "$as_me:28455: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27541: \$? = $ac_status" >&5 + echo "$as_me:28458: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - cf_cv_find_linkage_intl=yes - cf_cv_header_path_intl=/usr/include - cf_cv_library_path_intl=/usr/lib - + ac_cv_func_alloca_works=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 +ac_cv_func_alloca_works=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:28468: result: $ac_cv_func_alloca_works" >&5 +echo "${ECHO_T}$ac_cv_func_alloca_works" >&6 -LIBS="-lintl $cf_save_LIBS" +if test $ac_cv_func_alloca_works = yes; then -cat >conftest.$ac_ext <<_ACEOF -#line 27555 "configure" +cat >>confdefs.h <<\EOF +#define HAVE_ALLOCA 1 +EOF + +else + # The SVR3 libPW and SVR4 libucb both contain incompatible functions +# that cause trouble. Some versions do not even contain alloca or +# contain a buggy version. If you still want to use their alloca, +# use ar to extract alloca.o from them instead of compiling alloca.c. + +ALLOCA=alloca.$ac_objext + +cat >>confdefs.h <<\EOF +#define C_ALLOCA 1 +EOF + +echo "$as_me:28489: checking whether \`alloca.c' needs Cray hooks" >&5 +echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6 +if test "${ac_cv_os_cray+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 28495 "configure" #include "confdefs.h" +#if defined(CRAY) && ! defined(CRAY2) +webecray +#else +wenotbecray +#endif -#include -extern int _nl_msg_cat_cntr; +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "webecray" >/dev/null 2>&1; then + ac_cv_os_cray=yes +else + ac_cv_os_cray=no +fi +rm -rf conftest* + +fi +echo "$as_me:28513: result: $ac_cv_os_cray" >&5 +echo "${ECHO_T}$ac_cv_os_cray" >&6 +if test $ac_cv_os_cray = yes; then + for ac_func in _getb67 GETB67 getb67; do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:28518: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 28524 "configure" +#include "confdefs.h" +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func + +#ifdef __cplusplus +extern "C" +#endif + +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (void); int main (void) { - bindtextdomain ("", ""); - return (int) gettext ("") - -#ifndef IGNORE_MSGFMT_HACK - + _nl_msg_cat_cntr +/* The GNU C library defines stubs for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#error found stub for $ac_func #endif + return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:27577: \"$ac_link\"") >&5 +if { (eval echo "$as_me:28555: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:27580: \$? = $ac_status" >&5 + echo "$as_me:28558: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:27583: \"$ac_try\"") >&5 + { (eval echo "$as_me:28561: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27586: \$? = $ac_status" >&5 + echo "$as_me:28564: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - cf_cv_find_linkage_intl=yes - cf_cv_header_path_intl=/usr/include - cf_cv_library_path_intl=/usr/lib - cf_cv_library_file_intl="-lintl" - + eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:28574: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then - cf_cv_find_linkage_intl=no - LIBS="$cf_save_LIBS" - - test -n "$verbose" && echo " find linkage for intl library" 1>&6 +cat >>confdefs.h <&5 + break +fi -echo "${as_me:-configure}:27605: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5 + done +fi - cf_save_CPPFLAGS="$CPPFLAGS" - cf_test_CPPFLAGS="$CPPFLAGS" +echo "$as_me:28588: checking stack direction for C alloca" >&5 +echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6 +if test "${ac_cv_c_stack_direction+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + ac_cv_c_stack_direction=0 +else + cat >conftest.$ac_ext <<_ACEOF +#line 28597 "configure" +#include "confdefs.h" +int +find_stack_direction (void) +{ + static char *addr = 0; + auto char dummy; + if (addr == 0) + { + addr = &dummy; + return find_stack_direction (); + } + else + return (&dummy > addr) ? 1 : -1; +} -cf_search= +int +main (void) +{ + $ac_main_return (find_stack_direction () < 0); +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:28620: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:28623: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:28625: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:28628: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_c_stack_direction=1 +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_c_stack_direction=-1 +fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +echo "$as_me:28640: result: $ac_cv_c_stack_direction" >&5 +echo "${ECHO_T}$ac_cv_c_stack_direction" >&6 -# collect the current set of include-directories from compiler flags -cf_header_path_list="" -if test -n "${CFLAGS}${CPPFLAGS}" ; then - for cf_header_path in $CPPFLAGS $CFLAGS - do - case $cf_header_path in - -I*) - cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` +cat >>confdefs.h <&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 28658 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:28662: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:28668: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + eval "$as_ac_Header=no" +fi +rm -f conftest.err conftest.$ac_ext fi +echo "$as_me:28687: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 28706 "configure" +#include "confdefs.h" +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func -test "x$prefix" != "xNONE" && \ -test -d "$prefix" && \ - { - test -n "$verbose" && echo " ... testing for include-directories under $prefix" - test -d $prefix/include && cf_search="$cf_search $prefix/include" - test -d $prefix/include/intl && cf_search="$cf_search $prefix/include/intl" - test -d $prefix/include/intl/include && cf_search="$cf_search $prefix/include/intl/include" - test -d $prefix/intl/include && cf_search="$cf_search $prefix/intl/include" - test -d $prefix/intl/include/intl && cf_search="$cf_search $prefix/intl/include/intl" -} +#ifdef __cplusplus +extern "C" +#endif -for cf_subdir_prefix in \ - /usr \ - /usr/local \ - /usr/pkg \ - /opt \ - /opt/local \ - $HOME -do +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (void); -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" -} +int +main (void) +{ -done +/* The GNU C library defines stubs for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#error found stub for $ac_func +#endif -test "$includedir" != NONE && \ -test "$includedir" != "/usr/include" && \ -test -d "$includedir" && { - test -d $includedir && cf_search="$cf_search $includedir" - test -d $includedir/intl && cf_search="$cf_search $includedir/intl" + return $ac_func (); + ; + return 0; } +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:28737: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:28740: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:28743: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:28746: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:28756: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5 +echo $ECHO_N "checking for working mmap... $ECHO_C" >&6 +if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + ac_cv_func_mmap_fixed_mapped=no +else + cat >conftest.$ac_ext <<_ACEOF +#line 28775 "configure" +#include "confdefs.h" +$ac_includes_default +/* Thanks to Mike Haertel and Jim Avera for this test. + Here is a matrix of mmap possibilities: + mmap private not fixed + mmap private fixed at somewhere currently unmapped + mmap private fixed at somewhere already mapped + mmap shared not fixed + mmap shared fixed at somewhere currently unmapped + mmap shared fixed at somewhere already mapped + For private mappings, we should verify that changes cannot be read() + back from the file, nor mmap's back from the file at a different + address. (There have been systems where private was not correctly + implemented like the infamous i386 svr4.0, and systems where the + VM page cache was not coherent with the file system buffer cache + like early versions of FreeBSD and possibly contemporary NetBSD.) + For shared mappings, we should conversely verify that changes get + propagated back to all the places they're supposed to be. - 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 + Grep wants private fixed already mapped. + The main things grep needs to know about mmap are: + * does it exist and is it safe to write into the mmap'd area + * how to use it (BSD variants) */ -echo "${as_me:-configure}:27696: testing ... testing $cf_cv_header_path_intl ..." 1>&5 +#include +#include - CPPFLAGS="$cf_save_CPPFLAGS" +#if !STDC_HEADERS && !HAVE_STDLIB_H +char *malloc (); +#endif - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_intl" +/* This mess was copied from the GNU getpagesize.h. */ +#if !HAVE_GETPAGESIZE +/* Assume that all systems that can run configure have sys/param.h. */ +# if !HAVE_SYS_PARAM_H +# define HAVE_SYS_PARAM_H 1 +# endif - cat >conftest.$ac_ext <<_ACEOF -#line 27704 "configure" -#include "confdefs.h" +# ifdef _SC_PAGESIZE +# define getpagesize() sysconf(_SC_PAGESIZE) +# else /* no _SC_PAGESIZE */ +# if HAVE_SYS_PARAM_H +# include +# ifdef EXEC_PAGESIZE +# define getpagesize() EXEC_PAGESIZE +# else /* no EXEC_PAGESIZE */ +# ifdef NBPG +# define getpagesize() NBPG * CLSIZE +# ifndef CLSIZE +# define CLSIZE 1 +# endif /* no CLSIZE */ +# else /* no NBPG */ +# ifdef NBPC +# define getpagesize() NBPC +# else /* no NBPC */ +# ifdef PAGESIZE +# define getpagesize() PAGESIZE +# endif /* PAGESIZE */ +# endif /* no NBPC */ +# endif /* no NBPG */ +# endif /* no EXEC_PAGESIZE */ +# else /* no HAVE_SYS_PARAM_H */ +# define getpagesize() 8192 /* punt totally */ +# endif /* no HAVE_SYS_PARAM_H */ +# endif /* no _SC_PAGESIZE */ -#include -extern int _nl_msg_cat_cntr; +#endif /* no HAVE_GETPAGESIZE */ int main (void) { + char *data, *data2, *data3; + int i, pagesize; + int fd; - bindtextdomain ("", ""); - return (int) gettext ("") + pagesize = getpagesize (); -#ifndef IGNORE_MSGFMT_HACK - + _nl_msg_cat_cntr -#endif + /* First, make a file with some known garbage in it. */ + data = (char *) malloc (pagesize); + if (!data) + $ac_main_return (1); + for (i = 0; i < pagesize; ++i) + *(data + i) = rand (); + umask (0); + fd = creat ("conftest.mmap", 0600); + if (fd < 0) + $ac_main_return (1); + if (write (fd, data, pagesize) != pagesize) + $ac_main_return (1); + close (fd); - ; - return 0; + /* Next, try to mmap the file at a fixed address which already has + something else allocated at it. If we can, also make sure that + we see the same garbage. */ + fd = open ("conftest.mmap", O_RDWR); + if (fd < 0) + $ac_main_return (1); + data2 = (char *) malloc (2 * pagesize); + if (!data2) + $ac_main_return (1); + data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1); + if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_FIXED, fd, 0L)) + $ac_main_return (1); + for (i = 0; i < pagesize; ++i) + if (*(data + i) != *(data2 + i)) + $ac_main_return (1); + + /* Finally, make sure that changes to the mapped area do not + percolate back to the file as seen by read(). (This is a bug on + some variants of i386 svr4.0.) */ + for (i = 0; i < pagesize; ++i) + *(data2 + i) = *(data2 + i) + 1; + data3 = (char *) malloc (pagesize); + if (!data3) + $ac_main_return (1); + if (read (fd, data3, pagesize) != pagesize) + $ac_main_return (1); + for (i = 0; i < pagesize; ++i) + if (*(data + i) != *(data3 + i)) + $ac_main_return (1); + close (fd); + $ac_main_return (0); } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:27726: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest$ac_exeext +if { (eval echo "$as_me:28902: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:27729: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:27732: \"$ac_try\"") >&5 + echo "$as_me:28905: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:28907: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27735: \$? = $ac_status" >&5 + echo "$as_me:28910: \$? = $ac_status" >&5 (exit $ac_status); }; }; then + ac_cv_func_mmap_fixed_mapped=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_mmap_fixed_mapped=no +fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +echo "$as_me:28922: result: $ac_cv_func_mmap_fixed_mapped" >&5 +echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6 +if test $ac_cv_func_mmap_fixed_mapped = yes; then - test -n "$verbose" && echo " ... found intl headers in $cf_cv_header_path_intl" 1>&6 +cat >>confdefs.h <<\EOF +#define HAVE_MMAP 1 +EOF -echo "${as_me:-configure}:27740: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5 +fi +rm -f conftest.mmap - cf_cv_find_linkage_intl=maybe - cf_test_CPPFLAGS="$CPPFLAGS" - break +echo "$as_me:28933: checking whether we are using the GNU C Library 2.1 or newer" >&5 +echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6 +if test "${ac_cv_gnu_library_2_1+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 + cat >conftest.$ac_ext <<_ACEOF +#line 28939 "configure" +#include "confdefs.h" - CPPFLAGS="$cf_save_CPPFLAGS" +#include +#ifdef __GNU_LIBRARY__ + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) + Lucky GNU user + #endif +#endif +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "Lucky GNU user" >/dev/null 2>&1; then + ac_cv_gnu_library_2_1=yes +else + ac_cv_gnu_library_2_1=no fi -rm -f conftest.$ac_objext conftest.$ac_ext - fi - done - - if test "$cf_cv_find_linkage_intl" = maybe ; then +rm -rf conftest* -echo "${as_me:-configure}:27758: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5 +fi +echo "$as_me:28959: result: $ac_cv_gnu_library_2_1" >&5 +echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6 - cf_save_LIBS="$LIBS" - cf_save_LDFLAGS="$LDFLAGS" + GLIBC21="$ac_cv_gnu_library_2_1" - if test "$cf_cv_find_linkage_intl" != yes ; then +cf_makefile=Makefile -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 - -L*) - cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` +test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && echo *.po|sed -e 's/\.po//g' -e 's/*//'` -test "x$cf_library_path" != "xNONE" && \ -test -d "$cf_library_path" && \ - { - test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" - test -d $cf_library_path/lib && cf_search="$cf_search $cf_library_path/lib" - test -d $cf_library_path/lib/intl && cf_search="$cf_search $cf_library_path/lib/intl" - test -d $cf_library_path/lib/intl/lib && cf_search="$cf_search $cf_library_path/lib/intl/lib" - test -d $cf_library_path/intl/lib && cf_search="$cf_search $cf_library_path/intl/lib" - test -d $cf_library_path/intl/lib/intl && cf_search="$cf_search $cf_library_path/intl/lib/intl" -} +# Allow override of "config.h" definition: +: ${CONFIG_H:=config.h} - cf_library_path_list="$cf_library_path_list $cf_search" - ;; - esac - done +if test -z "$PACKAGE" ; then + { { echo "$as_me:28972: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&5 +echo "$as_me: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&2;} + { (exit 1); exit 1; }; } fi -cf_search= - -test "x$prefix" != "xNONE" && \ -test -d "$prefix" && \ - { - test -n "$verbose" && echo " ... testing for lib-directories under $prefix" - test -d $prefix/lib && cf_search="$cf_search $prefix/lib" - test -d $prefix/lib/intl && cf_search="$cf_search $prefix/lib/intl" - test -d $prefix/lib/intl/lib && cf_search="$cf_search $prefix/lib/intl/lib" - test -d $prefix/intl/lib && cf_search="$cf_search $prefix/intl/lib" - test -d $prefix/intl/lib/intl && cf_search="$cf_search $prefix/intl/lib/intl" -} +if test -z "$VERSION" ; then +if test -f $srcdir/VERSION ; then + VERSION=`sed -e '2,$d' $srcdir/VERSION|cut -f1` +else + VERSION=unknown +fi +fi -for cf_subdir_prefix in \ - /usr \ - /usr/local \ - /usr/pkg \ - /opt \ - /opt/local \ - $HOME +for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ +stdlib.h string.h unistd.h sys/param.h do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:28989: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 28995 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:28999: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:29005: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + eval "$as_ac_Header=no" +fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:29024: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 - -echo "${as_me:-configure}:27833: 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 <<_ACEOF -#line 27839 "configure" +for ac_func in feof_unlocked fgets_unlocked getcwd getegid geteuid \ +getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \ +strdup strtoul tsearch __argz_count __argz_stringify __argz_next +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:29039: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 29045 "configure" #include "confdefs.h" +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func -#include -extern int _nl_msg_cat_cntr; +#ifdef __cplusplus +extern "C" +#endif + +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (void); int main (void) { - bindtextdomain ("", ""); - return (int) gettext ("") - -#ifndef IGNORE_MSGFMT_HACK - + _nl_msg_cat_cntr +/* The GNU C library defines stubs for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#error found stub for $ac_func #endif + return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:27861: \"$ac_link\"") >&5 +if { (eval echo "$as_me:29076: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:27864: \$? = $ac_status" >&5 + echo "$as_me:29079: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:27867: \"$ac_try\"") >&5 + { (eval echo "$as_me:29082: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27870: \$? = $ac_status" >&5 + echo "$as_me:29085: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - test -n "$verbose" && echo " ... found intl library in $cf_cv_library_path_intl" 1>&6 - -echo "${as_me:-configure}:27875: 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 + eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - - CPPFLAGS="$cf_save_CPPFLAGS" - LIBS="$cf_save_LIBS" - LDFLAGS="$cf_save_LDFLAGS" - +eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi - done - CPPFLAGS="$cf_save_CPPFLAGS" - LDFLAGS="$cf_save_LDFLAGS" - fi - - else - cf_cv_find_linkage_intl=no - fi - fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +echo "$as_me:29095: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <conftest.$ac_ext <<_ACEOF +#line 29146 "configure" +#include "confdefs.h" +#include +int +main (void) +{ +printf("Hello") + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:29158: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:29161: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:29164: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:29167: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : else -cf_cv_func_gettext=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_incdir=yes fi +rm -f conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$cf_save_CPPFLAGS + fi + fi + fi - echo "$as_me:27914: checking for libintl.h and gettext()" >&5 -echo $ECHO_N "checking for libintl.h and gettext()... $ECHO_C" >&6 - echo "$as_me:27916: result: $cf_cv_func_gettext" >&5 -echo "${ECHO_T}$cf_cv_func_gettext" >&6 - - LIBS="$cf_save_LIBS_1" - CPPFLAGS="$cf_save_OPTS_1" + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - if test "$cf_cv_func_gettext" = yes ; then +echo "${as_me:-configure}:29184: testing adding $cf_add_incdir to include-path ..." 1>&5 -cat >>confdefs.h <<\EOF -#define HAVE_LIBINTL_H 1 -EOF + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - if test "$PACKAGE" != gettext; then + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + test "$cf_top_incdir" = "$cf_add_incdir" && break + cf_add_incdir="$cf_top_incdir" + else + break + fi + else + break + fi + done + done +fi -cat >>confdefs.h <<\EOF -#define HAVE_GETTEXT 1 -EOF + elif test -d $cf_searchpath/../include ; then -if test -n "$cf_cv_header_path_intl" ; then - for cf_add_incdir in $cf_cv_header_path_intl +if test -n "$cf_searchpath/../include" ; then + for cf_add_incdir in $cf_searchpath/../include do while test $cf_add_incdir != /usr/include do @@ -27958,7 +29227,7 @@ if test -n "$cf_cv_header_path_intl" ; t CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 27961 "configure" +#line 29230 "configure" #include "confdefs.h" #include int @@ -27970,16 +29239,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:27973: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:29242: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:27976: \$? = $ac_status" >&5 + echo "$as_me:29245: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:27979: \"$ac_try\"") >&5 + { (eval echo "$as_me:29248: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27982: \$? = $ac_status" >&5 + echo "$as_me:29251: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -27996,7 +29265,7 @@ rm -f conftest.$ac_objext conftest.$ac_e if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:27999: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:29268: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -28013,11 +29282,15 @@ echo "${as_me:-configure}:27999: testing done fi - if test -n "$cf_cv_library_file_intl" ; then - INTLLIBS="$cf_cv_library_file_intl $LIBICONV" + else +{ { echo "$as_me:29286: error: cannot find libiconv under $withval" >&5 +echo "$as_me: error: cannot find libiconv under $withval" >&2;} + { (exit 1); exit 1; }; } + fi + if test -d $cf_searchpath/lib; then -if test -n "$cf_cv_library_path_intl" ; then - for cf_add_libdir in $cf_cv_library_path_intl +if test -n "$cf_searchpath/lib" ; then + for cf_add_libdir in $cf_searchpath/lib do if test $cf_add_libdir = /usr/lib ; then : @@ -28035,1290 +29308,1596 @@ if test -n "$cf_cv_library_path_intl" ; if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:28038: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:29311: testing adding $cf_add_libdir to library-path ..." 1>&5 - INTLLIBS="-L$cf_add_libdir $INTLLIBS" + LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi fi done fi - fi + elif test -d $cf_searchpath ; then - gt_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" +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 ac_func in dcgettext -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:28054: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +echo "${as_me:-configure}:29340: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done +fi + + else +{ { echo "$as_me:29349: error: cannot find libiconv under $withval" >&5 +echo "$as_me: error: cannot find libiconv under $withval" >&2;} + { (exit 1); exit 1; }; } + fi +done + + ;; +esac + +fi; + + echo "$as_me:29360: checking for iconv" >&5 +echo $ECHO_N "checking for iconv... $ECHO_C" >&6 +if test "${am_cv_func_iconv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 28060 "configure" -#include "confdefs.h" -#define $ac_func autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef $ac_func -#ifdef __cplusplus -extern "C" -#endif +# If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these +# will be set on completion of the AC_TRY_LINK below. +cf_cv_header_path_iconv= +cf_cv_library_path_iconv= -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (void); +echo "${as_me:-configure}:29371: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5 + +cf_save_LIBS="$LIBS" + +cat >conftest.$ac_ext <<_ACEOF +#line 29376 "configure" +#include "confdefs.h" + +#include +#include int main (void) { -/* The GNU C library defines stubs for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -#error found stub for $ac_func -#endif + iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); - return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:28091: \"$ac_link\"") >&5 +if { (eval echo "$as_me:29395: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:28094: \$? = $ac_status" >&5 + echo "$as_me:29398: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:28097: \"$ac_try\"") >&5 + { (eval echo "$as_me:29401: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28100: \$? = $ac_status" >&5 + echo "$as_me:29404: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$as_ac_var=yes" + + cf_cv_find_linkage_iconv=yes + cf_cv_header_path_iconv=/usr/include + cf_cv_library_path_iconv=/usr/lib + else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -eval "$as_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:28110: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <&5 -echo "$as_me: WARNING: disabling NLS feature" >&2;} - sed -e /ENABLE_NLS/d confdefs.h >confdefs.tmp - mv confdefs.tmp confdefs.h - ALL_LINGUAS= - CATOBJEXT=.ignored - MSGFMT=":" - GMSGFMT=":" - XGETTEXT=":" - POSUB= - BUILD_INCLUDED_LIBINTL=no - USE_INCLUDED_LIBINTL=no - USE_NLS=no - nls_cv_use_gnu_gettext=no - fi - - if test "$CATOBJEXT" = "NONE"; then - nls_cv_use_gnu_gettext=maybe - fi - fi - - if test "$nls_cv_use_gnu_gettext" != "no"; then - CATOBJEXT=.gmo - if test -f $srcdir/intl/libintl.h ; then - INTLOBJS="\$(GETTOBJS)" - BUILD_INCLUDED_LIBINTL=yes - USE_INCLUDED_LIBINTL=yes - INTLLIBS="\$(top_builddir)/intl/libintl.a $LIBICONV" - LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` - elif test "$nls_cv_use_gnu_gettext" = "yes"; then - nls_cv_use_gnu_gettext=no - { echo "$as_me:28156: WARNING: no NLS library is packaged with this application" >&5 -echo "$as_me: WARNING: no NLS library is packaged with this application" >&2;} - fi - fi - if test "$GMSGFMT" != ":"; then - if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then - : ; - else - { echo "$as_me:28165: WARNING: found msgfmt program is not GNU msgfmt" >&5 -echo "$as_me: WARNING: found msgfmt program is not GNU msgfmt" >&2;} - fi - fi +LIBS="-liconv $cf_save_LIBS" - if test "$XGETTEXT" != ":"; then - if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then - : ; - else - { echo "$as_me:28174: WARNING: found xgettext program is not GNU xgettext" >&5 -echo "$as_me: WARNING: found xgettext program is not GNU xgettext" >&2;} - fi - fi - fi +cat >conftest.$ac_ext <<_ACEOF +#line 29418 "configure" +#include "confdefs.h" - if test "$XGETTEXT" != ":"; then - ac_config_commands="$ac_config_commands default-1" +#include +#include - if test "$PACKAGE" = gettext; then - BUILD_INCLUDED_LIBINTL=yes - fi +int +main (void) +{ - if test "$nls_cv_use_gnu_gettext" = "yes"; then - for ac_prog in bison -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 "$as_me:28192: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_INTLBISON+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$INTLBISON"; then - ac_cv_prog_INTLBISON="$INTLBISON" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_INTLBISON="$ac_prog" -echo "$as_me:28207: found $ac_dir/$ac_word" >&5 -break -done + iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:29437: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:29440: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:29443: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:29446: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_iconv=yes + cf_cv_header_path_iconv=/usr/include + cf_cv_library_path_iconv=/usr/lib + cf_cv_library_file_iconv="-liconv" -fi -fi -INTLBISON=$ac_cv_prog_INTLBISON -if test -n "$INTLBISON"; then - echo "$as_me:28215: result: $INTLBISON" >&5 -echo "${ECHO_T}$INTLBISON" >&6 else - echo "$as_me:28218: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 - test -n "$INTLBISON" && break -done + cf_cv_find_linkage_iconv=no + LIBS="$cf_save_LIBS" - if test -z "$INTLBISON"; then - ac_verc_fail=yes - else - echo "$as_me:28228: checking version of bison" >&5 -echo $ECHO_N "checking version of bison... $ECHO_C" >&6 - 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="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - esac - echo "$as_me:28237: result: $ac_prog_version" >&5 -echo "${ECHO_T}$ac_prog_version" >&6 - fi - if test $ac_verc_fail = yes; then - INTLBISON=: - fi - fi + test -n "$verbose" && echo " find linkage for iconv library" 1>&6 - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done - fi +echo "${as_me:-configure}:29463: testing find linkage for iconv library ..." 1>&5 - nls_cv_header_intl= - nls_cv_header_libgt= +echo "${as_me:-configure}:29465: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5 - DATADIRNAME=share + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" - INSTOBJEXT=.mo +cf_search= - GENCAT=gencat +# collect the current set of include-directories from compiler flags +cf_header_path_list="" +if test -n "${CFLAGS}${CPPFLAGS}" ; then + for cf_header_path in $CPPFLAGS $CFLAGS + do + case $cf_header_path in + -I*) + cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` - if test "x$CATOBJEXT" != "x"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - echo "$as_me:28264: checking for catalogs to be installed" >&5 -echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6 - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi - done - LINGUAS=$NEW_LINGUAS - echo "$as_me:28284: result: $LINGUAS" >&5 -echo "${ECHO_T}$LINGUAS" >&6 - fi +test "x$cf_header_path" != "xNONE" && \ +test -d "$cf_header_path" && \ + { + test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" + test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" + test -d $cf_header_path/include/iconv && cf_search="$cf_search $cf_header_path/include/iconv" + test -d $cf_header_path/include/iconv/include && cf_search="$cf_search $cf_header_path/include/iconv/include" + test -d $cf_header_path/iconv/include && cf_search="$cf_search $cf_header_path/iconv/include" + test -d $cf_header_path/iconv/include/iconv && cf_search="$cf_search $cf_header_path/iconv/include/iconv" +} - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi + cf_header_path_list="$cf_header_path_list $cf_search" + ;; + esac + done +fi - INTL_LIBTOOL_SUFFIX_PREFIX= +# add the variations for the package we are looking for -if test "$USE_NLS" = yes ; then +cf_search= -# Check whether --with-textdomain or --without-textdomain was given. -if test "${with_textdomain+set}" = set; then - withval="$with_textdomain" - NLS_TEXTDOMAIN=$withval -else - NLS_TEXTDOMAIN=$PACKAGE -fi; +test "x$prefix" != "xNONE" && \ +test -d "$prefix" && \ + { + test -n "$verbose" && echo " ... testing for include-directories under $prefix" + test -d $prefix/include && cf_search="$cf_search $prefix/include" + test -d $prefix/include/iconv && cf_search="$cf_search $prefix/include/iconv" + test -d $prefix/include/iconv/include && cf_search="$cf_search $prefix/include/iconv/include" + test -d $prefix/iconv/include && cf_search="$cf_search $prefix/iconv/include" + test -d $prefix/iconv/include/iconv && cf_search="$cf_search $prefix/iconv/include/iconv" +} -cat >>confdefs.h <&5 -echo $ECHO_N "checking if we should use included message-library... $ECHO_C" >&6 +test "$oldincludedir" != NONE && \ +test "$oldincludedir" != "/usr/include" && \ +test -d "$oldincludedir" && { + test -d $oldincludedir && cf_search="$cf_search $oldincludedir" + test -d $oldincludedir/iconv && cf_search="$cf_search $oldincludedir/iconv" +} -# Check whether --enable-included-msgs or --disable-included-msgs was given. -if test "${enable_included_msgs+set}" = set; then - enableval="$enable_included_msgs" - use_our_messages=$enableval -else - use_our_messages=yes -fi; -fi -echo "$as_me:28331: result: $use_our_messages" >&5 -echo "${ECHO_T}$use_our_messages" >&6 -fi +cf_search="$cf_search $cf_header_path_list" -MSG_DIR_MAKE="#" -if test "$use_our_messages" = yes -then - SUB_MAKEFILE="$SUB_MAKEFILE po/$cf_makefile.in:$srcdir/po/$cf_makefile.inn" - MSG_DIR_MAKE= -fi + 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 -if test "$USE_INCLUDED_LIBINTL" = yes ; then - if test "$nls_cv_force_use_gnu_gettext" = yes ; then - : - elif test "$nls_cv_use_gnu_gettext" = yes ; then - : - else - INTLDIR_MAKE="#" - fi - if test -z "$INTLDIR_MAKE"; then +echo "${as_me:-configure}:29556: testing ... testing $cf_cv_header_path_iconv ..." 1>&5 -cat >>confdefs.h <<\EOF -#define HAVE_LIBGETTEXT_H 1 -EOF + CPPFLAGS="$cf_save_CPPFLAGS" - for cf_makefile in \ - $srcdir/intl/Makefile.in \ - $srcdir/intl/makefile.in - do - if test -f "$cf_makefile" ; then - SUB_MAKEFILE="$SUB_MAKEFILE `echo \"${cf_makefile}\"|sed -e 's,^'$srcdir/',,' -e 's/\.in$//'`:${cf_makefile}" - break - fi - done - fi -else - INTLDIR_MAKE="#" - if test "$USE_NLS" = yes ; then + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_iconv" -for ac_header in libintl.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:28373: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 28379 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 29564 "configure" #include "confdefs.h" -#include <$ac_header> + +#include +#include + +int +main (void) +{ + + iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); + + ; + return 0; +} _ACEOF -if { (eval echo "$as_me:28383: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:29583: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:29586: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:29589: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:28389: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + echo "$as_me:29592: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + test -n "$verbose" && echo " ... found iconv headers in $cf_cv_header_path_iconv" 1>&6 + +echo "${as_me:-configure}:29597: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5 + + cf_cv_find_linkage_iconv=maybe + cf_test_CPPFLAGS="$CPPFLAGS" + break else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" -fi -rm -f conftest.err conftest.$ac_ext -fi -echo "$as_me:28408: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <&5 -fi -done + CPPFLAGS="$cf_save_CPPFLAGS" - fi fi +rm -f conftest.$ac_objext conftest.$ac_ext + fi + done -if test -z "$INTLDIR_MAKE" ; then + if test "$cf_cv_find_linkage_iconv" = maybe ; then - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-I../intl" +echo "${as_me:-configure}:29615: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5 -fi + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" -if test "$BUILD_INCLUDED_LIBINTL" = yes ; then - GT_YES="#" - GT_NO= -else - GT_YES= - GT_NO="#" -fi + if test "$cf_cv_find_linkage_iconv" != yes ; then -if test "$USE_INCLUDED_LIBINTL" = yes ; then - if test "$nls_cv_force_use_gnu_gettext" = 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 + -L*) + cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` -cat >>confdefs.h <<\EOF -#define HAVE_GETTEXT 1 -EOF +test "x$cf_library_path" != "xNONE" && \ +test -d "$cf_library_path" && \ + { + test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" + test -d $cf_library_path/lib && cf_search="$cf_search $cf_library_path/lib" + test -d $cf_library_path/lib/iconv && cf_search="$cf_search $cf_library_path/lib/iconv" + test -d $cf_library_path/lib/iconv/lib && cf_search="$cf_search $cf_library_path/lib/iconv/lib" + test -d $cf_library_path/iconv/lib && cf_search="$cf_search $cf_library_path/iconv/lib" + test -d $cf_library_path/iconv/lib/iconv && cf_search="$cf_search $cf_library_path/iconv/lib/iconv" +} - elif test "$nls_cv_use_gnu_gettext" = yes ; then + cf_library_path_list="$cf_library_path_list $cf_search" + ;; + esac + done +fi -cat >>confdefs.h <<\EOF -#define HAVE_GETTEXT 1 -EOF +cf_search= - fi - if test -n "$nls_cv_header_intl" ; then +test "x$prefix" != "xNONE" && \ +test -d "$prefix" && \ + { + test -n "$verbose" && echo " ... testing for lib-directories under $prefix" + test -d $prefix/lib && cf_search="$cf_search $prefix/lib" + test -d $prefix/lib/iconv && cf_search="$cf_search $prefix/lib/iconv" + test -d $prefix/lib/iconv/lib && cf_search="$cf_search $prefix/lib/iconv/lib" + test -d $prefix/iconv/lib && cf_search="$cf_search $prefix/iconv/lib" + test -d $prefix/iconv/lib/iconv && cf_search="$cf_search $prefix/iconv/lib/iconv" +} -cat >>confdefs.h <<\EOF -#define HAVE_LIBINTL_H 1 -EOF +for cf_subdir_prefix in \ + /usr \ + /usr/local \ + /usr/pkg \ + /opt \ + /opt/local \ + $HOME +do - fi -fi +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" +} -LIBS="$LIBS $LIBICONV" +done -### check for alloca (required for bison and/or intl/*) -case "$YACC" in -bison*) - use_alloca=yes - ;; -*) - use_alloca=$USE_INCLUDED_LIBINTL - ;; -esac +cf_search="$cf_library_path_list $cf_search" -if test ".$use_alloca" = .yes ; then + 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 -# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works -# for constant arguments. Useless! -echo "$as_me:28475: checking for working alloca.h" >&5 -echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6 -if test "${ac_cv_working_alloca_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 28481 "configure" +echo "${as_me:-configure}:29690: 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 <<_ACEOF +#line 29696 "configure" #include "confdefs.h" -#include + +#include +#include + int main (void) { -char *p = (char *) alloca (2 * sizeof (int)); + + iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); + ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:28493: \"$ac_link\"") >&5 +if { (eval echo "$as_me:29715: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:28496: \$? = $ac_status" >&5 + echo "$as_me:29718: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:28499: \"$ac_try\"") >&5 + { (eval echo "$as_me:29721: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28502: \$? = $ac_status" >&5 + echo "$as_me:29724: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_working_alloca_h=yes + + test -n "$verbose" && echo " ... found iconv library in $cf_cv_library_path_iconv" 1>&6 + +echo "${as_me:-configure}:29729: 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 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_working_alloca_h=no + + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" + LDFLAGS="$cf_save_LDFLAGS" + fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi + done + CPPFLAGS="$cf_save_CPPFLAGS" + LDFLAGS="$cf_save_LDFLAGS" + fi + + else + cf_cv_find_linkage_iconv=no + fi + fi -echo "$as_me:28512: result: $ac_cv_working_alloca_h" >&5 -echo "${ECHO_T}$ac_cv_working_alloca_h" >&6 -if test $ac_cv_working_alloca_h = yes; then +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -cat >>confdefs.h <<\EOF -#define HAVE_ALLOCA_H 1 -EOF +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +LIBS="$cf_save_LIBS" +if test "$cf_cv_find_linkage_iconv" = yes ; then +am_cv_func_iconv=yes +else +am_cv_func_iconv="no, consider installing GNU libiconv" fi -echo "$as_me:28522: checking for alloca" >&5 -echo $ECHO_N "checking for alloca... $ECHO_C" >&6 -if test "${ac_cv_func_alloca_works+set}" = set; then +fi +echo "$as_me:29769: result: $am_cv_func_iconv" >&5 +echo "${ECHO_T}$am_cv_func_iconv" >&6 + + if test "$am_cv_func_iconv" = yes; then + +cat >>confdefs.h <<\EOF +#define HAVE_ICONV 1 +EOF + + echo "$as_me:29778: checking if the declaration of iconv() needs const." >&5 +echo $ECHO_N "checking if the declaration of iconv() needs const.... $ECHO_C" >&6 +if test "${am_cv_proto_iconv_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 28528 "configure" + + cat >conftest.$ac_ext <<_ACEOF +#line 29785 "configure" #include "confdefs.h" -#ifdef __GNUC__ -# define alloca __builtin_alloca + +#include +#include + +extern +#ifdef __cplusplus +"C" +#endif +#if defined(__STDC__) || defined(__cplusplus) +size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); #else -# ifdef _MSC_VER -# include -# define alloca _alloca -# else -# if HAVE_ALLOCA_H -# include -# else -# ifdef _AIX - #pragma alloca -# else -# ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -# endif -# endif -# endif -# endif +size_t iconv(); #endif int main (void) { -char *p = (char *) alloca (1); + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:28560: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:29810: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:28563: \$? = $ac_status" >&5 + echo "$as_me:29813: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:28566: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:29816: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28569: \$? = $ac_status" >&5 + echo "$as_me:29819: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func_alloca_works=yes + am_cv_proto_iconv_const=no else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_func_alloca_works=no +am_cv_proto_iconv_const=yes fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:28579: result: $ac_cv_func_alloca_works" >&5 -echo "${ECHO_T}$ac_cv_func_alloca_works" >&6 +echo "$as_me:29829: result: $am_cv_proto_iconv_const" >&5 +echo "${ECHO_T}$am_cv_proto_iconv_const" >&6 -if test $ac_cv_func_alloca_works = yes; then + if test "$am_cv_proto_iconv_const" = yes ; then + am_cv_proto_iconv_arg1="const" + else + am_cv_proto_iconv_arg1="" + fi -cat >>confdefs.h <<\EOF -#define HAVE_ALLOCA 1 +cat >>confdefs.h <>confdefs.h <<\EOF -#define C_ALLOCA 1 -EOF +if test -n "$cf_cv_header_path_iconv" ; then + for cf_add_incdir in $cf_cv_header_path_iconv + do + while test $cf_add_incdir != /usr/include + do + if test -d $cf_add_incdir + then + cf_have_incdir=no + if test -n "$CFLAGS$CPPFLAGS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then + cf_have_incdir=yes; break + fi + done + fi -echo "$as_me:28600: checking whether \`alloca.c' needs Cray hooks" >&5 -echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6 -if test "${ac_cv_os_cray+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 28606 "configure" -#include "confdefs.h" -#if defined(CRAY) && ! defined(CRAY2) -webecray -#else -wenotbecray -#endif + if test "$cf_have_incdir" = no ; then + if test "$cf_add_incdir" = /usr/local/include ; then + if test "$GCC" = yes + then + cf_save_CPPFLAGS=$CPPFLAGS -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "webecray" >/dev/null 2>&1; then - ac_cv_os_cray=yes -else - ac_cv_os_cray=no -fi -rm -rf conftest* + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" -fi -echo "$as_me:28624: result: $ac_cv_os_cray" >&5 -echo "${ECHO_T}$ac_cv_os_cray" >&6 -if test $ac_cv_os_cray = yes; then - for ac_func in _getb67 GETB67 getb67; do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:28629: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 28635 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 29874 "configure" #include "confdefs.h" -#define $ac_func autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef $ac_func - -#ifdef __cplusplus -extern "C" -#endif - -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (void); - +#include int main (void) { - -/* The GNU C library defines stubs for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -#error found stub for $ac_func -#endif - - return $ac_func (); +printf("Hello") ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:28666: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:29886: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:28669: \$? = $ac_status" >&5 + echo "$as_me:29889: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:28672: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:29892: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28675: \$? = $ac_status" >&5 + echo "$as_me:29895: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$as_ac_var=yes" + : else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -eval "$as_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +cf_have_incdir=yes fi -echo "$as_me:28685: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then +rm -f conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$cf_save_CPPFLAGS + fi + fi + fi -cat >>confdefs.h <&6 - break -fi +echo "${as_me:-configure}:29912: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + test "$cf_top_incdir" = "$cf_add_incdir" && break + cf_add_incdir="$cf_top_incdir" + else + break + fi + else + break + fi + done done fi -echo "$as_me:28699: checking stack direction for C alloca" >&5 -echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6 -if test "${ac_cv_c_stack_direction+set}" = set; then + if test -n "$cf_cv_library_file_iconv" ; then + 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 + +echo "${as_me:-configure}:29951: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done +fi + + fi + fi + +echo "$as_me:29962: checking for nl_langinfo and CODESET" >&5 +echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 +if test "${am_cv_langinfo_codeset+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$cross_compiling" = yes; then - ac_cv_c_stack_direction=0 -else cat >conftest.$ac_ext <<_ACEOF -#line 28708 "configure" +#line 29968 "configure" #include "confdefs.h" -int -find_stack_direction (void) -{ - static char *addr = 0; - auto char dummy; - if (addr == 0) - { - addr = &dummy; - return find_stack_direction (); - } - else - return (&dummy > addr) ? 1 : -1; -} - +#include int main (void) { - $ac_main_return (find_stack_direction () < 0); +char* cs = nl_langinfo(CODESET); (void)cs + ; + return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:28731: \"$ac_link\"") >&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:29980: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:28734: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:28736: \"$ac_try\"") >&5 + echo "$as_me:29983: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:29986: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28739: \$? = $ac_status" >&5 + echo "$as_me:29989: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_c_stack_direction=1 + am_cv_langinfo_codeset=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_c_stack_direction=-1 -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +am_cv_langinfo_codeset=no fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi -echo "$as_me:28751: result: $ac_cv_c_stack_direction" >&5 -echo "${ECHO_T}$ac_cv_c_stack_direction" >&6 +echo "$as_me:30000: result: $am_cv_langinfo_codeset" >&5 +echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 + if test $am_cv_langinfo_codeset = yes; then -cat >>confdefs.h <>confdefs.h <<\EOF +#define HAVE_LANGINFO_CODESET 1 EOF -fi - -case $host_os in -linux*|gnu*) - # workaround for bison 1.875c (compound breakage in Linux stdlib.h - # and bison's output make bison try to use alloca()). - if test -z "$GCC" ; then - CPPFLAGS="$CPPFLAGS -DYYSTACK_USE_ALLOCA=0" - ALLOCA="" - elif test "$INTEL_COMPILER" = yes ; then - CPPFLAGS="$CPPFLAGS -DYYSTACK_USE_ALLOCA=0" - ALLOCA="" fi - ;; -esac + if test $ac_cv_header_locale_h = yes; then + echo "$as_me:30011: checking for LC_MESSAGES" >&5 +echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6 +if test "${am_cv_val_LC_MESSAGES+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ALLOCA="" - -fi - -# if struct hostent contains h_addr_list or not (SunOS-3.5) -echo "$as_me:28780: checking for h_addr_list in struct hostent" >&5 -echo $ECHO_N "checking for h_addr_list in struct hostent... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line 28783 "configure" -#include "confdefs.h" - -#ifdef HAVE_NETDB_H -#include -#endif - + cat >conftest.$ac_ext <<_ACEOF +#line 30017 "configure" +#include "confdefs.h" +#include int main (void) { - -struct hostent h; -h.h_addr_list[0]=0; - +return LC_MESSAGES ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:28802: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:30029: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:28805: \$? = $ac_status" >&5 + echo "$as_me:30032: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:28808: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:30035: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28811: \$? = $ac_status" >&5 + echo "$as_me:30038: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_hostent_h_addr_list=yes + am_cv_val_LC_MESSAGES=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_hostent_h_addr_list=no +am_cv_val_LC_MESSAGES=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:28820: result: $ac_cv_hostent_h_addr_list" >&5 -echo "${ECHO_T}$ac_cv_hostent_h_addr_list" >&6 -if test $ac_cv_hostent_h_addr_list = yes; then - cat >>confdefs.h <<\EOF -#define HAVE_HOSTENT_H_ADDR_LIST 1 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:30048: result: $am_cv_val_LC_MESSAGES" >&5 +echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6 + if test $am_cv_val_LC_MESSAGES = yes; then + +cat >>confdefs.h <<\EOF +#define HAVE_LC_MESSAGES 1 EOF + fi fi + echo "$as_me:30058: checking whether NLS is requested" >&5 +echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6 -for ac_header in X11/Xpoll.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:28832: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +# Check whether --enable-nls or --disable-nls was given. +if test "${enable_nls+set}" = set; then + enableval="$enable_nls" + USE_NLS=$enableval +else + USE_NLS=yes +fi; + echo "$as_me:30068: result: $USE_NLS" >&5 +echo "${ECHO_T}$USE_NLS" >&6 + + BUILD_INCLUDED_LIBINTL=no + USE_INCLUDED_LIBINTL=no + INTLLIBS= + + if test "$USE_NLS" = "yes"; then + POSUB=po + +cat >>confdefs.h <<\EOF +#define ENABLE_NLS 1 +EOF + + echo "$as_me:30082: checking whether included gettext is requested" >&5 +echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6 + +# Check whether --with-included-gettext or --without-included-gettext was given. +if test "${with_included_gettext+set}" = set; then + withval="$with_included_gettext" + nls_cv_force_use_gnu_gettext=$withval +else + nls_cv_force_use_gnu_gettext=no +fi; + echo "$as_me:30092: result: $nls_cv_force_use_gnu_gettext" >&5 +echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6 + + nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" + if test "$nls_cv_force_use_gnu_gettext" != "yes"; then + CATOBJEXT=NONE + + cf_save_msgfmt_path="$MSGFMT" + cf_save_xgettext_path="$XGETTEXT" + + # Extract the first word of "msgfmt", so it can be a program name with args. + +set dummy msgfmt; ac_word=$2 +echo "$as_me:30105: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_MSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 28838 "configure" -#include "confdefs.h" -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:28842: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:28848: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi + 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=. + if test -f $ac_dir/$ac_word$ac_exeext; then + if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1; then + ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exeext" + break + fi + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" + ;; +esac +fi +MSGFMT="$ac_cv_path_MSGFMT" +if test "$MSGFMT" != ":"; then + echo "$as_me:30132: result: $MSGFMT" >&5 +echo "${ECHO_T}$MSGFMT" >&6 else - ac_cpp_err=yes + echo "$as_me:30135: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + + # Extract the first word of "gmsgfmt", so it can be a program name with args. +set dummy gmsgfmt; ac_word=$2 +echo "$as_me:30141: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_GMSGFMT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" + case $GMSGFMT in + [\\/]* | ?:[\\/]*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_GMSGFMT="$ac_dir/$ac_word" + echo "$as_me:30158: found $ac_dir/$ac_word" >&5 + break +fi +done + + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" + ;; +esac +fi +GMSGFMT=$ac_cv_path_GMSGFMT + +if test -n "$GMSGFMT"; then + echo "$as_me:30170: result: $GMSGFMT" >&5 +echo "${ECHO_T}$GMSGFMT" >&6 +else + echo "$as_me:30173: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + # Extract the first word of "xgettext", so it can be a program name with args. + +set dummy xgettext; ac_word=$2 +echo "$as_me:30180: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_XGETTEXT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&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=. + if test -f $ac_dir/$ac_word$ac_exeext; then + if $ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1; then + ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exeext" + break + fi + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" + ;; +esac +fi +XGETTEXT="$ac_cv_path_XGETTEXT" +if test "$XGETTEXT" != ":"; then + echo "$as_me:30207: result: $XGETTEXT" >&5 +echo "${ECHO_T}$XGETTEXT" >&6 +else + echo "$as_me:30210: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + cf_save_OPTS_1="$CPPFLAGS" + if test "x$cf_save_msgfmt_path" = "x$MSGFMT" && \ + test "x$cf_save_xgettext_path" = "x$XGETTEXT" ; then + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in -DIGNORE_MSGFMT_HACK +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 + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + 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 + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + + ;; + esac + ;; + *) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + + ;; + esac + ;; +yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + 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 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + fi -rm -f conftest.err conftest.$ac_ext + +if test -n "$cf_new_cppflags" ; then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + fi -echo "$as_me:28867: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <&5 -echo $ECHO_N "checking for declaration of fd_set... $ECHO_C" >&6 -if test "${cf_cv_type_fd_set+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else +# If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these +# will be set on completion of the AC_TRY_LINK below. +cf_cv_header_path_intl= +cf_cv_library_path_intl= -echo "${as_me:-configure}:28883: testing sys/types alone ..." 1>&5 +echo "${as_me:-configure}:30341: testing Starting FIND_LINKAGE(intl,) ..." 1>&5 + +cf_save_LIBS="$LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 28886 "configure" +#line 30346 "configure" #include "confdefs.h" -#include +#include +extern int _nl_msg_cat_cntr; + int main (void) { -fd_set x + + bindtextdomain ("", ""); + return (int) gettext ("") + +#ifndef IGNORE_MSGFMT_HACK + + _nl_msg_cat_cntr +#endif + ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:28899: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:30368: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:28902: \$? = $ac_status" >&5 + echo "$as_me:30371: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:28905: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:30374: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28908: \$? = $ac_status" >&5 + echo "$as_me:30377: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_type_fd_set=sys/types.h + + cf_cv_find_linkage_intl=yes + cf_cv_header_path_intl=/usr/include + cf_cv_library_path_intl=/usr/lib + else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "${as_me:-configure}:28915: testing X11/Xpoll.h ..." 1>&5 +LIBS="-lintl $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 28918 "configure" +#line 30391 "configure" #include "confdefs.h" -#ifdef HAVE_X11_XPOLL_H -#include -#endif +#include +extern int _nl_msg_cat_cntr; + int main (void) { -fd_set x + + bindtextdomain ("", ""); + return (int) gettext ("") + +#ifndef IGNORE_MSGFMT_HACK + + _nl_msg_cat_cntr +#endif + ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:28933: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:30413: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:28936: \$? = $ac_status" >&5 + echo "$as_me:30416: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:28939: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:30419: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28942: \$? = $ac_status" >&5 + echo "$as_me:30422: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_type_fd_set=X11/Xpoll.h + + cf_cv_find_linkage_intl=yes + cf_cv_header_path_intl=/usr/include + cf_cv_library_path_intl=/usr/lib + cf_cv_library_file_intl="-lintl" + else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "${as_me:-configure}:28949: testing sys/select.h ..." 1>&5 + cf_cv_find_linkage_intl=no + LIBS="$cf_save_LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 28952 "configure" -#include "confdefs.h" + test -n "$verbose" && echo " find linkage for intl library" 1>&6 -#include -#include -int -main (void) -{ -fd_set x - ; - return 0; +echo "${as_me:-configure}:30439: testing find linkage for intl library ..." 1>&5 + +echo "${as_me:-configure}:30441: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5 + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" + +cf_search= + +# collect the current set of include-directories from compiler flags +cf_header_path_list="" +if test -n "${CFLAGS}${CPPFLAGS}" ; then + for cf_header_path in $CPPFLAGS $CFLAGS + do + 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" && \ +test -d "$cf_header_path" && \ + { + test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" + test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" + test -d $cf_header_path/include/intl && cf_search="$cf_search $cf_header_path/include/intl" + test -d $cf_header_path/include/intl/include && cf_search="$cf_search $cf_header_path/include/intl/include" + test -d $cf_header_path/intl/include && cf_search="$cf_search $cf_header_path/intl/include" + test -d $cf_header_path/intl/include/intl && cf_search="$cf_search $cf_header_path/intl/include/intl" } -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:28966: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:28969: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:28972: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:28975: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_type_fd_set=sys/select.h -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cf_cv_type_fd_set=unknown -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -rm -f conftest.$ac_objext conftest.$ac_ext + + cf_header_path_list="$cf_header_path_list $cf_search" + ;; + esac + done fi -echo "$as_me:28989: result: $cf_cv_type_fd_set" >&5 -echo "${ECHO_T}$cf_cv_type_fd_set" >&6 -if test $cf_cv_type_fd_set = sys/select.h ; then -cat >>confdefs.h <<\EOF -#define USE_SYS_SELECT_H 1 -EOF +# add the variations for the package we are looking for -fi +cf_search= -echo "$as_me:28999: checking for fd_set macros" >&5 -echo $ECHO_N "checking for fd_set macros... $ECHO_C" >&6 -if test "${cf_cv_macros_fd_set+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else +test "x$prefix" != "xNONE" && \ +test -d "$prefix" && \ + { + test -n "$verbose" && echo " ... testing for include-directories under $prefix" + test -d $prefix/include && cf_search="$cf_search $prefix/include" + test -d $prefix/include/intl && cf_search="$cf_search $prefix/include/intl" + test -d $prefix/include/intl/include && cf_search="$cf_search $prefix/include/intl/include" + test -d $prefix/intl/include && cf_search="$cf_search $prefix/intl/include" + test -d $prefix/intl/include/intl && cf_search="$cf_search $prefix/intl/include/intl" +} -cat >conftest.$ac_ext <<_ACEOF -#line 29006 "configure" -#include "confdefs.h" +for cf_subdir_prefix in \ + /usr \ + /usr/local \ + /usr/pkg \ + /opt \ + /opt/local \ + $HOME +do -#include -#if USE_SYS_SELECT_H -# include -#else -# ifdef HAVE_SYS_TIME_H -# include -# ifdef TIME_WITH_SYS_TIME -# include -# endif -# else -# include -# endif -#endif +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 && \ +test "$includedir" != "/usr/include" && \ +test -d "$includedir" && { + test -d $includedir && cf_search="$cf_search $includedir" + test -d $includedir/intl && cf_search="$cf_search $includedir/intl" +} + +test "$oldincludedir" != NONE && \ +test "$oldincludedir" != "/usr/include" && \ +test -d "$oldincludedir" && { + test -d $oldincludedir && cf_search="$cf_search $oldincludedir" + test -d $oldincludedir/intl && cf_search="$cf_search $oldincludedir/intl" +} + +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 + +echo "${as_me:-configure}:30532: testing ... testing $cf_cv_header_path_intl ..." 1>&5 + + CPPFLAGS="$cf_save_CPPFLAGS" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_intl" + + cat >conftest.$ac_ext <<_ACEOF +#line 30540 "configure" +#include "confdefs.h" + +#include +extern int _nl_msg_cat_cntr; int main (void) { - fd_set read_bits; - FD_ZERO(&read_bits); - FD_SET(0, &read_bits); + bindtextdomain ("", ""); + return (int) gettext ("") + +#ifndef IGNORE_MSGFMT_HACK + + _nl_msg_cat_cntr +#endif + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:29035: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:30562: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:29038: \$? = $ac_status" >&5 + echo "$as_me:30565: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:29041: \"$ac_try\"") >&5 + { (eval echo "$as_me:30568: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29044: \$? = $ac_status" >&5 + echo "$as_me:30571: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_macros_fd_set=yes + + test -n "$verbose" && echo " ... found intl headers in $cf_cv_header_path_intl" 1>&6 + +echo "${as_me:-configure}:30576: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5 + + cf_cv_find_linkage_intl=maybe + cf_test_CPPFLAGS="$CPPFLAGS" + break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_macros_fd_set=no + + CPPFLAGS="$cf_save_CPPFLAGS" + fi rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:29054: result: $cf_cv_macros_fd_set" >&5 -echo "${ECHO_T}$cf_cv_macros_fd_set" >&6 -test $cf_cv_macros_fd_set = yes && -cat >>confdefs.h <<\EOF -#define HAVE_TYPE_FD_SET 1 -EOF + fi + done -# tolower() is known to be broken on 4.2BSD by -# not checking if input is an uppercase letter -# /* #define tolower(c) ((c)-'A'+'a') */ -echo "$as_me:29064: checking for working tolower()" >&5 -echo $ECHO_N "checking for working tolower()... $ECHO_C" >&6 -if test "$cross_compiling" = yes; then + if test "$cf_cv_find_linkage_intl" = maybe ; then - echo "$as_me:29068: result: unknown" >&5 -echo "${ECHO_T}unknown" >&6 +echo "${as_me:-configure}:30594: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5 -else - cat >conftest.$ac_ext <<_ACEOF -#line 29073 "configure" -#include "confdefs.h" + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" -#include -int main() { - unsigned char str; + if test "$cf_cv_find_linkage_intl" != yes ; then - for (str = 1; str < 127; str++) { - if ((char) tolower(str) != ((str >= 'A' && str <= 'Z') ? ((unsigned char) (str - 'A' + 'a')) : str)) - return 1; - } - return 0; +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 + -L*) + cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` + +test "x$cf_library_path" != "xNONE" && \ +test -d "$cf_library_path" && \ + { + test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" + test -d $cf_library_path/lib && cf_search="$cf_search $cf_library_path/lib" + test -d $cf_library_path/lib/intl && cf_search="$cf_search $cf_library_path/lib/intl" + test -d $cf_library_path/lib/intl/lib && cf_search="$cf_search $cf_library_path/lib/intl/lib" + test -d $cf_library_path/intl/lib && cf_search="$cf_search $cf_library_path/intl/lib" + test -d $cf_library_path/intl/lib/intl && cf_search="$cf_search $cf_library_path/intl/lib/intl" } -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:29088: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:29091: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:29093: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:29096: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:29099: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + cf_library_path_list="$cf_library_path_list $cf_search" + ;; + esac + done +fi -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cf_search= - cat >>confdefs.h <<\EOF -#define TOLOWER_BROKEN 1 -EOF +test "x$prefix" != "xNONE" && \ +test -d "$prefix" && \ + { + test -n "$verbose" && echo " ... testing for lib-directories under $prefix" + test -d $prefix/lib && cf_search="$cf_search $prefix/lib" + test -d $prefix/lib/intl && cf_search="$cf_search $prefix/lib/intl" + test -d $prefix/lib/intl/lib && cf_search="$cf_search $prefix/lib/intl/lib" + test -d $prefix/intl/lib && cf_search="$cf_search $prefix/intl/lib" + test -d $prefix/intl/lib/intl && cf_search="$cf_search $prefix/intl/lib/intl" +} - echo "$as_me:29111: result: no" >&5 -echo "${ECHO_T}no" >&6 +for cf_subdir_prefix in \ + /usr \ + /usr/local \ + /usr/pkg \ + /opt \ + /opt/local \ + $HOME +do -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi +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" +} -# toupper is known to be broken on 4.2BSD by -# not checking if input is an lowercase letter -# /* #define toupper(c) ((c)-'a'+'A') */ -echo "$as_me:29121: checking for working toupper()" >&5 -echo $ECHO_N "checking for working toupper()... $ECHO_C" >&6 -if test "$cross_compiling" = yes; then +done - echo "$as_me:29125: result: unknown" >&5 -echo "${ECHO_T}unknown" >&6 +cf_search="$cf_library_path_list $cf_search" -else - cat >conftest.$ac_ext <<_ACEOF -#line 29130 "configure" + 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}:30669: 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 <<_ACEOF +#line 30675 "configure" #include "confdefs.h" -#include -int main() { - unsigned char str; +#include +extern int _nl_msg_cat_cntr; - for (str = 1; str < 127; str++) { - if ((char) toupper(str) != ((str >= 'a' && str <= 'z') ? ((unsigned char) (str - 'a' + 'A')) : str)) - return 1; - } - return 0; +int +main (void) +{ + + bindtextdomain ("", ""); + return (int) gettext ("") + +#ifndef IGNORE_MSGFMT_HACK + + _nl_msg_cat_cntr +#endif + + ; + return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:29145: \"$ac_link\"") >&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:30697: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:29148: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:29150: \"$ac_try\"") >&5 + echo "$as_me:30700: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:30703: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29153: \$? = $ac_status" >&5 + echo "$as_me:30706: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:29156: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + test -n "$verbose" && echo " ... found intl library in $cf_cv_library_path_intl" 1>&6 + +echo "${as_me:-configure}:30711: 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 else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - cat >>confdefs.h <<\EOF -#define TOUPPER_BROKEN 1 -EOF - - echo "$as_me:29168: result: no" >&5 -echo "${ECHO_T}no" >&6 + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" + LDFLAGS="$cf_save_LDFLAGS" fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi + done + CPPFLAGS="$cf_save_CPPFLAGS" + LDFLAGS="$cf_save_LDFLAGS" + fi -for cf_hdr in iconv.h -do - echo "$as_me:29177: checking for $cf_hdr" >&5 -echo $ECHO_N "checking for $cf_hdr... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line 29180 "configure" -#include "confdefs.h" + else + cf_cv_find_linkage_intl=no + fi -#include -#include <$cf_hdr> +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -_ACEOF -if { (eval echo "$as_me:29187: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:29193: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes fi -if test -z "$ac_cpp_err"; then - cf_found=yes +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +LIBS="$cf_save_LIBS" + +if test "$cf_cv_find_linkage_intl" = yes ; then +cf_cv_func_gettext=yes else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - cf_found=no +cf_cv_func_gettext=no fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:29211: result: $cf_found" >&5 -echo "${ECHO_T}$cf_found" >&6 -if test $cf_found = yes ; then -cf_tr_hdr=`echo "$cf_hdr" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + echo "$as_me:30750: checking for libintl.h and gettext()" >&5 +echo $ECHO_N "checking for libintl.h and gettext()... $ECHO_C" >&6 + echo "$as_me:30752: result: $cf_cv_func_gettext" >&5 +echo "${ECHO_T}$cf_cv_func_gettext" >&6 + + LIBS="$cf_save_LIBS_1" + CPPFLAGS="$cf_save_OPTS_1" + + if test "$cf_cv_func_gettext" = yes ; then + +cat >>confdefs.h <<\EOF +#define HAVE_LIBINTL_H 1 +EOF + + if test "$PACKAGE" != gettext; then - cat >>confdefs.h <>confdefs.h <<\EOF +#define HAVE_GETTEXT 1 EOF -fi -done +if test -n "$cf_cv_header_path_intl" ; then + for cf_add_incdir in $cf_cv_header_path_intl + do + while test $cf_add_incdir != /usr/include + do + if test -d $cf_add_incdir + then + cf_have_incdir=no + if test -n "$CFLAGS$CPPFLAGS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then + cf_have_incdir=yes; break + fi + done + fi -echo "$as_me:29224: checking for iconv_open() //TRANSLIT extension" >&5 -echo $ECHO_N "checking for iconv_open() //TRANSLIT extension... $ECHO_C" >&6 -if test "$cross_compiling" = yes; then + if test "$cf_have_incdir" = no ; then + if test "$cf_add_incdir" = /usr/local/include ; then + if test "$GCC" = yes + then + cf_save_CPPFLAGS=$CPPFLAGS - echo "$as_me:29228: result: unknown" >&5 -echo "${ECHO_T}unknown" >&6 + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" -else - cat >conftest.$ac_ext <<_ACEOF -#line 29233 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 30797 "configure" #include "confdefs.h" - -#ifdef HAVE_ICONV_H -# include -#endif /* HAVE_ICONV_H */ -#ifdef HAVE_STDLIB_H -# include -#endif /* HAVE_STDLIB_H */ -int main() { - iconv_t cd; - - if ((cd = iconv_open("US-ASCII//TRANSLIT", "ISO-8859-1")) == (iconv_t) (-1)) - exit(1); - exit(0); +#include +int +main (void) +{ +printf("Hello") + ; + return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:29251: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:30809: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:29254: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:29256: \"$ac_try\"") >&5 + echo "$as_me:30812: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:30815: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29259: \$? = $ac_status" >&5 + echo "$as_me:30818: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - cat >>confdefs.h <<\EOF -#define HAVE_ICONV_OPEN_TRANSLIT 1 -EOF - - echo "$as_me:29266: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - + : else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 +cf_have_incdir=yes +fi +rm -f conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$cf_save_CPPFLAGS + fi + fi + fi - echo "$as_me:29274: result: no" >&5 -echo "${ECHO_T}no" >&6 + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +echo "${as_me:-configure}:30835: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + test "$cf_top_incdir" = "$cf_add_incdir" && break + cf_add_incdir="$cf_top_incdir" + else + break + fi + else + break + fi + done + done 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 < 2.0 as link(2) is detected but doesn't work -case "$host_os" in - *cygwin*) - case `uname -r | sed 's,(.*,,'` in - B*|1.0-6].*) - # multiple defects - cat >>confdefs.h <<\EOF -#define NO_LOCALE 1 -EOF + if test -n "$cf_cv_library_file_intl" ; then + INTLLIBS="$cf_cv_library_file_intl $LIBICONV" - cat >>confdefs.h <<\EOF -#define NO_LOCKING 1 -EOF +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 - cat >>confdefs.h <<\EOF -#define FILE_MODE_BROKEN 1 -EOF +echo "${as_me:-configure}:30874: testing adding $cf_add_libdir to library-path ..." 1>&5 - ;; - 1.7.*) - # link does not work - cat >>confdefs.h <<\EOF -#define NO_LOCKING 1 -EOF + INTLLIBS="-L$cf_add_libdir $INTLLIBS" + fi + fi + done +fi - ;; - *) - echo "$as_me:29311: checking for link" >&5 -echo $ECHO_N "checking for link... $ECHO_C" >&6 -if test "${ac_cv_func_link+set}" = set; then + fi + + gt_save_LIBS="$LIBS" + LIBS="$LIBS $INTLLIBS" + +for ac_func in dcgettext +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:30890: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 29317 "configure" +#line 30896 "configure" #include "confdefs.h" -#define link autoconf_temporary +#define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef link +#undef $ac_func #ifdef __cplusplus extern "C" @@ -29326,7 +30905,7 @@ extern "C" /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char link (void); +char $ac_func (void); int main (void) @@ -29335,231 +30914,315 @@ main (void) /* The GNU C library defines stubs 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) -#error found stub for link +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#error found stub for $ac_func #endif - return link (); + return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:29348: \"$ac_link\"") >&5 +if { (eval echo "$as_me:30927: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:29351: \$? = $ac_status" >&5 + echo "$as_me:30930: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:29354: \"$ac_try\"") >&5 + { (eval echo "$as_me:30933: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29357: \$? = $ac_status" >&5 + echo "$as_me:30936: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func_link=yes + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:30946: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5 +echo "$as_me: WARNING: disabling NLS feature" >&2;} + sed -e /ENABLE_NLS/d confdefs.h >confdefs.tmp + mv confdefs.tmp confdefs.h + ALL_LINGUAS= + CATOBJEXT=.ignored + MSGFMT=":" + GMSGFMT=":" + XGETTEXT=":" + POSUB= + BUILD_INCLUDED_LIBINTL=no + USE_INCLUDED_LIBINTL=no + USE_NLS=no + nls_cv_use_gnu_gettext=no + fi + + if test "$CATOBJEXT" = "NONE"; then + nls_cv_use_gnu_gettext=maybe + fi + fi + + if test "$nls_cv_use_gnu_gettext" != "no"; then + CATOBJEXT=.gmo + if test -f $srcdir/intl/libintl.h ; then + INTLOBJS="\$(GETTOBJS)" + BUILD_INCLUDED_LIBINTL=yes + USE_INCLUDED_LIBINTL=yes + INTLLIBS="\$(top_builddir)/intl/libintl.a $LIBICONV" + LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` + elif test "$nls_cv_use_gnu_gettext" = "yes"; then + nls_cv_use_gnu_gettext=no + { echo "$as_me:30992: WARNING: no NLS library is packaged with this application" >&5 +echo "$as_me: WARNING: no NLS library is packaged with this application" >&2;} + fi + fi + + if test "$GMSGFMT" != ":"; then + if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then + : ; + else + { echo "$as_me:31001: WARNING: found msgfmt program is not GNU msgfmt" >&5 +echo "$as_me: WARNING: found msgfmt program is not GNU msgfmt" >&2;} + fi + fi + + if test "$XGETTEXT" != ":"; then + if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then + : ; + else + { echo "$as_me:31010: WARNING: found xgettext program is not GNU xgettext" >&5 +echo "$as_me: WARNING: found xgettext program is not GNU xgettext" >&2;} + fi + fi + fi + + if test "$XGETTEXT" != ":"; then + ac_config_commands="$ac_config_commands default-1" + + if test "$PACKAGE" = gettext; then + BUILD_INCLUDED_LIBINTL=yes + fi + + if test "$nls_cv_use_gnu_gettext" = "yes"; then + for ac_prog in bison +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 "$as_me:31028: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_INTLBISON+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_func_link=no + if test -n "$INTLBISON"; then + ac_cv_prog_INTLBISON="$INTLBISON" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_INTLBISON="$ac_prog" +echo "$as_me:31043: found $ac_dir/$ac_word" >&5 +break +done + fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:29367: result: $ac_cv_func_link" >&5 -echo "${ECHO_T}$ac_cv_func_link" >&6 -if test $ac_cv_func_link = yes; then - cat >>confdefs.h <<\EOF -#define HAVE_LINK 1 -EOF - +INTLBISON=$ac_cv_prog_INTLBISON +if test -n "$INTLBISON"; then + echo "$as_me:31051: result: $INTLBISON" >&5 +echo "${ECHO_T}$INTLBISON" >&6 +else + echo "$as_me:31054: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - ;; - esac - ;; - *haiku*) - # link does not work - cat >>confdefs.h <<\EOF -#define NO_LOCKING 1 -EOF + test -n "$INTLBISON" && break +done - ;; - *) - echo "$as_me:29387: checking for link" >&5 -echo $ECHO_N "checking for link... $ECHO_C" >&6 -if test "${ac_cv_func_link+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 29393 "configure" -#include "confdefs.h" -#define link autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef link + if test -z "$INTLBISON"; then + ac_verc_fail=yes + else + echo "$as_me:31064: checking version of bison" >&5 +echo $ECHO_N "checking version of bison... $ECHO_C" >&6 + 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="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + esac + echo "$as_me:31073: result: $ac_prog_version" >&5 +echo "${ECHO_T}$ac_prog_version" >&6 + fi + if test $ac_verc_fail = yes; then + INTLBISON=: + fi + fi -#ifdef __cplusplus -extern "C" -#endif + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done + fi -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char link (void); + nls_cv_header_intl= + nls_cv_header_libgt= -int -main (void) -{ + DATADIRNAME=share -/* The GNU C library defines stubs 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) -#error found stub for link -#endif + INSTOBJEXT=.mo - return link (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:29424: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:29427: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:29430: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:29433: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_link=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_func_link=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:29443: result: $ac_cv_func_link" >&5 -echo "${ECHO_T}$ac_cv_func_link" >&6 -if test $ac_cv_func_link = yes; then - cat >>confdefs.h <<\EOF -#define HAVE_LINK 1 -EOF + GENCAT=gencat -fi + if test "x$CATOBJEXT" != "x"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + echo "$as_me:31100: checking for catalogs to be installed" >&5 +echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6 + NEW_LINGUAS= + for presentlang in $ALL_LINGUAS; do + useit=no + for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=yes;; + esac + done + if test $useit = yes; then + NEW_LINGUAS="$NEW_LINGUAS $presentlang" + fi + done + LINGUAS=$NEW_LINGUAS + echo "$as_me:31120: result: $LINGUAS" >&5 +echo "${ECHO_T}$LINGUAS" >&6 + fi -esac + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done + fi + fi -if test "$cf_cv_termlib" = pdcurses ; then - echo "$as_me:29455: checking for X" >&5 -echo $ECHO_N "checking for X... $ECHO_C" >&6 + INTL_LIBTOOL_SUFFIX_PREFIX= -# Check whether --with-x or --without-x was given. -if test "${with_x+set}" = set; then - withval="$with_x" +if test "$USE_NLS" = yes ; then -fi; -# $have_x is `yes', `no', `disabled', or empty when we do not yet know. -if test "x$with_x" = xno; then - # The user explicitly disabled X. - have_x=disabled -else - if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then - # Both variables are already set. - have_x=yes - else - if test "${ac_cv_have_x+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# Check whether --with-textdomain or --without-textdomain was given. +if test "${with_textdomain+set}" = set; then + withval="$with_textdomain" + NLS_TEXTDOMAIN=$withval else - # One or both of the vars are not set, and there is no cached value. -ac_x_includes=no ac_x_libraries=no -rm -fr conftest.dir -if mkdir conftest.dir; then - cd conftest.dir - # Make sure to not put "make" in the Imakefile rules, since we grep it out. - cat >Imakefile <<'EOF' -acfindx: - @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' + NLS_TEXTDOMAIN=$PACKAGE +fi; + +cat >>confdefs.h </dev/null 2>/dev/null && test -f Makefile; then - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` - # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. - for ac_extension in a so sl dylib dll; do - if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && - test -f $ac_im_libdir/libX11.$ac_extension; then - ac_im_usrlibdir=$ac_im_libdir; break - fi - done - # Screen out bogus values from the imake configuration. They are - # bogus both because they are the default anyway, and because - # using them would break gcc on systems where it needs fixed includes. - case $ac_im_incroot in - /usr/include) ;; - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; - esac - case $ac_im_usrlibdir in - /usr/lib | /lib) ;; - *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; - esac - fi - cd .. - rm -fr conftest.dir + fi -# Standard set of common directories for X headers. -# Check X11 before X11Rn because it is often a symlink to the current release. -ac_x_header_dirs=' -/usr/X11/include -/usr/X11R6/include -/usr/X11R5/include -/usr/X11R4/include +INTLDIR_MAKE= +MSG_DIR_MAKE= +SUB_MAKEFILE= -/usr/include/X11 -/usr/include/X11R6 -/usr/include/X11R5 -/usr/include/X11R4 +cf_makefile=Makefile -/usr/local/X11/include -/usr/local/X11R6/include -/usr/local/X11R5/include -/usr/local/X11R4/include +use_our_messages=no +if test "$USE_NLS" = yes ; then +if test -d $srcdir/po ; then +echo "$as_me:31156: checking if we should use included message-library" >&5 +echo $ECHO_N "checking if we should use included message-library... $ECHO_C" >&6 -/usr/local/include/X11 -/usr/local/include/X11R6 -/usr/local/include/X11R5 -/usr/local/include/X11R4 +# Check whether --enable-included-msgs or --disable-included-msgs was given. +if test "${enable_included_msgs+set}" = set; then + enableval="$enable_included_msgs" + use_our_messages=$enableval +else + use_our_messages=yes +fi; +fi +echo "$as_me:31167: result: $use_our_messages" >&5 +echo "${ECHO_T}$use_our_messages" >&6 +fi -/usr/X386/include -/usr/x386/include -/usr/XFree86/include/X11 +MSG_DIR_MAKE="#" +if test "$use_our_messages" = yes +then + SUB_MAKEFILE="$SUB_MAKEFILE po/$cf_makefile.in:$srcdir/po/$cf_makefile.inn" + MSG_DIR_MAKE= +fi -/usr/include -/usr/local/include -/usr/unsupported/include -/usr/athena/include -/usr/local/x11r5/include -/usr/lpp/Xamples/include +if test "$USE_INCLUDED_LIBINTL" = yes ; then + if test "$nls_cv_force_use_gnu_gettext" = yes ; then + : + elif test "$nls_cv_use_gnu_gettext" = yes ; then + : + else + INTLDIR_MAKE="#" + fi + if test -z "$INTLDIR_MAKE"; then -/usr/openwin/include -/usr/openwin/share/include' +cat >>confdefs.h <<\EOF +#define HAVE_LIBGETTEXT_H 1 +EOF -if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Intrinsic.h. - # First, try using that file with no special directory specified. + for cf_makefile in \ + $srcdir/intl/Makefile.in \ + $srcdir/intl/makefile.in + do + if test -f "$cf_makefile" ; then + SUB_MAKEFILE="$SUB_MAKEFILE `echo \"${cf_makefile}\"|sed -e 's,^'$srcdir/',,' -e 's/\.in$//'`:${cf_makefile}" + break + fi + done + fi +else + INTLDIR_MAKE="#" + if test "$USE_NLS" = yes ; then + +for ac_header in libintl.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:31209: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else cat >conftest.$ac_ext <<_ACEOF -#line 29552 "configure" +#line 31215 "configure" #include "confdefs.h" -#include +#include <$ac_header> _ACEOF -if { (eval echo "$as_me:29556: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:31219: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:29562: \$? = $ac_status" >&5 + echo "$as_me:31225: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -29570,791 +31233,930 @@ else ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - # We can compile using X headers with no special include directory. -ac_x_includes= + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Intrinsic.h"; then - ac_x_includes=$ac_dir - break - fi -done + eval "$as_ac_Header=no" fi rm -f conftest.err conftest.$ac_ext -fi # $ac_x_includes = no - -if test "$ac_x_libraries" = no; then - # Check for the libraries. - # See if we find them without any special options. - # Don't add to $LIBS permanently. - ac_save_LIBS=$LIBS - LIBS="-lXt $LIBS" - cat >conftest.$ac_ext <<_ACEOF -#line 29595 "configure" -#include "confdefs.h" -#include -int -main (void) -{ -XtMalloc (0) - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:29607: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:29610: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:29613: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:29616: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - LIBS=$ac_save_LIBS -# We can link X programs with no special library path. -ac_x_libraries= -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -LIBS=$ac_save_LIBS -for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` -do - # Don't even attempt the hair of trying to link an X program! - for ac_extension in a so sl dylib dll; do - if test -r $ac_dir/libXt.$ac_extension; then - ac_x_libraries=$ac_dir - break 2 - fi - done -done fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi # $ac_x_libraries = no +echo "$as_me:31244: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 -echo "${ECHO_T}$have_x" >&6 - no_x=yes + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I../intl" + +fi + +if test "$BUILD_INCLUDED_LIBINTL" = yes ; then + GT_YES="#" + GT_NO= else - # If each of the values was on the command line, it overrides each guess. - test "x$x_includes" = xNONE && x_includes=$ac_x_includes - test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries - # Update the cache value to reflect the command line values. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$as_me:29664: result: libraries $x_libraries, headers $x_includes" >&5 -echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 + GT_YES= + GT_NO="#" fi -if test "$no_x" = yes; then - # Not all programs may use this symbol, but it does not hurt to define it. +if test "$USE_INCLUDED_LIBINTL" = yes ; then + if test "$nls_cv_force_use_gnu_gettext" = yes ; then cat >>confdefs.h <<\EOF -#define X_DISPLAY_MISSING 1 +#define HAVE_GETTEXT 1 EOF - X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= -else - if test -n "$x_includes"; then - X_CFLAGS="$X_CFLAGS -I$x_includes" - fi + elif test "$nls_cv_use_gnu_gettext" = yes ; then - # It would also be nice to do this for all -L options, not just this one. - if test -n "$x_libraries"; then - X_LIBS="$X_LIBS -L$x_libraries" - # For Solaris; some versions of Sun CC require a space after -R and - # others require no space. Words are not sufficient . . . . - case `(uname -sr) 2>/dev/null` in - "SunOS 5"*) - echo "$as_me:29688: checking whether -R must be followed by a space" >&5 -echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 - ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" - cat >conftest.$ac_ext <<_ACEOF -#line 29692 "configure" -#include "confdefs.h" +cat >>confdefs.h <<\EOF +#define HAVE_GETTEXT 1 +EOF + + fi + if test -n "$nls_cv_header_intl" ; then + +cat >>confdefs.h <<\EOF +#define HAVE_LIBINTL_H 1 +EOF + + fi +fi + +LIBS="$LIBS $LIBICONV" + +### check for alloca (required for bison and/or intl/*) +case "$YACC" in +bison*) + use_alloca=yes + ;; +*) + use_alloca=$USE_INCLUDED_LIBINTL + ;; +esac + +if test ".$use_alloca" = .yes ; then +# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works +# for constant arguments. Useless! +echo "$as_me:31311: checking for working alloca.h" >&5 +echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6 +if test "${ac_cv_working_alloca_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 31317 "configure" +#include "confdefs.h" +#include int main (void) { - +char *p = (char *) alloca (2 * sizeof (int)); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:29704: \"$ac_link\"") >&5 +if { (eval echo "$as_me:31329: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:29707: \$? = $ac_status" >&5 + echo "$as_me:31332: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:29710: \"$ac_try\"") >&5 + { (eval echo "$as_me:31335: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29713: \$? = $ac_status" >&5 + echo "$as_me:31338: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_R_nospace=yes + ac_cv_working_alloca_h=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_R_nospace=no +ac_cv_working_alloca_h=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - if test $ac_R_nospace = yes; then - echo "$as_me:29723: result: no" >&5 -echo "${ECHO_T}no" >&6 - X_LIBS="$X_LIBS -R$x_libraries" - else - LIBS="$ac_xsave_LIBS -R $x_libraries" - cat >conftest.$ac_ext <<_ACEOF -#line 29729 "configure" +fi +echo "$as_me:31348: result: $ac_cv_working_alloca_h" >&5 +echo "${ECHO_T}$ac_cv_working_alloca_h" >&6 +if test $ac_cv_working_alloca_h = yes; then + +cat >>confdefs.h <<\EOF +#define HAVE_ALLOCA_H 1 +EOF + +fi + +echo "$as_me:31358: checking for alloca" >&5 +echo $ECHO_N "checking for alloca... $ECHO_C" >&6 +if test "${ac_cv_func_alloca_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 31364 "configure" #include "confdefs.h" +#ifdef __GNUC__ +# define alloca __builtin_alloca +#else +# ifdef _MSC_VER +# include +# define alloca _alloca +# else +# if HAVE_ALLOCA_H +# include +# else +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca /* predefined by HP cc +Olibcalls */ +char *alloca (); +# endif +# endif +# endif +# endif +#endif int main (void) { - +char *p = (char *) alloca (1); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:29741: \"$ac_link\"") >&5 +if { (eval echo "$as_me:31396: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:29744: \$? = $ac_status" >&5 + echo "$as_me:31399: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:29747: \"$ac_try\"") >&5 + { (eval echo "$as_me:31402: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29750: \$? = $ac_status" >&5 + echo "$as_me:31405: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_R_space=yes + ac_cv_func_alloca_works=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_R_space=no +ac_cv_func_alloca_works=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - if test $ac_R_space = yes; then - echo "$as_me:29760: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - X_LIBS="$X_LIBS -R $x_libraries" - else - echo "$as_me:29764: result: neither works" >&5 -echo "${ECHO_T}neither works" >&6 - fi - fi - LIBS=$ac_xsave_LIBS - esac - fi +fi +echo "$as_me:31415: result: $ac_cv_func_alloca_works" >&5 +echo "${ECHO_T}$ac_cv_func_alloca_works" >&6 - # Check for system-dependent libraries X programs must link with. - # Do this before checking for the system-independent R6 libraries - # (-lICE), since we may need -lsocket or whatever for X linking. +if test $ac_cv_func_alloca_works = yes; then - if test "$ISC" = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" - else - # Martyn Johnson says this is needed for Ultrix, if the X - # libraries were built with DECnet support. And Karl Berry says - # the Alpha needs dnet_stub (dnet does not exist). - ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" - cat >conftest.$ac_ext <<_ACEOF -#line 29784 "configure" +cat >>confdefs.h <<\EOF +#define HAVE_ALLOCA 1 +EOF + +else + # The SVR3 libPW and SVR4 libucb both contain incompatible functions +# that cause trouble. Some versions do not even contain alloca or +# contain a buggy version. If you still want to use their alloca, +# use ar to extract alloca.o from them instead of compiling alloca.c. + +ALLOCA=alloca.$ac_objext + +cat >>confdefs.h <<\EOF +#define C_ALLOCA 1 +EOF + +echo "$as_me:31436: checking whether \`alloca.c' needs Cray hooks" >&5 +echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6 +if test "${ac_cv_os_cray+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 31442 "configure" #include "confdefs.h" +#if defined(CRAY) && ! defined(CRAY2) +webecray +#else +wenotbecray +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "webecray" >/dev/null 2>&1; then + ac_cv_os_cray=yes +else + ac_cv_os_cray=no +fi +rm -rf conftest* + +fi +echo "$as_me:31460: result: $ac_cv_os_cray" >&5 +echo "${ECHO_T}$ac_cv_os_cray" >&6 +if test $ac_cv_os_cray = yes; then + for ac_func in _getb67 GETB67 getb67; do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:31465: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 31471 "configure" +#include "confdefs.h" +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif + /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char XOpenDisplay (); +char $ac_func (void); + int main (void) { -XOpenDisplay (); + +/* The GNU C library defines stubs for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#error found stub for $ac_func +#endif + + return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:29803: \"$ac_link\"") >&5 +if { (eval echo "$as_me:31502: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:29806: \$? = $ac_status" >&5 + echo "$as_me:31505: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:29809: \"$ac_try\"") >&5 + { (eval echo "$as_me:31508: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29812: \$? = $ac_status" >&5 + echo "$as_me:31511: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - : + eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:29818: checking for dnet_ntoa in -ldnet" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 -if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:31521: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + +cat >>confdefs.h <&5 +echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6 +if test "${ac_cv_c_stack_direction+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldnet $LIBS" + if test "$cross_compiling" = yes; then + ac_cv_c_stack_direction=0 +else + cat >conftest.$ac_ext <<_ACEOF +#line 31544 "configure" +#include "confdefs.h" +int +find_stack_direction (void) +{ + static char *addr = 0; + auto char dummy; + if (addr == 0) + { + addr = &dummy; + return find_stack_direction (); + } + else + return (&dummy > addr) ? 1 : -1; +} + +int +main (void) +{ + $ac_main_return (find_stack_direction () < 0); +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:31567: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:31570: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:31572: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:31575: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_c_stack_direction=1 +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_c_stack_direction=-1 +fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +echo "$as_me:31587: result: $ac_cv_c_stack_direction" >&5 +echo "${ECHO_T}$ac_cv_c_stack_direction" >&6 + +cat >>confdefs.h <&5 +echo $ECHO_N "checking for h_addr_list in struct hostent... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 29826 "configure" +#line 31619 "configure" #include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" +#ifdef HAVE_NETDB_H +#include #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dnet_ntoa (); + int main (void) { -dnet_ntoa (); + +struct hostent h; +h.h_addr_list[0]=0; + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:29845: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:31638: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:29848: \$? = $ac_status" >&5 + echo "$as_me:31641: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:29851: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:31644: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29854: \$? = $ac_status" >&5 + echo "$as_me:31647: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_dnet_dnet_ntoa=yes + ac_cv_hostent_h_addr_list=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_dnet_dnet_ntoa=no +ac_cv_hostent_h_addr_list=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +echo "$as_me:31656: result: $ac_cv_hostent_h_addr_list" >&5 +echo "${ECHO_T}$ac_cv_hostent_h_addr_list" >&6 +if test $ac_cv_hostent_h_addr_list = yes; then + +cat >>confdefs.h <<\EOF +#define HAVE_HOSTENT_H_ADDR_LIST 1 +EOF + +fi + +for ac_header in X11/Xpoll.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:31669: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 31675 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:31679: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:31685: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + eval "$as_ac_Header=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:29865: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 -if test $ac_cv_lib_dnet_dnet_ntoa = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" +echo "$as_me:31704: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 -if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then +echo "$as_me:31714: checking for declaration of fd_set" >&5 +echo $ECHO_N "checking for declaration of fd_set... $ECHO_C" >&6 +if test "${cf_cv_type_fd_set+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldnet_stub $LIBS" + +echo "${as_me:-configure}:31720: testing sys/types alone ..." 1>&5 + cat >conftest.$ac_ext <<_ACEOF -#line 29880 "configure" +#line 31723 "configure" #include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dnet_ntoa (); +#include int main (void) { -dnet_ntoa (); +fd_set x; (void)x ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:29899: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:31736: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:29902: \$? = $ac_status" >&5 + echo "$as_me:31739: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:29905: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:31742: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29908: \$? = $ac_status" >&5 + echo "$as_me:31745: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_dnet_stub_dnet_ntoa=yes + cf_cv_type_fd_set=sys/types.h else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_dnet_stub_dnet_ntoa=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:29919: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 -if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" -fi - fi -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS="$ac_xsave_LIBS" +echo "${as_me:-configure}:31752: testing X11/Xpoll.h ..." 1>&5 - # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, - # to get the SysV transport functions. - # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) - # needs -lnsl. - # The nsl library prevents programs from opening the X display - # on Irix 5.2, according to T.E. Dickey. - # The functions gethostbyname, getservbyname, and inet_addr are - # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - echo "$as_me:29938: checking for gethostbyname" >&5 -echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 -if test "${ac_cv_func_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 29944 "configure" +cat >conftest.$ac_ext <<_ACEOF +#line 31755 "configure" #include "confdefs.h" -#define gethostbyname autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef gethostbyname -#ifdef __cplusplus -extern "C" +#ifdef HAVE_X11_XPOLL_H +#include #endif - -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname (void); - int main (void) { - -/* The GNU C library defines stubs 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_gethostbyname) || defined (__stub___gethostbyname) -#error found stub for gethostbyname -#endif - - return gethostbyname (); +fd_set x; (void)x ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:29975: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:31770: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:29978: \$? = $ac_status" >&5 + echo "$as_me:31773: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:29981: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:31776: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29984: \$? = $ac_status" >&5 + echo "$as_me:31779: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func_gethostbyname=yes + cf_cv_type_fd_set=X11/Xpoll.h else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_func_gethostbyname=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:29994: result: $ac_cv_func_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 - if test $ac_cv_func_gethostbyname = no; then - echo "$as_me:29998: checking for gethostbyname in -lnsl" >&5 -echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lnsl $LIBS" +echo "${as_me:-configure}:31786: testing sys/select.h ..." 1>&5 + cat >conftest.$ac_ext <<_ACEOF -#line 30006 "configure" +#line 31789 "configure" #include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname (); +#include +#include int main (void) { -gethostbyname (); +fd_set x; (void)x ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:30025: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:31803: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:30028: \$? = $ac_status" >&5 + echo "$as_me:31806: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:30031: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:31809: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:30034: \$? = $ac_status" >&5 + echo "$as_me:31812: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_nsl_gethostbyname=yes + cf_cv_type_fd_set=sys/select.h else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_nsl_gethostbyname=no +cf_cv_type_fd_set=unknown fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:30045: result: $ac_cv_lib_nsl_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 -if test $ac_cv_lib_nsl_gethostbyname = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" +rm -f conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.$ac_objext conftest.$ac_ext fi +echo "$as_me:31826: result: $cf_cv_type_fd_set" >&5 +echo "${ECHO_T}$cf_cv_type_fd_set" >&6 +if test $cf_cv_type_fd_set = sys/select.h ; then - if test $ac_cv_lib_nsl_gethostbyname = no; then - echo "$as_me:30052: checking for gethostbyname in -lbsd" >&5 -echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 -if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then +cat >>confdefs.h <<\EOF +#define USE_SYS_SELECT_H 1 +EOF + +fi + +echo "$as_me:31836: checking for fd_set macros" >&5 +echo $ECHO_N "checking for fd_set macros... $ECHO_C" >&6 +if test "${cf_cv_macros_fd_set+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lbsd $LIBS" + cat >conftest.$ac_ext <<_ACEOF -#line 30060 "configure" +#line 31843 "configure" #include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" +#include +#if USE_SYS_SELECT_H +# include +#else +# ifdef HAVE_SYS_TIME_H +# include +# ifdef TIME_WITH_SYS_TIME +# include +# endif +# else +# include +# endif #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname (); + int main (void) { -gethostbyname (); + + fd_set read_bits; + FD_ZERO(&read_bits); + FD_SET(0, &read_bits); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:30079: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:31872: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:30082: \$? = $ac_status" >&5 + echo "$as_me:31875: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:30085: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:31878: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:30088: \$? = $ac_status" >&5 + echo "$as_me:31881: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_bsd_gethostbyname=yes + cf_cv_macros_fd_set=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_bsd_gethostbyname=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +cf_cv_macros_fd_set=no fi -echo "$as_me:30099: result: $ac_cv_lib_bsd_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 -if test $ac_cv_lib_bsd_gethostbyname = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" +rm -f conftest.$ac_objext conftest.$ac_ext fi +echo "$as_me:31891: result: $cf_cv_macros_fd_set" >&5 +echo "${ECHO_T}$cf_cv_macros_fd_set" >&6 +test $cf_cv_macros_fd_set = yes && +cat >>confdefs.h <<\EOF +#define HAVE_TYPE_FD_SET 1 +EOF - fi - fi +# tolower() is known to be broken on 4.2BSD by +# not checking if input is an uppercase letter +# /* #define tolower(c) ((c)-'A'+'a') */ +echo "$as_me:31901: checking for working tolower()" >&5 +echo $ECHO_N "checking for working tolower()... $ECHO_C" >&6 +if test "$cross_compiling" = yes; then + + echo "$as_me:31905: result: unknown" >&5 +echo "${ECHO_T}unknown" >&6 - # lieder@skyler.mavd.honeywell.com says without -lsocket, - # socket/setsockopt and other routines are undefined under SCO ODT - # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary - # on later versions), says Simon Leinen: it contains gethostby* - # variants that don't use the nameserver (or something). -lsocket - # must be given before -lnsl if both are needed. We assume that - # if connect needs -lnsl, so does gethostbyname. - echo "$as_me:30115: checking for connect" >&5 -echo $ECHO_N "checking for connect... $ECHO_C" >&6 -if test "${ac_cv_func_connect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 30121 "configure" +#line 31910 "configure" #include "confdefs.h" -#define connect autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef connect - -#ifdef __cplusplus -extern "C" -#endif - -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char connect (void); - -int -main (void) -{ -/* The GNU C library defines stubs 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_connect) || defined (__stub___connect) -#error found stub for connect -#endif +#include +int main() { + unsigned char str; - return connect (); - ; - return 0; + for (str = 1; str < 127; str++) { + if ((char) tolower(str) != ((str >= 'A' && str <= 'Z') ? ((unsigned char) (str - 'A' + 'a')) : str)) + return 1; + } + return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:30152: \"$ac_link\"") >&5 +rm -f conftest$ac_exeext +if { (eval echo "$as_me:31925: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:30155: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:30158: \"$ac_try\"") >&5 + echo "$as_me:31928: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:31930: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:30161: \$? = $ac_status" >&5 + echo "$as_me:31933: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func_connect=yes + + echo "$as_me:31936: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_func_connect=no + +cat >>confdefs.h <<\EOF +#define TOLOWER_BROKEN 1 +EOF + + echo "$as_me:31948: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:30171: result: $ac_cv_func_connect" >&5 -echo "${ECHO_T}$ac_cv_func_connect" >&6 - if test $ac_cv_func_connect = no; then - echo "$as_me:30175: checking for connect in -lsocket" >&5 -echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 -if test "${ac_cv_lib_socket_connect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# toupper is known to be broken on 4.2BSD by +# not checking if input is an lowercase letter +# /* #define toupper(c) ((c)-'a'+'A') */ +echo "$as_me:31958: checking for working toupper()" >&5 +echo $ECHO_N "checking for working toupper()... $ECHO_C" >&6 +if test "$cross_compiling" = yes; then + + echo "$as_me:31962: result: unknown" >&5 +echo "${ECHO_T}unknown" >&6 + else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 30183 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 31967 "configure" #include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char connect (); -int -main (void) -{ -connect (); - ; - return 0; +#include +int main() { + unsigned char str; + + for (str = 1; str < 127; str++) { + if ((char) toupper(str) != ((str >= 'a' && str <= 'z') ? ((unsigned char) (str - 'a' + 'A')) : str)) + return 1; + } + return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:30202: \"$ac_link\"") >&5 +rm -f conftest$ac_exeext +if { (eval echo "$as_me:31982: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:30205: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:30208: \"$ac_try\"") >&5 + echo "$as_me:31985: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:31987: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:30211: \$? = $ac_status" >&5 + echo "$as_me:31990: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_socket_connect=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_socket_connect=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:30222: result: $ac_cv_lib_socket_connect" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 -if test $ac_cv_lib_socket_connect = yes; then - X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" -fi - fi + echo "$as_me:31993: result: yes" >&5 +echo "${ECHO_T}yes" >&6 - # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:30231: checking for remove" >&5 -echo $ECHO_N "checking for remove... $ECHO_C" >&6 -if test "${ac_cv_func_remove+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 30237 "configure" -#include "confdefs.h" -#define remove autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef remove + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 -#ifdef __cplusplus -extern "C" -#endif +cat >>confdefs.h <<\EOF +#define TOUPPER_BROKEN 1 +EOF -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char remove (void); + echo "$as_me:32005: result: no" >&5 +echo "${ECHO_T}no" >&6 -int -main (void) -{ +fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi -/* The GNU C library defines stubs 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_remove) || defined (__stub___remove) -#error found stub for remove -#endif +for cf_hdr in iconv.h +do + echo "$as_me:32014: checking for $cf_hdr" >&5 +echo $ECHO_N "checking for $cf_hdr... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line 32017 "configure" +#include "confdefs.h" + +#include +#include <$cf_hdr> - return remove (); - ; - return 0; -} _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:30268: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:30271: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:30274: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (eval echo "$as_me:32024: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - echo "$as_me:30277: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_remove=yes + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:32030: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + cf_found=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_func_remove=no + cat conftest.$ac_ext >&5 + cf_found=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext +echo "$as_me:32048: result: $cf_found" >&5 +echo "${ECHO_T}$cf_found" >&6 +if test $cf_found = yes ; then + +cf_tr_hdr=`echo "$cf_hdr" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + cat >>confdefs.h <&5 -echo "${ECHO_T}$ac_cv_func_remove" >&6 +done + +echo "$as_me:32061: checking for iconv_open() //TRANSLIT extension" >&5 +echo $ECHO_N "checking for iconv_open() //TRANSLIT extension... $ECHO_C" >&6 +if test "$cross_compiling" = yes; then + + echo "$as_me:32065: result: unknown" >&5 +echo "${ECHO_T}unknown" >&6 - if test $ac_cv_func_remove = no; then - echo "$as_me:30291: checking for remove in -lposix" >&5 -echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 -if test "${ac_cv_lib_posix_remove+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lposix $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 30299 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 32070 "configure" #include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char remove (); -int -main (void) -{ -remove (); - ; - return 0; +#ifdef HAVE_ICONV_H +# include +#endif /* HAVE_ICONV_H */ +#ifdef HAVE_STDLIB_H +# include +#endif /* HAVE_STDLIB_H */ +int main() { + iconv_t cd; + + if ((cd = iconv_open("US-ASCII//TRANSLIT", "ISO-8859-1")) == (iconv_t) (-1)) + exit(1); + exit(0); } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:30318: \"$ac_link\"") >&5 +rm -f conftest$ac_exeext +if { (eval echo "$as_me:32088: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:30321: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:30324: \"$ac_try\"") >&5 + echo "$as_me:32091: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:32093: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:30327: \$? = $ac_status" >&5 + echo "$as_me:32096: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_posix_remove=yes + +cat >>confdefs.h <<\EOF +#define HAVE_ICONV_OPEN_TRANSLIT 1 +EOF + + echo "$as_me:32103: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_posix_remove=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + + echo "$as_me:32111: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi -echo "$as_me:30338: result: $ac_cv_lib_posix_remove" >&5 -echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 -if test $ac_cv_lib_posix_remove = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - 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 < 2.0 as link(2) is detected but doesn't work +case "$host_os" in + *cygwin*) + case `uname -r | sed 's,(.*,,'` in + B*|1.0-6].*) + # multiple defects + +cat >>confdefs.h <<\EOF +#define NO_LOCALE 1 +EOF + +cat >>confdefs.h <<\EOF +#define NO_LOCKING 1 +EOF + +cat >>confdefs.h <<\EOF +#define FILE_MODE_BROKEN 1 +EOF + + ;; + 1.7.*) + # link does not work + cat >>confdefs.h <<\EOF +#define NO_LOCKING 1 +EOF - # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:30347: checking for shmat" >&5 -echo $ECHO_N "checking for shmat... $ECHO_C" >&6 -if test "${ac_cv_func_shmat+set}" = set; then + ;; + *) + echo "$as_me:32149: checking for link" >&5 +echo $ECHO_N "checking for link... $ECHO_C" >&6 +if test "${ac_cv_func_link+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 30353 "configure" +#line 32155 "configure" #include "confdefs.h" -#define shmat autoconf_temporary +#define link autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef shmat +#undef link #ifdef __cplusplus extern "C" @@ -30362,7 +32164,7 @@ extern "C" /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char shmat (void); +char link (void); int main (void) @@ -30371,164 +32173,128 @@ main (void) /* The GNU C library defines stubs 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_shmat) || defined (__stub___shmat) -#error found stub for shmat +#if defined (__stub_link) || defined (__stub___link) +#error found stub for link #endif - return shmat (); + return link (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:30384: \"$ac_link\"") >&5 +if { (eval echo "$as_me:32186: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:30387: \$? = $ac_status" >&5 + echo "$as_me:32189: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:30390: \"$ac_try\"") >&5 + { (eval echo "$as_me:32192: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:30393: \$? = $ac_status" >&5 + echo "$as_me:32195: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func_shmat=yes + ac_cv_func_link=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_func_shmat=no +ac_cv_func_link=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:30403: result: $ac_cv_func_shmat" >&5 -echo "${ECHO_T}$ac_cv_func_shmat" >&6 +echo "$as_me:32205: result: $ac_cv_func_link" >&5 +echo "${ECHO_T}$ac_cv_func_link" >&6 +if test $ac_cv_func_link = yes; then - if test $ac_cv_func_shmat = no; then - echo "$as_me:30407: checking for shmat in -lipc" >&5 -echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 -if test "${ac_cv_lib_ipc_shmat+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lipc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 30415 "configure" -#include "confdefs.h" +cat >>confdefs.h <<\EOF +#define HAVE_LINK 1 +EOF -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shmat (); -int -main (void) -{ -shmat (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:30434: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:30437: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:30440: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:30443: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_ipc_shmat=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_ipc_shmat=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:30454: result: $ac_cv_lib_ipc_shmat" >&5 -echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 -if test $ac_cv_lib_ipc_shmat = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi - fi - fi + ;; + esac + ;; + *haiku*) + # link does not work + cat >>confdefs.h <<\EOF +#define NO_LOCKING 1 +EOF - # Check for libraries that X11R6 Xt/Xaw programs need. - ac_save_LDFLAGS=$LDFLAGS - test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" - # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to - # check for ICE first), but we must link in the order -lSM -lICE or - # we get undefined symbols. So assume we have SM if we have ICE. - # These have to be linked with before -lX11, unlike the other - # libraries we check for below, so use a different variable. - # John Interrante, Karl Berry - echo "$as_me:30472: checking for IceConnectionNumber in -lICE" >&5 -echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 -if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then + ;; + *) + echo "$as_me:32226: checking for link" >&5 +echo $ECHO_N "checking for link... $ECHO_C" >&6 +if test "${ac_cv_func_link+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lICE $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 30480 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 32232 "configure" #include "confdefs.h" +#define link autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef link -/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif + /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char IceConnectionNumber (); +char link (void); + int main (void) { -IceConnectionNumber (); + +/* The GNU C library defines stubs 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) +#error found stub for link +#endif + + return link (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:30499: \"$ac_link\"") >&5 +if { (eval echo "$as_me:32263: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:30502: \$? = $ac_status" >&5 + echo "$as_me:32266: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:30505: \"$ac_try\"") >&5 + { (eval echo "$as_me:32269: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:30508: \$? = $ac_status" >&5 + echo "$as_me:32272: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_ICE_IceConnectionNumber=yes + ac_cv_func_link=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_ICE_IceConnectionNumber=no +ac_cv_func_link=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:30519: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 -if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then - X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" +echo "$as_me:32282: result: $ac_cv_func_link" >&5 +echo "${ECHO_T}$ac_cv_func_link" >&6 +if test $ac_cv_func_link = yes; then + cat >>confdefs.h <<\EOF +#define HAVE_LINK 1 +EOF + fi - LDFLAGS=$ac_save_LDFLAGS +esac -fi +if test "$cf_cv_termlib" = pdcurses ; then cf_x_athena=${cf_x_athena:-Xaw} -echo "$as_me:30531: checking if you want to link with Xaw 3d library" >&5 +echo "$as_me:32297: checking if you want to link with Xaw 3d library" >&5 echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6 withval= @@ -30539,14 +32305,14 @@ if test "${with_Xaw3d+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=Xaw3d - echo "$as_me:30542: result: yes" >&5 + echo "$as_me:32308: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:30545: result: no" >&5 + echo "$as_me:32311: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:30549: checking if you want to link with Xaw 3d xft library" >&5 +echo "$as_me:32315: checking if you want to link with Xaw 3d xft library" >&5 echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6 withval= @@ -30557,14 +32323,14 @@ if test "${with_Xaw3dxft+set}" = set; th fi; if test "$withval" = yes ; then cf_x_athena=Xaw3dxft - echo "$as_me:30560: result: yes" >&5 + echo "$as_me:32326: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:30563: result: no" >&5 + echo "$as_me:32329: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:30567: checking if you want to link with neXT Athena library" >&5 +echo "$as_me:32333: checking if you want to link with neXT Athena library" >&5 echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6 withval= @@ -30575,14 +32341,14 @@ if test "${with_neXtaw+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=neXtaw - echo "$as_me:30578: result: yes" >&5 + echo "$as_me:32344: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:30581: result: no" >&5 + echo "$as_me:32347: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:30585: checking if you want to link with Athena-Plus library" >&5 +echo "$as_me:32351: checking if you want to link with Athena-Plus library" >&5 echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6 withval= @@ -30593,10 +32359,10 @@ if test "${with_XawPlus+set}" = set; the fi; if test "$withval" = yes ; then cf_x_athena=XawPlus - echo "$as_me:30596: result: yes" >&5 + echo "$as_me:32362: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:30599: result: no" >&5 + echo "$as_me:32365: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -30616,17 +32382,17 @@ 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}:30619: testing found package $cf_athena_pkg ..." 1>&5 +echo "${as_me:-configure}:32385: 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}:30625: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:32391: 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}:30629: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:32395: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -30726,19 +32492,19 @@ if test -n "$cf_new_extra_cppflags" ; th 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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -30757,20 +32523,20 @@ EOF 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}:30760: testing ..trimmed $LIBS ..." 1>&5 +echo "${as_me:-configure}:32526: testing ..trimmed $LIBS ..." 1>&5 ;; esac done -echo "$as_me:30766: checking for usable $cf_x_athena/Xmu package" >&5 +echo "$as_me:32532: checking for usable $cf_x_athena/Xmu package" >&5 echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6 if test "${cf_cv_xaw_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 30773 "configure" +#line 32539 "configure" #include "confdefs.h" #include @@ -30779,23 +32545,24 @@ int main (void) { -int check = XmuCompareISOLatin1("big", "small") +int check = XmuCompareISOLatin1("big", "small"); +(void)check; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:30789: \"$ac_link\"") >&5 +if { (eval echo "$as_me:32556: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:30792: \$? = $ac_status" >&5 + echo "$as_me:32559: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:30795: \"$ac_try\"") >&5 + { (eval echo "$as_me:32562: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:30798: \$? = $ac_status" >&5 + echo "$as_me:32565: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xaw_compat=yes else @@ -30805,7 +32572,7 @@ cf_cv_xaw_compat=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:30808: result: $cf_cv_xaw_compat" >&5 +echo "$as_me:32575: result: $cf_cv_xaw_compat" >&5 echo "${ECHO_T}$cf_cv_xaw_compat" >&6 if test "$cf_cv_xaw_compat" = no @@ -30817,7 +32584,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6 *) test -n "$verbose" && echo " work around broken package" 1>&6 -echo "${as_me:-configure}:30820: testing work around broken package ..." 1>&5 +echo "${as_me:-configure}:32587: testing work around broken package ..." 1>&5 cf_save_xmu="$LIBS" cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^ *//' -e 's/ .*//'` @@ -30825,17 +32592,17 @@ echo "${as_me:-configure}:30820: testing if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then test -n "$verbose" && echo " found package xmu" 1>&6 -echo "${as_me:-configure}:30828: testing found package xmu ..." 1>&5 +echo "${as_me:-configure}:32595: 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}:30834: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:32601: 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}:30838: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:32605: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -30935,19 +32702,19 @@ if test -n "$cf_new_extra_cppflags" ; th 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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -30955,12 +32722,12 @@ LIBS="$cf_add_libs" test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:30958: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:32725: 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}:30963: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:32730: testing ...after $LIBS ..." 1>&5 else cf_pkgconfig_incs= @@ -30968,12 +32735,12 @@ else test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:30971: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:32738: 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}:30976: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:32743: testing ...after $LIBS ..." 1>&5 fi @@ -30984,7 +32751,7 @@ fi 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}:30987: testing ..trimmed $LIBS ..." 1>&5 +echo "${as_me:-configure}:32754: testing ..trimmed $LIBS ..." 1>&5 ;; esac @@ -31009,17 +32776,17 @@ 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}:31012: testing found package Xext ..." 1>&5 +echo "${as_me:-configure}:32779: 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}:31018: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:32785: 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}:31022: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:32789: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -31119,19 +32886,19 @@ if test -n "$cf_new_extra_cppflags" ; th 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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -31140,7 +32907,7 @@ else cf_pkgconfig_incs= cf_pkgconfig_libs= - echo "$as_me:31143: checking for XextCreateExtension in -lXext" >&5 + echo "$as_me:32910: checking for XextCreateExtension in -lXext" >&5 echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6 if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -31148,7 +32915,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lXext $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 31151 "configure" +#line 32918 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -31167,16 +32934,16 @@ XextCreateExtension (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:31170: \"$ac_link\"") >&5 +if { (eval echo "$as_me:32937: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:31173: \$? = $ac_status" >&5 + echo "$as_me:32940: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:31176: \"$ac_try\"") >&5 + { (eval echo "$as_me:32943: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:31179: \$? = $ac_status" >&5 + echo "$as_me:32946: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xext_XextCreateExtension=yes else @@ -31187,23 +32954,23 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:31190: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 +echo "$as_me:32957: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6 if test $ac_cv_lib_Xext_XextCreateExtension = yes; then -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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lXext; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -31211,7 +32978,7 @@ fi fi -# OSX is schizoid about who owns /usr/X11 (old) versus /opt/X11 (new), and (and +# OSX is schizoid about who owns /usr/X11 (old) versus /opt/X11 (new) (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 @@ -31223,17 +32990,17 @@ then if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then test -n "$verbose" && echo " found package x11" 1>&6 -echo "${as_me:-configure}:31226: testing found package x11 ..." 1>&5 +echo "${as_me:-configure}:32993: 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}:31232: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:32999: 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}:31236: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:33003: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -31333,19 +33100,19 @@ if test -n "$cf_new_extra_cppflags" ; th 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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -31353,24 +33120,24 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:31356: WARNING: unable to find X11 library" >&5 + { echo "$as_me:33123: WARNING: unable to find X11 library" >&5 echo "$as_me: WARNING: unable to find X11 library" >&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}:31363: testing found package ice ..." 1>&5 +echo "${as_me:-configure}:33130: 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}:31369: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:33136: 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}:31373: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:33140: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -31470,19 +33237,19 @@ if test -n "$cf_new_extra_cppflags" ; th 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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -31490,24 +33257,24 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:31493: WARNING: unable to find ICE library" >&5 + { echo "$as_me:33260: WARNING: unable to find ICE library" >&5 echo "$as_me: WARNING: unable to find ICE library" >&2;} fi if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then test -n "$verbose" && echo " found package sm" 1>&6 -echo "${as_me:-configure}:31500: testing found package sm ..." 1>&5 +echo "${as_me:-configure}:33267: 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}:31506: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:33273: 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}:31510: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:33277: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -31607,19 +33374,19 @@ if test -n "$cf_new_extra_cppflags" ; th 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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -31627,24 +33394,24 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:31630: WARNING: unable to find SM library" >&5 + { echo "$as_me:33397: WARNING: unable to find SM library" >&5 echo "$as_me: WARNING: unable to find SM library" >&2;} fi if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then test -n "$verbose" && echo " found package xt" 1>&6 -echo "${as_me:-configure}:31637: testing found package xt ..." 1>&5 +echo "${as_me:-configure}:33404: 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}:31643: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:33410: 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}:31647: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:33414: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -31744,19 +33511,19 @@ if test -n "$cf_new_extra_cppflags" ; th 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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -31764,10 +33531,12 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:31767: WARNING: unable to find Xt library" >&5 + { echo "$as_me:33534: WARNING: unable to find Xt library" >&5 echo "$as_me: WARNING: unable to find Xt library" >&2;} fi +else + LIBS="$X_PRE_LIBS $LIBS $X_EXTRA_LIBS" fi cf_have_X_LIBS=no @@ -31775,17 +33544,17 @@ 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}:31778: testing found package xt ..." 1>&5 +echo "${as_me:-configure}:33547: 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}:31784: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:33553: 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}:31788: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:33557: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -31885,19 +33654,19 @@ if test -n "$cf_new_extra_cppflags" ; th 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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -31906,14 +33675,14 @@ LIBS="$cf_add_libs" ;; *) # we have an "xt" package, but it may omit Xt's dependency on X11 -echo "$as_me:31909: checking for usable X dependency" >&5 +echo "$as_me:33678: checking for usable X dependency" >&5 echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6 if test "${cf_cv_xt_x11_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 31916 "configure" +#line 33685 "configure" #include "confdefs.h" #include @@ -31932,16 +33701,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:31935: \"$ac_link\"") >&5 +if { (eval echo "$as_me:33704: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:31938: \$? = $ac_status" >&5 + echo "$as_me:33707: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:31941: \"$ac_try\"") >&5 + { (eval echo "$as_me:33710: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:31944: \$? = $ac_status" >&5 + echo "$as_me:33713: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xt_x11_compat=yes else @@ -31951,30 +33720,30 @@ cf_cv_xt_x11_compat=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:31954: result: $cf_cv_xt_x11_compat" >&5 +echo "$as_me:33723: result: $cf_cv_xt_x11_compat" >&5 echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6 if test "$cf_cv_xt_x11_compat" = no then test -n "$verbose" && echo " work around broken X11 dependency" 1>&6 -echo "${as_me:-configure}:31960: testing work around broken X11 dependency ..." 1>&5 +echo "${as_me:-configure}:33729: testing work around broken X11 dependency ..." 1>&5 # 2010/11/19 - good enough until a working Xt on Xcb is delivered. if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then test -n "$verbose" && echo " found package x11" 1>&6 -echo "${as_me:-configure}:31967: testing found package x11 ..." 1>&5 +echo "${as_me:-configure}:33736: 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}:31973: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:33742: 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}:31977: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:33746: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -32074,19 +33843,19 @@ if test -n "$cf_new_extra_cppflags" ; th 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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -32097,12 +33866,12 @@ else test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:32100: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:33869: 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}:32105: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:33874: testing ...after $LIBS ..." 1>&5 fi @@ -32110,14 +33879,14 @@ fi ;; esac -echo "$as_me:32113: checking for usable X Toolkit package" >&5 +echo "$as_me:33882: checking for usable X Toolkit package" >&5 echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6 if test "${cf_cv_xt_ice_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 32120 "configure" +#line 33889 "configure" #include "confdefs.h" #include @@ -32125,23 +33894,23 @@ cat >conftest.$ac_ext <<_ACEOF int main (void) { -int num = IceConnectionNumber(0) +int num = IceConnectionNumber(0); (void) num ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:32135: \"$ac_link\"") >&5 +if { (eval echo "$as_me:33904: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:32138: \$? = $ac_status" >&5 + echo "$as_me:33907: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:32141: \"$ac_try\"") >&5 + { (eval echo "$as_me:33910: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32144: \$? = $ac_status" >&5 + echo "$as_me:33913: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xt_ice_compat=yes else @@ -32151,7 +33920,7 @@ cf_cv_xt_ice_compat=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:32154: result: $cf_cv_xt_ice_compat" >&5 +echo "$as_me:33923: result: $cf_cv_xt_ice_compat" >&5 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6 if test "$cf_cv_xt_ice_compat" = no @@ -32165,22 +33934,22 @@ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6 *) test -n "$verbose" && echo " work around broken ICE dependency" 1>&6 -echo "${as_me:-configure}:32168: testing work around broken ICE dependency ..." 1>&5 +echo "${as_me:-configure}:33937: testing work around broken ICE dependency ..." 1>&5 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then test -n "$verbose" && echo " found package ice" 1>&6 -echo "${as_me:-configure}:32173: testing found package ice ..." 1>&5 +echo "${as_me:-configure}:33942: 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}:32179: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:33948: 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}:32183: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:33952: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -32280,36 +34049,36 @@ if test -n "$cf_new_extra_cppflags" ; th 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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 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}:32302: testing found package sm ..." 1>&5 +echo "${as_me:-configure}:34071: 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}:32308: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:34077: 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}:32312: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:34081: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -32409,19 +34178,19 @@ if test -n "$cf_new_extra_cppflags" ; th 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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -32438,12 +34207,12 @@ else test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:32441: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:34210: 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}:32446: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:34215: testing ...after $LIBS ..." 1>&5 fi @@ -32463,7 +34232,7 @@ else test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me:-configure}:32466: testing checking additions to CFLAGS ..." 1>&5 +echo "${as_me:-configure}:34235: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" cf_check_cppflags="$CPPFLAGS" @@ -32548,7 +34317,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}:32551: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:34320: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -32558,7 +34327,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}:32561: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:34330: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -32568,7 +34337,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}:32571: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:34340: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" @@ -32577,7 +34346,7 @@ fi if test "x$cf_check_cflags" != "x$CFLAGS" ; then cat >conftest.$ac_ext <<_ACEOF -#line 32580 "configure" +#line 34349 "configure" #include "confdefs.h" #include int @@ -32589,16 +34358,16 @@ printf("Hello world"); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:32592: \"$ac_link\"") >&5 +if { (eval echo "$as_me:34361: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:32595: \$? = $ac_status" >&5 + echo "$as_me:34364: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:32598: \"$ac_try\"") >&5 + { (eval echo "$as_me:34367: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32601: \$? = $ac_status" >&5 + echo "$as_me:34370: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -32606,12 +34375,12 @@ else cat conftest.$ac_ext >&5 test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 -echo "${as_me:-configure}:32609: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 +echo "${as_me:-configure}:34378: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 -echo "${as_me:-configure}:32614: testing but keeping change to \$CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:34383: testing but keeping change to \$CPPFLAGS ..." 1>&5 fi CFLAGS="$cf_check_flags" @@ -32619,13 +34388,13 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - echo "$as_me:32622: checking for XOpenDisplay" >&5 + echo "$as_me:34391: checking for XOpenDisplay" >&5 echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6 if test "${ac_cv_func_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 32628 "configure" +#line 34397 "configure" #include "confdefs.h" #define XOpenDisplay autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -32656,16 +34425,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:32659: \"$ac_link\"") >&5 +if { (eval echo "$as_me:34428: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:32662: \$? = $ac_status" >&5 + echo "$as_me:34431: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:32665: \"$ac_try\"") >&5 + { (eval echo "$as_me:34434: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32668: \$? = $ac_status" >&5 + echo "$as_me:34437: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_XOpenDisplay=yes else @@ -32675,21 +34444,21 @@ ac_cv_func_XOpenDisplay=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:32678: result: $ac_cv_func_XOpenDisplay" >&5 +echo "$as_me:34447: result: $ac_cv_func_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6 if test $ac_cv_func_XOpenDisplay = yes; then : else - echo "$as_me:32684: checking for XOpenDisplay in -lX11" >&5 + echo "$as_me:34453: checking for XOpenDisplay in -lX11" >&5 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" +LIBS="-lX11 $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 32692 "configure" +#line 34461 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -32708,16 +34477,16 @@ XOpenDisplay (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:32711: \"$ac_link\"") >&5 +if { (eval echo "$as_me:34480: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:32714: \$? = $ac_status" >&5 + echo "$as_me:34483: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:32717: \"$ac_try\"") >&5 + { (eval echo "$as_me:34486: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32720: \$? = $ac_status" >&5 + echo "$as_me:34489: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_X11_XOpenDisplay=yes else @@ -32728,23 +34497,23 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:32731: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "$as_me:34500: result: $ac_cv_lib_X11_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 if test $ac_cv_lib_X11_XOpenDisplay = yes; then -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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lX11; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -32752,13 +34521,13 @@ fi fi - echo "$as_me:32755: checking for XtAppInitialize" >&5 + echo "$as_me:34524: checking for XtAppInitialize" >&5 echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6 if test "${ac_cv_func_XtAppInitialize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 32761 "configure" +#line 34530 "configure" #include "confdefs.h" #define XtAppInitialize autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -32789,16 +34558,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:32792: \"$ac_link\"") >&5 +if { (eval echo "$as_me:34561: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:32795: \$? = $ac_status" >&5 + echo "$as_me:34564: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:32798: \"$ac_try\"") >&5 + { (eval echo "$as_me:34567: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32801: \$? = $ac_status" >&5 + echo "$as_me:34570: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_XtAppInitialize=yes else @@ -32808,21 +34577,21 @@ ac_cv_func_XtAppInitialize=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:32811: result: $ac_cv_func_XtAppInitialize" >&5 +echo "$as_me:34580: result: $ac_cv_func_XtAppInitialize" >&5 echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6 if test $ac_cv_func_XtAppInitialize = yes; then : else - echo "$as_me:32817: checking for XtAppInitialize in -lXt" >&5 + echo "$as_me:34586: checking for XtAppInitialize in -lXt" >&5 echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6 if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" +LIBS="-lXt $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 32825 "configure" +#line 34594 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -32841,16 +34610,16 @@ XtAppInitialize (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:32844: \"$ac_link\"") >&5 +if { (eval echo "$as_me:34613: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:32847: \$? = $ac_status" >&5 + echo "$as_me:34616: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:32850: \"$ac_try\"") >&5 + { (eval echo "$as_me:34619: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32853: \$? = $ac_status" >&5 + echo "$as_me:34622: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xt_XtAppInitialize=yes else @@ -32861,7 +34630,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:32864: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 +echo "$as_me:34633: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6 if test $ac_cv_lib_Xt_XtAppInitialize = yes; then @@ -32870,7 +34639,7 @@ cat >>confdefs.h <<\EOF EOF cf_have_X_LIBS=Xt - LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS" + LIBS="-lXt $LIBS" fi fi @@ -32878,7 +34647,7 @@ fi fi if test $cf_have_X_LIBS = no ; then - { echo "$as_me:32881: WARNING: Unable to successfully link X Toolkit library (-lXt) with + { echo "$as_me:34650: WARNING: Unable to successfully link X Toolkit library (-lXt) with test program. You will have to check and add the proper libraries by hand to makefile." >&5 echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with @@ -32896,22 +34665,37 @@ for cf_path in default \ /usr/local do if test -z "$cf_x_athena_inc" ; then - cf_save="$CPPFLAGS" + +cf_save_LIBS_CF_X_ATHENA_CPPFLAGS="$LIBS" +cf_save_CFLAGS_CF_X_ATHENA_CPPFLAGS="$CFLAGS" +cf_save_CPPFLAGS_CF_X_ATHENA_CPPFLAGS="$CPPFLAGS" +LIBS="$LIBS ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS}" +for cf_X_CFLAGS in $X_CFLAGS +do + case "x$cf_X_CFLAGS" in + x-[IUD]*) + CPPFLAGS="$CPPFLAGS $cf_X_CFLAGS" + ;; + *) + CFLAGS="$CFLAGS $cf_X_CFLAGS" + ;; + esac +done + cf_test=X11/$cf_x_athena_root/SimpleMenu.h if test $cf_path != default ; then - CPPFLAGS="$cf_save" test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_path/include" - echo "$as_me:32907: checking for $cf_test in $cf_path" >&5 + echo "$as_me:34691: checking for $cf_test in $cf_path" >&5 echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6 else - echo "$as_me:32910: checking for $cf_test" >&5 + echo "$as_me:34694: checking for $cf_test" >&5 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6 fi cat >conftest.$ac_ext <<_ACEOF -#line 32914 "configure" +#line 34698 "configure" #include "confdefs.h" #include @@ -32925,16 +34709,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:32928: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:34712: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:32931: \$? = $ac_status" >&5 + echo "$as_me:34715: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:32934: \"$ac_try\"") >&5 + { (eval echo "$as_me:34718: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32937: \$? = $ac_status" >&5 + echo "$as_me:34721: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -32943,20 +34727,24 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:32946: result: $cf_result" >&5 + echo "$as_me:34730: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 + +LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS" +CFLAGS="$cf_save_CFLAGS_CF_X_ATHENA_CPPFLAGS" +CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_CPPFLAGS" + if test "$cf_result" = yes ; then - cf_x_athena_inc=$cf_path + test "$cf_path" = default && cf_x_athena_inc=default + test "$cf_path" != default && cf_x_athena_inc=$cf_path/include break - else - CPPFLAGS="$cf_save" fi fi done if test -z "$cf_x_athena_inc" ; then - { echo "$as_me:32958: WARNING: Unable to successfully find Athena header files with test program" >&5 -echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;} + { echo "$as_me:34746: WARNING: Unable to find Athena header files" >&5 +echo "$as_me: WARNING: Unable to find Athena header files" >&2;} elif test "$cf_x_athena_inc" != default ; then test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " @@ -32983,52 +34771,47 @@ do "-l$cf_lib -lXpm -lXmu" \ "-l${cf_lib}_s -lXmu_s" do - if test -z "$cf_x_athena_lib" ; then - cf_save="$LIBS" - cf_test=XawSimpleMenuAddGlobalActions - if test $cf_path != default ; then - -cf_add_libs="-L$cf_path/lib $cf_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" + test -n "$cf_x_athena_lib" && break + +cf_save_LIBS_CF_X_ATHENA_LIBS="$LIBS" +cf_save_CFLAGS_CF_X_ATHENA_LIBS="$CFLAGS" +cf_save_CPPFLAGS_CF_X_ATHENA_LIBS="$CPPFLAGS" +LIBS="$LIBS ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS}" +for cf_X_CFLAGS in $X_CFLAGS +do + case "x$cf_X_CFLAGS" in + x-[IUD]*) + CPPFLAGS="$CPPFLAGS $cf_X_CFLAGS" + ;; + *) + CFLAGS="$CFLAGS $cf_X_CFLAGS" + ;; + esac done -LIBS="$cf_add_libs" - echo "$as_me:33007: checking for $cf_libs in $cf_path" >&5 -echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6 - else + cf_test=XawSimpleMenuAddGlobalActions + test "$cf_path" != default && cf_libs="-L$cf_path/lib $cf_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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" - echo "$as_me:33027: checking for $cf_test in $cf_libs" >&5 + echo "$as_me:34811: checking for $cf_test in $cf_libs" >&5 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6 - fi - cat >conftest.$ac_ext <<_ACEOF -#line 33031 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 34814 "configure" #include "confdefs.h" #include @@ -33044,16 +34827,16 @@ $cf_test((XtAppContext) 0) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:33047: \"$ac_link\"") >&5 +if { (eval echo "$as_me:34830: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:33050: \$? = $ac_status" >&5 + echo "$as_me:34833: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:33053: \"$ac_try\"") >&5 + { (eval echo "$as_me:34836: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:33056: \$? = $ac_status" >&5 + echo "$as_me:34839: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -33062,13 +34845,16 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:33065: result: $cf_result" >&5 + echo "$as_me:34848: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 - if test "$cf_result" = yes ; then - cf_x_athena_lib="$cf_libs" - break - fi - LIBS="$cf_save" + +LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS" +CFLAGS="$cf_save_CFLAGS_CF_X_ATHENA_LIBS" +CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_LIBS" + + if test "$cf_result" = yes ; then + cf_x_athena_lib="$cf_libs" + break fi done # cf_libs test -n "$cf_x_athena_lib" && break @@ -33076,11 +34862,27 @@ echo "${ECHO_T}$cf_result" >&6 done if test -z "$cf_x_athena_lib" ; then - { { echo "$as_me:33079: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 + { { echo "$as_me:34865: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;} { (exit 1); exit 1; }; } fi +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_x_athena_lib; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" + cf_x_athena_LIBS=`echo "HAVE_LIB_$cf_x_athena" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cat >>confdefs.h <&5 +echo "$as_me:34899: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -33109,7 +34911,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog" -echo "$as_me:33112: found $ac_dir/$ac_word" >&5 +echo "$as_me:34914: found $ac_dir/$ac_word" >&5 break done @@ -33117,10 +34919,10 @@ fi fi XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG if test -n "$XCURSES_CONFIG"; then - echo "$as_me:33120: result: $XCURSES_CONFIG" >&5 + echo "$as_me:34922: result: $XCURSES_CONFIG" >&5 echo "${ECHO_T}$XCURSES_CONFIG" >&6 else - echo "$as_me:33123: result: no" >&5 + echo "$as_me:34925: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -33133,7 +34935,7 @@ if test -z "$XCURSES_CONFIG"; then 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 "$as_me:33136: checking for $ac_word" >&5 +echo "$as_me:34938: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -33148,7 +34950,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog" -echo "$as_me:33151: found $ac_dir/$ac_word" >&5 +echo "$as_me:34953: found $ac_dir/$ac_word" >&5 break done @@ -33156,10 +34958,10 @@ fi fi ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG if test -n "$ac_ct_XCURSES_CONFIG"; then - echo "$as_me:33159: result: $ac_ct_XCURSES_CONFIG" >&5 + echo "$as_me:34961: result: $ac_ct_XCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6 else - echo "$as_me:33162: result: no" >&5 + echo "$as_me:34964: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -33270,19 +35072,19 @@ if test -n "$cf_new_extra_cppflags" ; th fi -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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in `$XCURSES_CONFIG --libs`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -33294,7 +35096,7 @@ LDFLAGS="$LDFLAGS $X_LIBS" test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me:-configure}:33297: testing checking additions to CFLAGS ..." 1>&5 +echo "${as_me:-configure}:35099: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" cf_check_cppflags="$CPPFLAGS" @@ -33379,7 +35181,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}:33382: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:35184: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -33389,7 +35191,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}:33392: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:35194: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -33399,7 +35201,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}:33402: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:35204: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" @@ -33408,7 +35210,7 @@ fi if test "x$cf_check_cflags" != "x$CFLAGS" ; then cat >conftest.$ac_ext <<_ACEOF -#line 33411 "configure" +#line 35213 "configure" #include "confdefs.h" #include int @@ -33420,16 +35222,16 @@ printf("Hello world"); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:33423: \"$ac_link\"") >&5 +if { (eval echo "$as_me:35225: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:33426: \$? = $ac_status" >&5 + echo "$as_me:35228: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:33429: \"$ac_try\"") >&5 + { (eval echo "$as_me:35231: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:33432: \$? = $ac_status" >&5 + echo "$as_me:35234: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -33437,12 +35239,12 @@ else cat conftest.$ac_ext >&5 test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 -echo "${as_me:-configure}:33440: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 +echo "${as_me:-configure}:35242: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 -echo "${as_me:-configure}:33445: testing but keeping change to \$CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:35247: testing but keeping change to \$CPPFLAGS ..." 1>&5 fi CFLAGS="$cf_check_flags" @@ -33450,7 +35252,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:33453: checking for XOpenDisplay in -lX11" >&5 +echo "$as_me:35255: checking for XOpenDisplay in -lX11" >&5 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -33458,7 +35260,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 33461 "configure" +#line 35263 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -33477,16 +35279,16 @@ XOpenDisplay (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:33480: \"$ac_link\"") >&5 +if { (eval echo "$as_me:35282: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:33483: \$? = $ac_status" >&5 + echo "$as_me:35285: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:33486: \"$ac_try\"") >&5 + { (eval echo "$as_me:35288: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:33489: \$? = $ac_status" >&5 + echo "$as_me:35291: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_X11_XOpenDisplay=yes else @@ -33497,52 +35299,52 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:33500: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "$as_me:35302: result: $ac_cv_lib_X11_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 if test $ac_cv_lib_X11_XOpenDisplay = yes; then -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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lX11; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" fi -echo "$as_me:33522: checking for XCurses library" >&5 +echo "$as_me:35324: checking for XCurses library" >&5 echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6 if test "${cf_cv_lib_XCurses+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -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_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lXCurses; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; 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" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 33545 "configure" +#line 35347 "configure" #include "confdefs.h" #include @@ -33557,16 +35359,16 @@ XCursesExit(); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:33560: \"$ac_link\"") >&5 +if { (eval echo "$as_me:35362: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:33563: \$? = $ac_status" >&5 + echo "$as_me:35365: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:33566: \"$ac_try\"") >&5 + { (eval echo "$as_me:35368: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:33569: \$? = $ac_status" >&5 + echo "$as_me:35371: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_lib_XCurses=yes else @@ -33577,7 +35379,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:33580: result: $cf_cv_lib_XCurses" >&5 +echo "$as_me:35382: result: $cf_cv_lib_XCurses" >&5 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6 fi @@ -33592,23 +35394,23 @@ cat >>confdefs.h <<\EOF #define XCURSES 1 EOF - echo "$as_me:33595: checking for xcurses.h" >&5 + echo "$as_me:35397: checking for xcurses.h" >&5 echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6 if test "${ac_cv_header_xcurses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 33601 "configure" +#line 35403 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:33605: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:35407: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:33611: \$? = $ac_status" >&5 + echo "$as_me:35413: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -33627,7 +35429,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:33630: result: $ac_cv_header_xcurses_h" >&5 +echo "$as_me:35432: result: $ac_cv_header_xcurses_h" >&5 echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6 if test $ac_cv_header_xcurses_h = yes; then @@ -33638,7 +35440,7 @@ EOF fi else - { { echo "$as_me:33641: error: Cannot link with XCurses" >&5 + { { echo "$as_me:35443: error: Cannot link with XCurses" >&5 echo "$as_me: error: Cannot link with XCurses" >&2;} { (exit 1); exit 1; }; } fi @@ -33648,13 +35450,13 @@ fi for ac_func in vw_printw do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:33651: checking for $ac_func" >&5 +echo "$as_me:35453: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 33657 "configure" +#line 35459 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -33685,16 +35487,16 @@ main (void) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:33688: \"$ac_link\"") >&5 +if { (eval echo "$as_me:35490: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:33691: \$? = $ac_status" >&5 + echo "$as_me:35493: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:33694: \"$ac_try\"") >&5 + { (eval echo "$as_me:35496: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:33697: \$? = $ac_status" >&5 + echo "$as_me:35499: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -33704,7 +35506,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:33707: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:35509: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <&5 + { echo "$as_me:35521: WARNING: no term-lib found, you might run into trouble later." >&5 echo "$as_me: WARNING: no term-lib found, you might run into trouble later." >&2;} fi if test "$YACC" = "" ; then - { echo "$as_me:33723: WARNING: no yacc-parser found, you might run into trouble later." >&5 + { echo "$as_me:35525: WARNING: no yacc-parser found, you might run into trouble later." >&5 echo "$as_me: WARNING: no yacc-parser found, you might run into trouble later." >&2;} fi if test "$RANLIB" = "" ; then - { echo "$as_me:33727: WARNING: no library archive builder found, you might run into trouble later." >&5 + { echo "$as_me:35529: WARNING: no library archive builder found, you might run into trouble later." >&5 echo "$as_me: WARNING: no library archive builder found, you might run into trouble later." >&2;} fi @@ -33734,36 +35536,43 @@ CFLAGS="$CFLAGS $EXTRA_CFLAGS" LINTFLAGS=$LINTFLAGS cf_define=`echo "$CC"|sed -e 's/\\\\/\\\\134/g' -e 's/^[ ]\\+//' -e 's/[ ]\\+$//' -e 's/"/\\\\042/g'` + cat >>confdefs.h <>confdefs.h <>confdefs.h <>confdefs.h <>confdefs.h <>confdefs.h <>confdefs.h <&5 +{ echo "$as_me:35659: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -33860,6 +35669,8 @@ debug=false SHELL=\${CONFIG_SHELL-$SHELL} ac_cs_invocation="\$0 \$@" +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF @@ -33979,7 +35790,7 @@ EOF cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:34026: error: ambiguous option: $1 + { { echo "$as_me:35837: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -34042,7 +35853,7 @@ Try \`$0 --help' for more information." ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:34045: error: unrecognized option: $1 + -*) { { echo "$as_me:35856: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -34061,7 +35872,7 @@ cat >&5 << _ACEOF ## Running config.status. ## ## ----------------------- ## -This file was extended by $as_me 2.52.20181006, executed with +This file was extended by $as_me 2.52.20200802, executed with CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_LINKS = $CONFIG_LINKS @@ -34090,7 +35901,7 @@ do "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "include/autoconf.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/autoconf.h:include/autoconf.hin" ;; - *) { { echo "$as_me:34093: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:35904: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -34224,6 +36035,8 @@ s,@PATH_METAMAIL@,$PATH_METAMAIL,;t t s,@PATH_SUM@,$PATH_SUM,;t t s,@DEFAULT_EDITOR@,$DEFAULT_EDITOR,;t t s,@DEFAULT_MAILER@,$DEFAULT_MAILER,;t t +s,@PKG_CONFIG@,$PKG_CONFIG,;t t +s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t s,@PATH_PGP@,$PATH_PGP,;t t s,@PATH_PGPK@,$PATH_PGPK,;t t s,@PATH_GPG@,$PATH_GPG,;t t @@ -34235,14 +36048,16 @@ s,@ECHO_LD@,$ECHO_LD,;t t s,@RULE_CC@,$RULE_CC,;t t s,@SHOW_CC@,$SHOW_CC,;t t s,@ECHO_CC@,$ECHO_CC,;t t +s,@X_CFLAGS@,$X_CFLAGS,;t t +s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t +s,@X_LIBS@,$X_LIBS,;t t +s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t s,@NEWSLIBDIR@,$NEWSLIBDIR,;t t s,@SPOOLDIR@,$SPOOLDIR,;t t s,@NOVROOTDIR@,$NOVROOTDIR,;t t s,@INEWSDIR@,$INEWSDIR,;t t s,@INEWS@,$INEWS,;t t -s,@PKG_CONFIG@,$PKG_CONFIG,;t t -s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t s,@NCURSES_CONFIG@,$NCURSES_CONFIG,;t t s,@ac_ct_NCURSES_CONFIG@,$ac_ct_NCURSES_CONFIG,;t t s,@PCRE_MAJOR@,$PCRE_MAJOR,;t t @@ -34259,6 +36074,8 @@ s,@EXTRAOBJS@,$EXTRAOBJS,;t t s,@EXTRAO_DEP@,$EXTRAO_DEP,;t t s,@CANDIR_MAKE@,$CANDIR_MAKE,;t t s,@CANLIBS@,$CANLIBS,;t t +s,@CAN_CPPFLAGS@,$CAN_CPPFLAGS,;t t +s,@CAN_MAKEFILE@,$CAN_MAKEFILE,;t t s,@TIN_DEFAULTS_DIR@,$TIN_DEFAULTS_DIR,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@cf_cv_makeflags@,$cf_cv_makeflags,;t t @@ -34290,10 +36107,6 @@ s,@SUB_MAKEFILE@,$SUB_MAKEFILE,;t t s,@INTLDIR_MAKE@,$INTLDIR_MAKE,;t t s,@GT_YES@,$GT_YES,;t t s,@GT_NO@,$GT_NO,;t t -s,@X_CFLAGS@,$X_CFLAGS,;t t -s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t -s,@X_LIBS@,$X_LIBS,;t t -s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t s,@XCURSES_CONFIG@,$XCURSES_CONFIG,;t t s,@ac_ct_XCURSES_CONFIG@,$ac_ct_XCURSES_CONFIG,;t t s,@LINTFLAGS@,$LINTFLAGS,;t t @@ -34429,7 +36242,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:34432: creating $ac_file" >&5 + { echo "$as_me:36245: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -34447,7 +36260,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:34450: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:36263: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -34460,7 +36273,7 @@ echo "$as_me: error: cannot find input f echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:34463: error: cannot find input file: $f" >&5 + { { echo "$as_me:36276: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -34476,7 +36289,7 @@ cat >>$CONFIG_STATUS <<\EOF if test -n "$ac_seen"; then ac_used=`grep '@datarootdir@' $ac_item` if test -z "$ac_used"; then - { echo "$as_me:34479: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:36292: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&2;} @@ -34485,7 +36298,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' $ac_item` if test -n "$ac_seen"; then - { echo "$as_me:34488: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:36301: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&2;} @@ -34522,7 +36335,7 @@ s,@INSTALL@,$ac_INSTALL,;t t ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file` if test -z "$ac_init"; then ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` - { echo "$as_me:34525: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:36338: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&5 echo "$as_me: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&2;} @@ -34533,7 +36346,7 @@ $ac_seen" >&2;} egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out if test -s $tmp/out; then ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` - { echo "$as_me:34536: WARNING: Some variables may not be substituted: + { echo "$as_me:36349: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -34582,7 +36395,7 @@ for ac_file in : $CONFIG_HEADERS; do tes * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:34585: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:36398: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -34593,7 +36406,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:34596: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:36409: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -34606,7 +36419,7 @@ echo "$as_me: error: cannot find input f echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:34609: error: cannot find input file: $f" >&5 + { { echo "$as_me:36422: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -34724,7 +36537,7 @@ cat >>$CONFIG_STATUS <<\EOF rm -f $tmp/in if test x"$ac_file" != x-; then if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:34727: $ac_file is unchanged" >&5 + { echo "$as_me:36540: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ diff -Nurp '--exclude=.bzr*' tin-2.4.4/configure.in tin-2.4.5/configure.in --- tin-2.4.4/configure.in 2019-12-24 11:00:16.000000000 +0100 +++ tin-2.4.5/configure.in 2020-12-24 12:47:22.063864221 +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 : 2019-03-12 +dnl Updated : 2020-12-02 dnl Notes : dnl -dnl Copyright (c) 1995-2020 Thomas E. Dickey +dnl Copyright (c) 1995-2021 Thomas E. Dickey dnl All rights reserved. dnl dnl Redistribution and use in source and binary forms, with or without @@ -41,9 +41,9 @@ AC_PREFIX_DEFAULT(/usr/local) dnl PACKAGE is required for GNU gettext PACKAGE=tin -VERSION=2.4.4 -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") -AC_DEFINE_UNQUOTED(VERSION, "$VERSION") +VERSION=2.4.5 +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Define this to the package name]) +AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Define this to the package version]) AC_SUBST(PACKAGE) AC_SUBST(VERSION) @@ -113,8 +113,11 @@ case "$host_cpu:$host_vendor:$host_os" i ;; # SEIUX doesn't have any useful preprocessor symbol mips:sei:seiux*) #(vi - AC_DEFINE(SEIUX) + AC_DEFINE(SEIUX,1,[Define this to 1 for the MIPS/SEIUX system]) ;; + # ISC Interactive Unix likewise + i386:pc:isc*) #(vi + AC_DEFINE(ISC_UNIX,1,[Define this to 1 for the i386/ISC system]) esac dnl TODO: also check for heapsort(3) in libbsd? @@ -144,7 +147,7 @@ extern int my_compare(const void *, cons fi fi if test "x$cf_use_heapsort" = xyes; then - AC_DEFINE(USE_HEAPSORT) + AC_DEFINE(USE_HEAPSORT,1,[Define this to 1 to use the heapsort function]) fi CF_WITH_PROGRAM(ispell, @@ -160,6 +163,7 @@ CF_PROG_SUM_R CF_PATH_EDITOR CF_PATH_MAILER CF_PATH_MAILBOX +CF_PKG_CONFIG ## PGP Support AC_MSG_CHECKING(if you want PGP/GPG-Support) @@ -209,9 +213,9 @@ if test "$USE_NNTP" = "yes" ; then AC_MSG_CHECKING(whether to be NNTP_ONLY) CF_ARG_ENABLE(nntp-only, [ --enable-nntp-only enable reading via NNTP only], - [AC_DEFINE(NNTP_ONLY) + [AC_DEFINE(NNTP_ONLY,1,[Define this to 1 to be NNTP-only]) USE_SPOOLDIR=no], - [AC_DEFINE(NNTP_ABLE)]) + [AC_DEFINE(NNTP_ABLE,1,[Define this to 1 to be NNTP-capable])]) AC_MSG_RESULT($enableval) fi @@ -422,7 +426,7 @@ none) esac if test $use_curses != no ; then - AC_DEFINE(USE_CURSES) + AC_DEFINE(USE_CURSES,1,[Define this to 1 if we will use the curses library]) case $cf_with_screen in #(vi ncurses) #(vi CF_NCURSES_CONFIG @@ -451,7 +455,7 @@ AC_MSG_RESULT($PCRE_HOME) CF_BUNDLED_PCRE($PCRE_HOME) PCRE_MAKEFILE= -if test "$PCRE_HOME" = "no" ; then +if test "$cf_pcre_home" = "no" ; then LINK_SIZE="-DLINK_SIZE=2" AC_SUBST(LINK_SIZE) UTF8="-DSUPPORT_UTF8" @@ -469,13 +473,13 @@ CF_WITH_DMALLOC(debug_malloc=DMALLOC) AC_ARG_WITH(trace, [ --with-trace use debugging/traces for screen output], [ - AC_CHECK_FUNC(_tracef,[AC_DEFINE(HAVE__TRACEF)],[ + AC_CHECK_FUNC(_tracef,[AC_DEFINE(HAVE__TRACEF,1,[Define this to 1 if we have function _tracef])],[ AC_CHECK_LIB(${cf_with_screen}_g,_tracef, [AC_DEFINE(HAVE__TRACEF) LIBS=`echo "$LIBS" | sed -e s/-l${cf_with_screen}// -e s/-lcurses//` LIBS="-l${cf_with_screen}_g $LIBS" use_trace=yes - AC_DEFINE(USE_TRACE) + AC_DEFINE(USE_TRACE,1,[Define this to 1 if we will use ncurses' trace-functions]) EXTRAO_DEP='' EXTRAOBJS="$EXTRAOBJS \$(OBJDIR)/trace.o"], use_trace=no)])], @@ -491,7 +495,7 @@ CF_ARG_WITH(domain-name, [ --with-domain-name sets $DOMAIN_NAME], DOMAIN_NAME) if test "$DOMAIN_NAME" != ""; then - AC_DEFINE_UNQUOTED(DOMAIN_NAME, "$DOMAIN_NAME") + AC_DEFINE_UNQUOTED(DOMAIN_NAME, "$DOMAIN_NAME",[Define this to the news server's domain-name]) fi AC_MSG_RESULT($DOMAIN_NAME) @@ -527,33 +531,38 @@ fi ## These options are interdependent, so we delay defining them til now: test -n "$NNTP_DEFAULT_SERVER" \ - && AC_DEFINE_UNQUOTED(NNTP_DEFAULT_SERVER,"$NNTP_DEFAULT_SERVER") -test ".$INEWSDIR" != ".$NEWSLIBDIR" && AC_DEFINE_UNQUOTED(INEWSDIR,"$INEWSDIR") -AC_DEFINE_UNQUOTED(NEWSLIBDIR,"$NEWSLIBDIR") -AC_DEFINE_UNQUOTED(NOVROOTDIR,"$NOVROOTDIR") -AC_DEFINE_UNQUOTED(SPOOLDIR,"$SPOOLDIR") + && AC_DEFINE_UNQUOTED(NNTP_DEFAULT_SERVER,"$NNTP_DEFAULT_SERVER",[Define this to the default NNTP server]) +test ".$INEWSDIR" != ".$NEWSLIBDIR" && AC_DEFINE_UNQUOTED(INEWSDIR,"$INEWSDIR",[Define this to the inews directory path]) +AC_DEFINE_UNQUOTED(NEWSLIBDIR,"$NEWSLIBDIR",[Define this to the news library directory path]) +AC_DEFINE_UNQUOTED(NOVROOTDIR,"$NOVROOTDIR",[Define this to the news overview directory path]) +AC_DEFINE_UNQUOTED(SPOOLDIR,"$SPOOLDIR",[Define this to the spool directory path]) ## optional features AC_MSG_CHECKING(whether to use MH style mail handling for mailgroups) CF_ARG_ENABLE(mh-mail-handling, [ --enable-mh-mail-handling use MH style mail handling for mailgroups], - [AC_DEFINE(HAVE_MH_MAIL_HANDLING)]) + [AC_DEFINE(HAVE_MH_MAIL_HANDLING,1,[Define this to 1 to use MH style mail handling for mailgroups])]) AC_MSG_RESULT($enableval) -CAN_MAKEFILE= -CANDIR_MAKE= AC_MSG_CHECKING(whether to use Cancel-Locks) CF_ARG_ENABLE(cancel-locks, - [ --enable-cancel-locks enable creation of Cancel-Locks], - [CANLIBS='-L../libcanlock -lcanlock' - CAN_MAKEFILE="libcanlock/Makefile" - AC_DEFINE(USE_CANLOCK)], - [CANDIR_MAKE='#' - CANLIBS='']) + [ --enable-cancel-locks enable creation of Cancel-Locks]) AC_MSG_RESULT($enableval) +USE_CANLOCK=$enableval + +if test "$USE_CANLOCK" = yes ; then + AC_MSG_CHECKING(whether to use installed canlock rather than bundled) + AC_ARG_WITH(canlock, + [ --with-cancel-locks=PATH use installed canlock versus bundled], + [CANLOCK_HOME=$withval], + [CANLOCK_HOME=$USE_CANLOCK]) + AC_MSG_RESULT($CANLOCK_HOME) + CF_BUNDLED_CANLOCK($CANLOCK_HOME) +else + CANDIR_MAKE='#' +fi AC_SUBST(CANDIR_MAKE) -AC_SUBST(CANLIBS) ## gsasl - used for AUTH SASL PLAIN gsasl=no @@ -572,7 +581,7 @@ fi AC_MSG_CHECKING(whether to enable 8-bit keycodes) CF_ARG_DISABLE(8bit-keys, [ --disable-8bit-keys disable 8-bit keycode support],, - [AC_DEFINE(HAVE_KEY_PREFIX)]) + [AC_DEFINE(HAVE_KEY_PREFIX,1,[Define this to 1 to enable 8-bit keycodes])]) AC_MSG_RESULT($enableval) AC_MSG_CHECKING(whether to enable ANSI-color) @@ -584,21 +593,21 @@ AC_MSG_RESULT($use_color) AC_MSG_CHECKING(whether to enable posting-etiquette) CF_ARG_DISABLE(etiquette, [ --disable-etiquette disable printing of posting-etiquette], - [AC_DEFINE(NO_ETIQUETTE)]) + [AC_DEFINE(NO_ETIQUETTE,1,[Define this to 1 to enable posting-etiquette])]) AC_MSG_RESULT($enableval) AC_MSG_CHECKING(whether to strictly observe RFC2047 and break long lines) CF_ARG_DISABLE(break-long-lines, [ --disable-break-long-lines don't break long mime-encoded lines],, - [AC_DEFINE(MIME_BREAK_LONG_LINES)]) + [AC_DEFINE(MIME_BREAK_LONG_LINES,1,[Define this to 1 to strictly observe RFC2047 and break long lines])]) AC_MSG_RESULT($enableval) AC_MSG_CHECKING(whether to force MM_CHARSET obeyance when decoding mime) CF_ARG_DISABLE(mime-strict-charset, [ --disable-mime-strict-charset force MM_CHARSET obeyance],, - [AC_DEFINE(MIME_STRICT_CHARSET)]) + [AC_DEFINE(MIME_STRICT_CHARSET,1,[Define this to 1 to force MM_CHARSET obeyance when decoding mime])]) AC_MSG_RESULT($enableval) AC_MSG_CHECKING(for MIME character-set) @@ -617,56 +626,56 @@ AC_MSG_RESULT($DEFAULT_ISO2ASC) AC_MSG_CHECKING(whether to enable locale support) CF_ARG_DISABLE(locale, [ --disable-locale disable locale support], - [AC_DEFINE(NO_LOCALE)]) + [AC_DEFINE(NO_LOCALE,1,[Define this to 1 to disable locale support])]) AC_MSG_RESULT($enableval) AC_MSG_CHECKING(whether to enable posting) CF_ARG_DISABLE(posting, [ --disable-posting disable posting], - [AC_DEFINE(NO_POSTING)]) + [AC_DEFINE(NO_POSTING,1,[Define this to 1 to disable posting])]) AC_MSG_RESULT($enableval) AC_MSG_CHECKING(whether to enable shell escape) CF_ARG_DISABLE(shell-escape, [ --disable-shell-escape disable shell escape], - [AC_DEFINE(NO_SHELL_ESCAPE)]) + [AC_DEFINE(NO_SHELL_ESCAPE,1,[Define this to 1 to disable shell escape])]) AC_MSG_RESULT($enableval) AC_MSG_CHECKING(whether to have fascist newsadmin) CF_ARG_ENABLE(fascist-newsadmin, [ --enable-fascist-newsadmin have fascist newsadmin], - [AC_DEFINE(HAVE_FASCIST_NEWSADMIN)]) + [AC_DEFINE(HAVE_FASCIST_NEWSADMIN,1,[Define this to 1 to have fascist newsadmin])]) AC_MSG_RESULT($enableval) AC_MSG_CHECKING(whether to enable inverse video and highlighting) CF_ARG_DISABLE(inverse-video, [ --disable-inverse-video disable inverse video and highlighting], - [AC_DEFINE(USE_INVERSE_HACK)]) + [AC_DEFINE(USE_INVERSE_HACK,1,[Define this to 1 to enable inverse video and highlighting])]) AC_MSG_RESULT($enableval) AC_MSG_CHECKING(whether to enable piping support) CF_ARG_DISABLE(piping, [ --disable-piping disable piping support], - [AC_DEFINE(DONT_HAVE_PIPING)]) + [AC_DEFINE(DONT_HAVE_PIPING,1,[Define this to 1 to enable piping support])]) AC_MSG_RESULT($enableval) AC_MSG_CHECKING(whether to enable printer support) CF_ARG_DISABLE(printing, [ --disable-printing disable printer support], - [AC_DEFINE(DISABLE_PRINTING)]) + [AC_DEFINE(DISABLE_PRINTING,1,[Define this to 1 to enable printer support])]) AC_MSG_RESULT($enableval) AC_MSG_CHECKING(whether to unique tmp-files by appending .pid) CF_ARG_DISABLE(append-pid, [ --disable-append-pid disable appending .pid to tmp-files],, - [AC_DEFINE(APPEND_PID)]) + [AC_DEFINE(APPEND_PID,1,[Define this to 1 to unique tmp-files by appending .pid])]) AC_MSG_RESULT($enableval) AC_MSG_CHECKING(whether to fallback to XHDR XREF if XOVER isn't supported) CF_ARG_DISABLE(xhdr-xref, [ --disable-xhdr-xref disable XHDR XREF fallback],, - [AC_DEFINE(XHDR_XREF)]) + [AC_DEFINE(XHDR_XREF,1,[Define this to 1 to fallback to XHDR XREF if XOVER isn't supported])]) AC_MSG_RESULT($enableval) ### bypass a bug in old versions of leafnode & NNTPcache @@ -674,7 +683,7 @@ AC_MSG_CHECKING(whether to send a GROUP CF_ARG_ENABLE(broken-listgroup-fix, [ --enable-broken-listgroup-fix send extra GROUP command before LISTGROUP], - [AC_DEFINE(BROKEN_LISTGROUP)]) + [AC_DEFINE(BROKEN_LISTGROUP,1,[Define this to 1 to send a GROUP command before a LISTGROUP])]) AC_MSG_RESULT($enableval) ### on some old systems the WIFEXITED()/WEXITSTATUS() macros do not work @@ -682,7 +691,7 @@ AC_MSG_CHECKING(whether to ignore system CF_ARG_ENABLE(broken-system-fix, [ --enable-broken-system-fix ignore system()s return value], - [AC_DEFINE(IGNORE_SYSTEM_STATUS)]) + [AC_DEFINE(IGNORE_SYSTEM_STATUS,1,[Define this to 1 to ignore system()s return value])]) AC_MSG_RESULT($enableval) ### checks for the location of the system-wide default setting file @@ -693,14 +702,14 @@ CF_WITH_PATH(defaults-dir, ], TIN_DEFAULTS_DIR,/etc/tin) AC_MSG_RESULT($TIN_DEFAULTS_DIR) -AC_DEFINE_UNQUOTED(TIN_DEFAULTS_DIR,"$TIN_DEFAULTS_DIR") +AC_DEFINE_UNQUOTED(TIN_DEFAULTS_DIR,"$TIN_DEFAULTS_DIR",[Define this to the directory containing tin.defaults file]) ### check for ipv6 support AC_MSG_CHECKING([whether to enable IPv6]) CF_ARG_DISABLE(ipv6, [ --disable-ipv6 disable IPv6 support (default: enabled)], , - [AC_DEFINE(ENABLE_IPV6)]) + [AC_DEFINE(ENABLE_IPV6,1,[Define this to 1 to enable IPv6])]) AC_MSG_RESULT($enableval) if test "$enableval" = "yes"; then CF_CHECK_IPV6 @@ -712,7 +721,7 @@ AC_MSG_CHECKING([whether to enable long CF_ARG_ENABLE(long-article-numbers, [ --enable-long-article-numbers enable long article numbers (default: disabled)], -[AC_DEFINE(ENABLE_LONG_ARTICLE_NUMBERS)]) +[AC_DEFINE(ENABLE_LONG_ARTICLE_NUMBERS,1,[Define this to 1 to enable long article numbers])]) AC_MSG_RESULT($enableval) ### checks for operator characteristics (should be the last option) @@ -722,7 +731,7 @@ AC_ARG_WITH(coffee, [ case "$withval" in yes) AC_MSG_RESULT(yes - with milk - please!) - AC_DEFINE(HAVE_COFFEE) + AC_DEFINE(HAVE_COFFEE,1,[Define this to 1 to make a coffee while compiling]) ;; *) AC_MSG_RESULT(no) @@ -834,7 +843,7 @@ AC_TRY_COMPILE([ ac_cv_quad_t=yes, ac_cv_quad_t=no) AC_MSG_RESULT($ac_cv_quad_t) if test $ac_cv_quad_t = yes; then - AC_DEFINE(HAVE_QUAD_T) + AC_DEFINE(HAVE_QUAD_T,1,[Define this to 1 if we have type quad_t]) fi dnl test to see if long long is defined @@ -845,7 +854,7 @@ AC_TRY_COMPILE([ ac_cv_long_long=yes, ac_cv_long_long=no) AC_MSG_RESULT($ac_cv_long_long) if test $ac_cv_long_long = yes; then - AC_DEFINE(HAVE_LONG_LONG) + AC_DEFINE(HAVE_LONG_LONG,1,[Define this to 1 if we have long-long type]) fi dnl test to see if int_least64_t is defined @@ -861,7 +870,7 @@ AC_TRY_COMPILE([ ac_cv_int_least64_t=yes, ac_cv_int_least64_t=no) AC_MSG_RESULT($ac_cv_int_least64_t) if test $ac_cv_int_least64_t = yes; then - AC_DEFINE(HAVE_INT_LEAST64_T) + AC_DEFINE(HAVE_INT_LEAST64_T,1,[Define this to 1 if we have type least64_t]) AC_MSG_CHECKING(for INT64_C) AC_TRY_COMPILE([ @@ -875,7 +884,7 @@ if test $ac_cv_int_least64_t = yes; then ac_cv_int64_c=yes, ac_cv_int64_c=no) AC_MSG_RESULT($ac_cv_int64_c) if test $ac_cv_int64_c = yes; then - AC_DEFINE(HAVE_INT64_C) + AC_DEFINE(HAVE_INT64_C,1,[Define this to 1 if we have function INT64_C]) fi fi @@ -894,7 +903,7 @@ AC_TRY_COMPILE([ ac_cv_nl_item=yes, ac_cv_nl_item=no) AC_MSG_RESULT($ac_cv_nl_item) if test $ac_cv_nl_item = yes; then - AC_DEFINE(HAVE_NL_ITEM) + AC_DEFINE(HAVE_NL_ITEM,1,[Define this to 1 if we have header nl_types.h]) fi ### Checks for libraries. @@ -902,8 +911,8 @@ fi # only define HAVE_LIBUU and HAVE_UUDEVIEW_H if both are found AC_CHECK_LIB(uu, UUInitialize, [AC_CHECK_HEADER(uudeview.h, - [AC_DEFINE(HAVE_LIBUU) - AC_DEFINE(HAVE_UUDEVIEW_H) + [AC_DEFINE(HAVE_LIBUU,1,[Define this to 1 if we have library uu]) + AC_DEFINE(HAVE_UUDEVIEW_H,1,[Define this to 1 if we have header uudeview.h]) LIBS="$LIBS -luu"] )] ) @@ -918,12 +927,13 @@ AC_CHECK_LIB(uu, UUInitialize, # - uidna_openUTS46() # - uidna_nameToUnicode() # - unorm2_normalize() +# get $CFLAGS/$LDFLAGS from pkg-config icu-uc if possible cf_try_icuuc="no" cf_try_icuuc46="no" AC_CHECK_HEADER(unicode/unorm.h,[ AC_CHECK_HEADER(unicode/ustring.h, [ - AC_DEFINE(HAVE_UNICODE_UNORM_H) - AC_DEFINE(HAVE_UNICODE_USTRING_H) + AC_DEFINE(HAVE_UNICODE_UNORM_H,1,[Define this to 1 if we have header unicode/unorm.h]) + AC_DEFINE(HAVE_UNICODE_USTRING_H,1,[Define this to 1 if we have header unicode/ustring.h]) AC_MSG_CHECKING(for unorm_normalize in libicuuc) cf_save_LIBS="$LIBS" cf_try_icuuc="no" @@ -932,14 +942,14 @@ AC_CHECK_HEADER(unicode/unorm.h,[ int32_t needed, ustr = NULL; UErrorCode status; needed = unorm_normalize(ustr, -1, UNORM_DEFAULT, 0, NULL, 0, &status);], [ - AC_DEFINE(HAVE_LIBICUUC) + AC_DEFINE(HAVE_LIBICUUC,1,[Define this to 1 if we have libicuuc]) cf_try_icuuc="yes"], LIBS=$cf_save_LIBS ) AC_MSG_RESULT($cf_try_icuuc) cf_save_LIBS="$LIBS" AC_CHECK_HEADER(unicode/uidna.h, [ - AC_DEFINE(HAVE_UNICODE_UIDNA_H) + AC_DEFINE(HAVE_UNICODE_UIDNA_H,1,[Define this to 1 if we have header unicode/uidna.h]) ]) AC_MSG_CHECKING(for uidna_nameToUnicode in libicuuc) AC_TRY_LINK([#include @@ -950,27 +960,27 @@ AC_CHECK_HEADER(unicode/unorm.h,[ uidna_openUTS46(UNORM_DEFAULT, &status); uidna_nameToUnicode(uts46, NULL, 0, NULL, 0, &info, &status); uidna_close(uts46);], [ - AC_DEFINE(HAVE_LIBICUUC_46_API) + AC_DEFINE(HAVE_LIBICUUC_46_API,1,[Define this to 1 if we have libicuus 46-API]) cf_try_icuuc46="yes"], LIBS=$cf_save_LIBS ) AC_MSG_RESULT($cf_try_icuuc46) AC_CHECK_HEADER(unicode/ubidi.h, [ - AC_DEFINE(HAVE_UNICODE_UBIDI_H) + AC_DEFINE(HAVE_UNICODE_UBIDI_H,1,[Define this to 1 if we have header unicode/ubidi.h]) ]) ]) ]) # IDNA2008 AC_CHECK_HEADER(unicode/unorm2.h, [ - AC_DEFINE(HAVE_UNICODE_UNORM2_H) + AC_DEFINE(HAVE_UNICODE_UNORM2_H,1,[Define this to 1 if we have header unicode/unorm2.h]) ]) # without icuuc try GNU libunistring for normalization if test $cf_try_icuuc = no ; then AC_CHECK_HEADER(unitypes.h,[ AC_CHECK_HEADER(uninorm.h,[ - AC_DEFINE(HAVE_UNITYPES_H) - AC_DEFINE(HAVE_UNINORM_H) + AC_DEFINE(HAVE_UNITYPES_H,1,[Define this to 1 if we have header unitypes.h]) + AC_DEFINE(HAVE_UNINORM_H,1,[Define this to 1 if we have header uninorm.h]) AC_MSG_CHECKING(for u8_normalize in libunistring) cf_save_LIBS="$LIBS" cf_try_unistring="no" @@ -979,7 +989,7 @@ if test $cf_try_icuuc = no ; then #include ], [ size_t ol = 0; u8_normalize(UNINORM_NFC, (uint8_t *) "x", 2, NULL, &ol);], [ - AC_DEFINE(HAVE_LIBUNISTRING) + AC_DEFINE(HAVE_LIBUNISTRING,1,[Define this to 1 if we have library unistring]) cf_try_unistring="yes"], LIBS=$cf_save_LIBS ) @@ -990,26 +1000,27 @@ fi # without icuuc try libidn for Internationalized Domain Names / IDN 2003 # TODO: check for libidn2 +# get $CFLAGS/$LDFLAGS from pkg-config libidn[2] if possible if test $cf_try_icuuc = no ; then AC_CHECK_LIB(idn, stringprep_check_version, [AC_CHECK_HEADER(stringprep.h,[ - AC_DEFINE(HAVE_STRINGPREP_H) + AC_DEFINE(HAVE_STRINGPREP_H,1,[Define this to 1 if we have header stringprep.h]) AC_CHECK_HEADER(idna.h, [ - AC_DEFINE(HAVE_IDNA_H) + AC_DEFINE(HAVE_IDNA_H,1,[Define this to 1 if we have header idna.h]) AC_CHECK_LIB(idn, idna_to_unicode_lzlz, [ - AC_DEFINE(HAVE_IDNA_TO_UNICODE_LZLZ) + AC_DEFINE(HAVE_IDNA_TO_UNICODE_LZLZ,1,[Define this to 1 if we have function idna_to_unicode_lzlz]) AC_MSG_CHECKING(for IDNA_USE_STD3_ASCII_RULES) AC_EGREP_HEADER(IDNA_USE_STD3_ASCII_RULES, idna.h, [ - AC_DEFINE(HAVE_IDNA_USE_STD3_ASCII_RULES) + AC_DEFINE(HAVE_IDNA_USE_STD3_ASCII_RULES,1,[Define this to 1 if we have symbol IDNA_USE_STD3_ASCII_RULES in idna.h]) AC_MSG_RESULT(yes)], AC_MSG_RESULT(no) ) ]) AC_CHECK_LIB(idn, idna_strerror, [ - AC_DEFINE(HAVE_IDNA_STRERROR) + AC_DEFINE(HAVE_IDNA_STRERROR,1,[Define this to 1 if we have function idna_strerror]) ]) ]) - AC_DEFINE(HAVE_LIBIDN) + AC_DEFINE(HAVE_LIBIDN,1,[Define this to 1 if we have library idn]) LIBS="$LIBS -lidn"] )] ) @@ -1028,9 +1039,9 @@ AC_CHECK_LIB(idnkit, idn_decodename, [ strcpy(in, "xn--brenfe-fta9a2q.de"); rs = idn_decodename(IDN_DECODE_LOOKUP, &in, &out, 254); idn_result_tostring(rs);], [ - AC_DEFINE(HAVE_LIBIDNKIT) - AC_DEFINE(HAVE_IDN_API_H) - AC_DEFINE(HAVE_IDN_DECODENAME) + AC_DEFINE(HAVE_LIBIDNKIT,1,[Define this to 1 if we can link with idnkit library]) + AC_DEFINE(HAVE_IDN_API_H,1,[Define this to 1 if we have header idn/api.h]) + AC_DEFINE(HAVE_IDN_DECODENAME,1,[Define this to 1 if we have function idn_decodename]) AC_MSG_RESULT(yes)], [ LIBS=$cf_save_LIBS AC_MSG_RESULT(no) @@ -1059,20 +1070,20 @@ make an error [cf_result=no]) AC_MSG_RESULT($cf_result) CFLAGS="$cf_save_CFLAGS" - test $cf_result = yes && AC_DEFINE(HAVE_TERMCAP_H) + test $cf_result = yes && AC_DEFINE(HAVE_TERMCAP_H,1,[Define this to 1 if we have non-ncurses header termcap.h]) CF_TYPE_OUTCHAR fi cf_tc_funcs= cf_tc_externs= if test ".$cf_cv_termlib" = .terminfo ; then - AC_DEFINE(USE_TERMINFO) + AC_DEFINE(USE_TERMINFO,1,[Define this to 1 if we use terminfo functions for screen management]) cf_tc_funcs="tigetint tigetnum tparam tparm" cf_tc_externs="$cf_tc_funcs tgoto tigetstr tputs tigetflag" elif test ".$cf_cv_termlib" = .termcap ; then # BSD 'tputs()' may need 'PC' to be set. AC_TRY_LINK([],[extern char PC; PC = 0], - [AC_DEFINE(HAVE_EXTERN_TCAP_PC)]) + [AC_DEFINE(HAVE_EXTERN_TCAP_PC,1,[Define this if termcap's extern PC exists])]) cf_tc_funcs="tgetint tgetnum tparam tparm" cf_tc_externs="$cf_tc_funcs tgoto tgetstr tputs tgetent tgetflag" fi @@ -1093,6 +1104,7 @@ AC_CHECK_FUNCS(\ execlp \ explicit_bzero \ explicit_memset \ + fchmod \ fcntl \ fdopen \ fork \ @@ -1150,14 +1162,14 @@ AC_CHECK_FUNCS(\ $cf_tc_funcs ) AC_CHECK_FUNC(flock, - AC_DEFINE(HAVE_FLOCK),[ + AC_DEFINE(HAVE_FLOCK,1,[Define this to 1 if flock function exists]),[ AC_CHECK_LIB(bsd, flock, AC_DEFINE(HAVE_FLOCK) LIBS="$LIBS -lbsd")]) # clock_gettime() / librt AC_CHECK_FUNC(clock_gettime, - AC_DEFINE(HAVE_CLOCK_GETTIME),[ + AC_DEFINE(HAVE_CLOCK_GETTIME,1,[Define this to 1 if clock_gettime function exists]),[ AC_CHECK_LIB(rt, clock_gettime, AC_DEFINE(HAVE_CLOCK_GETTIME) LIBS="$LIBS -lrt" @@ -1179,7 +1191,7 @@ int main() }], [ AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_MEMSET_S) + AC_DEFINE(HAVE_MEMSET_S,1,[Define this to 1 if we have function memset_s]) ], [AC_MSG_RESULT([no])], [AC_MSG_RESULT([unknown])] @@ -1198,7 +1210,7 @@ gettimeofday(&tv, &tz);], ac_cv_func_gettimeofday_2args=yes, ac_cv_func_gettimeofday_2args=no) AC_MSG_RESULT($ac_cv_func_gettimeofday_2args) if test $ac_cv_func_gettimeofday_2args = yes; then - AC_DEFINE(GETTIMEOFDAY_2ARGS) + AC_DEFINE(GETTIMEOFDAY_2ARGS,1,[Define this to 1 if gettimeofday takes two arguments]) fi CF_POSIX_JC @@ -1207,7 +1219,7 @@ CF_FUNC_MEMMOVE AC_MSG_CHECKING(if select expects int * arguments) AC_EGREP_HEADER([select\(.*, *int *\*,],time.h, - AC_DEFINE(HAVE_SELECT_INTP) AC_MSG_RESULT(yes), + AC_DEFINE(HAVE_SELECT_INTP,1,[Define this to 1 if select expects int * arguments]) AC_MSG_RESULT(yes), AC_MSG_RESULT(no) ) @@ -1241,7 +1253,7 @@ CF_FUNC_SYSTEM # Check if we are trying to use curses+color, but cannot if test $use_color = yes ; then if test $use_curses = no ; then - AC_DEFINE(HAVE_COLOR) + AC_DEFINE(HAVE_COLOR,1,[Define this to 1 if curses supports color]) elif test $cf_with_screen = pdcurses ; then AC_DEFINE(HAVE_COLOR) else @@ -1442,7 +1454,7 @@ h.h_addr_list[0]=0; ],ac_cv_hostent_h_addr_list=yes,ac_cv_hostent_h_addr_list=no) AC_MSG_RESULT($ac_cv_hostent_h_addr_list) if test $ac_cv_hostent_h_addr_list = yes; then - AC_DEFINE(HAVE_HOSTENT_H_ADDR_LIST) + AC_DEFINE(HAVE_HOSTENT_H_ADDR_LIST,1,[Define this to 1 if we have h_addr_list in struct hostent]) fi CF_CHECK_FD_SET @@ -1466,7 +1478,7 @@ int main() { AC_MSG_RESULT(yes) ], [ - AC_DEFINE(TOLOWER_BROKEN) + AC_DEFINE(TOLOWER_BROKEN,1,[Define this to 1 if function tolower if broken]) AC_MSG_RESULT(no) ], [ @@ -1493,7 +1505,7 @@ int main() { AC_MSG_RESULT(yes) ], [ - AC_DEFINE(TOUPPER_BROKEN) + AC_DEFINE(TOUPPER_BROKEN,1,[Define this to 1 if function toupper if broken]) AC_MSG_RESULT(no) ], [ @@ -1519,7 +1531,7 @@ int main() { exit(0); }], [ - AC_DEFINE(HAVE_ICONV_OPEN_TRANSLIT) + AC_DEFINE(HAVE_ICONV_OPEN_TRANSLIT,1,[Define this to 1 if iconv_open() //TRANSLIT extension works]) AC_MSG_RESULT(yes) ], [ @@ -1539,16 +1551,16 @@ case "$host_os" in case `uname -r | sed 's,(.*,,'` in B*|1.0-6].*) # multiple defects - AC_DEFINE(NO_LOCALE) - AC_DEFINE(NO_LOCKING) - AC_DEFINE(FILE_MODE_BROKEN) + AC_DEFINE(NO_LOCALE,1,[Define this to 1 if locale does not work]) + AC_DEFINE(NO_LOCKING,1,[Define this to 1 if locking does not work]) + AC_DEFINE(FILE_MODE_BROKEN,1,[Define this to 1 if file-permissions are broken]) ;; 1.7.*) # link does not work AC_DEFINE(NO_LOCKING) ;; *) - AC_CHECK_FUNC(link, AC_DEFINE(HAVE_LINK)) + AC_CHECK_FUNC(link, AC_DEFINE(HAVE_LINK,1,[Define this to 1 if we have function link])) ;; esac ;; @@ -1588,7 +1600,7 @@ CF_DEFINE_STRING(TIN_CPP, "$CPP") CF_DEFINE_STRING(TIN_CPPFLAGS, "$CPPFLAGS") CF_DEFINE_STRING(TIN_LD, "$CC") CF_DEFINE_STRING(TIN_LDFLAGS, "$LDFLAGS") -CF_DEFINE_STRING(TIN_LIBS, "$PCREDIR_LIBS $LIBS") +CF_DEFINE_STRING(TIN_LIBS, "$PCREDIR_LIBS $CANLIBS $LIBS") AC_OUTPUT($PCRE_MAKEFILE $SUB_MAKEFILE diff -Nurp '--exclude=.bzr*' tin-2.4.4/doc/CHANGES tin-2.4.5/doc/CHANGES --- tin-2.4.4/doc/CHANGES 2019-12-24 09:52:52.000000000 +0100 +++ tin-2.4.5/doc/CHANGES 2020-12-19 22:12:21.352094774 +0100 @@ -1,3 +1,71 @@ +-- 2.4.5 release 20201224 "Glen Albyn" -- + + 022) Dennis Preiser + BUG. 'B'ody and '/'article search with wildcard matching (wildcard=0) + didn't work + BUG. convert_tex2iso with UTF-8 as local charset did map "O to wrong + char + BUG. missing termination of conversion table for convert_tex2iso + BUG. avoid possible endless loop in search_group + BUG. tin_ltoa in some cases returned an error where it shouldn't + BUG. 'T'ag all parts of multipart message didn't work with thread_arts + 4 (multipart) or 5 (percentage) + BUG. hung on empty (lone '.') positive (220) response to ARTICLE command + ADD. make {Group,Thread}TagParts 'T' toggle like 't'ag + ADD. don't show mime parse error for missing end marker if not running + in debug mode + ADD. increase hash-table sizes + ADD. speed up multipart threading + ADD. multipart tagging ThreadTagParts 'T' to thread level + ADD. reduce memory usage by struct reordering to avoid padding + ADD. GNKSA_MISSING_REALNAME return code for filtering + REM. redundant conde + FIX. art.c, charset.c, group.c, hashstr.c, help.c, keymap.c, lang.c + misc.c, page.c, refs.c, rfc2046.c, screen.c, search.c, string.c + tags.c, thread.c, wildmat.c, extern.h, keymap.h, proto.h, tin.h + tin.[15] + + 021) Thomas E. Dickey + ADD. update configure macros + ADD. fallback to the bundled pcre if required + ADD. prefer systemwide libcanlock over bundled one + FIX. aclocal.m4, configure[.in], Makefile.[in], tin.h + + 020) Urs Janssen + ADD. config.guess, config.sub update + ADD. document strip_re_regex, strip_was_regex and col_message in manpage + ADD. configure check for fchmod(2) and fallback to chmod(2) if system + lacks it (e.g. Interactive UNIX) + ADD. speed up filter on Path:-header + ADD. allow abortion of subject/author search in group level + ADD. allow abortion of filtering + ADD. raise default max length for numbers in prompts from 6 to 10 digits + ADD. restrict multipart detection to messages with more than 1 part + ADD. show an error message if append_mail() fails + ADD. allow path for posted_articles_file + ADD. document gnksa-parser return codes in tin(5) + ADD. center_line() now does BiDi + ADD. don't fail on GNKSA_MISSING_REALNAME when posting + ADD. GNKSA_RANGLE_MISSING (104) error code to gnksa-filter + BUG. when $TIN_INDEX_NEWSDIR was used INDEX_NEWSDIR was + automatically appended to the string, but for the '-I' cmd.line it + wasn't, now '-I' behaves exactly like $TIN_INDEX_NEWSDIR + REM. redundant condition + FIX. art.c, attrib.c, config.c, debug.c, filter.c, getline.c, inews.c + init.c, lang.c, main.c, makecfg.c, memory.c, misc.c, newsrc.c + nrctbl.c, options_menu.c, post.c, read.c, save.c, screen.c + search.c, tags.c, thread.c, tmpfile.c, extern.h, proto.h, tin.h + tin.[15], configure[.in], autoconf.h[in], config.guess, config.sub + en_GB.po, keymap.sample + + 019) Matt Anton + ADD. updated french translation + FIX. fr.po + + 018) Toomas Soome + ADD. updated estonian translation + FIX. et.po + -- 2.4.4 release 20191224 "Millburn" -- 017) Dennis Grevenstein diff -Nurp '--exclude=.bzr*' tin-2.4.4/doc/CHANGES.old tin-2.4.5/doc/CHANGES.old --- tin-2.4.4/doc/CHANGES.old 2019-11-27 10:16:29.000000000 +0100 +++ tin-2.4.5/doc/CHANGES.old 2020-12-03 16:36:07.264091342 +0100 @@ -397,7 +397,7 @@ U014) Urs Janssen ADD. allow new IDN ccTLD of Mongolia ADD. allow gTLD post. ADD. tweaked manpage - ADD. make traget install_nls_man for translated manpages + ADD. make target install_nls_man for translated manpages ADD. config.guess update FIX. charset.c, config.c, init.c, options_menu.c, string.c, policy.h Makefile, Makefile.in, tin.1, tin.5, config.guess @@ -3516,7 +3516,7 @@ U001) Urs Janssen BUG. fixed uncritical memleak in free_attributes_array() BUG. fixed possible call of free(NULL) ADD. overview_xref_support() now handles Xref:full entries in - overview.ftm with traling garbage on the line + overview.ftm with trailing garbage on the line ADD. check for duplicated Newsgroups, Subject and Followup-To header before posting ADD. key to ignore Followup-To in followups @@ -4123,7 +4123,7 @@ U001) Urs Janssen ADD. strip doubled newsgroups from Followup-To: before checking if it contains several groups ADD. searching in posted_message-file disabled - ADD. allow as fieldseperator in ~/.newsauth + ADD. allow as fieldseparator in ~/.newsauth ADD. check for empty / all whitespace Subject ADD. updated pcre (1.07 -> 1.09) ADD. -X cmd-line switch @@ -6090,7 +6090,7 @@ U001) Urs Janssen --unoff BETA release 961222 -- -255) David-Michael Lincke +255) David-Michael Lincke ADD. missing DEFAULT_MAILER for hp-ux FIX. tin.h diff -Nurp '--exclude=.bzr*' tin-2.4.4/doc/INSTALL tin-2.4.5/doc/INSTALL --- tin-2.4.4/doc/INSTALL 2019-11-20 13:43:43.000000000 +0100 +++ tin-2.4.5/doc/INSTALL 2020-11-18 17:07:54.700743065 +0100 @@ -57,8 +57,9 @@ The following configure options and defi FOLLOW_USEFOR_DRAFT NNTP_SERVER_FILE FORGERY PROFILE REQUIRE_BRACKETS_IN_DOMAIN_LITERAL SMALL_MEMORY_MACHINE - HAVE_LIBUU + HAVE_LIBUU REREAD_ACTIVE_FILE_SECS HAVE_BROKEN_SSCANF DISABLE_PIPELINING + OPTIMIZE_JUST_STAR MATCH_TAR_PATTERN Not yet documented configure options and defines: @@ -67,10 +68,8 @@ TIN related: --with-socks --with-socks5 --with-sum - DEBUG MATCH_TAR_PATTERN - DEBUG_ART FILE_MODE_BROKEN - OPTIMIZE_JUST_STAR REREAD_ACTIVE_FILE_SECS - NO_LOCKING + DEBUG FILE_MODE_BROKEN + DEBUG_ART NO_LOCKING System related: --datadir --localstatedir @@ -521,6 +520,14 @@ Turn on Cancel-Locks (RFC 8315). This fe the Message-ID of the posting, so if your server does not offer server side purposed IDs you have to mess around with EVIL_INSIDE. +--with-canlock[=PATH] (default: bundled copy of canlock) +If --enable-cancel-locks is used, use this option to also specify if you +wish to use an externally-installed copy of the canlock (Cancel-Locks) +library. If you specify a PATH, it should be the root of a directory +containing the include- and lib-directories where canlock is installed. +If you do not specify a PATH, the makefile will use the standard +locations for this library. + --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 @@ -535,11 +542,11 @@ The --enable-nls option enables Native L tin to run in languages other than American English. Native Language Support is enabled by default, the --disable-nls option disables NLS. ---with-included-gettext (default:off) +--with-included-gettext (default:off) If NLS is enabled, the --with-included-gettext option causes the build procedure to prefer its copy of GNU gettext. ---disable-included-msgs (default:off) +--disable-included-msgs (default:off) If NLS is enabled, the --disable-included-msgs option causes the build procedure to assume message libraries are already installed, and to not build them. @@ -665,6 +672,19 @@ issue a warning instead of an error-mess Followup-To:-header contains spaces, newlines or tabs. See RFC 5536 3.1.4. and RFC 5536 3.2.6. +REREAD_ACTIVE_FILE_SECS +initial default value for tinrc variable reread_active_file_secs, +see tin(5) for details. + +OPTIMIZE_JUST_STAR +treat a wildmat of * as a match without inspecting the text to match. this +is a simple optimization and hard set to 1 in wildmat.c + +MATCH_TAR_PATTERN +do tar(1) matching rules, which ignore a trailing slash. this is hard unset +in wildmat.c to disable it. + + License ------- SPDX-License-Identifier: BSD-3-Clause diff -Nurp '--exclude=.bzr*' tin-2.4.4/doc/TODO tin-2.4.5/doc/TODO --- tin-2.4.4/doc/TODO 2019-07-04 12:39:12.000000000 +0200 +++ tin-2.4.5/doc/TODO 2020-12-17 17:12:36.227267262 +0100 @@ -19,10 +19,6 @@ o col_response is a misnomer as the cou anymore (except on the very first article). The man-page is outdated too. [20080826 Urs Janssen ] -o 'T'ag all parts of multipart message doesn't work (it never did) - with thread_arts 4 (multipart) or 5 (percentage) - [20080606 Urs Janssen ] - o cLINES < MIN_LINES_ON_TERMINAL || cCOLS < MIN_COLUMNS_ON_TERMINAL isn't checked on startup [20071210 Urs Janssen ] @@ -44,6 +40,8 @@ o batch mode has several bugs the statistics nor taken into account for the 'any unread news' status. - -vc could be more verbose (like -vcZ is) - -o currently is not a 'batch_mode' option + - -u could be faster if not building threads etc. pp. + (build_references(), filter_articles(), make_threads()) [Urs Janssen ] o add version number to other config-files (e.g. tin.defaults) @@ -72,10 +70,13 @@ o if tin is falling back to HEAD/NEXT ( tinrc.getart_limit [20090112 Urs Janssen ] -o the keys GroupToggleSubjDisplay and ThreadToggleSubjDisplay are misnamed, +o the keys GroupToggleSubjDisplay / GROUP_TOGGLE_SUBJECT_DISPLAY and + ThreadToggleSubjDisplay / THREAD_TOGGLE_SUBJECT_DISPLAY are misnamed, as they toggle the display of the sender address, not the subject. [20130839 Urs Janssen ] +o there is a memleak when $TINRC is set in read_cmd_line_options(envargs()) + Pager Problems -------------- @@ -139,7 +140,8 @@ o add second pipe command when piping m sense). [20160412 Urs Janssen ] -o allow abort piping multiple articles, ESC/'z' just aborts the current one +o allow abort piping / saving multiple articles, ESC/'z' just aborts the + current one [20160409 Urs Janssen ] o add per scope getart_limit via attributes @@ -175,9 +177,6 @@ o add DEFAULT_SIGDASHES_REGEX and relat detection in cook.c [20080925 Urs Janssen ] -o give an error message if append_mail() fails (grep TODO post.c) - [20080423 Urs Janssen ] - o allow remapping of the 'z' abort-key (lynx style) in wait_for_input(). o add user defined screen layout at different levels (e.g. posting @@ -205,13 +204,11 @@ o add more AUTHINFO SASL (RFC 4643, RFC or a handrolled version for at least PLAIN) [20080316 Urs Janssen ] +o make 'GNKSA'-parser RFC5322/USEFOR compliant and fix bugs + o add XZVER (and XZHDR) support (zlib compressed yyencoded overview data) -o make 'GNKSA'-parser RFC5322/USEFOR compliant and fix bugs - (e.g. "<~$!~( )@( )example.com>" causes "illegal character in RHS", but - the address is valid) - o the TLD checking in the 'GNKSA'-parser needs some rework, keeping the list of valid TLDs up to date is more or less impossible with the ~1400 pending new TLDs @@ -363,10 +360,6 @@ o if using "-n" command-line switch you o item_by_item_etiquette_warnings [compile-time?] (e.g. enable x-posts without f'up warning, disable long-sig warning) -o don't prefix posted_articles_file with maildir if posted_articles_file - has an absolute path (after expanding ~). - [20130627 Urs Janssen ] - o posted_articles_file is not available in attributes [20130628 Urs Janssen ] @@ -406,7 +399,6 @@ o Additions to the thread menu: 'f' (post a followup) (maybe also 'F', '^W', ...) 'N' (next unread article) 'P' (previous unread article) - 'T' (tag all parts of current multipart-message in order) 'V' (View/pipe/save multimedia attachments) 'X' (mark all unread articles that have not been selected as read) ';' (mark unread arts as hot if >= 1 art in thread is hot) @@ -447,6 +439,9 @@ o Add to the attachment menu ('V'): '%' (toggle rot13 encoding of screen content) '&' (GLOBAL_TOGGLE_COLOR) +o integrate multi-part tagging with regular tagging, eg. + "This article appears to have multi-parts, try and find them (y/n)?" + o Add a command-line switch (-V) that prints out all values of cpp-symbols etc. [partly done, but should be cleaned up] @@ -464,8 +459,6 @@ o when From: only contains "First-name o Bounce duplicate Message-ID's when the headers are read. This will make the threading code happier too. - Make read_overview() more forgiving of errors. If the article # is okay, - then there is no reason to completely hide the article [Jason Faultless ] o Merge the selection code with the range code. Having two similar methods @@ -562,18 +555,14 @@ o allow editing of the strings presente the full filter-file [20120201 Urs Janssen ] -o allow to abort the filter loop with iKeyAbort when entering a (large) - group - [20160211 Urs Janssen ] +o allow ranges in gnksa-filters "gnksa=200-399" or "gnksa=101,103,201" + [20200709 Urs Janssen ] Pager enhancements ------------------ o add 'autoview' (spawn external viewer) 'autohide' (don't even show info about that part) for different content-types -o integrate multi-part tagging with regular tagging, eg. - "This article appears to have multi-parts, try and find them (y/n)?" - o add Content-Language (RFC 3282) analysis o suppress hide_uue=2 checking unless first line in an article or following @@ -584,6 +573,8 @@ o add missing mailcap (RFC 1524) featur to be passed to the command as standard input, ... [20111205 Urs Janssen ] +o add BiDi handling to page header + Internal Changes ---------------- o merge refs.c:valid_msgid() and post.c:damaged_id() @@ -716,19 +707,17 @@ o check where int/long/... should be re off_t, ... [Urs Janssen ] -o check code with Splint (LCLint) , - valgrind (), cppcheck - (), AdLint - (), clang-analyzer - (), Coverity - (), infer - () 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 - tagged art. Traversing tagged arts becomes much easier & faster. - [Jason Faultless ] +o check code with + valgrind (), + cppcheck (), + Coverity (), + gcc-10 -fanalyzer + (), + clang-analyzer (), + infer () + AdLint (), + Splint (LCLint) and + zzuf () o strip Xref:-header if saving news in batch mode (-S)? [Urs Janssen ] @@ -792,6 +781,8 @@ o check for wcsftime() and if found use least in page.c). [20130129 Urs Janssen ] +o BiDi handling to select-, group-, thread-level + Docs/online help ---------------- o document the difference between @@ -834,6 +825,10 @@ o man page always needs work and proof o tin.defaults could use more documentation in man page (tin.5) +o submit short invocation examples to tldr + and/or eg + + o replace "\\" by "\e" in man pages (portable?) o integrate doc/auth.txt into tin.1 man page @@ -981,6 +976,11 @@ o in several places only the latest key should we try to show them all? [20050718 Urs Janssen ] +o remove hard coded keys (eg. 'q') from txt_filter_global_rules, + txt_reading_article, txt_select_config_file_option, txt_group and + replace with actual keybinding (after making it rebindable). + [20200526 Urs Janssen ] + o add PGP_INCLUDE_KEY to pgp_mail_keys? [20050426 Urs Janssen ] @@ -1040,7 +1040,7 @@ o update gettext stuff to > gettext-0.1 o and pcre2 support (new API) -o clean up included pcre stuff and update to >= pcre-8.43 +o clean up included pcre stuff and update to >= pcre-8.44 o shows up cross-postings multiple times even if read once before getting a resync/reread active/newsrc-file diff -Nurp '--exclude=.bzr*' tin-2.4.4/doc/WHATSNEW tin-2.4.5/doc/WHATSNEW --- tin-2.4.4/doc/WHATSNEW 2019-06-12 23:36:47.000000000 +0200 +++ tin-2.4.5/doc/WHATSNEW 2020-07-09 01:41:38.929219517 +0200 @@ -9,7 +9,9 @@ New features - options to color external quotes (extquote_handling, extquote_regex, col_extquote) - LookupMessage ('L') in select level if reading via NNTP +- ThreadTagParts ('T') in thread level - filter articles based on Path, see doc/filtering for details +- GNKSA_MISSING_REALNAME return code for filtering Changes ------- @@ -19,6 +21,10 @@ Subjects are now normalized if local cha The gTLD list is no longer actively maintained (too many new gTLD recently), disable_gnksa_domain_check=OFF might result in false positives. +With the new GNKSA_MISSING_REALNAME return code for filtering filter rules +with "gnksa=>NUM" may need inspection if filtering on missing real names is +desired. + --enable-heapsort is now default during configure (sort_function in tinrc still needs to be set accordingly if you like to use heapsort instead of qsort) diff -Nurp '--exclude=.bzr*' tin-2.4.4/doc/auth.txt tin-2.4.5/doc/auth.txt --- tin-2.4.4/doc/auth.txt 2019-07-15 15:27:51.000000000 +0200 +++ tin-2.4.5/doc/auth.txt 2020-12-08 10:33:37.586000980 +0100 @@ -4,21 +4,22 @@ Tin is able to do authentication to news NNTP Extensions" (this document is available at [1]). There are several ways of authentication described in that text which are referred to as Original AUTHINFO, AUTHINFO GENERIC, and AUTHINFO SIMPLE. Tin supports the Original -AUTHINFO and the AUTHINFO GENERIC methods and if tin is linked against -libgsasl and the server announces it as described in RFC 3977 [2] it -supports the AUTHINFO SASL PLAIN mechanisem as described in RFC 4643 [3]. In -addition to answers to authentication requests as described in the "Common -NNTP Extensions", tin also provides authentication at connection startup. +AUTHINFO and if tin is linked against libgsasl and the server announces it +as described in RFC 3977 [2] it supports the AUTHINFO SASL PLAIN mechanisem +as described in RFC 4643 [3]. In addition to answers to authentication +requests as described in the "Common NNTP Extensions", tin also provides +authentication at connection startup. Unfortunately, you cannot rely on the response codes of authentication requests as described in the "Common NNTP Extensions"; today's news servers mostly send NNTP codes 480, regardless of the type of authentication they expect. Therefore, authentication is always done in the same manner: First, -tin tries an AUTHINFO GENERIC authorization. If this fails, Original -AUTHINFO is used. If this does not work for you (which it should), please -contact me to track this problem down. There are known problems with the -reference nntp server available at ftp.academ.com -- this is a server bug -and not tin's fault; if you need a patch or workaround, drop me a mail. +tin tries AUTHINFO SASL PLAIN authorization (see above). If this fails or is +unavailable, Original AUTHINFO is used. If this does not work for you +(which it should), please contact me to track this problem down. There are +known problems with the reference nntp server available at ftp.academ.com -- +this is a server bug and not tin's fault; if you need a patch or workaround, +drop me a mail. Authentication requests will be handled whenever they occur; the command that caused the request will be sent again. @@ -51,22 +52,6 @@ authentication at this time is needed. I beginning of your news session, use the -A option when invoking tin or just provide a .newsauth file. -The AUTHINFO GENERIC authentication was implemented by someone else and has -not been tested by me since I do not know a server that supports this. - -To use AUTHINFO GENERIC, set up an environment variable NNTPAUTH with the -command and its parameters to invoke for authentication. The content of -NNTPAUTH is also used as the authenticator in the AUTHINFO GENERIC response -to the server. The environment variable NNTP_AUTH_FDS is used to store file -descriptors for reading from and writing to the server, and for a temporary -file ("cookie"); the three descriptors are separated by dots. The -authentication command can take use of NNTP_AUTH_FDS when invoked; it should -exit successful if the authentication was accepted. - -If NNTPAUTH is empty or not available, tin sends an "authinfo generic any -" command to the server and expects the result as an NNTP response -code. - The AUTHINFO SASL PLAIN authentication method requires tin to be linked against libgsasl. diff -Nurp '--exclude=.bzr*' tin-2.4.4/doc/config-anomalies tin-2.4.5/doc/config-anomalies --- tin-2.4.4/doc/config-anomalies 2017-05-03 19:47:32.000000000 +0200 +++ tin-2.4.5/doc/config-anomalies 2020-11-24 09:12:44.440816434 +0100 @@ -83,7 +83,7 @@ default_filter_days * getart_limit * recent_time * mail_address from in attributes; should be split into - username and addresse + username and address mm_charset mm_network_charset (if charset conversion is available) post_mime_encoding diff -Nurp '--exclude=.bzr*' tin-2.4.4/doc/filtering tin-2.4.5/doc/filtering --- tin-2.4.4/doc/filtering 2019-11-06 09:44:56.000000000 +0100 +++ tin-2.4.5/doc/filtering 2020-07-09 00:36:48.404497730 +0200 @@ -192,6 +192,7 @@ code error description 101 left parenthesis ("(") missing in oldstyle address (realname comment) 102 right parenthesis (")") missing in oldstyle address (realname comment) 103 at-sign ("@") missing in mail address + 104 right angle bracket (">") missing in route address 200-299: right hand side (FQDN part) of address, syntax and semantics code error description @@ -222,6 +223,7 @@ code error description 403 bad syntax in encoded word in realname part 404 illegal character in oldstyle realname part (one of "()<>\") 405 illegal character in realname part + 406 missing realname part Path:-filter diff -Nurp '--exclude=.bzr*' tin-2.4.4/doc/keymap.sample tin-2.4.5/doc/keymap.sample --- tin-2.4.4/doc/keymap.sample 2017-05-03 19:47:32.000000000 +0200 +++ tin-2.4.5/doc/keymap.sample 2020-11-25 16:15:08.504950672 +0100 @@ -247,6 +247,7 @@ ThreadReverseSel @ ThreadCancel D ThreadMarkArtRead K ThreadAutoSave S +ThreadTagParts T ThreadUntag U ThreadToggleSubjDisplay d ThreadMail m diff -Nurp '--exclude=.bzr*' tin-2.4.4/doc/l10n/de/tin.1 tin-2.4.5/doc/l10n/de/tin.1 --- tin-2.4.4/doc/l10n/de/tin.1 2019-12-24 10:58:39.000000000 +0100 +++ tin-2.4.5/doc/l10n/de/tin.1 2020-12-01 12:01:02.881664714 +0100 @@ -3,7 +3,7 @@ .\" Module : tin.1 .\" Author : I. Lea, U. Janssen .\" Created : 1991-08-23 -.\" Updated : 2019-12-24 +.\" Updated : 2020-11-17 .\" 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 2019" 2.4.4 "Usenet Newsreader" +.TH tin 1 "24. Dezember 2020" 2.4.5 "Usenet Newsreader" .\" .\" .SH NAME @@ -116,11 +116,12 @@ Zugehörigen Newsserver und newsrc\-Date via NNTP gelesen wird. .TP \fB\-G\fP\fI Artikellimit\fP -Limit the number of articles/group to retrieve from the server. If -\fIarticle\-limit\fP is > 0 not more than the last \fIarticle\-limit\fP -articles/group are fetched from the server. If \fIarticle\-limit\fP is < 0 -\fBtin\fP will start fetching articles from your first unread minus absolute -value of \fIarticle\-limit\fP. Default is 0, which means no limit. +Beschränkt die Anzahl der Artikel pro Gruppe, die vom Server abgerufen +werden sollen. Wenn \fIarticle\-limit\fP > 0 ist, werden nicht mehr als die +letzten \fIarticle\-limit\fP Artikel pro Gruppe vom Server geholt. Wenn +\fIarticle\-limit\fP < 0 ist, beginnt \fBtin\fP mit dem Abruf von Artikeln ab +Ihrem ersten ungelesenen Artikel minus dem absoluten Wert von +\fIarticle\-limit\fP. Die Voreinstellung ist 0, was keine Begrenzung bedeutet. .TP \fB\-h\fP Kurzübersicht der verfügbaren Kommandozeilenoptionen. @@ -182,7 +183,7 @@ Tages nicht laden. .TP \fB\-Q\fP Schnellstart. \fBtin\fP so schnell wie möglich starten, zur Zeit entspricht -diese Option \*(rq\fB\-nqd\fP\*(rq. +diese Option \*(rq\fB\-dnq\fP\*(rq. .TP \fB\-r\fP Nachrichten aus der Ferne vom Standard\-NTP\-Server, der in der @@ -209,7 +210,7 @@ Indexdateien über einen NNTP\-Server ab abgestellt ist. .TP \fB\-v\fP -Ausführliche Ausgabe für \*(rq\fB\-D\fP\*(rq, \*(rq\fB\-c\fP\*(rq, \*(rq\fB\-M\fP\*(rq, \*(rq\fB\-N\fP\*(rq, +Ausführliche Ausgabe für \*(rq\fB\-c\fP\*(rq, \*(rq\fB\-D\fP\*(rq, \*(rq\fB\-M\fP\*(rq, \*(rq\fB\-N\fP\*(rq, \&\*(rq\fB\-S\fP\*(rq, \*(rq\fB\-u\fP\*(rq und \*(rq\fB\-Z\fP\*(rq\-Optionen. Kann mehrfach verwendet werden, um die Ausführlichkeit zu erhöhen. .TP @@ -529,7 +530,7 @@ are listed. You can use \fBSearchSubjF\f to the menu. .TP \fBVersion 'v'\fP -.\"-------------------------------------------------------------------- +.\" ------------------------------------------------------------------- .\" Versions\-Informationen ausgeben. .SS "BEFEHLE ZUR GRUPPENAUSWAHL" @@ -671,7 +672,7 @@ Reread the \fI${TIN_LIBDIR:\-NEWSLIBDIR} see if any new news has arrived since starting \fBtin\fP. .TP \fBSelectMarkGrpUnread 'z' 'Z'\fP -.\"-------------------------------------------------------------------- +.\" ------------------------------------------------------------------- .\" Alle Artikel in der aktuellen Gruppe als ungelesen markieren. .SS "GROUP INDEX COMMANDS" @@ -890,7 +891,7 @@ Toggle tag\-status of current article / .TP \fBGroupTagParts 'T'\fP Alle Teile der aktuellen mehrteiligen Nachricht automatisch in der -Reihenfolge markieren. +Reihenfolge markieren bzw. die vorhandenen Markierungen entfernen. .TP \fBGroupToggleThreading 'u'\fP Cycle the threading mode through no threading, threading by subject, @@ -924,7 +925,7 @@ changes permanent. Aktuellen Artikel als ungelesen markieren. .TP \fBMarkThdUnread 'Z'\fP -.\"-------------------------------------------------------------------- +.\" ------------------------------------------------------------------- .\" 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 @@ -1071,6 +1072,10 @@ Markierte Artikel automatisch ohne weite Toggle tag status of current article for mailing, piping, printing, saving or reposting. .TP +\fBThreadTagParts 'T'\fP +Alle Teile der aktuellen mehrteiligen Nachricht automatisch in der +Reihenfolge markieren bzw. die vorhandenen Markierungen entfernen. +.TP \fBThreadUntag 'U'\fP Markierung aller markierten Threads entfernen. .TP @@ -1086,7 +1091,7 @@ range will be marked as unread instead o articles are present, a prompt asks how to proceed. .TP \fBMarkThdUnread 'Z'\fP -.\"-------------------------------------------------------------------- +.\" ------------------------------------------------------------------- .\" Alle Artikel im aktuellen Thread als ungelesen markieren. .SS "ARTICLE VIEWER COMMANDS" @@ -1343,7 +1348,7 @@ your own articles. Alle Artikel als ungelesen markieren. .TP \fBMarkThdUnread 'Z'\fP -.\"-------------------------------------------------------------------- +.\" ------------------------------------------------------------------- .\" Markiere den aktuellen Thread als ungelesen. .SS "URL LISTE" @@ -1377,7 +1382,7 @@ Hilfeseite der verfügbaren Befehle. \fBToggleHelpDisplay 'H'\fP Mini\-Hilfe am unterem Bildschirmrand ein\-/ausschalten. .RE -.\"-------------------------------------------------------------------- +.\" ------------------------------------------------------------------- .\" .SS "ATTACHMENT LISTING" \fBPageViewAttach\fP ('\fBV\fP') displays a list of attachments of the current @@ -1431,7 +1436,7 @@ Hilfeseite der verfügbaren Befehle. \fBToggleHelpDisplay 'H'\fP Mini\-Hilfe am unterem Bildschirmrand ein\-/ausschalten. .RE -.\"-------------------------------------------------------------------- +.\" ------------------------------------------------------------------- .\" .SS "GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES" .\" FIXME - add missing descriptions @@ -1601,6 +1606,9 @@ Hintergrundfarbe für inversen Text \fBFarbe des inversen Text (Vordergr.) (col_invers_fg)\fP Vordergrundfarbe für inversen Text .TP +\fBColor of status messages (col_message)\fP +Color of status messages in last line +.TP \fBFarbe der Hervorhebung _Striche_ (col_markdash)\fP Color of words emphasized like _this_. See also \fBword_h_display_marks\fP and \fBword_highlight\fP. @@ -2034,7 +2042,7 @@ Leerzeichen getrennte Werte angeben. Wen diese Option deaktiviert. .TP \fBZeige folgende Header nicht an (news_headers_to_not_display)\fP -Genau das gleiche wie 'news_headers_to_display', mit der Ausnahme, das es +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 @@ -2110,9 +2118,12 @@ following values are allowed: .RE .TP \fBGepostete Artikel speichern in (posted_articles_file)\fP -Keep posted articles in -\fI${TIN_HOMEDIR:\-"$HOME"}/Mail/\fP\fBposted_articles_file\fP. If no filename is -set then postings will not be saved. Default is 'posted'. +Keep posted articles in given file. If the given filename does not contain +any expandable strings it will be prefixed with +\fI${TIN_HOMEDIR:\-"$HOME"}/Mail/\fP. If no filename is set then postings will +not be saved. See the section "MAILING PIPING PRINTING REPOSTING AND SAVING +ARTICLES" for more information about the various expansion +characters. Default is 'posted'. .TP \fBAlle Header beim Drucken ausgeben (print_header)\fP If ON, then the full article header is sent to the printer. Otherwise only @@ -2378,6 +2389,14 @@ Keep). If ON, then unsubscribed groups will be permanently removed from your \fI${TIN_HOMEDIR:\-"$HOME"}/.newsrc\fP file. Default is OFF. .TP +\fBRegex with Subject prefixes (strip_re_regex)\fP +A regular expression to find Subject prefixes like "Re:" to remove. If +\fBstrip_re_regex\fP is blank, then \fB\%tin\fP(1) uses a built\-in default. +.TP +\fBRegex with Subject suffixes (strip_was_regex)\fP +A regular expression to find Subject suffixes like "(was:" to remove. If +\fBstrip_was_regex\fP is blank, then \fB\%tin\fP(1) uses a built\-in default. +.TP \fBReg. für \-Durchstr.\- Hervorhebungen (strokes_regex)\fP A regular expression that will be applied when reading articles. All matching words are shown in \fBcol_markstroke\fP or \fBmono_markstroke\fP. If @@ -2775,9 +2794,9 @@ current news.group.name but without \fBs the news.group.name with all '.' replaced by '/'. .PP If saving multiple files at once the filename (if not referring to a -mailbox) will be extended by ".num" where "num" is a at least 3 digit -number counting up from 1. Environment variables are allowed within a -filename (e.g., \fI$SOURCES/dir/filename\fP). +mailbox) will be extended by ".num" where "num" is at least 3 digit number +counting up from 1. Environment variables are allowed within a filename +(e.g., \fI$SOURCES/dir/filename\fP). .PP .\" .\" @@ -3152,7 +3171,7 @@ coffee. Subsequent readings of a group w updating of the index file and will be much faster as only new articles will need to be cached. .PP -As indexing might take some time you may want to run \fBtin\fP form the system +As indexing might take some time you may want to run \fBtin\fP from the system batcher \fB\%cron\fP(8) with the \*(rq\fB\-u\fP\*(rq option: .PP .RS @@ -3330,7 +3349,7 @@ Für eine ausführlich Beschreibung sieh .\" .SH UMGEBUNGSVARIABLEN .\" TODO: - sort in a useful order -.\" - add undocumented env-vars (if any) +.\" - add undocumented env-vars (e.g. DEV_TCP (SCO)) .TP \fBTINRC\fP Setzen Sie diese Variable wenn Sie Befehlszeilenoptionen angeben möchten mit @@ -3451,15 +3470,15 @@ Überschreibt den vollständigen Namen, angegeben ist, siehe auch \fBmail_address\fP. .TP \fBREALNAME\fP -Same as $\fBNAME\fP. +Bewirkt das Gleiche wie $\fBNAME\fP. .TP \fBHOME\fP Das Anmeldeverzeichnis des Benutzers. Weitere Informationen finden sich in \fB\%environ\fP(5). .TP \fBMAILER\fP -This variable has precedence over the default mailer that is used in all -mailing operations within \fBtin\fP. +Diese Variable hat Vorrang vor dem Standard\-Mailer, der bei allen +Versandoperationen innerhalb von \fBtin\fP verwendet wird. .TP \fBMAIL\fP Voller Pfad zum Postfach des Benutzers. @@ -3730,16 +3749,15 @@ Urs Janßen Erika Mustermann .\" .SH "SIEHE AUCH" -\fB\%cron\fP(8), \fB\%elm\fP(1), \fB\%emacs\fP(1), \fB\%gpg\fP(1), \fB\%inews\fP(1), -\fB\%ispell\fP(1), \fB\%lp\fP(1), \fB\%lpr\fP(1), \fB\%metamail\fP(1), \fB\%noffle\fP(1), -\fB\%perl\fP(1), \fB\%perlre\fP(1), \fB\%pgp\fP(1), \fB\%rn\fP(1), \fB\%sendmail\fP(1), -\fB\%shar\fP(1), \fB\%slrnface\fP(1), \fB\%tass\fP(1), \fB\%unshar\fP(1), -\fB\%uudecode\fP(1), \fB\%vi\fP(1), \fB\%xterm\fP(1x), \fB\%heapsort\fP(3), -\fB\%iconv\fP(3), \fB\%iconv_open\fP(3), \fB\%nl_langinfo\fP(3), \fB\%pcre\fP(3), -\fB\%pcrepattern\fP(3), \fB\%qsort\fP(3), \fB\%snprintf\fP(3), \fB\%strftime\fP(3), -\fB\%vsnprintf\fP(3), \fB\%wildmat\fP(3), \fB\%environ\fP(5), \fB\%locale\fP(5), -\fB\%mailcap\fP(5), \fB\%mbox\fP(5), \fB\%mmdf\fP(5), \fB\%newsoverview\fP(5), -\fB\%tin\fP(5), \fBRFC\%1345\fP, \fBRFC\%1524\fP, \fBRFC\%2045\fP, \fBRFC\%2046\fP, -\fBRFC\%2047\fP, \fBRFC\%2048\fP, \fBRFC\%2231\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\%elm\fP(1), \fB\%emacs\fP(1), \fB\%gpg\fP(1), \fB\%inews\fP(1), \fB\%ispell\fP(1), +\fB\%lp\fP(1), \fB\%lpr\fP(1), \fB\%metamail\fP(1), \fB\%noffle\fP(1), \fB\%perl\fP(1), +\fB\%perlre\fP(1), \fB\%pgp\fP(1), \fB\%rn\fP(1), \fB\%sendmail\fP(1), \fB\%shar\fP(1), +\fB\%slrnface\fP(1), \fB\%tass\fP(1), \fB\%unshar\fP(1), \fB\%uudecode\fP(1), +\fB\%vi\fP(1), \fB\%xterm\fP(1x), \fB\%heapsort\fP(3), \fB\%iconv\fP(3), +\fB\%iconv_open\fP(3), \fB\%nl_langinfo\fP(3), \fB\%pcre\fP(3), \fB\%pcrepattern\fP(3), +\fB\%qsort\fP(3), \fB\%snprintf\fP(3), \fB\%strftime\fP(3), \fB\%vsnprintf\fP(3), +\fB\%wildmat\fP(3), \fB\%environ\fP(5), \fB\%locale\fP(5), \fB\%mailcap\fP(5), +\fB\%mbox\fP(5), \fB\%mmdf\fP(5), \fB\%newsoverview\fP(5), \fB\%tin\fP(5), \fB\%cron\fP(8), +\fBRFC\%1345\fP, \fBRFC\%1524\fP, \fBRFC\%2045\fP, \fBRFC\%2046\fP, \fBRFC\%2047\fP, +\fBRFC\%2048\fP, \fBRFC\%2231\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.4.4/doc/l10n/de/tin.5 tin-2.4.5/doc/l10n/de/tin.5 --- tin-2.4.4/doc/l10n/de/tin.5 2019-12-24 10:58:40.000000000 +0100 +++ tin-2.4.5/doc/l10n/de/tin.5 2020-12-01 12:01:03.337681805 +0100 @@ -2,7 +2,7 @@ .\" Module : tin.5 .\" Author : U. Janssen .\" Created : 2000-07-10 -.\" Updated : 2019-12-24 +.\" Updated : 2020-11-10 .\" Notes : needs a some work .\" .\" @@ -11,7 +11,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH tin 5 "24. Dezember 2019" 2.4.4 "Usenet Newsreader" +.TH tin 5 "24. Dezember 2020" 2.4.5 "Usenet Newsreader" .SH NAME tin, rtin \- zugehörige Dateien @@ -753,8 +753,8 @@ be changed in the future. Don't use '#' ignored and your comments will get lost on the next write of the file. .TP \fBgroup\fP -A comma\-separated list of newsgroup patterns (wildmat\-style) to which groups -the filter rule will be applied. This line is mandatory! +A comma\-separated list of newsgroup patterns in wildmat\-style to which +groups the filter rule will be applied. This line is mandatory! .TP \fBcase\fP 0=Groß/Kleinschreibung beachten, 1=Groß/Kleinschreibung ignorieren @@ -763,43 +763,91 @@ the filter rule will be applied. This li Score value of the rule; can also be one of the magic words "kill" or "hot". .TP \fBsubj\fP -Vergleiche mit \*(rqSubject:\*(rq +Match against \*(rqSubject:\*(rq. The matching type used (wildmat or regex) +depends on the setting of the tinrc variable \fBwildcard\fP. .TP \fBfrom\fP Match against \*(rqFrom:\*(rq. \fB\%tin\fP(1) converts the contents of the \&\*(rqFrom:\*(rq header to an old style e\-mail address, e.g. \*(rqsome@body.example (John Doe)\*(rq instead of \*(rqJohn Doe \*(rq, before -trying to match the patterns in the filter rule. +trying to match the patterns in the filter rule. The matching type used +(wildmat or regex) depends on the setting of the tinrc variable \fBwildcard\fP. .TP \fBmsgid\fP -Vergleiche mit \*(rqMessage\-ID:\*(rq & allen \*(rqReferences:\*(rq +Match against \*(rqMessage\-ID:\*(rq and full \*(rqReferences:\*(rq. The matching type +used (wildmat or regex) depends on the setting of the tinrc variable +\fBwildcard\fP. .TP \fBmsgid_last\fP -Vergleiche mit \*(rqMessage\-ID:\*(rq & letztem \*(rqReferences:\*(rq Eintrag +Match against \*(rqMessage\-ID:\*(rq and last \*(rqReferences:\*(rq entry only. The +matching type used (wildmat or regex) depends on the setting of the tinrc +variable \fBwildcard\fP. .TP \fBmsgid_only\fP -Vergleiche mit \*(rqMessage\-ID:\*(rq +Match against \*(rqMessage\-ID:\*(rq. The matching type used (wildmat or regex) +depends on the setting of the tinrc variable \fBwildcard\fP. .TP \fBrefs_only\fP -Vergleiche mit \*(rqReferences:\*(rq +Match against \*(rqReferences:\*(rq. The matching type used (wildmat or regex) +depends on the setting of the tinrc variable \fBwildcard\fP. .TP \fBlines\fP Match against \*(rqLines:\*(rq, num matches more than. .TP -.\" TODO: document option in detail \fBgnksa\fP -Match against \*(rqFrom:\*(rq address parser return codes. +Match against \*(rqFrom:\*(rq address parser return codes. num matches more than the returned numeric +value. GNKSA_LOCAL_DOMAIN_LITERAL or GNKSA_INVALID_DOMAIN are only returned +if \fBdisable_gnksa_domain_check\fP is set to false. As the built in domain +list is outdated this should be considered carefully. +.in +.3i +.nf +.ta \w'%406 'u +\w'GNKSA_ZERO_LENGTH_LOCAL_WORD'u + \fB0\fP GNKSA_OK + \fB1\fP GNKSA_INTERNAL_ERROR +\fB100\fP GNKSA_LANGLE_MISSING +\fB101\fP GNKSA_LPAREN_MISSING +\fB102\fP GNKSA_RPAREN_MISSING +\fB103\fP GNKSA_ATSIGN_MISSING +\fB104\fP GNKSA_RANGLE_MISSING +\fB200\fP GNKSA_SINGLE_DOMAIN +\fB201\fP GNKSA_INVALID_DOMAIN +\fB202\fP GNKSA_ILLEGAL_DOMAIN +\fB203\fP GNKSA_UNKNOWN_DOMAIN +\fB204\fP GNKSA_INVALID_FQDN_CHAR +\fB205\fP GNKSA_ZERO_LENGTH_LABEL +\fB206\fP GNKSA_ILLEGAL_LABEL_LENGTH +\fB207\fP GNKSA_ILLEGAL_LABEL_HYPHEN +\fB208\fP GNKSA_ILLEGAL_LABEL_BEGNUM +\fB209\fP GNKSA_BAD_DOMAIN_LITERAL +\fB210\fP GNKSA_LOCAL_DOMAIN_LITERAL +\fB211\fP GNKSA_RBRACKET_MISSING +\fB300\fP GNKSA_LOCALPART_MISSING +\fB301\fP GNKSA_INVALID_LOCALPART +\fB302\fP GNKSA_ZERO_LENGTH_LOCAL_WORD +\fB400\fP GNKSA_ILLEGAL_UNQUOTED_CHAR +\fB401\fP GNKSA_ILLEGAL_QUOTED_CHAR +\fB402\fP GNKSA_ILLEGAL_ENCODED_CHAR +\fB403\fP GNKSA_BAD_ENCODE_SYNTAX +\fB404\fP GNKSA_ILLEGAL_PAREN_CHAR +\fB405\fP GNKSA_INVALID_REALNAME +\fB406\fP GNKSA_MISSING_REALNAME +.fi +.in -.3i .TP \fBxref\fP Match against \*(rqXref:\*(rq line. Before any matching is done the line is turned into the same format \*(rqNewsgroups:\*(rq has that is it is turned into a comma separated newsgroup list with all other information (i.e. the article -counter) removed. +counter) removed. The matching type used (wildmat or regex) depends on the +setting of the tinrc variable \fBwildcard\fP. .TP .\" TODO: document option in detail \fBpath\fP -Match against \*(rqPath:\*(rq line. This may not work on some servers. +Match against \*(rqPath:\*(rq line. This may not work on some servers. The +matching type used (wildmat or regex) depends on the setting of the tinrc +variable \fBwildcard\fP. .TP \fBtime\fP time_t Wert wann die Regel abläuft @@ -1049,6 +1097,7 @@ defaults. If a keyname is bound to NULL \fBThreadMail\fP m \fBThreadSave\fP s \fBThreadTag\fP t +\fBThreadTagParts\fP T \fBThreadUndoSel\fP ~ .sp \fBUrlSelect\fP ^J ^M @@ -1313,6 +1362,9 @@ Color of words emphasized like *this*. S Color of words emphasized like \-this\-. See also \fBword_h_display_marks\fP and \fBword_highlight\fP. .TP +\fBcol_message\fP +Color of status messages in last line +.TP \fBcol_minihelp\fP Farbe des Minihilfemenü .TP @@ -1729,7 +1781,7 @@ Leerzeichen getrennte Werte angeben. Wen diese Option deaktiviert. .TP \fBnews_headers_to_not_display\fP -Genau das gleiche wie 'news_headers_to_display', mit der Ausnahme, das es +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 @@ -1809,9 +1861,12 @@ careful with this option. .RE .TP \fBposted_articles_file\fP -Keep posted articles in -\fI${TIN_HOMEDIR:\-"$HOME"}/Mail/\fP\fBposted_articles_file\fP. If no filename is -set then postings will not be saved. Default is 'posted'. +Keep posted articles in given file. If the given filename does not contain +any expandable strings it will be prefixed with +\fI${TIN_HOMEDIR:\-"$HOME"}/Mail/\fP. If no filename is set then postings will +not be saved. See the section "MAILING PIPING PRINTING REPOSTING AND SAVING +ARTICLES" for more information about the various expansion +characters. Default is 'posted'. .TP \fBprint_header\fP If ON, then the full article header is sent to the printer. Otherwise only @@ -2094,6 +2149,14 @@ Keep). If ON, then unsubscribed groups will be permanently removed from your \fI${TIN_HOMEDIR:\-"$HOME"}/.newsrc\fP file. Default is OFF. .TP +\fBstrip_re_regex\fP +A regular expression to find Subject prefixes like "Re:" to remove If +\fBstrip_re_regex\fP is blank, then \fB\%tin\fP(1) uses a built\-in default. +.TP +\fBstrip_was_regex\fP +A regular expression to find Subject suffixes like "(was:" to remove. If +\fBstrip_was_regex\fP is blank, then \fB\%tin\fP(1) uses a built\-in default. +.TP \fBstrokes_regex\fP A regular expression that will be applied when reading articles. All matching words are shown in \fBcol_markstroke\fP or \fBmono_markstroke\fP. If diff -Nurp '--exclude=.bzr*' tin-2.4.4/doc/l10n/de.po tin-2.4.5/doc/l10n/de.po --- tin-2.4.4/doc/l10n/de.po 2019-12-24 10:57:48.000000000 +0100 +++ tin-2.4.5/doc/l10n/de.po 2020-12-01 12:00:57.349457400 +0100 @@ -1,19 +1,20 @@ # German translations for the tin man pages. # This file is distributed under the same license as the tin package. -# Urs Janssen , 2008-2018. +# Urs Janssen , 2008-2021. # msgid "" msgstr "" -"Project-Id-Version: tin-man 2.4.4\n" +"Project-Id-Version: tin-man 2.4.5\n" "Report-Msgid-Bugs-To: translation@tin.org\n" -"POT-Creation-Date: 2019-12-24 10:55+0100\n" -"PO-Revision-Date: 2019-12-24 10:57+0100\n" +"POT-Creation-Date: 2020-12-01 11:58+0100\n" +"PO-Revision-Date: 2020-12-01 12:00+0100\n" "Last-Translator: Urs Janssen \n" "Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" #. type: TH #: doc/tin.1:12 doc/tin.5:9 @@ -24,14 +25,14 @@ msgstr "tin" #. type: TH #: doc/tin.1:12 doc/tin.5:9 #, no-wrap -msgid "December 24th, 2019" -msgstr "24. Dezember 2019" +msgid "December 24th, 2020" +msgstr "24. Dezember 2020" #. type: TH #: doc/tin.1:12 doc/tin.5:9 #, no-wrap -msgid "2.4.4" -msgstr "2.4.4" +msgid "2.4.5" +msgstr "2.4.5" #. type: TH #: doc/tin.1:12 doc/tin.5:9 @@ -146,7 +147,7 @@ msgid "EXIT STATUS" msgstr "RÜCKGABEWERT" #. type: TP -#: doc/tin.1:79 doc/tin.1:1094 doc/tin.1:3473 +#: doc/tin.1:79 doc/tin.1:1099 doc/tin.1:3495 #, no-wrap msgid "B<0>" msgstr "B<0>" @@ -159,7 +160,7 @@ msgstr "" "vorhanden." #. type: TP -#: doc/tin.1:82 doc/tin.1:3476 +#: doc/tin.1:82 doc/tin.1:3498 #, no-wrap msgid "B<1>" msgstr "B<1>" @@ -170,7 +171,7 @@ msgid "Usage, syntax, configuration file msgstr "Bedien-, Syntax-, Konfigurations- oder Netzwerk-Fehler." #. type: TP -#: doc/tin.1:85 doc/tin.1:3479 +#: doc/tin.1:85 doc/tin.1:3501 #, no-wrap msgid "B<2>" msgstr "B<2>" @@ -181,7 +182,7 @@ msgid "Unread news available (batch mode msgstr "Ungelesene Nachrichten vorhanden (nur im Batch-Modus (''B<-Z>''))." #. type: TP -#: doc/tin.1:88 doc/tin.1:3482 +#: doc/tin.1:88 doc/tin.1:3504 #, no-wrap msgid "B<3>" msgstr "B<3>" @@ -348,6 +349,12 @@ msgid "" "will start fetching articles from your first unread minus absolute value of " "I. Default is 0, which means no limit." msgstr "" +"Beschränkt die Anzahl der Artikel pro Gruppe, die vom Server abgerufen " +"werden sollen. Wenn I E 0 ist, werden nicht mehr als die " +"letzten I Artikel pro Gruppe vom Server geholt. Wenn " +"I E 0 ist, beginnt B mit dem Abruf von Artikeln ab " +"Ihrem ersten ungelesenen Artikel minus dem absoluten Wert von I. Die Voreinstellung ist 0, was keine Begrenzung bedeutet." #. type: TP #: doc/tin.1:139 @@ -529,10 +536,10 @@ msgstr "B<-Q>" #: doc/tin.1:198 msgid "" "Quick start. Start B as quickly as possible. Currently this is " -"equivalent to ''B<-nqd>''." +"equivalent to ''B<-dnq>''." msgstr "" "Schnellstart. B so schnell wie möglich starten, zur Zeit entspricht " -"diese Option ''B<-nqd>''." +"diese Option ''B<-dnq>''." #. type: TP #: doc/tin.1:198 @@ -620,11 +627,11 @@ msgstr "B<-v>" #. type: Plain text #: doc/tin.1:225 msgid "" -"Verbose mode for ''B<-D>'', ''B<-c>'', ''B<-M>'', ''B<-N>'', \\&''B<-S>'', " +"Verbose mode for ''B<-c>'', ''B<-D>'', ''B<-M>'', ''B<-N>'', \\&''B<-S>'', " "''B<-u>'' and ''B<-Z>'' options. Can be used multiple times to increase " "verbosity." msgstr "" -"Ausführliche Ausgabe für ''B<-D>'', ''B<-c>'', ''B<-M>'', ''B<-N>'', \\&''B<-" +"Ausführliche Ausgabe für ''B<-c>'', ''B<-D>'', ''B<-M>'', ''B<-N>'', \\&''B<-" "S>'', ''B<-u>'' und ''B<-Z>''-Optionen. Kann mehrfach verwendet werden, um " "die Ausführlichkeit zu erhöhen." @@ -1288,7 +1295,7 @@ msgstr "" "überall das Gleichen." #. type: TP -#: doc/tin.1:492 doc/tin.1:1366 doc/tin.1:1419 +#: doc/tin.1:492 doc/tin.1:1371 doc/tin.1:1424 #, no-wrap msgid "B" msgstr "B" @@ -1371,7 +1378,7 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:523 doc/tin.1:1372 doc/tin.1:1426 +#: doc/tin.1:523 doc/tin.1:1377 doc/tin.1:1431 #, no-wrap msgid "B" msgstr "B" @@ -1385,13 +1392,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:529 doc/tin.1:1375 doc/tin.1:1429 +#: doc/tin.1:529 doc/tin.1:1380 doc/tin.1:1434 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:532 doc/tin.1:1378 doc/tin.1:1432 +#: doc/tin.1:532 doc/tin.1:1383 doc/tin.1:1437 msgid "Toggle the display of help mini menu at the bottom of the screen." msgstr "Mini-Hilfe am unterem Bildschirmrand ein-/ausschalten." @@ -1416,7 +1423,7 @@ msgstr "" msgid "B" msgstr "B" -#. -------------------------------------------------------------------- +#. ------------------------------------------------------------------- #. type: Plain text #: doc/tin.1:543 msgid "Print B version information." @@ -1429,7 +1436,7 @@ msgid "NEWSGROUP SELECTION COMMANDS" msgstr "BEFEHLE ZUR GRUPPENAUSWAHL" #. type: TP -#: doc/tin.1:544 doc/tin.1:682 doc/tin.1:933 doc/tin.1:1097 doc/tin.1:3485 +#: doc/tin.1:544 doc/tin.1:682 doc/tin.1:934 doc/tin.1:1102 doc/tin.1:3507 #, no-wrap msgid "B<4>" msgstr "B<4>" @@ -1456,13 +1463,13 @@ msgstr "" "Vorsicht." #. type: TP -#: doc/tin.1:551 doc/tin.1:703 doc/tin.1:954 +#: doc/tin.1:551 doc/tin.1:703 doc/tin.1:955 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:555 doc/tin.1:707 doc/tin.1:958 +#: doc/tin.1:555 doc/tin.1:707 doc/tin.1:959 msgid "" "Choose a range of articles to be affected by the next command. See the " "section \"RANGES\" for more information." @@ -1482,21 +1489,21 @@ msgid "Sort the list of newsgroups." msgstr "Liste vorhandener Newsgruppen sortieren." #. type: TP -#: doc/tin.1:558 doc/tin.1:710 doc/tin.1:961 doc/tin.1:1151 doc/tin.1:1363 -#: doc/tin.1:1413 +#: doc/tin.1:558 doc/tin.1:710 doc/tin.1:962 doc/tin.1:1156 doc/tin.1:1368 +#: doc/tin.1:1418 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:561 doc/tin.1:713 doc/tin.1:964 doc/tin.1:1154 doc/tin.1:1366 -#: doc/tin.1:1416 +#: doc/tin.1:561 doc/tin.1:713 doc/tin.1:965 doc/tin.1:1159 doc/tin.1:1371 +#: doc/tin.1:1421 msgid "Repeat the previous search." msgstr "Vorherige Suche wiederholen." #. type: TP -#: doc/tin.1:561 doc/tin.1:713 doc/tin.1:964 doc/tin.1:1154 doc/tin.1:1357 -#: doc/tin.1:1407 +#: doc/tin.1:561 doc/tin.1:713 doc/tin.1:965 doc/tin.1:1159 doc/tin.1:1362 +#: doc/tin.1:1412 #, no-wrap msgid "B" msgstr "B" @@ -1509,8 +1516,8 @@ msgstr "" "(falls angezeigt) suchen." #. type: TP -#: doc/tin.1:564 doc/tin.1:716 doc/tin.1:967 doc/tin.1:1157 doc/tin.1:1360 -#: doc/tin.1:1410 +#: doc/tin.1:564 doc/tin.1:716 doc/tin.1:968 doc/tin.1:1162 doc/tin.1:1365 +#: doc/tin.1:1415 #, no-wrap msgid "B" msgstr "B" @@ -1549,7 +1556,7 @@ msgstr "" "Gruppenliste und sucht nach ungelesenen Gruppen." #. type: TP -#: doc/tin.1:574 doc/tin.1:791 doc/tin.1:1005 doc/tin.1:1215 +#: doc/tin.1:574 doc/tin.1:791 doc/tin.1:1006 doc/tin.1:1220 #, no-wrap msgid "B" msgstr "B" @@ -1562,7 +1569,7 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:578 doc/tin.1:795 doc/tin.1:1009 doc/tin.1:1219 +#: doc/tin.1:578 doc/tin.1:795 doc/tin.1:1010 doc/tin.1:1224 #, no-wrap msgid "B" msgstr "B" @@ -1590,13 +1597,13 @@ msgstr "" "der Gruppenbeschreibungen um." #. type: TP -#: doc/tin.1:586 doc/tin.1:808 doc/tin.1:1022 doc/tin.1:1231 +#: doc/tin.1:586 doc/tin.1:808 doc/tin.1:1023 doc/tin.1:1236 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:589 doc/tin.1:811 doc/tin.1:1025 doc/tin.1:1234 +#: doc/tin.1:589 doc/tin.1:811 doc/tin.1:1026 doc/tin.1:1239 msgid "Edit the filter file and reload it afterwards." msgstr "Filter-Datei bearbeiten und danach anwenden." @@ -1617,8 +1624,8 @@ msgstr "" "werden." #. type: TP -#: doc/tin.1:593 doc/tin.1:818 doc/tin.1:1025 doc/tin.1:1247 doc/tin.1:1369 -#: doc/tin.1:1422 +#: doc/tin.1:593 doc/tin.1:818 doc/tin.1:1026 doc/tin.1:1252 doc/tin.1:1374 +#: doc/tin.1:1427 #, no-wrap msgid "B" msgstr "B" @@ -1632,18 +1639,18 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:598 doc/tin.1:822 doc/tin.1:1028 doc/tin.1:1250 +#: doc/tin.1:598 doc/tin.1:822 doc/tin.1:1029 doc/tin.1:1255 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:601 doc/tin.1:825 doc/tin.1:1031 doc/tin.1:1253 +#: doc/tin.1:601 doc/tin.1:825 doc/tin.1:1032 doc/tin.1:1258 msgid "Toggle inverse video." msgstr "(De)aktiviere inverse Darstellung." #. type: TP -#: doc/tin.1:601 doc/tin.1:834 doc/tin.1:1037 doc/tin.1:1259 +#: doc/tin.1:601 doc/tin.1:834 doc/tin.1:1038 doc/tin.1:1264 #, no-wrap msgid "B" msgstr "B" @@ -1680,13 +1687,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:614 doc/tin.1:842 doc/tin.1:1267 +#: doc/tin.1:614 doc/tin.1:842 doc/tin.1:1272 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:618 doc/tin.1:846 doc/tin.1:1271 +#: doc/tin.1:618 doc/tin.1:846 doc/tin.1:1276 msgid "" "User configurable options menu (for more information see section \"GLOBAL " "OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES\")." @@ -1704,7 +1711,7 @@ msgid "Positions the cursor on the next msgstr "Setzt den Cursor auf die nächste Gruppe mit ungelesenen Artikeln." #. type: TP -#: doc/tin.1:621 doc/tin.1:863 doc/tin.1:1050 doc/tin.1:1288 +#: doc/tin.1:621 doc/tin.1:863 doc/tin.1:1051 doc/tin.1:1293 #, no-wrap msgid "B" msgstr "B" @@ -1718,13 +1725,13 @@ msgstr "" "B beenden, falls B gesetzt ist wird nochmal nachgefragt." #. type: TP -#: doc/tin.1:625 doc/tin.1:866 doc/tin.1:1053 doc/tin.1:1291 +#: doc/tin.1:625 doc/tin.1:866 doc/tin.1:1054 doc/tin.1:1296 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:628 doc/tin.1:869 doc/tin.1:1056 doc/tin.1:1294 +#: doc/tin.1:628 doc/tin.1:869 doc/tin.1:1057 doc/tin.1:1299 msgid "Quit B \\(em don't ask the user to confirm." msgstr "Beendet B sofort, ohne Bestätigungsnachfrage." @@ -1743,13 +1750,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:633 doc/tin.1:872 doc/tin.1:1056 +#: doc/tin.1:633 doc/tin.1:872 doc/tin.1:1057 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:637 doc/tin.1:876 doc/tin.1:1060 +#: doc/tin.1:637 doc/tin.1:876 doc/tin.1:1061 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." @@ -1812,7 +1819,7 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:655 doc/tin.1:900 doc/tin.1:1075 doc/tin.1:1328 +#: doc/tin.1:655 doc/tin.1:901 doc/tin.1:1080 doc/tin.1:1333 #, no-wrap msgid "B" msgstr "B" @@ -1871,7 +1878,7 @@ msgstr "" msgid "B" msgstr "B" -#. -------------------------------------------------------------------- +#. ------------------------------------------------------------------- #. type: Plain text #: doc/tin.1:678 msgid "Mark all articles in the current group as unread." @@ -1897,39 +1904,39 @@ msgid "Select article 4." msgstr "Artikel 4 auswählen." #. type: TP -#: doc/tin.1:685 doc/tin.1:936 doc/tin.1:1100 +#: doc/tin.1:685 doc/tin.1:937 doc/tin.1:1105 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:689 doc/tin.1:940 doc/tin.1:1104 +#: doc/tin.1:689 doc/tin.1:941 doc/tin.1:1109 msgid "" "Auto select article(s) using a menu. Read the section \"FILTERING ARTICLES\" " "for more information." msgstr "" #. type: TP -#: doc/tin.1:689 doc/tin.1:940 doc/tin.1:1116 +#: doc/tin.1:689 doc/tin.1:941 doc/tin.1:1121 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:693 doc/tin.1:944 doc/tin.1:1120 +#: doc/tin.1:693 doc/tin.1:945 doc/tin.1:1125 msgid "" "Kill article(s) using a menu. Read the section \"FILTERING ARTICLES\" for " "more information." msgstr "" #. type: TP -#: doc/tin.1:693 doc/tin.1:944 +#: doc/tin.1:693 doc/tin.1:945 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:698 doc/tin.1:949 +#: doc/tin.1:698 doc/tin.1:950 msgid "" "Mark current article, thread, range, auto-selected (hot) articles, articles " "matching pattern or tagged articles as read. A prompt asks which type should " @@ -1937,13 +1944,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:698 doc/tin.1:949 +#: doc/tin.1:698 doc/tin.1:950 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:703 doc/tin.1:954 +#: doc/tin.1:703 doc/tin.1:955 msgid "" "Mark current article, thread, range, auto-selected (hot) articles, articles " "matching pattern or tagged articles as unread. A prompt asks which type " @@ -1951,23 +1958,23 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:707 doc/tin.1:958 doc/tin.1:1148 +#: doc/tin.1:707 doc/tin.1:959 doc/tin.1:1153 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:710 doc/tin.1:961 doc/tin.1:1151 +#: doc/tin.1:710 doc/tin.1:962 doc/tin.1:1156 msgid "Re-enter the last message that was viewed." msgstr "Zur zuletzt angezeigte Nachricht springen." #. type: Plain text -#: doc/tin.1:716 doc/tin.1:967 +#: doc/tin.1:716 doc/tin.1:968 msgid "Search forward for specified subject." msgstr "Vorwärts nach dem angegebenem Subject suchen." #. type: Plain text -#: doc/tin.1:719 doc/tin.1:970 +#: doc/tin.1:719 doc/tin.1:971 msgid "Search backwards for specified subject." msgstr "Rückwärts nach dem angegebenem Subject suchen." @@ -1978,7 +1985,7 @@ msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:722 doc/tin.1:973 +#: doc/tin.1:722 doc/tin.1:974 msgid "Select current thread for later processing." msgstr "Wähle aktuellen Thread für die spätere Verarbeitung aus." @@ -2065,13 +2072,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:751 doc/tin.1:982 doc/tin.1:1174 +#: doc/tin.1:751 doc/tin.1:983 doc/tin.1:1179 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:756 doc/tin.1:987 doc/tin.1:1179 +#: doc/tin.1:756 doc/tin.1:988 doc/tin.1:1184 msgid "" "Pipe current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles into command. See the section \"MAILING " @@ -2079,7 +2086,7 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:756 doc/tin.1:1179 +#: doc/tin.1:756 doc/tin.1:1184 #, no-wrap msgid "B" msgstr "B" @@ -2097,7 +2104,7 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:765 doc/tin.1:1188 +#: doc/tin.1:765 doc/tin.1:1193 #, no-wrap msgid "B" msgstr "B" @@ -2137,7 +2144,7 @@ msgid "View next unread article or group msgstr "Zeige nächsten den ungelesenen Artikel oder die nächste Gruppe." #. type: TP -#: doc/tin.1:780 doc/tin.1:993 doc/tin.1:1205 +#: doc/tin.1:780 doc/tin.1:994 doc/tin.1:1210 #, no-wrap msgid "B" msgstr "B" @@ -2152,24 +2159,24 @@ msgstr "" "Header." #. type: TP -#: doc/tin.1:784 doc/tin.1:998 doc/tin.1:1208 +#: doc/tin.1:784 doc/tin.1:999 doc/tin.1:1213 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:787 doc/tin.1:1001 +#: doc/tin.1:787 doc/tin.1:1002 msgid "Author backward search. Otherwise, see B ('B') above." msgstr "Autoren-Suche rückwärts. Siehe auch B ('B') oben." #. type: TP -#: doc/tin.1:787 doc/tin.1:1001 doc/tin.1:1211 +#: doc/tin.1:787 doc/tin.1:1002 doc/tin.1:1216 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:791 doc/tin.1:1005 doc/tin.1:1215 +#: doc/tin.1:791 doc/tin.1:1006 doc/tin.1:1220 msgid "" "Search the body of all articles in group (can be slow). You can abort the " "search using B ('B')." @@ -2198,7 +2205,7 @@ msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:803 doc/tin.1:1017 +#: doc/tin.1:803 doc/tin.1:1018 msgid "" "Cycle the display of the author through all the possible options for the " "tinrc variable B." @@ -2211,7 +2218,7 @@ msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:808 doc/tin.1:1022 doc/tin.1:1228 +#: doc/tin.1:808 doc/tin.1:1023 doc/tin.1:1233 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 " @@ -2274,7 +2281,7 @@ msgid "Open the thread under the current msgstr "Öffnet den Thread unter der aktuellen Cursorposition." #. type: Plain text -#: doc/tin.1:837 doc/tin.1:1040 doc/tin.1:1262 +#: doc/tin.1:837 doc/tin.1:1041 doc/tin.1:1267 msgid "Look up article by ''Message-ID:''." msgstr "Artikel anhand der ''Message-ID:'' nachschlagen." @@ -2285,7 +2292,7 @@ msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:842 doc/tin.1:1045 doc/tin.1:1267 +#: doc/tin.1:842 doc/tin.1:1046 doc/tin.1:1272 msgid "" "Mail current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles to someone. See the section \"MAILING " @@ -2310,18 +2317,18 @@ msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:852 doc/tin.1:1277 +#: doc/tin.1:852 doc/tin.1:1282 msgid "Go to the next unread article." msgstr "Zum nächsten ungelesenen Artikel springen." #. type: TP -#: doc/tin.1:852 doc/tin.1:1045 doc/tin.1:1277 +#: doc/tin.1:852 doc/tin.1:1046 doc/tin.1:1282 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:857 doc/tin.1:1050 doc/tin.1:1282 +#: doc/tin.1:857 doc/tin.1:1051 doc/tin.1:1287 msgid "" "Send current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles to printer. See the section \"MAILING " @@ -2351,7 +2358,7 @@ msgid "Go to previous unread article." msgstr "Zum vorherigen ungelesenen Artikel gehen." #. type: Plain text -#: doc/tin.1:866 doc/tin.1:1053 +#: doc/tin.1:866 doc/tin.1:1054 msgid "Return to previous level." msgstr "Kehre zur vorherigen Ebene zurück." @@ -2373,7 +2380,7 @@ msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:881 doc/tin.1:1065 doc/tin.1:1307 +#: doc/tin.1:881 doc/tin.1:1066 doc/tin.1:1312 msgid "" "Save current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles. See the section \"MAILING PIPING " @@ -2387,7 +2394,7 @@ msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:884 doc/tin.1:1068 doc/tin.1:1310 +#: doc/tin.1:884 doc/tin.1:1069 doc/tin.1:1315 msgid "Save marked articles automatically without further prompting." msgstr "Markierte Artikel automatisch ohne weiteres Nachfragen speichern." @@ -2412,21 +2419,22 @@ msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:892 +#: doc/tin.1:893 doc/tin.1:1077 msgid "" -"Automatically tag in order all the parts of the current multi-part message." +"Automatically tag/untag all the parts of the current multi-part message in " +"order." msgstr "" "Alle Teile der aktuellen mehrteiligen Nachricht automatisch in der " -"Reihenfolge markieren." +"Reihenfolge markieren bzw. die vorhandenen Markierungen entfernen." #. type: TP -#: doc/tin.1:892 +#: doc/tin.1:893 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:897 +#: doc/tin.1:898 msgid "" "Cycle the threading mode through no threading, threading by subject, " "threading by references, threading on both subject and references, group " @@ -2434,18 +2442,18 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:897 +#: doc/tin.1:898 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:900 +#: doc/tin.1:901 msgid "Untag all articles that were tagged." msgstr "Markierung aller markierten Artikel entfernen." #. type: Plain text -#: doc/tin.1:907 doc/tin.1:1082 doc/tin.1:1335 +#: doc/tin.1:908 doc/tin.1:1087 doc/tin.1:1340 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'), " @@ -2454,13 +2462,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:907 +#: doc/tin.1:908 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:913 doc/tin.1:1341 +#: doc/tin.1:914 doc/tin.1:1346 msgid "" "Repost an already posted article / thread / auto-selected (hot) articles / " "articles matching pattern / tagged articles to another newsgroup(s). Useful " @@ -2469,13 +2477,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:913 +#: doc/tin.1:914 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:921 +#: doc/tin.1:922 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. " @@ -2486,25 +2494,25 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:921 doc/tin.1:1082 doc/tin.1:1341 +#: doc/tin.1:922 doc/tin.1:1087 doc/tin.1:1346 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:924 +#: doc/tin.1:925 msgid "Mark current article as unread." msgstr "Aktuellen Artikel als ungelesen markieren." #. type: TP -#: doc/tin.1:924 doc/tin.1:1087 doc/tin.1:1344 +#: doc/tin.1:925 doc/tin.1:1092 doc/tin.1:1349 #, no-wrap msgid "B" msgstr "B" -#. -------------------------------------------------------------------- +#. ------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:931 +#: doc/tin.1:932 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 " @@ -2512,79 +2520,79 @@ msgid "" msgstr "" #. type: SS -#: doc/tin.1:931 +#: doc/tin.1:932 #, no-wrap msgid "THREAD LISTING COMMANDS" msgstr "" #. type: Plain text -#: doc/tin.1:936 +#: doc/tin.1:937 msgid "Select article 4 within thread." msgstr "Artikel 4 aus dem Thread auswählen." #. type: TP -#: doc/tin.1:970 +#: doc/tin.1:971 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:973 +#: doc/tin.1:974 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:976 +#: doc/tin.1:977 msgid "Toggle selection of current article." msgstr "Auswahl des aktuellen Artikels umkehren." #. type: TP -#: doc/tin.1:976 +#: doc/tin.1:977 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:979 +#: doc/tin.1:980 msgid "Reverse article selections." msgstr "Artikelauswahl invertieren." #. type: TP -#: doc/tin.1:979 +#: doc/tin.1:980 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:982 +#: doc/tin.1:983 msgid "Undo all selections on current thread." msgstr "Alle Markierungen im aktuellen Thread rückgängig machen." #. type: TP -#: doc/tin.1:987 +#: doc/tin.1:988 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" #. type: Plain text -#: doc/tin.1:990 +#: doc/tin.1:991 msgid "Read current article within thread." msgstr "Aktuellen Artikel im Thread lesen." #. type: TP -#: doc/tin.1:990 +#: doc/tin.1:991 #, no-wrap msgid "BTABE'>" msgstr "BTABE'>" #. type: Plain text -#: doc/tin.1:993 +#: doc/tin.1:994 msgid "View next unread article within thread." msgstr "Nächsten ungelesenen Artikel im Thread anzeigen." #. type: Plain text -#: doc/tin.1:998 +#: doc/tin.1:999 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 " @@ -2592,44 +2600,44 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1009 +#: doc/tin.1:1010 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:1013 +#: doc/tin.1:1014 msgid "" "Mark thread as read [after confirmation] and enter the next thread " "containing unread news." msgstr "" #. type: TP -#: doc/tin.1:1013 +#: doc/tin.1:1014 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1017 +#: doc/tin.1:1018 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1028 doc/tin.1:1250 +#: doc/tin.1:1029 doc/tin.1:1255 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:1031 +#: doc/tin.1:1032 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1037 +#: doc/tin.1:1038 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 " @@ -2637,146 +2645,152 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1040 +#: doc/tin.1:1041 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1060 +#: doc/tin.1:1061 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1065 +#: doc/tin.1:1066 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1068 +#: doc/tin.1:1069 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1072 doc/tin.1:1314 +#: doc/tin.1:1073 doc/tin.1:1319 msgid "" "Toggle tag status of current article for mailing, piping, printing, saving " "or reposting." msgstr "" #. type: TP -#: doc/tin.1:1072 +#: doc/tin.1:1073 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.1:1077 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1075 +#: doc/tin.1:1080 msgid "Untag all tagged threads." msgstr "Markierung aller markierten Threads entfernen." #. type: Plain text -#: doc/tin.1:1087 +#: doc/tin.1:1092 msgid "" "Mark current article in thread as unread. If a range of articles is set, the " "range will be marked as unread instead of the current article. When tagged " "articles are present, a prompt asks how to proceed." msgstr "" -#. -------------------------------------------------------------------- +#. ------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:1092 +#: doc/tin.1:1097 msgid "Mark all articles in thread as unread." msgstr "Alle Artikel im aktuellen Thread als ungelesen markieren." #. type: SS -#: doc/tin.1:1092 +#: doc/tin.1:1097 #, no-wrap msgid "ARTICLE VIEWER COMMANDS" msgstr "" #. type: Plain text -#: doc/tin.1:1097 +#: doc/tin.1:1102 msgid "Read the first (base) article in this thread." msgstr "Den ersten (Basis) Artikel in diesem Thread lesen." #. type: Plain text -#: doc/tin.1:1100 +#: doc/tin.1:1105 msgid "Read response 4 in this thread." msgstr "Antwort 4 im diesem Thread lesen." #. type: TP -#: doc/tin.1:1104 +#: doc/tin.1:1109 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1108 +#: doc/tin.1:1113 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:1108 +#: doc/tin.1:1113 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1113 +#: doc/tin.1:1118 msgid "Perform B<\\%pgp>(1) operations on article." msgstr "B<\\%pgp>(1) Operation auf den Artikel an anwenden." #. type: TP -#: doc/tin.1:1113 +#: doc/tin.1:1118 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1116 +#: doc/tin.1:1121 msgid "Toggles the display mode (raw including all headers vs. cooked)." msgstr "" "Schaltet den Anzeigemodus um (Roh einschließlich aller Header zu " "Aufbereitet)." #. type: TP -#: doc/tin.1:1120 +#: doc/tin.1:1125 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1123 +#: doc/tin.1:1128 msgid "Toggle the TAB width between 4 and 8 characters." msgstr "Tabulatorbreite zwischen 4 und 8 Zeichen Umschalten." #. type: TP -#: doc/tin.1:1123 +#: doc/tin.1:1128 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1127 +#: doc/tin.1:1132 msgid "" "Post a followup to the current article with a copy of the article with all " "headers included." msgstr "" #. type: TP -#: doc/tin.1:1127 +#: doc/tin.1:1132 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1131 +#: doc/tin.1:1136 msgid "" "Toggle TeX to ISO decoding for current article. The default behavior is " "taken from the B variable in the tinrc file." @@ -2786,49 +2800,49 @@ msgstr "" "entnommen." #. type: TP -#: doc/tin.1:1131 +#: doc/tin.1:1136 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1134 +#: doc/tin.1:1139 msgid "" "Toggles the display of all headers vs. headers in B." msgstr "" #. type: TP -#: doc/tin.1:1134 +#: doc/tin.1:1139 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1137 +#: doc/tin.1:1142 msgid "Toggle ROT-13 decoding for this article." msgstr "ROT-13 Entschlüsseln ein-/ausschalten." #. type: TP -#: doc/tin.1:1137 +#: doc/tin.1:1142 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1141 +#: doc/tin.1:1146 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:1141 +#: doc/tin.1:1146 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1148 +#: doc/tin.1:1153 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 " @@ -2838,23 +2852,23 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1157 +#: doc/tin.1:1162 msgid "Forward search the text of this article." msgstr "Vorwärts innerhalb dieses Artikels suchen." #. type: Plain text -#: doc/tin.1:1160 +#: doc/tin.1:1165 msgid "Backward search the text of this article." msgstr "Rückwärts innerhalb dieses Artikels suchen." #. type: TP -#: doc/tin.1:1160 +#: doc/tin.1:1165 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1165 +#: doc/tin.1:1170 msgid "" "Skip to the end of the next quoted text-block in this article. Quoted text " "is everything which matches B, B or " @@ -2862,40 +2876,40 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1165 +#: doc/tin.1:1170 #, no-wrap msgid "B'>" msgstr "B'>" #. type: Plain text -#: doc/tin.1:1168 +#: doc/tin.1:1173 msgid "Go to the first article in the current thread." msgstr "Gehe zum ersten Artikel im aktuellen Thread." #. type: TP -#: doc/tin.1:1168 +#: doc/tin.1:1173 #, no-wrap msgid "B'>" msgstr "B'>" #. type: Plain text -#: doc/tin.1:1171 +#: doc/tin.1:1176 msgid "Go to the last article in the current thread." msgstr "Gehe zum letzten Artikel im aktuellen Thread." #. type: TP -#: doc/tin.1:1171 +#: doc/tin.1:1176 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1174 +#: doc/tin.1:1179 msgid "Toggle word highlighting on/off." msgstr "Wort-Hervorheben ein-/ausschalten." #. type: Plain text -#: doc/tin.1:1188 +#: doc/tin.1:1193 msgid "" "Auto select article(s) with a single key. The defaults used for selection " "are set based upon the following four tinrc config variables: " @@ -2907,7 +2921,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1197 +#: doc/tin.1:1202 msgid "" "Kill article(s) with a single key. The defaults used for killing are based " "upon the following four tinrc config variables: B, " @@ -2918,24 +2932,24 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1197 +#: doc/tin.1:1202 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" #. type: Plain text -#: doc/tin.1:1200 +#: doc/tin.1:1205 msgid "Go to next base article." msgstr "Zum nächsten Basisartikel springen." #. type: TP -#: doc/tin.1:1200 +#: doc/tin.1:1205 #, no-wrap msgid "BTABE'>" msgstr "BTABE'>" #. type: Plain text -#: doc/tin.1:1205 +#: doc/tin.1:1210 msgid "" "Go to next unread article. If the tinrc variable B doesn't " "contain PageNextUnread, then this key will first page through the current " @@ -2943,337 +2957,337 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1208 +#: doc/tin.1:1213 msgid "Author forward search." msgstr "Suche nach Autor (vorwärts)." #. type: Plain text -#: doc/tin.1:1211 +#: doc/tin.1:1216 msgid "Author backward search." msgstr "Suche nach Autor (rückwärts)." #. type: Plain text -#: doc/tin.1:1219 +#: doc/tin.1:1224 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:1223 +#: doc/tin.1:1228 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:1223 +#: doc/tin.1:1228 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1228 +#: doc/tin.1:1233 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1231 +#: doc/tin.1:1236 msgid "" "Edit the current article. This is restricted to mailgroups and saved news." msgstr "" #. type: TP -#: doc/tin.1:1234 +#: doc/tin.1:1239 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1237 +#: doc/tin.1:1242 msgid "" "Post a followup to the current article with a copy of the article included." msgstr "" #. type: TP -#: doc/tin.1:1237 +#: doc/tin.1:1242 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1241 +#: doc/tin.1:1246 msgid "" "Post a followup to the current article without including a copy of the " "article." msgstr "" #. type: TP -#: doc/tin.1:1241 +#: doc/tin.1:1246 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1244 +#: doc/tin.1:1249 msgid "Go to the start of the article." msgstr "Zum Anfang des Artikels springen." #. type: TP -#: doc/tin.1:1244 +#: doc/tin.1:1249 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1247 +#: doc/tin.1:1252 msgid "Go to the end of the article." msgstr "Zum Ende des Artikels springen." #. type: TP -#: doc/tin.1:1253 +#: doc/tin.1:1258 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1256 +#: doc/tin.1:1261 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:1256 +#: doc/tin.1:1261 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1259 +#: doc/tin.1:1264 msgid "Show the thread menu that the current article is a part of." msgstr "" #. type: TP -#: doc/tin.1:1262 +#: doc/tin.1:1267 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1271 +#: doc/tin.1:1276 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1274 +#: doc/tin.1:1279 msgid "Go to the next article." msgstr "Gehe zum nächsten Artikel." #. type: TP -#: doc/tin.1:1274 +#: doc/tin.1:1279 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1282 +#: doc/tin.1:1287 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1285 +#: doc/tin.1:1290 msgid "Go to the previous article." msgstr "Gehe zum vorherigen Artikel." #. type: TP -#: doc/tin.1:1285 +#: doc/tin.1:1290 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1288 +#: doc/tin.1:1293 msgid "Go to the previous unread article." msgstr "" #. type: Plain text -#: doc/tin.1:1291 +#: doc/tin.1:1296 msgid "Return to the previous level." msgstr "Kehrt zur vorherigen Ebene zurück." #. type: TP -#: doc/tin.1:1294 +#: doc/tin.1:1299 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1298 +#: doc/tin.1:1303 msgid "" "Reply through mail to the author of the current article with a copy of the " "article included." msgstr "" #. type: TP -#: doc/tin.1:1298 +#: doc/tin.1:1303 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1302 +#: doc/tin.1:1307 msgid "" "Reply through mail to the author of the current article without including " "the original article." msgstr "" #. type: TP -#: doc/tin.1:1302 +#: doc/tin.1:1307 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1307 +#: doc/tin.1:1312 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1310 +#: doc/tin.1:1315 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1314 +#: doc/tin.1:1319 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1317 +#: doc/tin.1:1322 msgid "Return to group selection level." msgstr "Kehrt zur Auswahlebene zurück." #. type: TP -#: doc/tin.1:1317 +#: doc/tin.1:1322 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1320 +#: doc/tin.1:1325 msgid "Go to parent article." msgstr "" #. type: TP -#: doc/tin.1:1320 +#: doc/tin.1:1325 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1324 +#: doc/tin.1:1329 msgid "" "Display a list of URLs in the current article. See the section \"URL LISTING" "\" for more information." msgstr "" #. type: TP -#: doc/tin.1:1324 +#: doc/tin.1:1329 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1328 +#: doc/tin.1:1333 msgid "" "Display a list of attachments of the current article. See the section " "\"ATTACHMENT LISTING\" for more information." msgstr "" #. type: TP -#: doc/tin.1:1335 +#: doc/tin.1:1340 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1344 +#: doc/tin.1:1349 msgid "Mark article as unread." msgstr "Alle Artikel als ungelesen markieren." -#. -------------------------------------------------------------------- +#. ------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:1349 +#: doc/tin.1:1354 msgid "Mark the current thread as unread." msgstr "Markiere den aktuellen Thread als ungelesen." #. type: SS -#: doc/tin.1:1349 +#: doc/tin.1:1354 #, no-wrap msgid "URL LISTING" msgstr "URL LISTE" #. type: Plain text -#: doc/tin.1:1352 +#: doc/tin.1:1357 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:1353 +#: doc/tin.1:1358 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" #. type: Plain text -#: doc/tin.1:1357 +#: doc/tin.1:1362 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:1360 +#: doc/tin.1:1365 msgid "URL forward search." msgstr "Suche nach URL (vorwärts)." #. type: Plain text -#: doc/tin.1:1363 +#: doc/tin.1:1368 msgid "URL backward search." msgstr "Suche nach URL (rückwärts)." #. type: Plain text -#: doc/tin.1:1369 doc/tin.1:1422 +#: doc/tin.1:1374 doc/tin.1:1427 msgid "Shell escape." msgstr "Ausgang zur Shell." #. type: Plain text -#: doc/tin.1:1372 +#: doc/tin.1:1377 msgid "Toggle the display of the current URL in the last line." msgstr "Anzeige der aktuellen URL in der letzten Zeile (de)aktivieren." #. type: Plain text -#: doc/tin.1:1375 doc/tin.1:1429 +#: doc/tin.1:1380 doc/tin.1:1434 msgid "Help screen of commands available." msgstr "Hilfeseite der verfügbaren Befehle." -#. -------------------------------------------------------------------- +#. ------------------------------------------------------------------- #. type: SS -#: doc/tin.1:1381 +#: doc/tin.1:1386 #, no-wrap msgid "ATTACHMENT LISTING" msgstr "" #. type: Plain text -#: doc/tin.1:1384 +#: doc/tin.1:1389 msgid "" "B ('B') displays a list of attachments of the current " "article. Besides the common moving keys, the following commands are " @@ -3281,116 +3295,116 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1385 +#: doc/tin.1:1390 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1388 +#: doc/tin.1:1393 msgid "Pipe attachment into command." msgstr "Anhang an Befehl weiterleiten." #. type: TP -#: doc/tin.1:1388 +#: doc/tin.1:1393 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1391 +#: doc/tin.1:1396 msgid "Save current attachment / tagged attachments to disk." msgstr "" #. type: TP -#: doc/tin.1:1391 +#: doc/tin.1:1396 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" #. type: Plain text -#: doc/tin.1:1394 +#: doc/tin.1:1399 msgid "View attachment." msgstr "Multimediaanhänge anzeigen." #. type: TP -#: doc/tin.1:1394 +#: doc/tin.1:1399 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1397 +#: doc/tin.1:1402 msgid "Tag one or more attachments for saving." msgstr "" #. type: TP -#: doc/tin.1:1397 +#: doc/tin.1:1402 #, no-wrap msgid "B" #. type: Plain text -#: doc/tin.1:1401 +#: doc/tin.1:1406 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:1401 +#: doc/tin.1:1406 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1404 +#: doc/tin.1:1409 msgid "Reverse tagging of all attachments." msgstr "Markierung der Anhänge umkehren." #. type: TP -#: doc/tin.1:1404 +#: doc/tin.1:1409 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1407 +#: doc/tin.1:1412 msgid "Untag all tagged attachments." msgstr "Markierung der markierten Anhängen aufheben." #. type: Plain text -#: doc/tin.1:1410 +#: doc/tin.1:1415 msgid "Attachment forward search." msgstr "" #. type: Plain text -#: doc/tin.1:1413 +#: doc/tin.1:1418 msgid "Attachment backward search." msgstr "" #. type: TP -#: doc/tin.1:1416 +#: doc/tin.1:1421 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1419 +#: doc/tin.1:1424 msgid "" "Pipe attachment into command. Uses the raw attachment, no decoding is done." msgstr "" #. type: Plain text -#: doc/tin.1:1426 +#: doc/tin.1:1431 msgid "" "Toggle the display of the name/description of the current attachment in the " "last line." msgstr "Name oder Beschreibung des Anhangs in der untersten Zeile anzeigen." -#. -------------------------------------------------------------------- +#. ------------------------------------------------------------------- #. type: SS -#: doc/tin.1:1435 +#: doc/tin.1:1440 #, no-wrap msgid "GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES" msgstr "" @@ -3399,7 +3413,7 @@ msgstr "" #. - \fI${TIN_LIBDIR:\-NEWSLIBDIR}/tinrc\fR is used #. in the !TIN_DEFAULTS_DIR config case #. type: Plain text -#: doc/tin.1:1447 +#: doc/tin.1:1452 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 " @@ -3410,7 +3424,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1455 +#: doc/tin.1:1460 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 " @@ -3421,7 +3435,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1461 +#: doc/tin.1:1466 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 " @@ -3431,7 +3445,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1468 +#: doc/tin.1:1473 msgid "" "As with the other menus, B ('B<^L>') will redraw the screen. You " "can use B ('B'), B ('B') and B " @@ -3441,7 +3455,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1473 +#: doc/tin.1:1478 msgid "" "The options menu provides access to the attributes menu for the current " "group by the B ('BTABE>') command. Pressing " @@ -3450,14 +3464,14 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1476 +#: doc/tin.1:1481 msgid "" "The B ('B') command brings up the scopes menu. For more " "information see section \"SCOPES MENU\"." msgstr "" #. type: Plain text -#: doc/tin.1:1480 +#: doc/tin.1:1485 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/" @@ -3465,13 +3479,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1480 +#: doc/tin.1:1485 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1486 doc/tin.5:1204 +#: doc/tin.1:1491 doc/tin.5:1253 msgid "" "If ON abbreviate long newsgroup names at group selection level and article " "level (if necessary) like this: news.software.readers -E n.software." @@ -3482,13 +3496,13 @@ msgstr "" "readers -E n.s.readers -E n.s.r. Voreinstellung ist OFF." #. type: TP -#: doc/tin.1:1486 +#: doc/tin.1:1491 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1490 doc/tin.5:1208 +#: doc/tin.1:1495 doc/tin.5:1257 msgid "" "If ON add posted articles which start a new thread to filter for " "highlighting follow-ups. Default is ON." @@ -3497,24 +3511,24 @@ msgstr "" "hinzu um eventuelle Antworten hervorzuheben. Voreinstellung ist ON." #. type: TP -#: doc/tin.1:1490 +#: doc/tin.1:1495 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1493 doc/tin.5:1211 +#: doc/tin.1:1498 doc/tin.5:1260 msgid "Turn ON advertising in header (''User-Agent:''). Default is ON." msgstr "Falls ON füge 'User-Agent:'-Kopfzeile ein. Voreinstellung ist ON." #. type: TP -#: doc/tin.1:1493 +#: doc/tin.1:1498 #, no-wrap msgid "B" msgstr "B<Übersp. multipart/alternative-Teile (alternative_handling)>" #. type: Plain text -#: doc/tin.1:1496 doc/tin.5:1214 +#: doc/tin.1:1501 doc/tin.5:1263 msgid "" "If ON strip multipart/alternative messages automatically. Default is ON." msgstr "" @@ -3522,25 +3536,25 @@ msgstr "" "Voreinstellung ist ON." #. type: TP -#: doc/tin.1:1496 +#: doc/tin.1:1501 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1499 doc/tin.5:1217 +#: doc/tin.1:1504 doc/tin.5:1266 msgid "The character used to show that an article was deleted. Default is 'D'." msgstr "" "Zeichen das anzeigt, dass ein Artikel gelöscht wurde. Voreinstellung ist 'D'." #. type: TP -#: doc/tin.1:1499 +#: doc/tin.1:1504 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1502 doc/tin.5:1220 +#: doc/tin.1:1507 doc/tin.5:1269 msgid "" "The character used to show that an article is in a range. Default is '#'." msgstr "" @@ -3548,13 +3562,13 @@ msgstr "" "befindet. Voreinstellung ist '#'." #. type: TP -#: doc/tin.1:1502 +#: doc/tin.1:1507 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1506 doc/tin.5:1224 +#: doc/tin.1:1511 doc/tin.5:1273 msgid "" "The character used to show that an article will return as an unread article " "when the group is next entered. Default is '-'." @@ -3564,13 +3578,13 @@ msgstr "" "Voreinstellung ist '-'." #. type: TP -#: doc/tin.1:1506 +#: doc/tin.1:1511 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1510 doc/tin.5:1228 +#: doc/tin.1:1515 doc/tin.5:1277 msgid "" "The character used to show that an article/thread is auto-selected (hot). " "Default is '*'." @@ -3579,13 +3593,13 @@ msgstr "" "automatisch ausgewählt ist (heiß). Voreinstellung ist '*'." #. type: TP -#: doc/tin.1:1510 +#: doc/tin.1:1515 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1514 doc/tin.5:1232 +#: doc/tin.1:1519 doc/tin.5:1281 msgid "" "The character used to show that an article/thread is recent (not older than " "X days). See also B. Default is 'o'." @@ -3594,13 +3608,13 @@ msgstr "" "(nicht älter als X Tage). Siehe auch B. Voreinstellung ist ' o'." #. type: TP -#: doc/tin.1:1514 +#: doc/tin.1:1519 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1518 doc/tin.5:1236 +#: doc/tin.1:1523 doc/tin.5:1285 msgid "" "The character used to show that an article has not been read. Default is " "'+'." @@ -3609,26 +3623,26 @@ msgstr "" "Voreinstellung ist '+'." #. type: TP -#: doc/tin.1:1518 +#: doc/tin.1:1523 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1521 doc/tin.5:1239 +#: doc/tin.1:1526 doc/tin.5:1288 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:1521 +#: doc/tin.1:1526 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1525 doc/tin.5:1243 +#: doc/tin.1:1530 doc/tin.5:1292 msgid "" "The character used to show that an article was killed. Default is 'K'. " "B must be set accordingly." @@ -3637,26 +3651,26 @@ msgstr "" "'K'). B muss passend gesetzt sein." #. type: TP -#: doc/tin.1:1525 +#: doc/tin.1:1530 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1529 doc/tin.5:1247 +#: doc/tin.1:1534 doc/tin.5:1296 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:1529 doc/tin.5:1247 +#: doc/tin.1:1534 doc/tin.5:1296 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1534 +#: doc/tin.1:1539 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 " @@ -3664,26 +3678,26 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1534 +#: doc/tin.1:1539 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1538 doc/tin.5:1258 +#: doc/tin.1:1543 doc/tin.5:1307 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:1538 +#: doc/tin.1:1543 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1542 doc/tin.5:1262 +#: doc/tin.1:1547 doc/tin.5:1311 msgid "" "If ON automatically list thread when entering it using right arrow key. " "Default is ON." @@ -3692,24 +3706,24 @@ msgstr "" "anzeigen? Voreinstellung ist ON." #. type: TP -#: doc/tin.1:1542 +#: doc/tin.1:1547 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1545 doc/tin.1:2528 +#: doc/tin.1:1550 doc/tin.1:2550 msgid "Default is OFF." msgstr "Voreinstellung ist OFF." #. type: TP -#: doc/tin.1:1545 +#: doc/tin.1:1550 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1551 doc/tin.5:1271 +#: doc/tin.1:1556 doc/tin.5:1320 msgid "" "If ON articles/threads with ''Archive-name:'' in header will be " "automatically saved with the Archive-name & part/patch no and post processed " @@ -3717,13 +3731,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1551 +#: doc/tin.1:1556 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1556 doc/tin.5:1276 +#: doc/tin.1:1561 doc/tin.5:1325 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 " @@ -3734,13 +3748,13 @@ msgstr "" "Voreinstellung ist ON." #. type: TP -#: doc/tin.1:1556 +#: doc/tin.1:1561 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1561 doc/tin.5:1281 +#: doc/tin.1:1566 doc/tin.5:1330 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 " @@ -3748,13 +3762,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1561 +#: doc/tin.1:1566 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1566 +#: doc/tin.1:1571 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. " @@ -3762,13 +3776,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1566 +#: doc/tin.1:1571 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1572 doc/tin.5:1292 +#: doc/tin.1:1577 doc/tin.5:1341 msgid "" "Use this hash algorithm for cancel-locks. Only available when build with " "cancel-lock support. none disables the generation of cancel-locks. Valid " @@ -3780,313 +3794,324 @@ msgstr "" "sha512. Voreinstellung ist sha1." #. type: TP -#: doc/tin.1:1572 +#: doc/tin.1:1577 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1578 doc/tin.5:1296 +#: doc/tin.1:1583 doc/tin.5:1345 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:1578 +#: doc/tin.1:1583 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1581 doc/tin.5:1299 +#: doc/tin.1:1586 doc/tin.5:1348 msgid "Standard background color" msgstr "Standard Hintergrundfarbe" #. type: TP -#: doc/tin.1:1581 +#: doc/tin.1:1586 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1584 doc/tin.5:1302 +#: doc/tin.1:1589 doc/tin.5:1351 msgid "Color of quoted text from external sources" msgstr "Farbe des Fremdzitat-Textes" #. type: TP -#: doc/tin.1:1584 +#: doc/tin.1:1589 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1587 doc/tin.5:1305 +#: doc/tin.1:1592 doc/tin.5:1354 msgid "Color of sender (From:)" msgstr "Farbe des Autors (From:)" #. type: TP -#: doc/tin.1:1587 +#: doc/tin.1:1592 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1590 doc/tin.5:1308 +#: doc/tin.1:1595 doc/tin.5:1357 msgid "Color of header-lines" msgstr "Farbe der Artikelheaderzeilen" #. type: TP -#: doc/tin.1:1590 +#: doc/tin.1:1595 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1593 doc/tin.5:1311 +#: doc/tin.1:1598 doc/tin.5:1360 msgid "Color of help pages" msgstr "Farbe des Hilfstext" #. type: TP -#: doc/tin.1:1593 +#: doc/tin.1:1598 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1596 doc/tin.5:1314 +#: doc/tin.1:1601 doc/tin.5:1363 msgid "Color of background for inverse text" msgstr "Hintergrundfarbe für inversen Text" #. type: TP -#: doc/tin.1:1596 +#: doc/tin.1:1601 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1599 doc/tin.5:1317 +#: doc/tin.1:1604 doc/tin.5:1366 msgid "Color of foreground for inverse text" msgstr "Vordergrundfarbe für inversen Text" #. type: TP -#: doc/tin.1:1599 +#: doc/tin.1:1604 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1607 doc/tin.5:1385 +msgid "Color of status messages in last line" +msgstr "" + +#. type: TP +#: doc/tin.1:1607 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1603 doc/tin.5:1321 +#: doc/tin.1:1611 doc/tin.5:1370 msgid "" "Color of words emphasized like _this_. See also B and " "B." msgstr "" #. type: TP -#: doc/tin.1:1603 +#: doc/tin.1:1611 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1607 doc/tin.5:1325 +#: doc/tin.1:1615 doc/tin.5:1374 msgid "" "Color of words emphasized like /this/. See also B and " "B." msgstr "" #. type: TP -#: doc/tin.1:1607 +#: doc/tin.1:1615 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1611 doc/tin.5:1329 +#: doc/tin.1:1619 doc/tin.5:1378 msgid "" "Color of words emphasized like *this*. See also B and " "B." msgstr "" #. type: TP -#: doc/tin.1:1611 +#: doc/tin.1:1619 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1615 doc/tin.5:1333 +#: doc/tin.1:1623 doc/tin.5:1382 msgid "" "Color of words emphasized like -this-. See also B and " "B." msgstr "" #. type: TP -#: doc/tin.1:1615 +#: doc/tin.1:1623 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1618 doc/tin.5:1336 +#: doc/tin.1:1626 doc/tin.5:1388 msgid "Color of mini help menu" msgstr "Farbe des Minihilfemenü" #. type: TP -#: doc/tin.1:1618 +#: doc/tin.1:1626 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1621 doc/tin.5:1339 +#: doc/tin.1:1629 doc/tin.5:1391 msgid "Color of actual news header fields" msgstr "Farbe des angezeigten Headers" #. type: TP -#: doc/tin.1:1621 +#: doc/tin.1:1629 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1624 doc/tin.5:1342 +#: doc/tin.1:1632 doc/tin.5:1394 msgid "Standard foreground color" msgstr "Standard Vordergrundfarbe" #. type: TP -#: doc/tin.1:1624 +#: doc/tin.1:1632 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1627 doc/tin.5:1345 +#: doc/tin.1:1635 doc/tin.5:1397 msgid "Color of quoted lines" msgstr "Farbe der zitierten Zeilen" #. type: TP -#: doc/tin.1:1627 +#: doc/tin.1:1635 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1630 doc/tin.5:1348 +#: doc/tin.1:1638 doc/tin.5:1400 msgid "Color of twice quoted lines" msgstr "Farbe von zweifach zitierten Zeilen" #. type: TP -#: doc/tin.1:1630 +#: doc/tin.1:1638 #, no-wrap msgid "B3 times quoted line (col_quote3)>" msgstr "B3-fach zitierten Zeilen (col_quote3)>" #. type: Plain text -#: doc/tin.1:1633 doc/tin.5:1351 +#: doc/tin.1:1641 doc/tin.5:1403 msgid "Color of E=3 times quoted lines" msgstr "Farbe von =E3-fach zitierten Zeilen" #. type: TP -#: doc/tin.1:1633 +#: doc/tin.1:1641 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1637 doc/tin.5:1355 +#: doc/tin.1:1645 doc/tin.5:1407 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:1637 +#: doc/tin.1:1645 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1640 doc/tin.5:1358 +#: doc/tin.1:1648 doc/tin.5:1410 msgid "Color of signatures" msgstr "Farbe von Signaturen" #. type: TP -#: doc/tin.1:1640 +#: doc/tin.1:1648 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1643 doc/tin.5:1361 +#: doc/tin.1:1651 doc/tin.5:1413 msgid "Color of urls highlight" msgstr "Farbe der hervorgehobenen URLs" #. type: TP -#: doc/tin.1:1643 +#: doc/tin.1:1651 #, no-wrap msgid "B" msgstr "B" # #. type: Plain text -#: doc/tin.1:1646 doc/tin.5:1364 +#: doc/tin.1:1654 doc/tin.5:1416 msgid "Color of verbatim blocks" msgstr "Farbe des wortgetreu darzustellenden Textes" #. type: TP -#: doc/tin.1:1646 +#: doc/tin.1:1654 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1649 doc/tin.5:1367 +#: doc/tin.1:1657 doc/tin.5:1419 msgid "Color of article subject" msgstr "Farbe der Subjectzeile" #. type: TP -#: doc/tin.1:1649 +#: doc/tin.1:1657 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1652 doc/tin.5:1370 +#: doc/tin.1:1660 doc/tin.5:1422 msgid "Color of text-lines" msgstr "Farbe der Textzeilen" #. type: TP -#: doc/tin.1:1652 +#: doc/tin.1:1660 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1655 doc/tin.5:1373 +#: doc/tin.1:1663 doc/tin.5:1425 msgid "Color of help/mail sign" msgstr "Farbe des Hilfe/Mail-Zeichens" #. type: TP -#: doc/tin.1:1655 +#: doc/tin.1:1663 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1658 +#: doc/tin.1:1666 msgid "Ask for manual confirmation to protect the user." msgstr "Vorsichtshalber um Bestätigung bitten." #. type: IP -#: doc/tin.1:1659 doc/tin.1:1665 doc/tin.1:1669 +#: doc/tin.1:1667 doc/tin.1:1673 doc/tin.1:1677 #, no-wrap msgid "\\(bu" msgstr "\\(bu" #. TODO: check if all affected commands are marked [after confirmation] #. type: Plain text -#: doc/tin.1:1665 +#: doc/tin.1:1673 msgid "" "B Ask for confirmation before executing certain dangerous commands " "(e.g., B ('B')). Commands that this affects are marked in this " @@ -4094,21 +4119,21 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1669 +#: doc/tin.1:1677 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:1673 +#: doc/tin.1:1681 msgid "" "B: Ask for confirmation before marking all not selected (with " "B ('B') command) articles as read." msgstr "" #. type: Plain text -#: doc/tin.5:1394 +#: doc/tin.5:1446 msgid "Default is commands & quit." msgstr "Voreinstellung ist Kommandos & Ende." #. type: Plain text -#: doc/tin.5:1405 +#: doc/tin.5:1457 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<\\" @@ -11763,61 +11917,61 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1405 +#: doc/tin.5:1457 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1407 +#: doc/tin.5:1459 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1409 +#: doc/tin.5:1461 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1412 +#: doc/tin.5:1464 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1415 +#: doc/tin.5:1467 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1419 +#: doc/tin.5:1471 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1424 +#: doc/tin.5:1476 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1428 +#: doc/tin.5:1480 #, no-wrap msgid "B" msgstr "B" #. type: ta -#: doc/tin.5:1433 doc/tin.5:1462 +#: doc/tin.5:1485 doc/tin.5:1514 #, 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:1442 doc/tin.5:1471 +#: doc/tin.5:1494 doc/tin.5:1523 #, no-wrap msgid "" "0\t''Subject:'' (case sensitive)\n" @@ -11839,139 +11993,139 @@ msgstr "" "7\t''Lines:''\n" #. type: TP -#: doc/tin.5:1444 +#: doc/tin.5:1496 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1448 +#: doc/tin.5:1500 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1453 +#: doc/tin.5:1505 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1457 +#: doc/tin.5:1509 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1473 +#: doc/tin.5:1525 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1475 +#: doc/tin.5:1527 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1477 +#: doc/tin.5:1529 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1479 +#: doc/tin.5:1531 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1481 +#: doc/tin.5:1533 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1483 +#: doc/tin.5:1535 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1485 +#: doc/tin.5:1537 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1487 +#: doc/tin.5:1539 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1489 +#: doc/tin.5:1541 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1491 +#: doc/tin.5:1543 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1493 +#: doc/tin.5:1545 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1495 +#: doc/tin.5:1547 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1497 +#: doc/tin.5:1549 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1499 +#: doc/tin.5:1551 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1501 +#: doc/tin.5:1553 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1503 +#: doc/tin.5:1555 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1505 +#: doc/tin.5:1557 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1507 +#: doc/tin.5:1559 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1516 +#: doc/tin.5:1568 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., /" @@ -11979,13 +12133,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1519 +#: doc/tin.5:1571 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1526 +#: doc/tin.5:1578 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, " @@ -11993,19 +12147,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1526 +#: doc/tin.5:1578 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1530 +#: doc/tin.5:1582 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1537 +#: doc/tin.5:1589 msgid "" "If B is E 0 not more than the last B " "articles/group are fetched from the server. If B is E 0 B<" @@ -12014,13 +12168,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1537 +#: doc/tin.5:1589 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1551 +#: doc/tin.5:1603 msgid "" "Which keys B<\\%tin>(1) should accept to jump to the next unread article. " "Possible is any combination of B and B. When " @@ -12031,7 +12185,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1558 +#: doc/tin.5:1610 msgid "" "The format string used for the Group level. Default is \"%n\\ %m\\ %R\\ %L\\ " "\\ %s\\ \\ %F\". The following substitutions are supported:" @@ -12041,13 +12195,13 @@ msgstr "" "Ersetzungen werden unterstützt:" #. type: ta -#: doc/tin.5:1560 +#: doc/tin.5:1612 #, 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:1572 +#: doc/tin.5:1624 #, no-wrap msgid "" "%D\tdate\n" @@ -12075,31 +12229,31 @@ msgstr "" "%%\t%\n" #. type: TP -#: doc/tin.5:1574 +#: doc/tin.5:1626 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1584 +#: doc/tin.5:1636 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1591 +#: doc/tin.5:1643 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1597 +#: doc/tin.5:1649 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1603 +#: doc/tin.5:1655 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, " @@ -12108,32 +12262,32 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1603 +#: doc/tin.5:1655 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1607 +#: doc/tin.5:1659 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1612 +#: doc/tin.5:1664 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1616 +#: doc/tin.5:1668 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:1624 +#: doc/tin.5:1676 msgid "" "B is the 'traditional' behavior of B<\\%tin>(1). " "Only unread articles are killed once only by marking them read. As filtering " @@ -12143,106 +12297,106 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1640 +#: doc/tin.5:1692 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1650 +#: doc/tin.5:1702 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1655 +#: doc/tin.5:1707 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1674 +#: doc/tin.5:1726 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1711 +#: doc/tin.5:1763 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1723 doc/tin.5:2426 +#: doc/tin.5:1775 doc/tin.5:2492 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1756 +#: doc/tin.5:1808 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1761 +#: doc/tin.5:1813 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1766 +#: doc/tin.5:1818 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1771 +#: doc/tin.5:1823 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1776 +#: doc/tin.5:1828 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1782 +#: doc/tin.5:1834 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: TP -#: doc/tin.5:1803 +#: doc/tin.5:1855 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1806 +#: doc/tin.5:1858 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:1806 +#: doc/tin.5:1858 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1810 +#: doc/tin.5:1862 msgid "" "The normalization form which should be used to normalize unicode input. The " "possible values are:" msgstr "" #. type: Plain text -#: doc/tin.5:1828 +#: doc/tin.5:1880 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 " @@ -12250,7 +12404,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1856 +#: doc/tin.5:1908 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 " @@ -12258,7 +12412,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1862 +#: doc/tin.5:1914 msgid "" "This specifies whether to perform post processing on saved articles. " "Because the shell archive may contain commands you may not want to be " @@ -12267,7 +12421,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1870 +#: doc/tin.5:1922 msgid "" "B, unpacking of multi-part B<\\%shar>(1) files only. " "Because the shell archive may contain commands you may not want to be " @@ -12275,19 +12429,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1873 +#: doc/tin.5:1925 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1883 +#: doc/tin.5:1937 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1893 +#: doc/tin.5:1947 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 " @@ -12296,7 +12450,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1901 +#: doc/tin.5:1955 msgid "" "If ON show empty ''Followup-To:'' header when editing an article. Default " "is OFF." @@ -12305,13 +12459,13 @@ msgstr "" "ist OFF." #. type: TP -#: doc/tin.5:1906 +#: doc/tin.5:1960 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1912 +#: doc/tin.5:1966 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 " @@ -12320,7 +12474,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1917 +#: doc/tin.5:1971 msgid "" "B Compress quote characters together when quoting multiple " "times (for example, 'E E E' will be turned into " @@ -12328,7 +12482,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1923 +#: doc/tin.5:1977 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 " @@ -12337,18 +12491,18 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1925 +#: doc/tin.5:1979 msgid "B This option is on by default." msgstr "B Diese Option ist standardmäßig aktiviert." #. type: TP -#: doc/tin.5:1926 +#: doc/tin.5:1980 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1933 +#: doc/tin.5:1987 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, then B<" @@ -12356,13 +12510,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1933 +#: doc/tin.5:1987 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1940 +#: doc/tin.5:1994 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, then " @@ -12370,13 +12524,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1940 +#: doc/tin.5:1994 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1947 +#: doc/tin.5:2001 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, then " @@ -12384,19 +12538,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1947 +#: doc/tin.5:2001 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1951 +#: doc/tin.5:2005 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1958 +#: doc/tin.5:2012 msgid "" "If ON B<\\%tin>(1) does the rendering of bi-directional text. If OFF B<\\" "%tin>(1) leaves the rendering of bi-directional text to the terminal. " @@ -12404,49 +12558,49 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1958 +#: doc/tin.5:2012 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1967 +#: doc/tin.5:2021 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1971 +#: doc/tin.5:2025 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1975 +#: doc/tin.5:2029 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1979 +#: doc/tin.5:2033 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1983 +#: doc/tin.5:2037 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1991 +#: doc/tin.5:2045 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1995 +#: doc/tin.5:2049 msgid "" "The format string used for the Selection level. Default is \"%f\\ %n\\ %U\\ " "\\ %G\\ \\ %d\". The following substitutions are supported:" @@ -12456,13 +12610,13 @@ msgstr "" "Ersetzungen werden unterstützt:" #. type: ta -#: doc/tin.5:1997 +#: doc/tin.5:2051 #, 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:2004 +#: doc/tin.5:2058 #, no-wrap msgid "" "%G\tgroup name\n" @@ -12480,19 +12634,19 @@ msgstr "" "%%\t%\n" #. type: TP -#: doc/tin.5:2006 +#: doc/tin.5:2060 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2037 +#: doc/tin.5:2091 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2046 +#: doc/tin.5:2100 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 " @@ -12503,19 +12657,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2068 +#: doc/tin.5:2122 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2091 +#: doc/tin.5:2145 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2098 +#: doc/tin.5:2152 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -12523,19 +12677,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2144 +#: doc/tin.5:2198 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2151 +#: doc/tin.5:2205 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2158 +#: doc/tin.5:2212 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -12543,31 +12697,50 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2163 +#: doc/tin.5:2217 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2167 +#: doc/tin.5:2221 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2176 +#: doc/tin.5:2230 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2180 +#: doc/tin.5:2234 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2240 +msgid "" +"A regular expression to find Subject prefixes like \"Re:\" to remove If " +"B is blank, then B<\\%tin>(1) uses a built-in default." +msgstr "" + +#. type: TP +#: doc/tin.5:2240 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:2246 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2187 +#: doc/tin.5:2253 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -12575,7 +12748,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2192 +#: doc/tin.5:2258 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 " @@ -12583,7 +12756,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2202 +#: doc/tin.5:2268 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 " @@ -12595,7 +12768,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2206 +#: doc/tin.5:2272 msgid "" "The format string used for the Thread level. Default is \"%n\\ %m\\ \\ " "[%L]\\ \\ %T\\ \\ %F\". The following substitutions are supported:" @@ -12605,13 +12778,13 @@ msgstr "" "Ersetzungen werden unterstützt:" #. type: ta -#: doc/tin.5:2208 +#: doc/tin.5:2274 #, 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:2219 +#: doc/tin.5:2285 #, no-wrap msgid "" "%D\tdate\n" @@ -12637,7 +12810,7 @@ msgstr "" "%%\t%\n" #. type: Plain text -#: doc/tin.5:2226 +#: doc/tin.5:2292 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 " @@ -12645,19 +12818,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2230 +#: doc/tin.5:2296 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2242 +#: doc/tin.5:2308 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2256 +#: doc/tin.5:2322 msgid "" "Allows you to select how B<\\%tin>(1) treats blank lines in article " "bodies. Default is 0. This option does not affect lines within verbatim " @@ -12665,13 +12838,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2275 +#: doc/tin.5:2341 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2282 +#: doc/tin.5:2348 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -12679,13 +12852,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2282 +#: doc/tin.5:2348 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2286 +#: doc/tin.5:2352 msgid "" "If ON remove I<${TIN_HOMEDIR:-\"$HOME\"}/.article> after posting. Default is " "ON." @@ -12694,54 +12867,54 @@ msgstr "" "Voreinstellung ist ON." #. type: TP -#: doc/tin.5:2286 +#: doc/tin.5:2352 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2291 +#: doc/tin.5:2357 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2294 +#: doc/tin.5:2360 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2299 +#: doc/tin.5:2365 msgid "If enabled B<\\%tin>(1) uses ANSI-colors. Default is OFF." msgstr "" #. type: TP -#: doc/tin.5:2299 +#: doc/tin.5:2365 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2302 +#: doc/tin.5:2368 msgid "Use scroll keys on keypad. Default is OFF." msgstr "" "Navigationstasten auf dem Tastenfeld verwenden. Voreinstellung ist OFF." #. type: TP -#: doc/tin.5:2302 +#: doc/tin.5:2368 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2308 +#: doc/tin.5:2374 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2320 +#: doc/tin.5:2386 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 " @@ -12750,19 +12923,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2320 +#: doc/tin.5:2386 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2324 +#: doc/tin.5:2390 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2328 +#: doc/tin.5:2394 msgid "" "A regular expression that B will use to find the begin of a verbatim " "block. Default is #v+" @@ -12771,13 +12944,13 @@ msgstr "" "Absatzes findet. Voreinstellung ist #v+" #. type: TP -#: doc/tin.5:2328 +#: doc/tin.5:2394 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2332 +#: doc/tin.5:2398 msgid "" "A regular expression that B will use to find the end of a verbatim " "block. Default is #v-" @@ -12786,13 +12959,13 @@ msgstr "" "Absatzes findet. Voreinstellung ist #v-" #. type: TP -#: doc/tin.5:2335 +#: doc/tin.5:2401 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2351 +#: doc/tin.5:2417 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 " @@ -12804,31 +12977,31 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2351 +#: doc/tin.5:2417 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2363 +#: doc/tin.5:2429 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2371 +#: doc/tin.5:2437 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2387 +#: doc/tin.5:2453 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2403 +#: doc/tin.5:2469 msgid "" "Yet another global configuration file with \"I=I\" pairs. " "This one is for the more general options which usually can't be controlled " @@ -12838,31 +13011,31 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2403 +#: doc/tin.5:2469 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2406 +#: doc/tin.5:2472 msgid "Sets a global domain name used in From lines" msgstr "Setzt den globalen Domänennamen, der in From-Zeilen verwendet wird" #. type: Plain text -#: doc/tin.5:2410 +#: doc/tin.5:2476 msgid "" "Defines the name of your organization. $B overrides any " "specified value." msgstr "" #. type: TP -#: doc/tin.5:2410 +#: doc/tin.5:2476 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2415 +#: doc/tin.5:2481 msgid "" "Defines the default place for some configuration files, common values are I, I, I or I. " @@ -12870,13 +13043,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2415 +#: doc/tin.5:2481 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2421 +#: doc/tin.5:2487 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." @@ -12889,26 +13062,26 @@ msgstr "" "ändern, wenn Sie die Probleme Ihrer Benutzer selbst lösen wollen." #. type: TP -#: doc/tin.5:2421 +#: doc/tin.5:2487 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2426 +#: doc/tin.5:2492 msgid "Defines the directory containing the B<\\%inews>(1) executable." msgstr "" "Definiert das Verzeichnis, wleches das ausführbare B<\\%inews>(1) enthält." #. type: Plain text -#: doc/tin.5:2430 +#: doc/tin.5:2496 msgid "" "Default charset to be used in MIME's ''Content-Type:'' header. " "$B overrides any specified value." msgstr "" #. type: Plain text -#: doc/tin.5:2433 +#: doc/tin.5:2499 msgid "" "Default encoding scheme used in MIME articles. 8bit might be the best value." msgstr "" @@ -12916,7 +13089,7 @@ msgstr "" "die beste Wahl." #. type: Plain text -#: doc/tin.5:2437 +#: doc/tin.5:2503 msgid "" "Default encoding scheme used in MIME letters. quoted-printable is a good " "choice here." @@ -12925,13 +13098,13 @@ msgstr "" "eine gute Wahl." #. type: TP -#: doc/tin.5:2437 +#: doc/tin.5:2503 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2443 +#: doc/tin.5:2509 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<\\" @@ -12942,13 +13115,13 @@ msgstr "" "Voreinstellung auf ON geändert." #. type: TP -#: doc/tin.5:2443 +#: doc/tin.5:2509 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2447 +#: doc/tin.5:2513 msgid "" "Don't generate a ''Sender:'' header. This has an effect only if " "B is set to --internal." @@ -12957,13 +13130,13 @@ msgstr "" "steht wird die Einstellung ignoriert." #. type: TP -#: doc/tin.5:2447 +#: doc/tin.5:2513 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2452 +#: doc/tin.5:2518 msgid "" "Base of your newsspool (Bnews, Cnews and INN traditional spool style), " "common values are I, I, I. " @@ -12971,13 +13144,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2452 +#: doc/tin.5:2518 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2460 +#: doc/tin.5:2526 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:2464 +#: doc/tin.5:2530 msgid "" "Name of a single overview file, common values are I<.overview>, I. $B overrides any specified value." @@ -13001,13 +13174,13 @@ msgstr "" "view>. $B übersteuert den angegebenen Wert." #. type: TP -#: doc/tin.5:2464 +#: doc/tin.5:2530 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2469 +#: doc/tin.5:2535 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 " @@ -13015,13 +13188,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2469 +#: doc/tin.5:2535 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2475 +#: doc/tin.5:2541 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 " @@ -13030,13 +13203,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2475 +#: doc/tin.5:2541 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2480 +#: doc/tin.5:2546 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 " @@ -13044,13 +13217,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2480 +#: doc/tin.5:2546 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2485 +#: doc/tin.5:2551 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 " @@ -13061,13 +13234,13 @@ msgstr "" "Einstellung nur ändern müssen wenn sich Ihre Konfiguration unterscheidet." #. type: TP -#: doc/tin.5:2485 +#: doc/tin.5:2551 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2490 +#: doc/tin.5:2556 msgid "" "Full pathname of your newssystem's subscriptions file; usually the " "subscriptions file is in I, so you only have to change this " @@ -13079,12 +13252,12 @@ msgstr "" "unterscheidet." #. type: Plain text -#: doc/tin.5:2494 +#: doc/tin.5:2560 msgid "I" msgstr "I" #. type: Plain text -#: doc/tin.5:2498 +#: doc/tin.5:2564 msgid "" "translation into language specified in $B, $B or " "$B" @@ -13093,7 +13266,7 @@ msgstr "" "Sprache" #. type: Plain text -#: doc/tin.5:2512 +#: doc/tin.5:2578 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 " @@ -13107,7 +13280,7 @@ msgstr "" #. TODO: IIRC tin issues just a warning in that case? #. type: Plain text -#: doc/tin.5:2517 +#: doc/tin.5:2583 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 " @@ -13118,7 +13291,7 @@ msgstr "" "Newsgruppen angegeben werden, wird der Artikel zurückgewiesen." #. type: Plain text -#: doc/tin.5:2520 +#: doc/tin.5:2586 msgid "" "Each line consists of four space-separated fields \"I I " "I I\"." @@ -13127,30 +13300,30 @@ msgstr "" "I I I\"." #. type: TP -#: doc/tin.5:2520 doc/tin.5:2573 +#: doc/tin.5:2586 doc/tin.5:2639 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2523 +#: doc/tin.5:2589 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2526 +#: doc/tin.5:2592 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:2526 +#: doc/tin.5:2592 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2533 +#: doc/tin.5:2599 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 " @@ -13166,92 +13339,92 @@ msgstr "" "Newsgroup." #. type: TP -#: doc/tin.5:2533 +#: doc/tin.5:2599 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2536 +#: doc/tin.5:2602 msgid "can be one of those" msgstr "kann eines der folgenden sein" #. type: TP -#: doc/tin.5:2537 +#: doc/tin.5:2603 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2540 +#: doc/tin.5:2606 msgid "local postings are allowed" msgstr "lokale Postings sind erlaubt" #. type: TP -#: doc/tin.5:2540 +#: doc/tin.5:2606 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2543 +#: doc/tin.5:2609 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:2543 +#: doc/tin.5:2609 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2546 +#: doc/tin.5:2612 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:2546 +#: doc/tin.5:2612 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2549 +#: doc/tin.5:2615 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:2549 +#: doc/tin.5:2615 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2552 +#: doc/tin.5:2618 msgid "articles cannot be posted to this newsgroup" msgstr "in diese Gruppe darf nicht gepostet werden" #. type: TP -#: doc/tin.5:2552 +#: doc/tin.5:2618 #, no-wrap msgid "B<=foo.bar>" msgstr "B<=foo.bar>" #. type: Plain text -#: doc/tin.5:2555 +#: doc/tin.5:2621 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:2556 doc/tin.5:2583 doc/tin.5:2606 +#: doc/tin.5:2622 doc/tin.5:2649 doc/tin.5:2672 #, no-wrap msgid "B<\\%tin>(1)" msgstr "B<\\%tin>(1)" #. type: Plain text -#: doc/tin.5:2562 +#: doc/tin.5:2628 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 " @@ -13262,7 +13435,7 @@ msgstr "" "LIST (B) oder LIST COUNTS (B)." #. type: Plain text -#: doc/tin.5:2573 +#: doc/tin.5:2639 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 " @@ -13276,7 +13449,7 @@ msgstr "" "I\"." #. type: Plain text -#: doc/tin.5:2580 +#: doc/tin.5:2646 msgid "" "is the time when the group was created, expressed as the number of seconds " "since the Epoch." @@ -13285,18 +13458,18 @@ msgstr "" "Beginn der Epoche." #. type: TP -#: doc/tin.5:2580 +#: doc/tin.5:2646 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2583 +#: doc/tin.5:2649 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:2589 +#: doc/tin.5:2655 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) " @@ -13307,7 +13480,7 @@ msgstr "" "(B) Befehl." #. type: Plain text -#: doc/tin.5:2600 +#: doc/tin.5:2666 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 " @@ -13320,7 +13493,7 @@ msgstr "" "Tabulator getrennten Feldern \"I\tI\"." #. type: Plain text -#: doc/tin.5:2612 +#: doc/tin.5:2678 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) Befehl." #. type: Plain text -#: doc/tin.5:2621 +#: doc/tin.5:2687 msgid "" "This file might hold a default organization to be used in the " "''Organization:'' header. $B has a higher priority if set." @@ -13341,7 +13514,7 @@ msgstr "" "Priorität falls gesetzt." #. type: Plain text -#: doc/tin.5:2639 +#: doc/tin.5:2705 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 " @@ -13359,7 +13532,7 @@ msgstr "" "Befehl LIST OVERVIEW.FMT (B)." #. type: Plain text -#: doc/tin.5:2654 +#: doc/tin.5:2720 msgid "" "This file contains a list of newsgroups \\(em one per line \\(em which the " "client should subscribe to when the user has no ${TIN_HOMEDIR:-\"$HOME\"}/." @@ -13375,7 +13548,7 @@ msgstr "" "SUBSCRIPTIONS (B)." #. type: Plain text -#: doc/tin.5:2701 +#: doc/tin.5:2767 msgid "" "B<\\%elm>(1), B<\\%inews>(1), B<\\%ispell>(1), B<\\%lp>(1), B<\\%lpr>(1), B<" "\\%metamail>(1), B<\\%perl>(1), B<\\%perlre>(1), B<\\%pgp>(1), B<\\%rn>(1), " @@ -13398,3 +13571,18 @@ msgstr "" "\\%1524>, B, B, B, B, B, B, B, B, B, B, B, B, B" + +#~ msgid "Match against ''Subject:''" +#~ msgstr "Vergleiche mit ''Subject:''" + +#~ msgid "Match against ''Message-ID:'' and full ''References:''" +#~ msgstr "Vergleiche mit ''Message-ID:'' & allen ''References:''" + +#~ msgid "Match against ''Message-ID:'' and last ''References:'' entry only" +#~ msgstr "Vergleiche mit ''Message-ID:'' & letztem ''References:'' Eintrag" + +#~ msgid "Match against ''Message-ID:''" +#~ msgstr "Vergleiche mit ''Message-ID:''" + +#~ msgid "Match against ''References:''" +#~ msgstr "Vergleiche mit ''References:''" diff -Nurp '--exclude=.bzr*' tin-2.4.4/doc/l10n/en_GB/tin.1 tin-2.4.5/doc/l10n/en_GB/tin.1 --- tin-2.4.4/doc/l10n/en_GB/tin.1 2019-12-24 10:58:41.000000000 +0100 +++ tin-2.4.5/doc/l10n/en_GB/tin.1 2020-12-01 11:59:44.062711400 +0100 @@ -3,7 +3,7 @@ .\" Module : tin.1 .\" Author : I. Lea, U. Janssen .\" Created : 1991-08-23 -.\" Updated : 2019-12-24 +.\" Updated : 2020-11-17 .\" 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, 2019" 2.4.4 "Usenet newsreader" +.TH tin 1 "December 24th, 2020" 2.4.5 "Usenet newsreader" .\" .\" .SH NAME @@ -177,7 +177,7 @@ day. .TP \fB\-Q\fP Quick start. Start \fBtin\fP as quickly as possible. Currently this is -equivalent to \*(rq\fB\-nqd\fP\*(rq. +equivalent to \*(rq\fB\-dnq\fP\*(rq. .TP \fB\-r\fP Read news remotely from the default NNTP server specified in the environment @@ -201,7 +201,7 @@ option. This option is disabled if \fBti NNTP server and \fBcache_overview_files\fP is turned off. .TP \fB\-v\fP -Verbose mode for \*(rq\fB\-D\fP\*(rq, \*(rq\fB\-c\fP\*(rq, \*(rq\fB\-M\fP\*(rq, \*(rq\fB\-N\fP\*(rq, \&\*(rq\fB\-S\fP\*(rq, +Verbose mode for \*(rq\fB\-c\fP\*(rq, \*(rq\fB\-D\fP\*(rq, \*(rq\fB\-M\fP\*(rq, \*(rq\fB\-N\fP\*(rq, \&\*(rq\fB\-S\fP\*(rq, \&\*(rq\fB\-u\fP\*(rq and \*(rq\fB\-Z\fP\*(rq options. Can be used multiple times to increase verbosity. .TP @@ -513,7 +513,7 @@ are listed. You can use \fBSearchSubjF\f to the menu. .TP \fBVersion 'v'\fP -.\"-------------------------------------------------------------------- +.\" ------------------------------------------------------------------- .\" Print \fBtin\fP version information. .SS "NEWSGROUP SELECTION COMMANDS" @@ -648,7 +648,7 @@ Reread the \fI${TIN_LIBDIR:\-NEWSLIBDIR} see if any new news has arrived since starting \fBtin\fP. .TP \fBSelectMarkGrpUnread 'z' 'Z'\fP -.\"-------------------------------------------------------------------- +.\" ------------------------------------------------------------------- .\" Mark all articles in the current group as unread. .SS "GROUP INDEX COMMANDS" @@ -864,7 +864,8 @@ Toggle tag\-status of current article / \fBGroupRepost\fP ('\fBx\fP'). .TP \fBGroupTagParts 'T'\fP -Automatically tag in order all the parts of the current multi\-part message. +Automatically tag/untag all the parts of the current multi\-part message in +order. .TP \fBGroupToggleThreading 'u'\fP Cycle the threading mode through no threading, threading by subject, @@ -898,7 +899,7 @@ changes permanent. Mark current article as unread. .TP \fBMarkThdUnread 'Z'\fP -.\"-------------------------------------------------------------------- +.\" ------------------------------------------------------------------- .\" 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 @@ -1044,6 +1045,10 @@ Save marked articles automatically witho Toggle tag status of current article for mailing, piping, printing, saving or reposting. .TP +\fBThreadTagParts 'T'\fP +Automatically tag/untag all the parts of the current multi\-part message in +order. +.TP \fBThreadUntag 'U'\fP Untag all tagged threads. .TP @@ -1059,7 +1064,7 @@ range will be marked as unread instead o articles are present, a prompt asks how to proceed. .TP \fBMarkThdUnread 'Z'\fP -.\"-------------------------------------------------------------------- +.\" ------------------------------------------------------------------- .\" Mark all articles in thread as unread. .SS "ARTICLE VIEWER COMMANDS" @@ -1313,7 +1318,7 @@ your own articles. Mark article as unread. .TP \fBMarkThdUnread 'Z'\fP -.\"-------------------------------------------------------------------- +.\" ------------------------------------------------------------------- .\" Mark the current thread as unread. .SS "URL LISTING" @@ -1347,7 +1352,7 @@ Help screen of commands available. \fBToggleHelpDisplay 'H'\fP Toggle the display of help mini menu at the bottom of the screen. .RE -.\"-------------------------------------------------------------------- +.\" ------------------------------------------------------------------- .\" .SS "ATTACHMENT LISTING" \fBPageViewAttach\fP ('\fBV\fP') displays a list of attachments of the current @@ -1402,7 +1407,7 @@ Help screen of commands available. \fBToggleHelpDisplay 'H'\fP Toggle the display of help mini menu at the bottom of the screen. .RE -.\"-------------------------------------------------------------------- +.\" ------------------------------------------------------------------- .\" .SS "GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES" .\" FIXME - add missing descriptions @@ -1564,6 +1569,9 @@ Colour of background for inverse text \fBColour for inverse text (foreground) (col_invers_fg)\fP Colour of foreground for inverse text .TP +\fBColour of status messages (col_message)\fP +Colour of status messages in last line +.TP \fBColour of highlighting with _dash_ (col_markdash)\fP Colour of words emphasised like _this_. See also \fBword_h_display_marks\fP and \fBword_highlight\fP. @@ -2067,9 +2075,12 @@ following values are allowed: .RE .TP \fBFilename to be used for storing posted articles (posted_articles_file)\fP -Keep posted articles in -\fI${TIN_HOMEDIR:\-"$HOME"}/Mail/\fP\fBposted_articles_file\fP. If no filename is -set then postings will not be saved. Default is 'posted'. +Keep posted articles in given file. If the given filename does not contain +any expandable strings it will be prefixed with +\fI${TIN_HOMEDIR:\-"$HOME"}/Mail/\fP. If no filename is set then postings will +not be saved. See the section "MAILING PIPING PRINTING REPOSTING AND SAVING +ARTICLES" for more information about the various expansion +characters. Default is 'posted'. .TP \fBPrint all headers when printing (print_header)\fP If ON, then the full article header is sent to the printer. Otherwise only @@ -2333,6 +2344,14 @@ Keep). If ON, then unsubscribed groups will be permanently removed from your \fI${TIN_HOMEDIR:\-"$HOME"}/.newsrc\fP file. Default is OFF. .TP +\fBRegex with Subject prefixes (strip_re_regex)\fP +A regular expression to find Subject prefixes like "Re:" to remove. If +\fBstrip_re_regex\fP is blank, then \fB\%tin\fP(1) uses a built\-in default. +.TP +\fBRegex with Subject suffixes (strip_was_regex)\fP +A regular expression to find Subject suffixes like "(was:" to remove. If +\fBstrip_was_regex\fP is blank, then \fB\%tin\fP(1) uses a built\-in default. +.TP \fBRegex used to highlight \-strokes\- (strokes_regex)\fP A regular expression that will be applied when reading articles. All matching words are shown in \fBcol_markstroke\fP or \fBmono_markstroke\fP. If @@ -2722,9 +2741,9 @@ current news.group.name but without \fBs the news.group.name with all '.' replaced by '/'. .PP If saving multiple files at once the filename (if not referring to a -mailbox) will be extended by ".num" where "num" is a at least 3 digit -number counting up from 1. Environment variables are allowed within a -filename (e.g., \fI$SOURCES/dir/filename\fP). +mailbox) will be extended by ".num" where "num" is at least 3 digit number +counting up from 1. Environment variables are allowed within a filename +(e.g., \fI$SOURCES/dir/filename\fP). .PP .\" .\" @@ -3088,7 +3107,7 @@ coffee. Subsequent readings of a group w updating of the index file and will be much faster as only new articles will need to be cached. .PP -As indexing might take some time you may want to run \fBtin\fP form the system +As indexing might take some time you may want to run \fBtin\fP from the system batcher \fB\%cron\fP(8) with the \*(rq\fB\-u\fP\*(rq option: .PP .RS @@ -3265,7 +3284,7 @@ For a detailed description see \fB\%tin\ .\" .SH ENVIRONMENT .\" TODO: - sort in a useful order -.\" - add undocumented env-vars (if any) +.\" - add undocumented env-vars (e.g. DEV_TCP (SCO)) .TP \fBTINRC\fP Define this variable if you want to specify command\-line options that \fBtin\fP @@ -3653,16 +3672,15 @@ Urs Janssen .\" .\" .SH "SEE ALSO" -\fB\%cron\fP(8), \fB\%elm\fP(1), \fB\%emacs\fP(1), \fB\%gpg\fP(1), \fB\%inews\fP(1), -\fB\%ispell\fP(1), \fB\%lp\fP(1), \fB\%lpr\fP(1), \fB\%metamail\fP(1), \fB\%noffle\fP(1), -\fB\%perl\fP(1), \fB\%perlre\fP(1), \fB\%pgp\fP(1), \fB\%rn\fP(1), \fB\%sendmail\fP(1), -\fB\%shar\fP(1), \fB\%slrnface\fP(1), \fB\%tass\fP(1), \fB\%unshar\fP(1), -\fB\%uudecode\fP(1), \fB\%vi\fP(1), \fB\%xterm\fP(1x), \fB\%heapsort\fP(3), -\fB\%iconv\fP(3), \fB\%iconv_open\fP(3), \fB\%nl_langinfo\fP(3), \fB\%pcre\fP(3), -\fB\%pcrepattern\fP(3), \fB\%qsort\fP(3), \fB\%snprintf\fP(3), \fB\%strftime\fP(3), -\fB\%vsnprintf\fP(3), \fB\%wildmat\fP(3), \fB\%environ\fP(5), \fB\%locale\fP(5), -\fB\%mailcap\fP(5), \fB\%mbox\fP(5), \fB\%mmdf\fP(5), \fB\%newsoverview\fP(5), -\fB\%tin\fP(5), \fBRFC\%1345\fP, \fBRFC\%1524\fP, \fBRFC\%2045\fP, \fBRFC\%2046\fP, -\fBRFC\%2047\fP, \fBRFC\%2048\fP, \fBRFC\%2231\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\%elm\fP(1), \fB\%emacs\fP(1), \fB\%gpg\fP(1), \fB\%inews\fP(1), \fB\%ispell\fP(1), +\fB\%lp\fP(1), \fB\%lpr\fP(1), \fB\%metamail\fP(1), \fB\%noffle\fP(1), \fB\%perl\fP(1), +\fB\%perlre\fP(1), \fB\%pgp\fP(1), \fB\%rn\fP(1), \fB\%sendmail\fP(1), \fB\%shar\fP(1), +\fB\%slrnface\fP(1), \fB\%tass\fP(1), \fB\%unshar\fP(1), \fB\%uudecode\fP(1), +\fB\%vi\fP(1), \fB\%xterm\fP(1x), \fB\%heapsort\fP(3), \fB\%iconv\fP(3), +\fB\%iconv_open\fP(3), \fB\%nl_langinfo\fP(3), \fB\%pcre\fP(3), \fB\%pcrepattern\fP(3), +\fB\%qsort\fP(3), \fB\%snprintf\fP(3), \fB\%strftime\fP(3), \fB\%vsnprintf\fP(3), +\fB\%wildmat\fP(3), \fB\%environ\fP(5), \fB\%locale\fP(5), \fB\%mailcap\fP(5), +\fB\%mbox\fP(5), \fB\%mmdf\fP(5), \fB\%newsoverview\fP(5), \fB\%tin\fP(5), \fB\%cron\fP(8), +\fBRFC\%1345\fP, \fBRFC\%1524\fP, \fBRFC\%2045\fP, \fBRFC\%2046\fP, \fBRFC\%2047\fP, +\fBRFC\%2048\fP, \fBRFC\%2231\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.4.4/doc/l10n/en_GB/tin.5 tin-2.4.5/doc/l10n/en_GB/tin.5 --- tin-2.4.4/doc/l10n/en_GB/tin.5 2019-12-24 10:58:42.000000000 +0100 +++ tin-2.4.5/doc/l10n/en_GB/tin.5 2020-12-01 11:59:44.534729084 +0100 @@ -2,7 +2,7 @@ .\" Module : tin.5 .\" Author : U. Janssen .\" Created : 2000-07-10 -.\" Updated : 2019-12-24 +.\" Updated : 2020-11-10 .\" Notes : needs a some work .\" .\" @@ -11,7 +11,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH tin 5 "December 24th, 2019" 2.4.4 "Usenet newsreader" +.TH tin 5 "December 24th, 2020" 2.4.5 "Usenet newsreader" .SH NAME tin, rtin \- related files @@ -748,8 +748,8 @@ be changed in the future. Don't use '#' ignored and your comments will get lost on the next write of the file. .TP \fBgroup\fP -A comma\-separated list of newsgroup patterns (wildmat\-style) to which groups -the filter rule will be applied. This line is mandatory! +A comma\-separated list of newsgroup patterns in wildmat\-style to which +groups the filter rule will be applied. This line is mandatory! .TP \fBcase\fP 0=case\-sensitive, 1=case\-insensitive @@ -758,43 +758,91 @@ the filter rule will be applied. This li Score value of the rule; can also be one of the magic words "kill" or "hot". .TP \fBsubj\fP -Match against \*(rqSubject:\*(rq +Match against \*(rqSubject:\*(rq. The matching type used (wildmat or regex) +depends on the setting of the tinrc variable \fBwildcard\fP. .TP \fBfrom\fP Match against \*(rqFrom:\*(rq. \fB\%tin\fP(1) converts the contents of the \&\*(rqFrom:\*(rq header to an old style e\-mail address, e.g. \*(rqsome@body.example (John Doe)\*(rq instead of \*(rqJohn Doe \*(rq, before -trying to match the patterns in the filter rule. +trying to match the patterns in the filter rule. The matching type used +(wildmat or regex) depends on the setting of the tinrc variable \fBwildcard\fP. .TP \fBmsgid\fP -Match against \*(rqMessage\-ID:\*(rq and full \*(rqReferences:\*(rq +Match against \*(rqMessage\-ID:\*(rq and full \*(rqReferences:\*(rq. The matching type +used (wildmat or regex) depends on the setting of the tinrc variable +\fBwildcard\fP. .TP \fBmsgid_last\fP -Match against \*(rqMessage\-ID:\*(rq and last \*(rqReferences:\*(rq entry only +Match against \*(rqMessage\-ID:\*(rq and last \*(rqReferences:\*(rq entry only. The +matching type used (wildmat or regex) depends on the setting of the tinrc +variable \fBwildcard\fP. .TP \fBmsgid_only\fP -Match against \*(rqMessage\-ID:\*(rq +Match against \*(rqMessage\-ID:\*(rq. The matching type used (wildmat or regex) +depends on the setting of the tinrc variable \fBwildcard\fP. .TP \fBrefs_only\fP -Match against \*(rqReferences:\*(rq +Match against \*(rqReferences:\*(rq. The matching type used (wildmat or regex) +depends on the setting of the tinrc variable \fBwildcard\fP. .TP \fBlines\fP Match against \*(rqLines:\*(rq, num matches more than. .TP -.\" TODO: document option in detail \fBgnksa\fP -Match against \*(rqFrom:\*(rq address parser return codes. +Match against \*(rqFrom:\*(rq address parser return codes. num matches more than the returned numeric +value. GNKSA_LOCAL_DOMAIN_LITERAL or GNKSA_INVALID_DOMAIN are only returned +if \fBdisable_gnksa_domain_check\fP is set to false. As the built in domain +list is outdated this should be considered carefully. +.in +.3i +.nf +.ta \w'%406 'u +\w'GNKSA_ZERO_LENGTH_LOCAL_WORD'u + \fB0\fP GNKSA_OK + \fB1\fP GNKSA_INTERNAL_ERROR +\fB100\fP GNKSA_LANGLE_MISSING +\fB101\fP GNKSA_LPAREN_MISSING +\fB102\fP GNKSA_RPAREN_MISSING +\fB103\fP GNKSA_ATSIGN_MISSING +\fB104\fP GNKSA_RANGLE_MISSING +\fB200\fP GNKSA_SINGLE_DOMAIN +\fB201\fP GNKSA_INVALID_DOMAIN +\fB202\fP GNKSA_ILLEGAL_DOMAIN +\fB203\fP GNKSA_UNKNOWN_DOMAIN +\fB204\fP GNKSA_INVALID_FQDN_CHAR +\fB205\fP GNKSA_ZERO_LENGTH_LABEL +\fB206\fP GNKSA_ILLEGAL_LABEL_LENGTH +\fB207\fP GNKSA_ILLEGAL_LABEL_HYPHEN +\fB208\fP GNKSA_ILLEGAL_LABEL_BEGNUM +\fB209\fP GNKSA_BAD_DOMAIN_LITERAL +\fB210\fP GNKSA_LOCAL_DOMAIN_LITERAL +\fB211\fP GNKSA_RBRACKET_MISSING +\fB300\fP GNKSA_LOCALPART_MISSING +\fB301\fP GNKSA_INVALID_LOCALPART +\fB302\fP GNKSA_ZERO_LENGTH_LOCAL_WORD +\fB400\fP GNKSA_ILLEGAL_UNQUOTED_CHAR +\fB401\fP GNKSA_ILLEGAL_QUOTED_CHAR +\fB402\fP GNKSA_ILLEGAL_ENCODED_CHAR +\fB403\fP GNKSA_BAD_ENCODE_SYNTAX +\fB404\fP GNKSA_ILLEGAL_PAREN_CHAR +\fB405\fP GNKSA_INVALID_REALNAME +\fB406\fP GNKSA_MISSING_REALNAME +.fi +.in -.3i .TP \fBxref\fP Match against \*(rqXref:\*(rq line. Before any matching is done the line is turned into the same format \*(rqNewsgroups:\*(rq has that is it is turned into a comma separated newsgroup list with all other information (i.e. the article -counter) removed. +counter) removed. The matching type used (wildmat or regex) depends on the +setting of the tinrc variable \fBwildcard\fP. .TP .\" TODO: document option in detail \fBpath\fP -Match against \*(rqPath:\*(rq line. This may not work on some servers. +Match against \*(rqPath:\*(rq line. This may not work on some servers. The +matching type used (wildmat or regex) depends on the setting of the tinrc +variable \fBwildcard\fP. .TP \fBtime\fP time_t value when rule expires @@ -1044,6 +1092,7 @@ defaults. If a keyname is bound to NULL \fBThreadMail\fP m \fBThreadSave\fP s \fBThreadTag\fP t +\fBThreadTagParts\fP T \fBThreadUndoSel\fP ~ .sp \fBUrlSelect\fP ^J ^M @@ -1299,6 +1348,9 @@ Colour of words emphasised like *this*. Colour of words emphasised like \-this\-. See also \fBword_h_display_marks\fP and \fBword_highlight\fP. .TP +\fBcol_message\fP +Colour of status messages in last line +.TP \fBcol_minihelp\fP Colour of mini help menu .TP @@ -1788,9 +1840,12 @@ careful with this option. .RE .TP \fBposted_articles_file\fP -Keep posted articles in -\fI${TIN_HOMEDIR:\-"$HOME"}/Mail/\fP\fBposted_articles_file\fP. If no filename is -set then postings will not be saved. Default is 'posted'. +Keep posted articles in given file. If the given filename does not contain +any expandable strings it will be prefixed with +\fI${TIN_HOMEDIR:\-"$HOME"}/Mail/\fP. If no filename is set then postings will +not be saved. See the section "MAILING PIPING PRINTING REPOSTING AND SAVING +ARTICLES" for more information about the various expansion +characters. Default is 'posted'. .TP \fBprint_header\fP If ON, then the full article header is sent to the printer. Otherwise only @@ -2070,6 +2125,14 @@ Keep). If ON, then unsubscribed groups will be permanently removed from your \fI${TIN_HOMEDIR:\-"$HOME"}/.newsrc\fP file. Default is OFF. .TP +\fBstrip_re_regex\fP +A regular expression to find Subject prefixes like "Re:" to remove If +\fBstrip_re_regex\fP is blank, then \fB\%tin\fP(1) uses a built\-in default. +.TP +\fBstrip_was_regex\fP +A regular expression to find Subject suffixes like "(was:" to remove. If +\fBstrip_was_regex\fP is blank, then \fB\%tin\fP(1) uses a built\-in default. +.TP \fBstrokes_regex\fP A regular expression that will be applied when reading articles. All matching words are shown in \fBcol_markstroke\fP or \fBmono_markstroke\fP. If diff -Nurp '--exclude=.bzr*' tin-2.4.4/doc/l10n/en_GB.po tin-2.4.5/doc/l10n/en_GB.po --- tin-2.4.4/doc/l10n/en_GB.po 2019-12-24 10:57:30.000000000 +0100 +++ tin-2.4.5/doc/l10n/en_GB.po 2020-12-01 11:59:39.910555841 +0100 @@ -1,13 +1,13 @@ # English (United Kingdom) translations for the tin man pages. # This file is distributed under the same license as the tin package. -# Urs Janssen , 2011-2020. +# Urs Janssen , 2011-2021. # msgid "" msgstr "" -"Project-Id-Version: tin-man 2.4.4\n" +"Project-Id-Version: tin-man 2.4.5\n" "Report-Msgid-Bugs-To: translation@tin.org\n" -"POT-Creation-Date: 2019-12-24 10:55+0100\n" -"PO-Revision-Date: 2019-12-24 10:57+0100\n" +"POT-Creation-Date: 2020-12-01 11:58+0100\n" +"PO-Revision-Date: 2020-12-01 11:59+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, 2019" -msgstr "December 24th, 2019" +msgid "December 24th, 2020" +msgstr "December 24th, 2020" #. type: TH #: doc/tin.1:12 doc/tin.5:9 #, no-wrap -msgid "2.4.4" -msgstr "2.4.4" +msgid "2.4.5" +msgstr "2.4.5" #. type: TH #: doc/tin.1:12 doc/tin.5:9 @@ -144,7 +144,7 @@ msgid "EXIT STATUS" msgstr "EXIT STATUS" #. type: TP -#: doc/tin.1:79 doc/tin.1:1094 doc/tin.1:3473 +#: doc/tin.1:79 doc/tin.1:1099 doc/tin.1:3495 #, no-wrap msgid "B<0>" msgstr "B<0>" @@ -155,7 +155,7 @@ msgid "Successful program execution. No msgstr "Successful program execution. No unread news available in batch mode." #. type: TP -#: doc/tin.1:82 doc/tin.1:3476 +#: doc/tin.1:82 doc/tin.1:3498 #, no-wrap msgid "B<1>" msgstr "B<1>" @@ -166,7 +166,7 @@ msgid "Usage, syntax, configuration file msgstr "Usage, syntax, configuration file or network error." #. type: TP -#: doc/tin.1:85 doc/tin.1:3479 +#: doc/tin.1:85 doc/tin.1:3501 #, no-wrap msgid "B<2>" msgstr "B<2>" @@ -177,7 +177,7 @@ msgid "Unread news available (batch mode msgstr "Unread news available (batch mode (''B<-Z>'') only)." #. type: TP -#: doc/tin.1:88 doc/tin.1:3482 +#: doc/tin.1:88 doc/tin.1:3504 #, no-wrap msgid "B<3>" msgstr "B<3>" @@ -540,10 +540,10 @@ msgstr "B<-Q>" #: doc/tin.1:198 msgid "" "Quick start. Start B as quickly as possible. Currently this is " -"equivalent to ''B<-nqd>''." +"equivalent to ''B<-dnq>''." msgstr "" "Quick start. Start B as quickly as possible. Currently this is " -"equivalent to ''B<-nqd>''." +"equivalent to ''B<-dnq>''." #. type: TP #: doc/tin.1:198 @@ -629,11 +629,11 @@ msgstr "B<-v>" #. type: Plain text #: doc/tin.1:225 msgid "" -"Verbose mode for ''B<-D>'', ''B<-c>'', ''B<-M>'', ''B<-N>'', \\&''B<-S>'', " +"Verbose mode for ''B<-c>'', ''B<-D>'', ''B<-M>'', ''B<-N>'', \\&''B<-S>'', " "''B<-u>'' and ''B<-Z>'' options. Can be used multiple times to increase " "verbosity." msgstr "" -"Verbose mode for ''B<-D>'', ''B<-c>'', ''B<-M>'', ''B<-N>'', \\&''B<-S>'', " +"Verbose mode for ''B<-c>'', ''B<-D>'', ''B<-M>'', ''B<-N>'', \\&''B<-S>'', " "''B<-u>'' and ''B<-Z>'' options. Can be used multiple times to increase " "verbosity." @@ -1349,7 +1349,7 @@ msgstr "" "the same effect." #. type: TP -#: doc/tin.1:492 doc/tin.1:1366 doc/tin.1:1419 +#: doc/tin.1:492 doc/tin.1:1371 doc/tin.1:1424 #, no-wrap msgid "B" msgstr "B" @@ -1443,7 +1443,7 @@ msgstr "" "('B<^O>''B''B'). See also ''B<-o>'' command-line switch." #. type: TP -#: doc/tin.1:523 doc/tin.1:1372 doc/tin.1:1426 +#: doc/tin.1:523 doc/tin.1:1377 doc/tin.1:1431 #, no-wrap msgid "B" msgstr "B" @@ -1460,13 +1460,13 @@ msgstr "" "\\e>') to search on this screen. B ('B') returns to the menu." #. type: TP -#: doc/tin.1:529 doc/tin.1:1375 doc/tin.1:1429 +#: doc/tin.1:529 doc/tin.1:1380 doc/tin.1:1434 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:532 doc/tin.1:1378 doc/tin.1:1432 +#: doc/tin.1:532 doc/tin.1:1383 doc/tin.1:1437 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." @@ -1495,7 +1495,7 @@ msgstr "" msgid "B" msgstr "B" -#. -------------------------------------------------------------------- +#. ------------------------------------------------------------------- #. type: Plain text #: doc/tin.1:543 msgid "Print B version information." @@ -1508,7 +1508,7 @@ msgid "NEWSGROUP SELECTION COMMANDS" msgstr "NEWSGROUP SELECTION COMMANDS" #. type: TP -#: doc/tin.1:544 doc/tin.1:682 doc/tin.1:933 doc/tin.1:1097 doc/tin.1:3485 +#: doc/tin.1:544 doc/tin.1:682 doc/tin.1:934 doc/tin.1:1102 doc/tin.1:3507 #, no-wrap msgid "B<4>" msgstr "B<4>" @@ -1534,13 +1534,13 @@ msgstr "" "records of which articles have been read, so use this carefully." #. type: TP -#: doc/tin.1:551 doc/tin.1:703 doc/tin.1:954 +#: doc/tin.1:551 doc/tin.1:703 doc/tin.1:955 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:555 doc/tin.1:707 doc/tin.1:958 +#: doc/tin.1:555 doc/tin.1:707 doc/tin.1:959 msgid "" "Choose a range of articles to be affected by the next command. See the " "section \"RANGES\" for more information." @@ -1560,21 +1560,21 @@ msgid "Sort the list of newsgroups." msgstr "Sort the list of newsgroups." #. type: TP -#: doc/tin.1:558 doc/tin.1:710 doc/tin.1:961 doc/tin.1:1151 doc/tin.1:1363 -#: doc/tin.1:1413 +#: doc/tin.1:558 doc/tin.1:710 doc/tin.1:962 doc/tin.1:1156 doc/tin.1:1368 +#: doc/tin.1:1418 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:561 doc/tin.1:713 doc/tin.1:964 doc/tin.1:1154 doc/tin.1:1366 -#: doc/tin.1:1416 +#: doc/tin.1:561 doc/tin.1:713 doc/tin.1:965 doc/tin.1:1159 doc/tin.1:1371 +#: doc/tin.1:1421 msgid "Repeat the previous search." msgstr "Repeat the previous search." #. type: TP -#: doc/tin.1:561 doc/tin.1:713 doc/tin.1:964 doc/tin.1:1154 doc/tin.1:1357 -#: doc/tin.1:1407 +#: doc/tin.1:561 doc/tin.1:713 doc/tin.1:965 doc/tin.1:1159 doc/tin.1:1362 +#: doc/tin.1:1412 #, no-wrap msgid "B" msgstr "B" @@ -1585,8 +1585,8 @@ msgid "Search for a group by name and de msgstr "Search for a group by name and description (if displayed)." #. type: TP -#: doc/tin.1:564 doc/tin.1:716 doc/tin.1:967 doc/tin.1:1157 doc/tin.1:1360 -#: doc/tin.1:1410 +#: doc/tin.1:564 doc/tin.1:716 doc/tin.1:968 doc/tin.1:1162 doc/tin.1:1365 +#: doc/tin.1:1415 #, no-wrap msgid "B" msgstr "B" @@ -1623,7 +1623,7 @@ msgstr "" "group selection list looking for unread groups." #. type: TP -#: doc/tin.1:574 doc/tin.1:791 doc/tin.1:1005 doc/tin.1:1215 +#: doc/tin.1:574 doc/tin.1:791 doc/tin.1:1006 doc/tin.1:1220 #, no-wrap msgid "B" msgstr "B" @@ -1638,7 +1638,7 @@ msgstr "" "group in the group selection list." #. type: TP -#: doc/tin.1:578 doc/tin.1:795 doc/tin.1:1009 doc/tin.1:1219 +#: doc/tin.1:578 doc/tin.1:795 doc/tin.1:1010 doc/tin.1:1224 #, no-wrap msgid "B" msgstr "B" @@ -1668,13 +1668,13 @@ msgstr "" "descriptions." #. type: TP -#: doc/tin.1:586 doc/tin.1:808 doc/tin.1:1022 doc/tin.1:1231 +#: doc/tin.1:586 doc/tin.1:808 doc/tin.1:1023 doc/tin.1:1236 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:589 doc/tin.1:811 doc/tin.1:1025 doc/tin.1:1234 +#: doc/tin.1:589 doc/tin.1:811 doc/tin.1:1026 doc/tin.1:1239 msgid "Edit the filter file and reload it afterwards." msgstr "Edit the filter file and reload it afterwards." @@ -1694,8 +1694,8 @@ msgstr "" "even those not currently yanked in." #. type: TP -#: doc/tin.1:593 doc/tin.1:818 doc/tin.1:1025 doc/tin.1:1247 doc/tin.1:1369 -#: doc/tin.1:1422 +#: doc/tin.1:593 doc/tin.1:818 doc/tin.1:1026 doc/tin.1:1252 doc/tin.1:1374 +#: doc/tin.1:1427 #, no-wrap msgid "B" msgstr "B" @@ -1712,18 +1712,18 @@ msgstr "" "option." #. type: TP -#: doc/tin.1:598 doc/tin.1:822 doc/tin.1:1028 doc/tin.1:1250 +#: doc/tin.1:598 doc/tin.1:822 doc/tin.1:1029 doc/tin.1:1255 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:601 doc/tin.1:825 doc/tin.1:1031 doc/tin.1:1253 +#: doc/tin.1:601 doc/tin.1:825 doc/tin.1:1032 doc/tin.1:1258 msgid "Toggle inverse video." msgstr "Toggle inverse video." #. type: TP -#: doc/tin.1:601 doc/tin.1:834 doc/tin.1:1037 doc/tin.1:1259 +#: doc/tin.1:601 doc/tin.1:834 doc/tin.1:1038 doc/tin.1:1264 #, no-wrap msgid "B" msgstr "B" @@ -1763,13 +1763,13 @@ msgstr "" "group displayed." #. type: TP -#: doc/tin.1:614 doc/tin.1:842 doc/tin.1:1267 +#: doc/tin.1:614 doc/tin.1:842 doc/tin.1:1272 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:618 doc/tin.1:846 doc/tin.1:1271 +#: doc/tin.1:618 doc/tin.1:846 doc/tin.1:1276 msgid "" "User configurable options menu (for more information see section \"GLOBAL " "OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES\")." @@ -1789,7 +1789,7 @@ msgid "Positions the cursor on the next msgstr "Positions the cursor on the next group with unread articles in it." #. type: TP -#: doc/tin.1:621 doc/tin.1:863 doc/tin.1:1050 doc/tin.1:1288 +#: doc/tin.1:621 doc/tin.1:863 doc/tin.1:1051 doc/tin.1:1293 #, no-wrap msgid "B" msgstr "B" @@ -1804,13 +1804,13 @@ msgstr "" "accordingly." #. type: TP -#: doc/tin.1:625 doc/tin.1:866 doc/tin.1:1053 doc/tin.1:1291 +#: doc/tin.1:625 doc/tin.1:866 doc/tin.1:1054 doc/tin.1:1296 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:628 doc/tin.1:869 doc/tin.1:1056 doc/tin.1:1294 +#: doc/tin.1:628 doc/tin.1:869 doc/tin.1:1057 doc/tin.1:1299 msgid "Quit B \\(em don't ask the user to confirm." msgstr "Quit B \\(em don't ask the user to confirm." @@ -1832,13 +1832,13 @@ msgstr "" "command-line when B was started." #. type: TP -#: doc/tin.1:633 doc/tin.1:872 doc/tin.1:1056 +#: doc/tin.1:633 doc/tin.1:872 doc/tin.1:1057 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:637 doc/tin.1:876 doc/tin.1:1060 +#: doc/tin.1:637 doc/tin.1:876 doc/tin.1:1061 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." @@ -1909,7 +1909,7 @@ msgstr "" "understands." #. type: TP -#: doc/tin.1:655 doc/tin.1:900 doc/tin.1:1075 doc/tin.1:1328 +#: doc/tin.1:655 doc/tin.1:901 doc/tin.1:1080 doc/tin.1:1333 #, no-wrap msgid "B" msgstr "B" @@ -1976,7 +1976,7 @@ msgstr "" msgid "B" msgstr "B" -#. -------------------------------------------------------------------- +#. ------------------------------------------------------------------- #. type: Plain text #: doc/tin.1:678 msgid "Mark all articles in the current group as unread." @@ -2005,13 +2005,13 @@ msgid "Select article 4." msgstr "Select article 4." #. type: TP -#: doc/tin.1:685 doc/tin.1:936 doc/tin.1:1100 +#: doc/tin.1:685 doc/tin.1:937 doc/tin.1:1105 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:689 doc/tin.1:940 doc/tin.1:1104 +#: doc/tin.1:689 doc/tin.1:941 doc/tin.1:1109 msgid "" "Auto select article(s) using a menu. Read the section \"FILTERING ARTICLES\" " "for more information." @@ -2020,13 +2020,13 @@ msgstr "" "for more information." #. type: TP -#: doc/tin.1:689 doc/tin.1:940 doc/tin.1:1116 +#: doc/tin.1:689 doc/tin.1:941 doc/tin.1:1121 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:693 doc/tin.1:944 doc/tin.1:1120 +#: doc/tin.1:693 doc/tin.1:945 doc/tin.1:1125 msgid "" "Kill article(s) using a menu. Read the section \"FILTERING ARTICLES\" for " "more information." @@ -2035,13 +2035,13 @@ msgstr "" "more information." #. type: TP -#: doc/tin.1:693 doc/tin.1:944 +#: doc/tin.1:693 doc/tin.1:945 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:698 doc/tin.1:949 +#: doc/tin.1:698 doc/tin.1:950 msgid "" "Mark current article, thread, range, auto-selected (hot) articles, articles " "matching pattern or tagged articles as read. A prompt asks which type should " @@ -2052,13 +2052,13 @@ msgstr "" "be marked." #. type: TP -#: doc/tin.1:698 doc/tin.1:949 +#: doc/tin.1:698 doc/tin.1:950 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:703 doc/tin.1:954 +#: doc/tin.1:703 doc/tin.1:955 msgid "" "Mark current article, thread, range, auto-selected (hot) articles, articles " "matching pattern or tagged articles as unread. A prompt asks which type " @@ -2069,23 +2069,23 @@ msgstr "" "should be marked." #. type: TP -#: doc/tin.1:707 doc/tin.1:958 doc/tin.1:1148 +#: doc/tin.1:707 doc/tin.1:959 doc/tin.1:1153 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:710 doc/tin.1:961 doc/tin.1:1151 +#: doc/tin.1:710 doc/tin.1:962 doc/tin.1:1156 msgid "Re-enter the last message that was viewed." msgstr "Re-enter the last message that was viewed." #. type: Plain text -#: doc/tin.1:716 doc/tin.1:967 +#: doc/tin.1:716 doc/tin.1:968 msgid "Search forward for specified subject." msgstr "Search forward for specified subject." #. type: Plain text -#: doc/tin.1:719 doc/tin.1:970 +#: doc/tin.1:719 doc/tin.1:971 msgid "Search backwards for specified subject." msgstr "Search backwards for specified subject." @@ -2096,7 +2096,7 @@ msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:722 doc/tin.1:973 +#: doc/tin.1:722 doc/tin.1:974 msgid "Select current thread for later processing." msgstr "Select current thread for later processing." @@ -2199,13 +2199,13 @@ msgstr "" "Thus, one can iteratively whittle down uninteresting threads." #. type: TP -#: doc/tin.1:751 doc/tin.1:982 doc/tin.1:1174 +#: doc/tin.1:751 doc/tin.1:983 doc/tin.1:1179 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:756 doc/tin.1:987 doc/tin.1:1179 +#: doc/tin.1:756 doc/tin.1:988 doc/tin.1:1184 msgid "" "Pipe current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles into command. See the section \"MAILING " @@ -2216,7 +2216,7 @@ msgstr "" "PIPING PRINTING REPOSTING AND SAVING ARTICLES\" for more information." #. type: TP -#: doc/tin.1:756 doc/tin.1:1179 +#: doc/tin.1:756 doc/tin.1:1184 #, no-wrap msgid "B" msgstr "B" @@ -2241,7 +2241,7 @@ msgstr "" "information on filtering." #. type: TP -#: doc/tin.1:765 doc/tin.1:1188 +#: doc/tin.1:765 doc/tin.1:1193 #, no-wrap msgid "B" msgstr "B" @@ -2288,7 +2288,7 @@ msgid "View next unread article or group msgstr "View next unread article or group." #. type: TP -#: doc/tin.1:780 doc/tin.1:993 doc/tin.1:1205 +#: doc/tin.1:780 doc/tin.1:994 doc/tin.1:1210 #, no-wrap msgid "B" msgstr "B" @@ -2303,24 +2303,24 @@ msgstr "" "line." #. type: TP -#: doc/tin.1:784 doc/tin.1:998 doc/tin.1:1208 +#: doc/tin.1:784 doc/tin.1:999 doc/tin.1:1213 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:787 doc/tin.1:1001 +#: doc/tin.1:787 doc/tin.1:1002 msgid "Author backward search. Otherwise, see B ('B') above." msgstr "Author backward search. Otherwise, see B ('B') above." #. type: TP -#: doc/tin.1:787 doc/tin.1:1001 doc/tin.1:1211 +#: doc/tin.1:787 doc/tin.1:1002 doc/tin.1:1216 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:791 doc/tin.1:1005 doc/tin.1:1215 +#: doc/tin.1:791 doc/tin.1:1006 doc/tin.1:1220 msgid "" "Search the body of all articles in group (can be slow). You can abort the " "search using B ('B')." @@ -2353,7 +2353,7 @@ msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:803 doc/tin.1:1017 +#: doc/tin.1:803 doc/tin.1:1018 msgid "" "Cycle the display of the author through all the possible options for the " "tinrc variable B." @@ -2368,7 +2368,7 @@ msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:808 doc/tin.1:1022 doc/tin.1:1228 +#: doc/tin.1:808 doc/tin.1:1023 doc/tin.1:1233 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 " @@ -2435,7 +2435,7 @@ msgid "Open the thread under the current msgstr "Open the thread under the current cursor position." #. type: Plain text -#: doc/tin.1:837 doc/tin.1:1040 doc/tin.1:1262 +#: doc/tin.1:837 doc/tin.1:1041 doc/tin.1:1267 msgid "Look up article by ''Message-ID:''." msgstr "Look up article by ''Message-ID:''." @@ -2446,7 +2446,7 @@ msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:842 doc/tin.1:1045 doc/tin.1:1267 +#: doc/tin.1:842 doc/tin.1:1046 doc/tin.1:1272 msgid "" "Mail current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles to someone. See the section \"MAILING " @@ -2474,18 +2474,18 @@ msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:852 doc/tin.1:1277 +#: doc/tin.1:852 doc/tin.1:1282 msgid "Go to the next unread article." msgstr "Go to the next unread article." #. type: TP -#: doc/tin.1:852 doc/tin.1:1045 doc/tin.1:1277 +#: doc/tin.1:852 doc/tin.1:1046 doc/tin.1:1282 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:857 doc/tin.1:1050 doc/tin.1:1282 +#: doc/tin.1:857 doc/tin.1:1051 doc/tin.1:1287 msgid "" "Send current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles to printer. See the section \"MAILING " @@ -2518,7 +2518,7 @@ msgid "Go to previous unread article." msgstr "Go to previous unread article." #. type: Plain text -#: doc/tin.1:866 doc/tin.1:1053 +#: doc/tin.1:866 doc/tin.1:1054 msgid "Return to previous level." msgstr "Return to previous level." @@ -2540,7 +2540,7 @@ msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:881 doc/tin.1:1065 doc/tin.1:1307 +#: doc/tin.1:881 doc/tin.1:1066 doc/tin.1:1312 msgid "" "Save current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles. See the section \"MAILING PIPING " @@ -2557,7 +2557,7 @@ msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:884 doc/tin.1:1068 doc/tin.1:1310 +#: doc/tin.1:884 doc/tin.1:1069 doc/tin.1:1315 msgid "Save marked articles automatically without further prompting." msgstr "Save marked articles automatically without further prompting." @@ -2585,20 +2585,22 @@ msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:892 +#: doc/tin.1:893 doc/tin.1:1077 msgid "" -"Automatically tag in order all the parts of the current multi-part message." +"Automatically tag/untag all the parts of the current multi-part message in " +"order." msgstr "" -"Automatically tag in order all the parts of the current multi-part message." +"Automatically tag/untag all the parts of the current multi-part message in " +"order." #. type: TP -#: doc/tin.1:892 +#: doc/tin.1:893 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:897 +#: doc/tin.1:898 msgid "" "Cycle the threading mode through no threading, threading by subject, " "threading by references, threading on both subject and references, group " @@ -2609,18 +2611,18 @@ msgstr "" "multipart articles into a thread (''Subject:'' based)." #. type: TP -#: doc/tin.1:897 +#: doc/tin.1:898 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:900 +#: doc/tin.1:901 msgid "Untag all articles that were tagged." msgstr "Untag all articles that were tagged." #. type: Plain text -#: doc/tin.1:907 doc/tin.1:1082 doc/tin.1:1335 +#: doc/tin.1:908 doc/tin.1:1087 doc/tin.1:1340 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'), " @@ -2633,13 +2635,13 @@ msgstr "" "o>'' command-line switch) or discard it via B ('B')." #. type: TP -#: doc/tin.1:907 +#: doc/tin.1:908 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:913 doc/tin.1:1341 +#: doc/tin.1:914 doc/tin.1:1346 msgid "" "Repost an already posted article / thread / auto-selected (hot) articles / " "articles matching pattern / tagged articles to another newsgroup(s). Useful " @@ -2652,13 +2654,13 @@ msgstr "" "your own articles." #. type: TP -#: doc/tin.1:913 +#: doc/tin.1:914 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:921 +#: doc/tin.1:922 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. " @@ -2675,25 +2677,25 @@ msgstr "" "changes permanent." #. type: TP -#: doc/tin.1:921 doc/tin.1:1082 doc/tin.1:1341 +#: doc/tin.1:922 doc/tin.1:1087 doc/tin.1:1346 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:924 +#: doc/tin.1:925 msgid "Mark current article as unread." msgstr "Mark current article as unread." #. type: TP -#: doc/tin.1:924 doc/tin.1:1087 doc/tin.1:1344 +#: doc/tin.1:925 doc/tin.1:1092 doc/tin.1:1349 #, no-wrap msgid "B" msgstr "B" -#. -------------------------------------------------------------------- +#. ------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:931 +#: doc/tin.1:932 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 " @@ -2704,79 +2706,79 @@ msgstr "" "present, a prompt asks how to proceed." #. type: SS -#: doc/tin.1:931 +#: doc/tin.1:932 #, no-wrap msgid "THREAD LISTING COMMANDS" msgstr "THREAD LISTING COMMANDS" #. type: Plain text -#: doc/tin.1:936 +#: doc/tin.1:937 msgid "Select article 4 within thread." msgstr "Select article 4 within thread." #. type: TP -#: doc/tin.1:970 +#: doc/tin.1:971 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:973 +#: doc/tin.1:974 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:976 +#: doc/tin.1:977 msgid "Toggle selection of current article." msgstr "Toggle selection of current article." #. type: TP -#: doc/tin.1:976 +#: doc/tin.1:977 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:979 +#: doc/tin.1:980 msgid "Reverse article selections." msgstr "Reverse article selections." #. type: TP -#: doc/tin.1:979 +#: doc/tin.1:980 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:982 +#: doc/tin.1:983 msgid "Undo all selections on current thread." msgstr "Undo all selections on current thread." #. type: TP -#: doc/tin.1:987 +#: doc/tin.1:988 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" #. type: Plain text -#: doc/tin.1:990 +#: doc/tin.1:991 msgid "Read current article within thread." msgstr "Read current article within thread." #. type: TP -#: doc/tin.1:990 +#: doc/tin.1:991 #, no-wrap msgid "BTABE'>" msgstr "BTABE'>" #. type: Plain text -#: doc/tin.1:993 +#: doc/tin.1:994 msgid "View next unread article within thread." msgstr "View next unread article within thread." #. type: Plain text -#: doc/tin.1:998 +#: doc/tin.1:999 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 " @@ -2787,7 +2789,7 @@ msgstr "" "the current one." #. type: Plain text -#: doc/tin.1:1009 +#: doc/tin.1:1010 msgid "" "Mark thread as read [after confirmation] and return to the group index " "page. Move cursor to next thread." @@ -2796,7 +2798,7 @@ msgstr "" "page. Move cursor to next thread." #. type: Plain text -#: doc/tin.1:1013 +#: doc/tin.1:1014 msgid "" "Mark thread as read [after confirmation] and enter the next thread " "containing unread news." @@ -2805,30 +2807,30 @@ msgstr "" "containing unread news." #. type: TP -#: doc/tin.1:1013 +#: doc/tin.1:1014 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1017 +#: doc/tin.1:1018 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1028 doc/tin.1:1250 +#: doc/tin.1:1029 doc/tin.1:1255 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:1031 +#: doc/tin.1:1032 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1037 +#: doc/tin.1:1038 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 " @@ -2839,31 +2841,31 @@ msgstr "" "article. When tagged articles are present, a prompt asks how to proceed." #. type: TP -#: doc/tin.1:1040 +#: doc/tin.1:1041 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1060 +#: doc/tin.1:1061 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1065 +#: doc/tin.1:1066 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1068 +#: doc/tin.1:1069 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1072 doc/tin.1:1314 +#: doc/tin.1:1073 doc/tin.1:1319 msgid "" "Toggle tag status of current article for mailing, piping, printing, saving " "or reposting." @@ -2872,18 +2874,24 @@ msgstr "" "or reposting." #. type: TP -#: doc/tin.1:1072 +#: doc/tin.1:1073 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.1:1077 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1075 +#: doc/tin.1:1080 msgid "Untag all tagged threads." msgstr "Untag all tagged threads." #. type: Plain text -#: doc/tin.1:1087 +#: doc/tin.1:1092 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 " @@ -2893,36 +2901,36 @@ msgstr "" "range will be marked as unread instead of the current article. When tagged " "articles are present, a prompt asks how to proceed." -#. -------------------------------------------------------------------- +#. ------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:1092 +#: doc/tin.1:1097 msgid "Mark all articles in thread as unread." msgstr "Mark all articles in thread as unread." #. type: SS -#: doc/tin.1:1092 +#: doc/tin.1:1097 #, no-wrap msgid "ARTICLE VIEWER COMMANDS" msgstr "ARTICLE VIEWER COMMANDS" #. type: Plain text -#: doc/tin.1:1097 +#: doc/tin.1:1102 msgid "Read the first (base) article in this thread." msgstr "Read the first (base) article in this thread." #. type: Plain text -#: doc/tin.1:1100 +#: doc/tin.1:1105 msgid "Read response 4 in this thread." msgstr "Read response 4 in this thread." #. type: TP -#: doc/tin.1:1104 +#: doc/tin.1:1109 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1108 +#: doc/tin.1:1113 msgid "" "Reply through mail to the author of the current article with a copy of the " "article with all headers included." @@ -2931,46 +2939,46 @@ msgstr "" "article with all headers included." #. type: TP -#: doc/tin.1:1108 +#: doc/tin.1:1113 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1113 +#: doc/tin.1:1118 msgid "Perform B<\\%pgp>(1) operations on article." msgstr "Perform B<\\%pgp>(1) operations on article." #. type: TP -#: doc/tin.1:1113 +#: doc/tin.1:1118 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1116 +#: doc/tin.1:1121 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:1120 +#: doc/tin.1:1125 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1123 +#: doc/tin.1:1128 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:1123 +#: doc/tin.1:1128 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1127 +#: doc/tin.1:1132 msgid "" "Post a followup to the current article with a copy of the article with all " "headers included." @@ -2979,13 +2987,13 @@ msgstr "" "headers included." #. type: TP -#: doc/tin.1:1127 +#: doc/tin.1:1132 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1131 +#: doc/tin.1:1136 msgid "" "Toggle TeX to ISO decoding for current article. The default behavior is " "taken from the B variable in the tinrc file." @@ -2994,37 +3002,37 @@ msgstr "" "taken from the B variable in the tinrc file." #. type: TP -#: doc/tin.1:1131 +#: doc/tin.1:1136 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1134 +#: doc/tin.1:1139 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:1134 +#: doc/tin.1:1139 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1137 +#: doc/tin.1:1142 msgid "Toggle ROT-13 decoding for this article." msgstr "Toggle ROT-13 decoding for this article." #. type: TP -#: doc/tin.1:1137 +#: doc/tin.1:1142 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1141 +#: doc/tin.1:1146 msgid "" "Toggle the display of uuencoded sections. The default behavior is taken from " "the B variable in the tinrc file." @@ -3033,13 +3041,13 @@ msgstr "" "from the B variable in the tinrc file." #. type: TP -#: doc/tin.1:1141 +#: doc/tin.1:1146 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1148 +#: doc/tin.1:1153 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 " @@ -3054,23 +3062,23 @@ msgstr "" "up will hide it again." #. type: Plain text -#: doc/tin.1:1157 +#: doc/tin.1:1162 msgid "Forward search the text of this article." msgstr "Forward search the text of this article." #. type: Plain text -#: doc/tin.1:1160 +#: doc/tin.1:1165 msgid "Backward search the text of this article." msgstr "Backward search the text of this article." #. type: TP -#: doc/tin.1:1160 +#: doc/tin.1:1165 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1165 +#: doc/tin.1:1170 msgid "" "Skip to the end of the next quoted text-block in this article. Quoted text " "is everything which matches B, B or " @@ -3081,40 +3089,40 @@ msgstr "" "B." #. type: TP -#: doc/tin.1:1165 +#: doc/tin.1:1170 #, no-wrap msgid "B'>" msgstr "B'>" #. type: Plain text -#: doc/tin.1:1168 +#: doc/tin.1:1173 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:1168 +#: doc/tin.1:1173 #, no-wrap msgid "B'>" msgstr "B'>" #. type: Plain text -#: doc/tin.1:1171 +#: doc/tin.1:1176 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:1171 +#: doc/tin.1:1176 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1174 +#: doc/tin.1:1179 msgid "Toggle word highlighting on/off." msgstr "Toggle word highlighting on/off." #. type: Plain text -#: doc/tin.1:1188 +#: doc/tin.1:1193 msgid "" "Auto select article(s) with a single key. The defaults used for selection " "are set based upon the following four tinrc config variables: " @@ -3133,7 +3141,7 @@ msgstr "" "information on filtering." #. type: Plain text -#: doc/tin.1:1197 +#: doc/tin.1:1202 msgid "" "Kill article(s) with a single key. The defaults used for killing are based " "upon the following four tinrc config variables: B, " @@ -3150,24 +3158,24 @@ msgstr "" "\"FILTERING ARTICLES\" for more information on filtering." #. type: TP -#: doc/tin.1:1197 +#: doc/tin.1:1202 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" #. type: Plain text -#: doc/tin.1:1200 +#: doc/tin.1:1205 msgid "Go to next base article." msgstr "Go to next base article." #. type: TP -#: doc/tin.1:1200 +#: doc/tin.1:1205 #, no-wrap msgid "BTABE'>" msgstr "BTABE'>" #. type: Plain text -#: doc/tin.1:1205 +#: doc/tin.1:1210 msgid "" "Go to next unread article. If the tinrc variable B doesn't " "contain PageNextUnread, then this key will first page through the current " @@ -3178,17 +3186,17 @@ msgstr "" "article." #. type: Plain text -#: doc/tin.1:1208 +#: doc/tin.1:1213 msgid "Author forward search." msgstr "Author forward search." #. type: Plain text -#: doc/tin.1:1211 +#: doc/tin.1:1216 msgid "Author backward search." msgstr "Author backward search." #. type: Plain text -#: doc/tin.1:1219 +#: doc/tin.1:1224 msgid "" "Mark the current thread as read [after confirmation] and return to the " "previous menu. Move cursor to next item." @@ -3197,7 +3205,7 @@ msgstr "" "previous menu. Move cursor to next item." #. type: Plain text -#: doc/tin.1:1223 +#: doc/tin.1:1228 msgid "" "Mark the rest of the current thread as read [after confirmation] and enter " "the next thread with unread articles." @@ -3206,45 +3214,45 @@ msgstr "" "the next thread with unread articles." #. type: TP -#: doc/tin.1:1223 +#: doc/tin.1:1228 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1228 +#: doc/tin.1:1233 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1231 +#: doc/tin.1:1236 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:1234 +#: doc/tin.1:1239 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1237 +#: doc/tin.1:1242 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:1237 +#: doc/tin.1:1242 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1241 +#: doc/tin.1:1246 msgid "" "Post a followup to the current article without including a copy of the " "article." @@ -3253,107 +3261,107 @@ msgstr "" "article." #. type: TP -#: doc/tin.1:1241 +#: doc/tin.1:1246 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1244 +#: doc/tin.1:1249 msgid "Go to the start of the article." msgstr "Go to the start of the article." #. type: TP -#: doc/tin.1:1244 +#: doc/tin.1:1249 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1247 +#: doc/tin.1:1252 msgid "Go to the end of the article." msgstr "Go to the end of the article." #. type: TP -#: doc/tin.1:1253 +#: doc/tin.1:1258 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1256 +#: doc/tin.1:1261 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:1256 +#: doc/tin.1:1261 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1259 +#: doc/tin.1:1264 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:1262 +#: doc/tin.1:1267 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1271 +#: doc/tin.1:1276 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1274 +#: doc/tin.1:1279 msgid "Go to the next article." msgstr "Go to the next article." #. type: TP -#: doc/tin.1:1274 +#: doc/tin.1:1279 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1282 +#: doc/tin.1:1287 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1285 +#: doc/tin.1:1290 msgid "Go to the previous article." msgstr "Go to the previous article." #. type: TP -#: doc/tin.1:1285 +#: doc/tin.1:1290 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1288 +#: doc/tin.1:1293 msgid "Go to the previous unread article." msgstr "Go to the previous unread article." #. type: Plain text -#: doc/tin.1:1291 +#: doc/tin.1:1296 msgid "Return to the previous level." msgstr "Return to the previous level." #. type: TP -#: doc/tin.1:1294 +#: doc/tin.1:1299 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1298 +#: doc/tin.1:1303 msgid "" "Reply through mail to the author of the current article with a copy of the " "article included." @@ -3362,13 +3370,13 @@ msgstr "" "article included." #. type: TP -#: doc/tin.1:1298 +#: doc/tin.1:1303 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1302 +#: doc/tin.1:1307 msgid "" "Reply through mail to the author of the current article without including " "the original article." @@ -3377,53 +3385,53 @@ msgstr "" "the original article." #. type: TP -#: doc/tin.1:1302 +#: doc/tin.1:1307 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1307 +#: doc/tin.1:1312 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1310 +#: doc/tin.1:1315 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1314 +#: doc/tin.1:1319 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1317 +#: doc/tin.1:1322 msgid "Return to group selection level." msgstr "Return to group selection level." #. type: TP -#: doc/tin.1:1317 +#: doc/tin.1:1322 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1320 +#: doc/tin.1:1325 msgid "Go to parent article." msgstr "Go to parent article." #. type: TP -#: doc/tin.1:1320 +#: doc/tin.1:1325 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1324 +#: doc/tin.1:1329 msgid "" "Display a list of URLs in the current article. See the section \"URL LISTING" "\" for more information." @@ -3432,13 +3440,13 @@ msgstr "" "\" for more information." #. type: TP -#: doc/tin.1:1324 +#: doc/tin.1:1329 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1328 +#: doc/tin.1:1333 msgid "" "Display a list of attachments of the current article. See the section " "\"ATTACHMENT LISTING\" for more information." @@ -3447,30 +3455,30 @@ msgstr "" "\"ATTACHMENT LISTING\" for more information." #. type: TP -#: doc/tin.1:1335 +#: doc/tin.1:1340 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1344 +#: doc/tin.1:1349 msgid "Mark article as unread." msgstr "Mark article as unread." -#. -------------------------------------------------------------------- +#. ------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:1349 +#: doc/tin.1:1354 msgid "Mark the current thread as unread." msgstr "Mark the current thread as unread." #. type: SS -#: doc/tin.1:1349 +#: doc/tin.1:1354 #, no-wrap msgid "URL LISTING" msgstr "URL LISTING" #. type: Plain text -#: doc/tin.1:1352 +#: doc/tin.1:1357 msgid "" "B ('B') displays a list of URLs in the current article. " "Besides the common moving keys, the following commands are available:" @@ -3479,13 +3487,13 @@ msgstr "" "Besides the common moving keys, the following commands are available:" #. type: TP -#: doc/tin.1:1353 +#: doc/tin.1:1358 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" #. type: Plain text -#: doc/tin.1:1357 +#: doc/tin.1:1362 msgid "" "The current URL will be prompted and opened using the B. " "'BESCE>' or no input will skip the URL." @@ -3494,39 +3502,39 @@ msgstr "" "'BESCE>' or no input will skip the URL." #. type: Plain text -#: doc/tin.1:1360 +#: doc/tin.1:1365 msgid "URL forward search." msgstr "URL forward search." #. type: Plain text -#: doc/tin.1:1363 +#: doc/tin.1:1368 msgid "URL backward search." msgstr "URL backward search." #. type: Plain text -#: doc/tin.1:1369 doc/tin.1:1422 +#: doc/tin.1:1374 doc/tin.1:1427 msgid "Shell escape." msgstr "Shell escape." #. type: Plain text -#: doc/tin.1:1372 +#: doc/tin.1:1377 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:1375 doc/tin.1:1429 +#: doc/tin.1:1380 doc/tin.1:1434 msgid "Help screen of commands available." msgstr "Help screen of commands available." -#. -------------------------------------------------------------------- +#. ------------------------------------------------------------------- #. type: SS -#: doc/tin.1:1381 +#: doc/tin.1:1386 #, no-wrap msgid "ATTACHMENT LISTING" msgstr "ATTACHMENT LISTING" #. type: Plain text -#: doc/tin.1:1384 +#: doc/tin.1:1389 msgid "" "B ('B') displays a list of attachments of the current " "article. Besides the common moving keys, the following commands are " @@ -3537,57 +3545,57 @@ msgstr "" "available:" #. type: TP -#: doc/tin.1:1385 +#: doc/tin.1:1390 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1388 +#: doc/tin.1:1393 msgid "Pipe attachment into command." msgstr "Pipe attachment into command." #. type: TP -#: doc/tin.1:1388 +#: doc/tin.1:1393 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1391 +#: doc/tin.1:1396 msgid "Save current attachment / tagged attachments to disk." msgstr "Save current attachment / tagged attachments to disk." #. type: TP -#: doc/tin.1:1391 +#: doc/tin.1:1396 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" #. type: Plain text -#: doc/tin.1:1394 +#: doc/tin.1:1399 msgid "View attachment." msgstr "View attachment." #. type: TP -#: doc/tin.1:1394 +#: doc/tin.1:1399 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1397 +#: doc/tin.1:1402 msgid "Tag one or more attachments for saving." msgstr "Tag one or more attachments for saving." #. type: TP -#: doc/tin.1:1397 +#: doc/tin.1:1402 #, no-wrap msgid "B" #. type: Plain text -#: doc/tin.1:1401 +#: doc/tin.1:1406 msgid "" "Prompts for a pattern to match. All attachments whose name/description or " "content type/transfer encoding match the pattern will be tagged." @@ -3596,52 +3604,52 @@ msgstr "" "content type/transfer encoding match the pattern will be tagged." #. type: TP -#: doc/tin.1:1401 +#: doc/tin.1:1406 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1404 +#: doc/tin.1:1409 msgid "Reverse tagging of all attachments." msgstr "Reverse tagging of all attachments." #. type: TP -#: doc/tin.1:1404 +#: doc/tin.1:1409 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1407 +#: doc/tin.1:1412 msgid "Untag all tagged attachments." msgstr "Untag all tagged attachments." #. type: Plain text -#: doc/tin.1:1410 +#: doc/tin.1:1415 msgid "Attachment forward search." msgstr "Attachment forward search." #. type: Plain text -#: doc/tin.1:1413 +#: doc/tin.1:1418 msgid "Attachment backward search." msgstr "Attachment backward search." #. type: TP -#: doc/tin.1:1416 +#: doc/tin.1:1421 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1419 +#: doc/tin.1:1424 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:1426 +#: doc/tin.1:1431 msgid "" "Toggle the display of the name/description of the current attachment in the " "last line." @@ -3649,9 +3657,9 @@ msgstr "" "Toggle the display of the name/description of the current attachment in the " "last line." -#. -------------------------------------------------------------------- +#. ------------------------------------------------------------------- #. type: SS -#: doc/tin.1:1435 +#: doc/tin.1:1440 #, no-wrap msgid "GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES" msgstr "GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES" @@ -3660,7 +3668,7 @@ msgstr "GLOBAL OPTIONS MENU AND TINRC CO #. - \fI${TIN_LIBDIR:\-NEWSLIBDIR}/tinrc\fR is used #. in the !TIN_DEFAULTS_DIR config case #. type: Plain text -#: doc/tin.1:1447 +#: doc/tin.1:1452 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 " @@ -3677,7 +3685,7 @@ msgstr "" "distributing system-wide defaults to new users who have no private tinrc yet." #. type: Plain text -#: doc/tin.1:1455 +#: doc/tin.1:1460 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 " @@ -3694,7 +3702,7 @@ msgstr "" "don't edit the file directly whilst B is running." #. type: Plain text -#: doc/tin.1:1461 +#: doc/tin.1:1466 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 " @@ -3709,7 +3717,7 @@ msgstr "" "\\&'BESCE>' will abort without saving changes." #. type: Plain text -#: doc/tin.1:1468 +#: doc/tin.1:1473 msgid "" "As with the other menus, B ('B<^L>') will redraw the screen. You " "can use B ('B'), B ('B') and B " @@ -3724,7 +3732,7 @@ msgstr "" "keeping your changes." #. type: Plain text -#: doc/tin.1:1473 +#: doc/tin.1:1478 msgid "" "The options menu provides access to the attributes menu for the current " "group by the B ('BTABE>') command. Pressing " @@ -3737,7 +3745,7 @@ msgstr "" "information see section \"ATTRIBUTES MENU AND GROUP ATTRIBUTES\"." #. type: Plain text -#: doc/tin.1:1476 +#: doc/tin.1:1481 msgid "" "The B ('B') command brings up the scopes menu. For more " "information see section \"SCOPES MENU\"." @@ -3746,7 +3754,7 @@ msgstr "" "information see section \"SCOPES MENU\"." #. type: Plain text -#: doc/tin.1:1480 +#: doc/tin.1:1485 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/" @@ -3757,13 +3765,13 @@ msgstr "" "tinrc>." #. type: TP -#: doc/tin.1:1480 +#: doc/tin.1:1485 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1486 doc/tin.5:1204 +#: doc/tin.1:1491 doc/tin.5:1253 msgid "" "If ON abbreviate long newsgroup names at group selection level and article " "level (if necessary) like this: news.software.readers -E n.software." @@ -3774,13 +3782,13 @@ msgstr "" "readers -E n.s.readers -E n.s.r. Default is OFF." #. type: TP -#: doc/tin.1:1486 +#: doc/tin.1:1491 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1490 doc/tin.5:1208 +#: doc/tin.1:1495 doc/tin.5:1257 msgid "" "If ON add posted articles which start a new thread to filter for " "highlighting follow-ups. Default is ON." @@ -3789,62 +3797,62 @@ msgstr "" "highlighting follow-ups. Default is ON." #. type: TP -#: doc/tin.1:1490 +#: doc/tin.1:1495 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1493 doc/tin.5:1211 +#: doc/tin.1:1498 doc/tin.5:1260 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:1493 +#: doc/tin.1:1498 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1496 doc/tin.5:1214 +#: doc/tin.1:1501 doc/tin.5:1263 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:1496 +#: doc/tin.1:1501 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1499 doc/tin.5:1217 +#: doc/tin.1:1504 doc/tin.5:1266 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:1499 +#: doc/tin.1:1504 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1502 doc/tin.5:1220 +#: doc/tin.1:1507 doc/tin.5:1269 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:1502 +#: doc/tin.1:1507 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1506 doc/tin.5:1224 +#: doc/tin.1:1511 doc/tin.5:1273 msgid "" "The character used to show that an article will return as an unread article " "when the group is next entered. Default is '-'." @@ -3853,13 +3861,13 @@ msgstr "" "when the group is next entered. Default is '-'." #. type: TP -#: doc/tin.1:1506 +#: doc/tin.1:1511 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1510 doc/tin.5:1228 +#: doc/tin.1:1515 doc/tin.5:1277 msgid "" "The character used to show that an article/thread is auto-selected (hot). " "Default is '*'." @@ -3868,13 +3876,13 @@ msgstr "" "Default is '*'." #. type: TP -#: doc/tin.1:1510 +#: doc/tin.1:1515 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1514 doc/tin.5:1232 +#: doc/tin.1:1519 doc/tin.5:1281 msgid "" "The character used to show that an article/thread is recent (not older than " "X days). See also B. Default is 'o'." @@ -3883,13 +3891,13 @@ msgstr "" "X days). See also B. Default is 'o'." #. type: TP -#: doc/tin.1:1514 +#: doc/tin.1:1519 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1518 doc/tin.5:1236 +#: doc/tin.1:1523 doc/tin.5:1285 msgid "" "The character used to show that an article has not been read. Default is " "'+'." @@ -3898,24 +3906,24 @@ msgstr "" "'+'." #. type: TP -#: doc/tin.1:1518 +#: doc/tin.1:1523 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1521 doc/tin.5:1239 +#: doc/tin.1:1526 doc/tin.5:1288 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:1521 +#: doc/tin.1:1526 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1525 doc/tin.5:1243 +#: doc/tin.1:1530 doc/tin.5:1292 msgid "" "The character used to show that an article was killed. Default is 'K'. " "B must be set accordingly." @@ -3924,13 +3932,13 @@ msgstr "" "B must be set accordingly." #. type: TP -#: doc/tin.1:1525 +#: doc/tin.1:1530 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1529 doc/tin.5:1247 +#: doc/tin.1:1534 doc/tin.5:1296 msgid "" "The character used to show that an article was hot before it was read. " "Default is ':'. B must be set accordingly." @@ -3939,13 +3947,13 @@ msgstr "" "Default is ':'. B must be set accordingly." #. type: TP -#: doc/tin.1:1529 doc/tin.5:1247 +#: doc/tin.1:1534 doc/tin.5:1296 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1534 +#: doc/tin.1:1539 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 " @@ -3956,13 +3964,13 @@ msgstr "" "OFF." #. type: TP -#: doc/tin.1:1534 +#: doc/tin.1:1539 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1538 doc/tin.5:1258 +#: doc/tin.1:1543 doc/tin.5:1307 msgid "" "Automatically put your name in the ''Cc:'' and/or ''Bcc:'' field when " "mailing an article. Default is No." @@ -3971,13 +3979,13 @@ msgstr "" "mailing an article. Default is No." #. type: TP -#: doc/tin.1:1538 +#: doc/tin.1:1543 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1542 doc/tin.5:1262 +#: doc/tin.1:1547 doc/tin.5:1311 msgid "" "If ON automatically list thread when entering it using right arrow key. " "Default is ON." @@ -3986,24 +3994,24 @@ msgstr "" "Default is ON." #. type: TP -#: doc/tin.1:1542 +#: doc/tin.1:1547 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1545 doc/tin.1:2528 +#: doc/tin.1:1550 doc/tin.1:2550 msgid "Default is OFF." msgstr "Default is OFF." #. type: TP -#: doc/tin.1:1545 +#: doc/tin.1:1550 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1551 doc/tin.5:1271 +#: doc/tin.1:1556 doc/tin.5:1320 msgid "" "If ON articles/threads with ''Archive-name:'' in header will be " "automatically saved with the Archive-name & part/patch no and post processed " @@ -4014,13 +4022,13 @@ msgstr "" "if B is set to something other than 'No'. Default is OFF." #. type: TP -#: doc/tin.1:1551 +#: doc/tin.1:1556 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1556 doc/tin.5:1276 +#: doc/tin.1:1561 doc/tin.5:1325 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 " @@ -4031,13 +4039,13 @@ msgstr "" "ON." #. type: TP -#: doc/tin.1:1556 +#: doc/tin.1:1561 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1561 doc/tin.5:1281 +#: doc/tin.1:1566 doc/tin.5:1330 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 " @@ -4048,13 +4056,13 @@ msgstr "" "displayed after composing an article. Default is ON." #. type: TP -#: doc/tin.1:1561 +#: doc/tin.1:1566 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1566 +#: doc/tin.1:1571 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. " @@ -4065,13 +4073,13 @@ msgstr "" "See also \"INDEX FILES\". Default is OFF." #. type: TP -#: doc/tin.1:1566 +#: doc/tin.1:1571 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1572 doc/tin.5:1292 +#: doc/tin.1:1577 doc/tin.5:1341 msgid "" "Use this hash algorithm for cancel-locks. Only available when build with " "cancel-lock support. none disables the generation of cancel-locks. Valid " @@ -4082,13 +4090,13 @@ msgstr "" "values are none, sha1, sha256 and sha512. Default is sha1." #. type: TP -#: doc/tin.1:1572 +#: doc/tin.1:1577 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1578 doc/tin.5:1296 +#: doc/tin.1:1583 doc/tin.5:1345 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." @@ -4097,90 +4105,101 @@ msgstr "" "current session should be marked read. Default is OFF." #. type: TP -#: doc/tin.1:1578 +#: doc/tin.1:1583 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1581 doc/tin.5:1299 +#: doc/tin.1:1586 doc/tin.5:1348 msgid "Standard background color" msgstr "Standard background colour" #. type: TP -#: doc/tin.1:1581 +#: doc/tin.1:1586 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1584 doc/tin.5:1302 +#: doc/tin.1:1589 doc/tin.5:1351 msgid "Color of quoted text from external sources" msgstr "Colour of quoted text from external sources" #. type: TP -#: doc/tin.1:1584 +#: doc/tin.1:1589 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1587 doc/tin.5:1305 +#: doc/tin.1:1592 doc/tin.5:1354 msgid "Color of sender (From:)" msgstr "Colour of sender (From:)" #. type: TP -#: doc/tin.1:1587 +#: doc/tin.1:1592 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1590 doc/tin.5:1308 +#: doc/tin.1:1595 doc/tin.5:1357 msgid "Color of header-lines" msgstr "Colour of header-lines" #. type: TP -#: doc/tin.1:1590 +#: doc/tin.1:1595 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1593 doc/tin.5:1311 +#: doc/tin.1:1598 doc/tin.5:1360 msgid "Color of help pages" msgstr "Colour of help pages" #. type: TP -#: doc/tin.1:1593 +#: doc/tin.1:1598 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1596 doc/tin.5:1314 +#: doc/tin.1:1601 doc/tin.5:1363 msgid "Color of background for inverse text" msgstr "Colour of background for inverse text" #. type: TP -#: doc/tin.1:1596 +#: doc/tin.1:1601 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1599 doc/tin.5:1317 +#: doc/tin.1:1604 doc/tin.5:1366 msgid "Color of foreground for inverse text" msgstr "Colour of foreground for inverse text" #. type: TP -#: doc/tin.1:1599 +#: doc/tin.1:1604 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1607 doc/tin.5:1385 +msgid "Color of status messages in last line" +msgstr "Colour of status messages in last line" + +#. type: TP +#: doc/tin.1:1607 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1603 doc/tin.5:1321 +#: doc/tin.1:1611 doc/tin.5:1370 msgid "" "Color of words emphasized like _this_. See also B and " "B." @@ -4189,13 +4208,13 @@ msgstr "" "B." #. type: TP -#: doc/tin.1:1603 +#: doc/tin.1:1611 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1607 doc/tin.5:1325 +#: doc/tin.1:1615 doc/tin.5:1374 msgid "" "Color of words emphasized like /this/. See also B and " "B." @@ -4204,13 +4223,13 @@ msgstr "" "B." #. type: TP -#: doc/tin.1:1607 +#: doc/tin.1:1615 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1611 doc/tin.5:1329 +#: doc/tin.1:1619 doc/tin.5:1378 msgid "" "Color of words emphasized like *this*. See also B and " "B." @@ -4219,13 +4238,13 @@ msgstr "" "B." #. type: TP -#: doc/tin.1:1611 +#: doc/tin.1:1619 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1615 doc/tin.5:1333 +#: doc/tin.1:1623 doc/tin.5:1382 msgid "" "Color of words emphasized like -this-. See also B and " "B." @@ -4234,79 +4253,79 @@ msgstr "" "B." #. type: TP -#: doc/tin.1:1615 +#: doc/tin.1:1623 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1618 doc/tin.5:1336 +#: doc/tin.1:1626 doc/tin.5:1388 msgid "Color of mini help menu" msgstr "Colour of mini help menu" #. type: TP -#: doc/tin.1:1618 +#: doc/tin.1:1626 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1621 doc/tin.5:1339 +#: doc/tin.1:1629 doc/tin.5:1391 msgid "Color of actual news header fields" msgstr "Colour of actual news header fields" #. type: TP -#: doc/tin.1:1621 +#: doc/tin.1:1629 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1624 doc/tin.5:1342 +#: doc/tin.1:1632 doc/tin.5:1394 msgid "Standard foreground color" msgstr "Standard foreground colour" #. type: TP -#: doc/tin.1:1624 +#: doc/tin.1:1632 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1627 doc/tin.5:1345 +#: doc/tin.1:1635 doc/tin.5:1397 msgid "Color of quoted lines" msgstr "Colour of quoted lines" #. type: TP -#: doc/tin.1:1627 +#: doc/tin.1:1635 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1630 doc/tin.5:1348 +#: doc/tin.1:1638 doc/tin.5:1400 msgid "Color of twice quoted lines" msgstr "Colour of twice quoted lines" #. type: TP -#: doc/tin.1:1630 +#: doc/tin.1:1638 #, no-wrap msgid "B3 times quoted line (col_quote3)>" msgstr "B3 times quoted line (col_quote3)>" #. type: Plain text -#: doc/tin.1:1633 doc/tin.5:1351 +#: doc/tin.1:1641 doc/tin.5:1403 msgid "Color of E=3 times quoted lines" msgstr "Colour of E=3 times quoted lines" #. type: TP -#: doc/tin.1:1633 +#: doc/tin.1:1641 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1637 doc/tin.5:1355 +#: doc/tin.1:1645 doc/tin.5:1407 msgid "" "Color of response counter. This is the text that says \"Response x of y\" in " "the article viewer." @@ -4315,91 +4334,91 @@ msgstr "" "in the article viewer." #. type: TP -#: doc/tin.1:1637 +#: doc/tin.1:1645 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1640 doc/tin.5:1358 +#: doc/tin.1:1648 doc/tin.5:1410 msgid "Color of signatures" msgstr "Colour of signatures" #. type: TP -#: doc/tin.1:1640 +#: doc/tin.1:1648 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1643 doc/tin.5:1361 +#: doc/tin.1:1651 doc/tin.5:1413 msgid "Color of urls highlight" msgstr "Colour of urls highlight" #. type: TP -#: doc/tin.1:1643 +#: doc/tin.1:1651 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1646 doc/tin.5:1364 +#: doc/tin.1:1654 doc/tin.5:1416 msgid "Color of verbatim blocks" msgstr "Colour of verbatim blocks" #. type: TP -#: doc/tin.1:1646 +#: doc/tin.1:1654 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1649 doc/tin.5:1367 +#: doc/tin.1:1657 doc/tin.5:1419 msgid "Color of article subject" msgstr "Colour of article subject" #. type: TP -#: doc/tin.1:1649 +#: doc/tin.1:1657 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1652 doc/tin.5:1370 +#: doc/tin.1:1660 doc/tin.5:1422 msgid "Color of text-lines" msgstr "Colour of text-lines" #. type: TP -#: doc/tin.1:1652 +#: doc/tin.1:1660 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1655 doc/tin.5:1373 +#: doc/tin.1:1663 doc/tin.5:1425 msgid "Color of help/mail sign" msgstr "Colour of help/mail sign" #. type: TP -#: doc/tin.1:1655 +#: doc/tin.1:1663 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1658 +#: doc/tin.1:1666 msgid "Ask for manual confirmation to protect the user." msgstr "Ask for manual confirmation to protect the user." #. type: IP -#: doc/tin.1:1659 doc/tin.1:1665 doc/tin.1:1669 +#: doc/tin.1:1667 doc/tin.1:1673 doc/tin.1:1677 #, no-wrap msgid "\\(bu" msgstr "\\(bu" #. TODO: check if all affected commands are marked [after confirmation] #. type: Plain text -#: doc/tin.1:1665 +#: doc/tin.1:1673 msgid "" "B Ask for confirmation before executing certain dangerous commands " "(e.g., B ('B')). Commands that this affects are marked in this " @@ -4410,7 +4429,7 @@ msgstr "" "manual with '[after confirmation]'. Default is commands & quit." #. type: Plain text -#: doc/tin.1:1669 +#: doc/tin.1:1677 msgid "" "B You'll be asked to confirm that you wish to exit B when you use " "the B ('B') command." @@ -4419,7 +4438,7 @@ msgstr "" "the B ('B') command." #. type: Plain text -#: doc/tin.1:1673 +#: doc/tin.1:1681 msgid "" "B: Ask for confirmation before marking all not selected (with " "B ('B') command) articles as read." @@ -12945,12 +13119,12 @@ msgstr "" "B ('B') command) articles as read." #. type: Plain text -#: doc/tin.5:1394 +#: doc/tin.5:1446 msgid "Default is commands & quit." msgstr "Default is commands & quit." #. type: Plain text -#: doc/tin.5:1405 +#: doc/tin.5:1457 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<\\" @@ -12963,61 +13137,61 @@ msgstr "" "fallback code. Default is \"%a, %d %b %Y %H:%M:%S\"." #. type: TP -#: doc/tin.5:1405 +#: doc/tin.5:1457 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1407 +#: doc/tin.5:1459 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1409 +#: doc/tin.5:1461 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1412 +#: doc/tin.5:1464 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1415 +#: doc/tin.5:1467 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1419 +#: doc/tin.5:1471 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1424 +#: doc/tin.5:1476 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1428 +#: doc/tin.5:1480 #, no-wrap msgid "B" msgstr "B" #. type: ta -#: doc/tin.5:1433 doc/tin.5:1462 +#: doc/tin.5:1485 doc/tin.5:1514 #, no-wrap msgid "\\w'0,1 'u +\\w'\\'\\'Message-ID:\\'\\' & last \\'\\'References:\\'\\' entry only'u" msgstr "\\w'0,1 'u +\\w'\\'\\'Message-ID:\\'\\' & last \\'\\'References:\\'\\' entry only'u" #. type: Plain text -#: doc/tin.5:1442 doc/tin.5:1471 +#: doc/tin.5:1494 doc/tin.5:1523 #, no-wrap msgid "" "0\t''Subject:'' (case sensitive)\n" @@ -13039,139 +13213,139 @@ msgstr "" "7\t''Lines:''\n" #. type: TP -#: doc/tin.5:1444 +#: doc/tin.5:1496 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1448 +#: doc/tin.5:1500 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1453 +#: doc/tin.5:1505 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1457 +#: doc/tin.5:1509 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1473 +#: doc/tin.5:1525 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1475 +#: doc/tin.5:1527 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1477 +#: doc/tin.5:1529 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1479 +#: doc/tin.5:1531 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1481 +#: doc/tin.5:1533 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1483 +#: doc/tin.5:1535 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1485 +#: doc/tin.5:1537 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1487 +#: doc/tin.5:1539 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1489 +#: doc/tin.5:1541 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1491 +#: doc/tin.5:1543 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1493 +#: doc/tin.5:1545 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1495 +#: doc/tin.5:1547 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1497 +#: doc/tin.5:1549 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1499 +#: doc/tin.5:1551 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1501 +#: doc/tin.5:1553 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1503 +#: doc/tin.5:1555 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1505 +#: doc/tin.5:1557 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1507 +#: doc/tin.5:1559 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1516 +#: doc/tin.5:1568 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., /" @@ -13182,13 +13356,13 @@ msgstr "" "bin/vi +7 .article)." #. type: TP -#: doc/tin.5:1519 +#: doc/tin.5:1571 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1526 +#: doc/tin.5:1578 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, " @@ -13199,19 +13373,19 @@ msgstr "" "then B<\\%tin>(1) uses a built-in default." #. type: TP -#: doc/tin.5:1526 +#: doc/tin.5:1578 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1530 +#: doc/tin.5:1582 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1537 +#: doc/tin.5:1589 msgid "" "If B is E 0 not more than the last B " "articles/group are fetched from the server. If B is E 0 B<" @@ -13224,13 +13398,13 @@ msgstr "" "absolute value of B. Default is 0, which means no limit." #. type: TP -#: doc/tin.5:1537 +#: doc/tin.5:1589 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1551 +#: doc/tin.5:1603 msgid "" "Which keys B<\\%tin>(1) should accept to jump to the next unread article. " "Possible is any combination of B and B. When " @@ -13247,7 +13421,7 @@ msgstr "" "Default is B." #. type: Plain text -#: doc/tin.5:1558 +#: doc/tin.5:1610 msgid "" "The format string used for the Group level. Default is \"%n\\ %m\\ %R\\ %L\\ " "\\ %s\\ \\ %F\". The following substitutions are supported:" @@ -13256,13 +13430,13 @@ msgstr "" "\\ %s\\ \\ %F\". The following substitutions are supported:" #. type: ta -#: doc/tin.5:1560 +#: doc/tin.5:1612 #, no-wrap msgid "\\w'%G 'u +\\w'number of responses in thread'u" msgstr "\\w'%G 'u +\\w'number of responses in thread'u" #. type: Plain text -#: doc/tin.5:1572 +#: doc/tin.5:1624 #, no-wrap msgid "" "%D\tdate\n" @@ -13290,31 +13464,31 @@ msgstr "" "%%\t%\n" #. type: TP -#: doc/tin.5:1574 +#: doc/tin.5:1626 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1584 +#: doc/tin.5:1636 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1591 +#: doc/tin.5:1643 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1597 +#: doc/tin.5:1649 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1603 +#: doc/tin.5:1655 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, " @@ -13327,25 +13501,25 @@ msgstr "" "usage. This option has to suit B. Default is 0." #. type: TP -#: doc/tin.5:1603 +#: doc/tin.5:1655 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1607 +#: doc/tin.5:1659 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1612 +#: doc/tin.5:1664 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1616 +#: doc/tin.5:1668 msgid "" "This option controls the processing and display of articles that are killed. " "There are 3 options, default is 0 (B)." @@ -13354,7 +13528,7 @@ msgstr "" "There are 3 options, default is 0 (B)." #. type: Plain text -#: doc/tin.5:1624 +#: doc/tin.5:1676 msgid "" "B is the 'traditional' behavior of B<\\%tin>(1). " "Only unread articles are killed once only by marking them read. As filtering " @@ -13369,73 +13543,73 @@ msgstr "" "When you reenter the group the mark will be gone." #. type: TP -#: doc/tin.5:1640 +#: doc/tin.5:1692 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1650 +#: doc/tin.5:1702 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1655 +#: doc/tin.5:1707 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1674 +#: doc/tin.5:1726 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1711 +#: doc/tin.5:1763 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1723 doc/tin.5:2426 +#: doc/tin.5:1775 doc/tin.5:2492 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1756 +#: doc/tin.5:1808 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1761 +#: doc/tin.5:1813 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1766 +#: doc/tin.5:1818 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1771 +#: doc/tin.5:1823 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1776 +#: doc/tin.5:1828 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1782 +#: doc/tin.5:1834 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." @@ -13444,25 +13618,25 @@ msgstr "" "newsgroups. Do not change them unless you understand what they are for." #. type: TP -#: doc/tin.5:1803 +#: doc/tin.5:1855 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1806 +#: doc/tin.5:1858 msgid "Time in seconds to wait for a response from the server. Default is 120." msgstr "" "Time in seconds to wait for a response from the server. Default is 120." #. type: TP -#: doc/tin.5:1806 +#: doc/tin.5:1858 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1810 +#: doc/tin.5:1862 msgid "" "The normalization form which should be used to normalize unicode input. The " "possible values are:" @@ -13471,7 +13645,7 @@ msgstr "" "possible values are:" #. type: Plain text -#: doc/tin.5:1828 +#: doc/tin.5:1880 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 " @@ -13482,7 +13656,7 @@ msgstr "" "possible." #. type: Plain text -#: doc/tin.5:1856 +#: doc/tin.5:1908 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 " @@ -13493,7 +13667,7 @@ msgstr "" "determined using the B<\\%mailcap>(5) file. Default is ON." #. type: Plain text -#: doc/tin.5:1862 +#: doc/tin.5:1914 msgid "" "This specifies whether to perform post processing on saved articles. " "Because the shell archive may contain commands you may not want to be " @@ -13506,7 +13680,7 @@ msgstr "" "are allowed:" #. type: Plain text -#: doc/tin.5:1870 +#: doc/tin.5:1922 msgid "" "B, unpacking of multi-part B<\\%shar>(1) files only. " "Because the shell archive may contain commands you may not want to be " @@ -13517,19 +13691,19 @@ msgstr "" "executed, be careful with this option." #. type: TP -#: doc/tin.5:1873 +#: doc/tin.5:1925 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1883 +#: doc/tin.5:1937 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1893 +#: doc/tin.5:1947 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 " @@ -13542,7 +13716,7 @@ msgstr "" "Administrator." #. type: Plain text -#: doc/tin.5:1901 +#: doc/tin.5:1955 msgid "" "If ON show empty ''Followup-To:'' header when editing an article. Default " "is OFF." @@ -13551,13 +13725,13 @@ msgstr "" "is OFF." #. type: TP -#: doc/tin.5:1906 +#: doc/tin.5:1960 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1912 +#: doc/tin.5:1966 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 " @@ -13570,7 +13744,7 @@ msgstr "" "characters are compressed and empty lines are quoted." #. type: Plain text -#: doc/tin.5:1917 +#: doc/tin.5:1971 msgid "" "B Compress quote characters together when quoting multiple " "times (for example, 'E E E' will be turned into " @@ -13581,7 +13755,7 @@ msgstr "" "'EEE'). This option is on by default." #. type: Plain text -#: doc/tin.5:1923 +#: doc/tin.5:1977 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 " @@ -13594,18 +13768,18 @@ msgstr "" "quoted regardless of this option when B is off." #. type: Plain text -#: doc/tin.5:1925 +#: doc/tin.5:1979 msgid "B This option is on by default." msgstr "B This option is on by default." #. type: TP -#: doc/tin.5:1926 +#: doc/tin.5:1980 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1933 +#: doc/tin.5:1987 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, then B<" @@ -13616,13 +13790,13 @@ msgstr "" "\\%tin>(1) uses a built-in default." #. type: TP -#: doc/tin.5:1933 +#: doc/tin.5:1987 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1940 +#: doc/tin.5:1994 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, then " @@ -13633,13 +13807,13 @@ msgstr "" "B<\\%tin>(1) uses a built-in default." #. type: TP -#: doc/tin.5:1940 +#: doc/tin.5:1994 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1947 +#: doc/tin.5:2001 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, then " @@ -13650,19 +13824,19 @@ msgstr "" "B<\\%tin>(1) uses a built-in default." #. type: TP -#: doc/tin.5:1947 +#: doc/tin.5:2001 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1951 +#: doc/tin.5:2005 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1958 +#: doc/tin.5:2012 msgid "" "If ON B<\\%tin>(1) does the rendering of bi-directional text. If OFF B<\\" "%tin>(1) leaves the rendering of bi-directional text to the terminal. " @@ -13673,49 +13847,49 @@ msgstr "" "Default is OFF." #. type: TP -#: doc/tin.5:1958 +#: doc/tin.5:2012 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1967 +#: doc/tin.5:2021 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1971 +#: doc/tin.5:2025 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1975 +#: doc/tin.5:2029 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1979 +#: doc/tin.5:2033 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1983 +#: doc/tin.5:2037 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1991 +#: doc/tin.5:2045 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1995 +#: doc/tin.5:2049 msgid "" "The format string used for the Selection level. Default is \"%f\\ %n\\ %U\\ " "\\ %G\\ \\ %d\". The following substitutions are supported:" @@ -13724,13 +13898,13 @@ msgstr "" "\\ %G\\ \\ %d\". The following substitutions are supported:" #. type: ta -#: doc/tin.5:1997 +#: doc/tin.5:2051 #, no-wrap msgid "\\w'%G 'u +\\w'current group number'u" msgstr "\\w'%G 'u +\\w'current group number'u" #. type: Plain text -#: doc/tin.5:2004 +#: doc/tin.5:2058 #, no-wrap msgid "" "%G\tgroup name\n" @@ -13748,19 +13922,19 @@ msgstr "" "%%\t%\n" #. type: TP -#: doc/tin.5:2006 +#: doc/tin.5:2060 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2037 +#: doc/tin.5:2091 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2046 +#: doc/tin.5:2100 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 " @@ -13777,19 +13951,19 @@ msgstr "" "mailgroups> for mailgroups. Default is ON." #. type: TP -#: doc/tin.5:2068 +#: doc/tin.5:2122 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2091 +#: doc/tin.5:2145 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2098 +#: doc/tin.5:2152 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -13800,19 +13974,19 @@ msgstr "" "B is blank, then B<\\%tin>(1) uses a built-in default." #. type: TP -#: doc/tin.5:2144 +#: doc/tin.5:2198 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2151 +#: doc/tin.5:2205 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2158 +#: doc/tin.5:2212 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -13823,31 +13997,52 @@ msgstr "" "B is blank, then B<\\%tin>(1) uses a built-in default." #. type: TP -#: doc/tin.5:2163 +#: doc/tin.5:2217 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2167 +#: doc/tin.5:2221 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2176 +#: doc/tin.5:2230 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2180 +#: doc/tin.5:2234 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2240 +msgid "" +"A regular expression to find Subject prefixes like \"Re:\" to remove If " +"B is blank, then B<\\%tin>(1) uses a built-in default." +msgstr "" +"A regular expression to find Subject prefixes like \"Re:\" to remove If " +"B is blank, then B<\\%tin>(1) uses a built-in default." + +#. type: TP +#: doc/tin.5:2240 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:2246 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2187 +#: doc/tin.5:2253 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -13858,7 +14053,7 @@ msgstr "" "B is blank, then B<\\%tin>(1) uses a built-in default." #. type: Plain text -#: doc/tin.5:2192 +#: doc/tin.5:2258 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 " @@ -13869,7 +14064,7 @@ msgstr "" "viewer via B ('B<\">')." #. type: Plain text -#: doc/tin.5:2202 +#: doc/tin.5:2268 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 " @@ -13888,7 +14083,7 @@ msgstr "" "attributes>." #. type: Plain text -#: doc/tin.5:2206 +#: doc/tin.5:2272 msgid "" "The format string used for the Thread level. Default is \"%n\\ %m\\ \\ " "[%L]\\ \\ %T\\ \\ %F\". The following substitutions are supported:" @@ -13897,13 +14092,13 @@ msgstr "" "[%L]\\ \\ %T\\ \\ %F\". The following substitutions are supported:" #. type: ta -#: doc/tin.5:2208 +#: doc/tin.5:2274 #, no-wrap msgid "\\w'%G 'u +\\w'from, name and/or address'u" msgstr "\\w'%G 'u +\\w'from, name and/or address'u" #. type: Plain text -#: doc/tin.5:2219 +#: doc/tin.5:2285 #, no-wrap msgid "" "%D\tdate\n" @@ -13929,7 +14124,7 @@ msgstr "" "%%\t%\n" #. type: Plain text -#: doc/tin.5:2226 +#: doc/tin.5:2292 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 " @@ -13940,19 +14135,19 @@ msgstr "" "the range 0 to 100. The default is 75." #. type: TP -#: doc/tin.5:2230 +#: doc/tin.5:2296 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2242 +#: doc/tin.5:2308 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2256 +#: doc/tin.5:2322 msgid "" "Allows you to select how B<\\%tin>(1) treats blank lines in article " "bodies. Default is 0. This option does not affect lines within verbatim " @@ -13962,13 +14157,13 @@ msgstr "" "Default is 0. This option does not affect lines within verbatim blocks." #. type: TP -#: doc/tin.5:2275 +#: doc/tin.5:2341 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2282 +#: doc/tin.5:2348 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -13979,13 +14174,13 @@ msgstr "" "B is blank, then B<\\%tin>(1) uses a built-in default." #. type: TP -#: doc/tin.5:2282 +#: doc/tin.5:2348 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2286 +#: doc/tin.5:2352 msgid "" "If ON remove I<${TIN_HOMEDIR:-\"$HOME\"}/.article> after posting. Default is " "ON." @@ -13994,53 +14189,53 @@ msgstr "" "ON." #. type: TP -#: doc/tin.5:2286 +#: doc/tin.5:2352 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2291 +#: doc/tin.5:2357 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2294 +#: doc/tin.5:2360 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2299 +#: doc/tin.5:2365 msgid "If enabled B<\\%tin>(1) uses ANSI-colors. Default is OFF." msgstr "If enabled B<\\%tin>(1) uses ANSI-colours. Default is OFF." #. type: TP -#: doc/tin.5:2299 +#: doc/tin.5:2365 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2302 +#: doc/tin.5:2368 msgid "Use scroll keys on keypad. Default is OFF." msgstr "Use scroll keys on keypad. Default is OFF." #. type: TP -#: doc/tin.5:2302 +#: doc/tin.5:2368 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2308 +#: doc/tin.5:2374 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2320 +#: doc/tin.5:2386 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 " @@ -14053,19 +14248,19 @@ msgstr "" "is OFF." #. type: TP -#: doc/tin.5:2320 +#: doc/tin.5:2386 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2324 +#: doc/tin.5:2390 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2328 +#: doc/tin.5:2394 msgid "" "A regular expression that B will use to find the begin of a verbatim " "block. Default is #v+" @@ -14074,13 +14269,13 @@ msgstr "" "block. Default is #v+" #. type: TP -#: doc/tin.5:2328 +#: doc/tin.5:2394 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2332 +#: doc/tin.5:2398 msgid "" "A regular expression that B will use to find the end of a verbatim " "block. Default is #v-" @@ -14089,13 +14284,13 @@ msgstr "" "block. Default is #v-" #. type: TP -#: doc/tin.5:2335 +#: doc/tin.5:2401 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2351 +#: doc/tin.5:2417 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 " @@ -14114,31 +14309,31 @@ msgstr "" "wildmat notation." #. type: TP -#: doc/tin.5:2351 +#: doc/tin.5:2417 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2363 +#: doc/tin.5:2429 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2371 +#: doc/tin.5:2437 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2387 +#: doc/tin.5:2453 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2403 +#: doc/tin.5:2469 msgid "" "Yet another global configuration file with \"I=I\" pairs. " "This one is for the more general options which usually can't be controlled " @@ -14153,18 +14348,18 @@ msgstr "" "I." #. type: TP -#: doc/tin.5:2403 +#: doc/tin.5:2469 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2406 +#: doc/tin.5:2472 msgid "Sets a global domain name used in From lines" msgstr "Sets a global domain name used in From lines" #. type: Plain text -#: doc/tin.5:2410 +#: doc/tin.5:2476 msgid "" "Defines the name of your organization. $B overrides any " "specified value." @@ -14173,13 +14368,13 @@ msgstr "" "specified value." #. type: TP -#: doc/tin.5:2410 +#: doc/tin.5:2476 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2415 +#: doc/tin.5:2481 msgid "" "Defines the default place for some configuration files, common values are I, I, I or I. " @@ -14190,13 +14385,13 @@ msgstr "" "$B overrides any specified value." #. type: TP -#: doc/tin.5:2415 +#: doc/tin.5:2481 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2421 +#: doc/tin.5:2487 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." @@ -14209,18 +14404,18 @@ msgstr "" "administration if you want to deal with your lusers problems on your own." #. type: TP -#: doc/tin.5:2421 +#: doc/tin.5:2487 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2426 +#: doc/tin.5:2492 msgid "Defines the directory containing the B<\\%inews>(1) executable." msgstr "Defines the directory containing the B<\\%inews>(1) executable." #. type: Plain text -#: doc/tin.5:2430 +#: doc/tin.5:2496 msgid "" "Default charset to be used in MIME's ''Content-Type:'' header. " "$B overrides any specified value." @@ -14229,14 +14424,14 @@ msgstr "" "$B overrides any specified value." #. type: Plain text -#: doc/tin.5:2433 +#: doc/tin.5:2499 msgid "" "Default encoding scheme used in MIME articles. 8bit might be the best value." msgstr "" "Default encoding scheme used in MIME articles. 8bit might be the best value." #. type: Plain text -#: doc/tin.5:2437 +#: doc/tin.5:2503 msgid "" "Default encoding scheme used in MIME letters. quoted-printable is a good " "choice here." @@ -14245,13 +14440,13 @@ msgstr "" "choice here." #. type: TP -#: doc/tin.5:2437 +#: doc/tin.5:2503 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2443 +#: doc/tin.5:2509 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<\\" @@ -14262,13 +14457,13 @@ msgstr "" "%tin>(1) version 2.1.5" #. type: TP -#: doc/tin.5:2443 +#: doc/tin.5:2509 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2447 +#: doc/tin.5:2513 msgid "" "Don't generate a ''Sender:'' header. This has an effect only if " "B is set to --internal." @@ -14277,13 +14472,13 @@ msgstr "" "B is set to --internal." #. type: TP -#: doc/tin.5:2447 +#: doc/tin.5:2513 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2452 +#: doc/tin.5:2518 msgid "" "Base of your newsspool (Bnews, Cnews and INN traditional spool style), " "common values are I, I, I. " @@ -14294,13 +14489,13 @@ msgstr "" "$B overrides any specified value." #. type: TP -#: doc/tin.5:2452 +#: doc/tin.5:2518 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2460 +#: doc/tin.5:2526 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:2464 +#: doc/tin.5:2530 msgid "" "Name of a single overview file, common values are I<.overview>, I. $B overrides any specified value." @@ -14328,13 +14523,13 @@ msgstr "" "view>. $B overrides any specified value." #. type: TP -#: doc/tin.5:2464 +#: doc/tin.5:2530 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2469 +#: doc/tin.5:2535 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 " @@ -14345,13 +14540,13 @@ msgstr "" "your configuration differs." #. type: TP -#: doc/tin.5:2469 +#: doc/tin.5:2535 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2475 +#: doc/tin.5:2541 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 " @@ -14364,13 +14559,13 @@ msgstr "" "specified value." #. type: TP -#: doc/tin.5:2475 +#: doc/tin.5:2541 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2480 +#: doc/tin.5:2546 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 " @@ -14381,13 +14576,13 @@ msgstr "" "configuration differs." #. type: TP -#: doc/tin.5:2480 +#: doc/tin.5:2546 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2485 +#: doc/tin.5:2551 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 " @@ -14398,13 +14593,13 @@ msgstr "" "configuration differs." #. type: TP -#: doc/tin.5:2485 +#: doc/tin.5:2551 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2490 +#: doc/tin.5:2556 msgid "" "Full pathname of your newssystem's subscriptions file; usually the " "subscriptions file is in I, so you only have to change this " @@ -14415,12 +14610,12 @@ msgstr "" "setting if your configuration differs." #. type: Plain text -#: doc/tin.5:2494 +#: doc/tin.5:2560 msgid "I" msgstr "I" #. type: Plain text -#: doc/tin.5:2498 +#: doc/tin.5:2564 msgid "" "translation into language specified in $B, $B or " "$B" @@ -14429,7 +14624,7 @@ msgstr "" "$B" #. type: Plain text -#: doc/tin.5:2512 +#: doc/tin.5:2578 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 " @@ -14443,7 +14638,7 @@ msgstr "" #. TODO: IIRC tin issues just a warning in that case? #. type: Plain text -#: doc/tin.5:2517 +#: doc/tin.5:2583 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 " @@ -14454,7 +14649,7 @@ msgstr "" "is rejected." #. type: Plain text -#: doc/tin.5:2520 +#: doc/tin.5:2586 msgid "" "Each line consists of four space-separated fields \"I I " "I I\"." @@ -14463,30 +14658,30 @@ msgstr "" "I I\"." #. type: TP -#: doc/tin.5:2520 doc/tin.5:2573 +#: doc/tin.5:2586 doc/tin.5:2639 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2523 +#: doc/tin.5:2589 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2526 +#: doc/tin.5:2592 msgid "is the highest article number that has been used in that newsgroup" msgstr "is the highest article number that has been used in that newsgroup" #. type: TP -#: doc/tin.5:2526 +#: doc/tin.5:2592 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2533 +#: doc/tin.5:2599 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 " @@ -14501,90 +14696,90 @@ msgstr "" "are no articles in the newsgroup." #. type: TP -#: doc/tin.5:2533 +#: doc/tin.5:2599 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2536 +#: doc/tin.5:2602 msgid "can be one of those" msgstr "can be one of those" #. type: TP -#: doc/tin.5:2537 +#: doc/tin.5:2603 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2540 +#: doc/tin.5:2606 msgid "local postings are allowed" msgstr "local postings are allowed" #. type: TP -#: doc/tin.5:2540 +#: doc/tin.5:2606 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2543 +#: doc/tin.5:2609 msgid "no local postings are allowed, only remote ones" msgstr "no local postings are allowed, only remote ones" #. type: TP -#: doc/tin.5:2543 +#: doc/tin.5:2609 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2546 +#: doc/tin.5:2612 msgid "the group is moderated and all postings must be approved" msgstr "the group is moderated and all postings must be approved" #. type: TP -#: doc/tin.5:2546 +#: doc/tin.5:2612 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2549 +#: doc/tin.5:2615 msgid "articles in this group are not kept, but only passed on" msgstr "articles in this group are not kept, but only passed on" #. type: TP -#: doc/tin.5:2549 +#: doc/tin.5:2615 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2552 +#: doc/tin.5:2618 msgid "articles cannot be posted to this newsgroup" msgstr "articles cannot be posted to this newsgroup" #. type: TP -#: doc/tin.5:2552 +#: doc/tin.5:2618 #, no-wrap msgid "B<=foo.bar>" msgstr "B<=foo.bar>" #. type: Plain text -#: doc/tin.5:2555 +#: doc/tin.5:2621 msgid "articles are locally filed into the ''foo.bar'' group" msgstr "articles are locally filed into the ''foo.bar'' group" #. type: TP -#: doc/tin.5:2556 doc/tin.5:2583 doc/tin.5:2606 +#: doc/tin.5:2622 doc/tin.5:2649 doc/tin.5:2672 #, no-wrap msgid "B<\\%tin>(1)" msgstr "B<\\%tin>(1)" #. type: Plain text -#: doc/tin.5:2562 +#: doc/tin.5:2628 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 " @@ -14595,7 +14790,7 @@ msgstr "" "COUNTS (B) command instead." #. type: Plain text -#: doc/tin.5:2573 +#: doc/tin.5:2639 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 " @@ -14608,7 +14803,7 @@ msgstr "" "\"I I') above." msgstr "" #. type: TP -#: doc/tin.1:787 doc/tin.1:1001 doc/tin.1:1211 +#: doc/tin.1:787 doc/tin.1:1002 doc/tin.1:1216 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:791 doc/tin.1:1005 doc/tin.1:1215 +#: doc/tin.1:791 doc/tin.1:1006 doc/tin.1:1220 msgid "" "Search the body of all articles in group (can be slow). You can abort the " "search using B ('B')." @@ -1995,7 +1995,7 @@ msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:803 doc/tin.1:1017 +#: doc/tin.1:803 doc/tin.1:1018 msgid "" "Cycle the display of the author through all the possible options for the " "tinrc variable B." @@ -2008,7 +2008,7 @@ msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:808 doc/tin.1:1022 doc/tin.1:1228 +#: doc/tin.1:808 doc/tin.1:1023 doc/tin.1:1233 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 " @@ -2066,7 +2066,7 @@ msgid "Open the thread under the current msgstr "" #. type: Plain text -#: doc/tin.1:837 doc/tin.1:1040 doc/tin.1:1262 +#: doc/tin.1:837 doc/tin.1:1041 doc/tin.1:1267 msgid "Look up article by ''Message-ID:''." msgstr "" @@ -2077,7 +2077,7 @@ msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:842 doc/tin.1:1045 doc/tin.1:1267 +#: doc/tin.1:842 doc/tin.1:1046 doc/tin.1:1272 msgid "" "Mail current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles to someone. See the section \"MAILING " @@ -2102,18 +2102,18 @@ msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:852 doc/tin.1:1277 +#: doc/tin.1:852 doc/tin.1:1282 msgid "Go to the next unread article." msgstr "" #. type: TP -#: doc/tin.1:852 doc/tin.1:1045 doc/tin.1:1277 +#: doc/tin.1:852 doc/tin.1:1046 doc/tin.1:1282 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:857 doc/tin.1:1050 doc/tin.1:1282 +#: doc/tin.1:857 doc/tin.1:1051 doc/tin.1:1287 msgid "" "Send current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles to printer. See the section \"MAILING " @@ -2143,7 +2143,7 @@ msgid "Go to previous unread article." msgstr "" #. type: Plain text -#: doc/tin.1:866 doc/tin.1:1053 +#: doc/tin.1:866 doc/tin.1:1054 msgid "Return to previous level." msgstr "" @@ -2165,7 +2165,7 @@ msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:881 doc/tin.1:1065 doc/tin.1:1307 +#: doc/tin.1:881 doc/tin.1:1066 doc/tin.1:1312 msgid "" "Save current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles. See the section \"MAILING PIPING " @@ -2179,7 +2179,7 @@ msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:884 doc/tin.1:1068 doc/tin.1:1310 +#: doc/tin.1:884 doc/tin.1:1069 doc/tin.1:1315 msgid "Save marked articles automatically without further prompting." msgstr "" @@ -2204,19 +2204,20 @@ msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:892 +#: doc/tin.1:893 doc/tin.1:1077 msgid "" -"Automatically tag in order all the parts of the current multi-part message." +"Automatically tag/untag all the parts of the current multi-part message in " +"order." msgstr "" #. type: TP -#: doc/tin.1:892 +#: doc/tin.1:893 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:897 +#: doc/tin.1:898 msgid "" "Cycle the threading mode through no threading, threading by subject, " "threading by references, threading on both subject and references, group " @@ -2224,18 +2225,18 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:897 +#: doc/tin.1:898 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:900 +#: doc/tin.1:901 msgid "Untag all articles that were tagged." msgstr "" #. type: Plain text -#: doc/tin.1:907 doc/tin.1:1082 doc/tin.1:1335 +#: doc/tin.1:908 doc/tin.1:1087 doc/tin.1:1340 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'), " @@ -2244,13 +2245,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:907 +#: doc/tin.1:908 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:913 doc/tin.1:1341 +#: doc/tin.1:914 doc/tin.1:1346 msgid "" "Repost an already posted article / thread / auto-selected (hot) articles / " "articles matching pattern / tagged articles to another newsgroup(s). Useful " @@ -2259,13 +2260,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:913 +#: doc/tin.1:914 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:921 +#: doc/tin.1:922 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. " @@ -2276,25 +2277,25 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:921 doc/tin.1:1082 doc/tin.1:1341 +#: doc/tin.1:922 doc/tin.1:1087 doc/tin.1:1346 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:924 +#: doc/tin.1:925 msgid "Mark current article as unread." msgstr "" #. type: TP -#: doc/tin.1:924 doc/tin.1:1087 doc/tin.1:1344 +#: doc/tin.1:925 doc/tin.1:1092 doc/tin.1:1349 #, no-wrap msgid "B" msgstr "B" -#. -------------------------------------------------------------------- +#. ------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:931 +#: doc/tin.1:932 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 " @@ -2302,79 +2303,79 @@ msgid "" msgstr "" #. type: SS -#: doc/tin.1:931 +#: doc/tin.1:932 #, no-wrap msgid "THREAD LISTING COMMANDS" msgstr "HILOS DE MANDATOS LISTADOS" #. type: Plain text -#: doc/tin.1:936 +#: doc/tin.1:937 msgid "Select article 4 within thread." msgstr "" #. type: TP -#: doc/tin.1:970 +#: doc/tin.1:971 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:973 +#: doc/tin.1:974 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:976 +#: doc/tin.1:977 msgid "Toggle selection of current article." msgstr "" #. type: TP -#: doc/tin.1:976 +#: doc/tin.1:977 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:979 +#: doc/tin.1:980 msgid "Reverse article selections." msgstr "" #. type: TP -#: doc/tin.1:979 +#: doc/tin.1:980 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:982 +#: doc/tin.1:983 msgid "Undo all selections on current thread." msgstr "" #. type: TP -#: doc/tin.1:987 +#: doc/tin.1:988 #, no-wrap msgid "BCRE'>" msgstr "" #. type: Plain text -#: doc/tin.1:990 +#: doc/tin.1:991 msgid "Read current article within thread." msgstr "" #. type: TP -#: doc/tin.1:990 +#: doc/tin.1:991 #, no-wrap msgid "BTABE'>" msgstr "" #. type: Plain text -#: doc/tin.1:993 +#: doc/tin.1:994 msgid "View next unread article within thread." msgstr "" #. type: Plain text -#: doc/tin.1:998 +#: doc/tin.1:999 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 " @@ -2382,44 +2383,44 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1009 +#: doc/tin.1:1010 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:1013 +#: doc/tin.1:1014 msgid "" "Mark thread as read [after confirmation] and enter the next thread " "containing unread news." msgstr "" #. type: TP -#: doc/tin.1:1013 +#: doc/tin.1:1014 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1017 +#: doc/tin.1:1018 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1028 doc/tin.1:1250 +#: doc/tin.1:1029 doc/tin.1:1255 msgid "Display the subject of the current article in the last line." msgstr "" #. type: TP -#: doc/tin.1:1031 +#: doc/tin.1:1032 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1037 +#: doc/tin.1:1038 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 " @@ -2427,193 +2428,200 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1040 +#: doc/tin.1:1041 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1060 +#: doc/tin.1:1061 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1065 +#: doc/tin.1:1066 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1068 +#: doc/tin.1:1069 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1072 doc/tin.1:1314 +#: doc/tin.1:1073 doc/tin.1:1319 msgid "" "Toggle tag status of current article for mailing, piping, printing, saving " "or reposting." msgstr "" #. type: TP -#: doc/tin.1:1072 +#: doc/tin.1:1073 +#, fuzzy, no-wrap +#| msgid "B" +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.1:1077 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1075 +#: doc/tin.1:1080 msgid "Untag all tagged threads." msgstr "" #. type: Plain text -#: doc/tin.1:1087 +#: doc/tin.1:1092 msgid "" "Mark current article in thread as unread. If a range of articles is set, the " "range will be marked as unread instead of the current article. When tagged " "articles are present, a prompt asks how to proceed." msgstr "" -#. -------------------------------------------------------------------- +#. ------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:1092 +#: doc/tin.1:1097 msgid "Mark all articles in thread as unread." msgstr "" #. type: SS -#: doc/tin.1:1092 +#: doc/tin.1:1097 #, no-wrap msgid "ARTICLE VIEWER COMMANDS" msgstr "" #. type: Plain text -#: doc/tin.1:1097 +#: doc/tin.1:1102 msgid "Read the first (base) article in this thread." msgstr "" #. type: Plain text -#: doc/tin.1:1100 +#: doc/tin.1:1105 msgid "Read response 4 in this thread." msgstr "" #. type: TP -#: doc/tin.1:1104 +#: doc/tin.1:1109 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1108 +#: doc/tin.1:1113 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:1108 +#: doc/tin.1:1113 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1113 +#: doc/tin.1:1118 msgid "Perform B<\\%pgp>(1) operations on article." msgstr "" #. type: TP -#: doc/tin.1:1113 +#: doc/tin.1:1118 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1116 +#: doc/tin.1:1121 msgid "Toggles the display mode (raw including all headers vs. cooked)." msgstr "" #. type: TP -#: doc/tin.1:1120 +#: doc/tin.1:1125 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1123 +#: doc/tin.1:1128 msgid "Toggle the TAB width between 4 and 8 characters." msgstr "" #. type: TP -#: doc/tin.1:1123 +#: doc/tin.1:1128 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1127 +#: doc/tin.1:1132 msgid "" "Post a followup to the current article with a copy of the article with all " "headers included." msgstr "" #. type: TP -#: doc/tin.1:1127 +#: doc/tin.1:1132 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1131 +#: doc/tin.1:1136 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:1131 +#: doc/tin.1:1136 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1134 +#: doc/tin.1:1139 msgid "" "Toggles the display of all headers vs. headers in B." msgstr "" #. type: TP -#: doc/tin.1:1134 +#: doc/tin.1:1139 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1137 +#: doc/tin.1:1142 msgid "Toggle ROT-13 decoding for this article." msgstr "" #. type: TP -#: doc/tin.1:1137 +#: doc/tin.1:1142 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1141 +#: doc/tin.1:1146 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:1141 +#: doc/tin.1:1146 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1148 +#: doc/tin.1:1153 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 " @@ -2623,23 +2631,23 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1157 +#: doc/tin.1:1162 msgid "Forward search the text of this article." msgstr "" #. type: Plain text -#: doc/tin.1:1160 +#: doc/tin.1:1165 msgid "Backward search the text of this article." msgstr "" #. type: TP -#: doc/tin.1:1160 +#: doc/tin.1:1165 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1165 +#: doc/tin.1:1170 msgid "" "Skip to the end of the next quoted text-block in this article. Quoted text " "is everything which matches B, B or " @@ -2647,40 +2655,40 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1165 +#: doc/tin.1:1170 #, no-wrap msgid "B'>" msgstr "B'>" #. type: Plain text -#: doc/tin.1:1168 +#: doc/tin.1:1173 msgid "Go to the first article in the current thread." msgstr "" #. type: TP -#: doc/tin.1:1168 +#: doc/tin.1:1173 #, no-wrap msgid "B'>" msgstr "B'>" #. type: Plain text -#: doc/tin.1:1171 +#: doc/tin.1:1176 msgid "Go to the last article in the current thread." msgstr "" #. type: TP -#: doc/tin.1:1171 +#: doc/tin.1:1176 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1174 +#: doc/tin.1:1179 msgid "Toggle word highlighting on/off." msgstr "" #. type: Plain text -#: doc/tin.1:1188 +#: doc/tin.1:1193 msgid "" "Auto select article(s) with a single key. The defaults used for selection " "are set based upon the following four tinrc config variables: " @@ -2692,7 +2700,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1197 +#: doc/tin.1:1202 msgid "" "Kill article(s) with a single key. The defaults used for killing are based " "upon the following four tinrc config variables: B, " @@ -2703,24 +2711,24 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1197 +#: doc/tin.1:1202 #, no-wrap msgid "BCRE'>" msgstr "" #. type: Plain text -#: doc/tin.1:1200 +#: doc/tin.1:1205 msgid "Go to next base article." msgstr "" #. type: TP -#: doc/tin.1:1200 +#: doc/tin.1:1205 #, no-wrap msgid "BTABE'>" msgstr "" #. type: Plain text -#: doc/tin.1:1205 +#: doc/tin.1:1210 msgid "" "Go to next unread article. If the tinrc variable B doesn't " "contain PageNextUnread, then this key will first page through the current " @@ -2728,335 +2736,335 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1208 +#: doc/tin.1:1213 msgid "Author forward search." msgstr "" #. type: Plain text -#: doc/tin.1:1211 +#: doc/tin.1:1216 msgid "Author backward search." msgstr "" #. type: Plain text -#: doc/tin.1:1219 +#: doc/tin.1:1224 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:1223 +#: doc/tin.1:1228 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:1223 +#: doc/tin.1:1228 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1228 +#: doc/tin.1:1233 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1231 +#: doc/tin.1:1236 msgid "" "Edit the current article. This is restricted to mailgroups and saved news." msgstr "" #. type: TP -#: doc/tin.1:1234 +#: doc/tin.1:1239 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1237 +#: doc/tin.1:1242 msgid "" "Post a followup to the current article with a copy of the article included." msgstr "" #. type: TP -#: doc/tin.1:1237 +#: doc/tin.1:1242 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1241 +#: doc/tin.1:1246 msgid "" "Post a followup to the current article without including a copy of the " "article." msgstr "" #. type: TP -#: doc/tin.1:1241 +#: doc/tin.1:1246 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1244 +#: doc/tin.1:1249 msgid "Go to the start of the article." msgstr "" #. type: TP -#: doc/tin.1:1244 +#: doc/tin.1:1249 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1247 +#: doc/tin.1:1252 msgid "Go to the end of the article." msgstr "" #. type: TP -#: doc/tin.1:1253 +#: doc/tin.1:1258 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1256 +#: doc/tin.1:1261 msgid "Mark rest of thread as read and move onto the next unread thread." msgstr "" #. type: TP -#: doc/tin.1:1256 +#: doc/tin.1:1261 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1259 +#: doc/tin.1:1264 msgid "Show the thread menu that the current article is a part of." msgstr "" #. type: TP -#: doc/tin.1:1262 +#: doc/tin.1:1267 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1271 +#: doc/tin.1:1276 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1274 +#: doc/tin.1:1279 msgid "Go to the next article." msgstr "" #. type: TP -#: doc/tin.1:1274 +#: doc/tin.1:1279 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1282 +#: doc/tin.1:1287 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1285 +#: doc/tin.1:1290 msgid "Go to the previous article." msgstr "" #. type: TP -#: doc/tin.1:1285 +#: doc/tin.1:1290 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1288 +#: doc/tin.1:1293 msgid "Go to the previous unread article." msgstr "" #. type: Plain text -#: doc/tin.1:1291 +#: doc/tin.1:1296 msgid "Return to the previous level." msgstr "" #. type: TP -#: doc/tin.1:1294 +#: doc/tin.1:1299 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1298 +#: doc/tin.1:1303 msgid "" "Reply through mail to the author of the current article with a copy of the " "article included." msgstr "" #. type: TP -#: doc/tin.1:1298 +#: doc/tin.1:1303 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1302 +#: doc/tin.1:1307 msgid "" "Reply through mail to the author of the current article without including " "the original article." msgstr "" #. type: TP -#: doc/tin.1:1302 +#: doc/tin.1:1307 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1307 +#: doc/tin.1:1312 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1310 +#: doc/tin.1:1315 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1314 +#: doc/tin.1:1319 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1317 +#: doc/tin.1:1322 msgid "Return to group selection level." msgstr "" #. type: TP -#: doc/tin.1:1317 +#: doc/tin.1:1322 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1320 +#: doc/tin.1:1325 msgid "Go to parent article." msgstr "" #. type: TP -#: doc/tin.1:1320 +#: doc/tin.1:1325 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1324 +#: doc/tin.1:1329 msgid "" "Display a list of URLs in the current article. See the section \"URL LISTING" "\" for more information." msgstr "" #. type: TP -#: doc/tin.1:1324 +#: doc/tin.1:1329 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1328 +#: doc/tin.1:1333 msgid "" "Display a list of attachments of the current article. See the section " "\"ATTACHMENT LISTING\" for more information." msgstr "" #. type: TP -#: doc/tin.1:1335 +#: doc/tin.1:1340 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1344 +#: doc/tin.1:1349 msgid "Mark article as unread." msgstr "" -#. -------------------------------------------------------------------- +#. ------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:1349 +#: doc/tin.1:1354 msgid "Mark the current thread as unread." msgstr "" #. type: SS -#: doc/tin.1:1349 +#: doc/tin.1:1354 #, no-wrap msgid "URL LISTING" msgstr "LISTADO URL" #. type: Plain text -#: doc/tin.1:1352 +#: doc/tin.1:1357 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:1353 +#: doc/tin.1:1358 #, no-wrap msgid "BCRE'>" msgstr "" #. type: Plain text -#: doc/tin.1:1357 +#: doc/tin.1:1362 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:1360 +#: doc/tin.1:1365 msgid "URL forward search." msgstr "" #. type: Plain text -#: doc/tin.1:1363 +#: doc/tin.1:1368 msgid "URL backward search." msgstr "" #. type: Plain text -#: doc/tin.1:1369 doc/tin.1:1422 +#: doc/tin.1:1374 doc/tin.1:1427 msgid "Shell escape." msgstr "" #. type: Plain text -#: doc/tin.1:1372 +#: doc/tin.1:1377 msgid "Toggle the display of the current URL in the last line." msgstr "" #. type: Plain text -#: doc/tin.1:1375 doc/tin.1:1429 +#: doc/tin.1:1380 doc/tin.1:1434 msgid "Help screen of commands available." msgstr "" -#. -------------------------------------------------------------------- +#. ------------------------------------------------------------------- #. type: SS -#: doc/tin.1:1381 +#: doc/tin.1:1386 #, no-wrap msgid "ATTACHMENT LISTING" msgstr "" #. type: Plain text -#: doc/tin.1:1384 +#: doc/tin.1:1389 msgid "" "B ('B') displays a list of attachments of the current " "article. Besides the common moving keys, the following commands are " @@ -3064,116 +3072,116 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1385 +#: doc/tin.1:1390 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1388 +#: doc/tin.1:1393 msgid "Pipe attachment into command." msgstr "" #. type: TP -#: doc/tin.1:1388 +#: doc/tin.1:1393 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1391 +#: doc/tin.1:1396 msgid "Save current attachment / tagged attachments to disk." msgstr "" #. type: TP -#: doc/tin.1:1391 +#: doc/tin.1:1396 #, no-wrap msgid "BCRE'>" msgstr "" #. type: Plain text -#: doc/tin.1:1394 +#: doc/tin.1:1399 msgid "View attachment." msgstr "Vea adjunto." #. type: TP -#: doc/tin.1:1394 +#: doc/tin.1:1399 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1397 +#: doc/tin.1:1402 msgid "Tag one or more attachments for saving." msgstr "" #. type: TP -#: doc/tin.1:1397 +#: doc/tin.1:1402 #, no-wrap msgid "B" #. type: Plain text -#: doc/tin.1:1401 +#: doc/tin.1:1406 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:1401 +#: doc/tin.1:1406 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1404 +#: doc/tin.1:1409 msgid "Reverse tagging of all attachments." msgstr "" #. type: TP -#: doc/tin.1:1404 +#: doc/tin.1:1409 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1407 +#: doc/tin.1:1412 msgid "Untag all tagged attachments." msgstr "" #. type: Plain text -#: doc/tin.1:1410 +#: doc/tin.1:1415 msgid "Attachment forward search." msgstr "" #. type: Plain text -#: doc/tin.1:1413 +#: doc/tin.1:1418 msgid "Attachment backward search." msgstr "" #. type: TP -#: doc/tin.1:1416 +#: doc/tin.1:1421 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1419 +#: doc/tin.1:1424 msgid "" "Pipe attachment into command. Uses the raw attachment, no decoding is done." msgstr "" #. type: Plain text -#: doc/tin.1:1426 +#: doc/tin.1:1431 msgid "" "Toggle the display of the name/description of the current attachment in the " "last line." msgstr "" -#. -------------------------------------------------------------------- +#. ------------------------------------------------------------------- #. type: SS -#: doc/tin.1:1435 +#: doc/tin.1:1440 #, no-wrap msgid "GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES" msgstr "" @@ -3182,7 +3190,7 @@ msgstr "" #. - \fI${TIN_LIBDIR:\-NEWSLIBDIR}/tinrc\fR is used #. in the !TIN_DEFAULTS_DIR config case #. type: Plain text -#: doc/tin.1:1447 +#: doc/tin.1:1452 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 " @@ -3193,7 +3201,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1455 +#: doc/tin.1:1460 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 " @@ -3204,7 +3212,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1461 +#: doc/tin.1:1466 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 " @@ -3214,7 +3222,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1468 +#: doc/tin.1:1473 msgid "" "As with the other menus, B ('B<^L>') will redraw the screen. You " "can use B ('B'), B ('B') and B " @@ -3224,7 +3232,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1473 +#: doc/tin.1:1478 msgid "" "The options menu provides access to the attributes menu for the current " "group by the B ('BTABE>') command. Pressing " @@ -3233,14 +3241,14 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1476 +#: doc/tin.1:1481 msgid "" "The B ('B') command brings up the scopes menu. For more " "information see section \"SCOPES MENU\"." msgstr "" #. type: Plain text -#: doc/tin.1:1480 +#: doc/tin.1:1485 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/" @@ -3248,13 +3256,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1480 +#: doc/tin.1:1485 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1486 doc/tin.5:1204 +#: doc/tin.1:1491 doc/tin.5:1253 msgid "" "If ON abbreviate long newsgroup names at group selection level and article " "level (if necessary) like this: news.software.readers -E n.software." @@ -3262,161 +3270,161 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1486 +#: doc/tin.1:1491 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1490 doc/tin.5:1208 +#: doc/tin.1:1495 doc/tin.5:1257 msgid "" "If ON add posted articles which start a new thread to filter for " "highlighting follow-ups. Default is ON." msgstr "" #. type: TP -#: doc/tin.1:1490 +#: doc/tin.1:1495 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1493 doc/tin.5:1211 +#: doc/tin.1:1498 doc/tin.5:1260 msgid "Turn ON advertising in header (''User-Agent:''). Default is ON." msgstr "" #. type: TP -#: doc/tin.1:1493 +#: doc/tin.1:1498 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1496 doc/tin.5:1214 +#: doc/tin.1:1501 doc/tin.5:1263 msgid "" "If ON strip multipart/alternative messages automatically. Default is ON." msgstr "" #. type: TP -#: doc/tin.1:1496 +#: doc/tin.1:1501 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1499 doc/tin.5:1217 +#: doc/tin.1:1504 doc/tin.5:1266 msgid "The character used to show that an article was deleted. Default is 'D'." msgstr "" #. type: TP -#: doc/tin.1:1499 +#: doc/tin.1:1504 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1502 doc/tin.5:1220 +#: doc/tin.1:1507 doc/tin.5:1269 msgid "" "The character used to show that an article is in a range. Default is '#'." msgstr "" #. type: TP -#: doc/tin.1:1502 +#: doc/tin.1:1507 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1506 doc/tin.5:1224 +#: doc/tin.1:1511 doc/tin.5:1273 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:1506 +#: doc/tin.1:1511 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1510 doc/tin.5:1228 +#: doc/tin.1:1515 doc/tin.5:1277 msgid "" "The character used to show that an article/thread is auto-selected (hot). " "Default is '*'." msgstr "" #. type: TP -#: doc/tin.1:1510 +#: doc/tin.1:1515 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1514 doc/tin.5:1232 +#: doc/tin.1:1519 doc/tin.5:1281 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:1514 +#: doc/tin.1:1519 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1518 doc/tin.5:1236 +#: doc/tin.1:1523 doc/tin.5:1285 msgid "" "The character used to show that an article has not been read. Default is " "'+'." msgstr "" #. type: TP -#: doc/tin.1:1518 +#: doc/tin.1:1523 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1521 doc/tin.5:1239 +#: doc/tin.1:1526 doc/tin.5:1288 msgid "The character used to show that an article was read. Default is ' '." msgstr "" #. type: TP -#: doc/tin.1:1521 +#: doc/tin.1:1526 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1525 doc/tin.5:1243 +#: doc/tin.1:1530 doc/tin.5:1292 msgid "" "The character used to show that an article was killed. Default is 'K'. " "B must be set accordingly." msgstr "" #. type: TP -#: doc/tin.1:1525 +#: doc/tin.1:1530 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1529 doc/tin.5:1247 +#: doc/tin.1:1534 doc/tin.5:1296 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:1529 doc/tin.5:1247 +#: doc/tin.1:1534 doc/tin.5:1296 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1534 +#: doc/tin.1:1539 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 " @@ -3424,50 +3432,50 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1534 +#: doc/tin.1:1539 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1538 doc/tin.5:1258 +#: doc/tin.1:1543 doc/tin.5:1307 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:1538 +#: doc/tin.1:1543 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1542 doc/tin.5:1262 +#: doc/tin.1:1547 doc/tin.5:1311 msgid "" "If ON automatically list thread when entering it using right arrow key. " "Default is ON." msgstr "" #. type: TP -#: doc/tin.1:1542 +#: doc/tin.1:1547 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1545 doc/tin.1:2528 +#: doc/tin.1:1550 doc/tin.1:2550 msgid "Default is OFF." msgstr "" #. type: TP -#: doc/tin.1:1545 +#: doc/tin.1:1550 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1551 doc/tin.5:1271 +#: doc/tin.1:1556 doc/tin.5:1320 msgid "" "If ON articles/threads with ''Archive-name:'' in header will be " "automatically saved with the Archive-name & part/patch no and post processed " @@ -3475,13 +3483,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1551 +#: doc/tin.1:1556 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1556 doc/tin.5:1276 +#: doc/tin.1:1561 doc/tin.5:1325 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 " @@ -3489,13 +3497,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1556 +#: doc/tin.1:1561 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1561 doc/tin.5:1281 +#: doc/tin.1:1566 doc/tin.5:1330 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 " @@ -3503,13 +3511,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1561 +#: doc/tin.1:1566 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1566 +#: doc/tin.1:1571 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. " @@ -3517,13 +3525,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1566 +#: doc/tin.1:1571 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1572 doc/tin.5:1292 +#: doc/tin.1:1577 doc/tin.5:1341 msgid "" "Use this hash algorithm for cancel-locks. Only available when build with " "cancel-lock support. none disables the generation of cancel-locks. Valid " @@ -3531,314 +3539,325 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1572 +#: doc/tin.1:1577 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1578 doc/tin.5:1296 +#: doc/tin.1:1583 doc/tin.5:1345 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:1578 +#: doc/tin.1:1583 #, fuzzy, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1581 doc/tin.5:1299 +#: doc/tin.1:1586 doc/tin.5:1348 #, fuzzy msgid "Standard background color" msgstr "Color de fondo estándar" #. type: TP -#: doc/tin.1:1581 +#: doc/tin.1:1586 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1584 doc/tin.5:1302 +#: doc/tin.1:1589 doc/tin.5:1351 msgid "Color of quoted text from external sources" msgstr "" #. type: TP -#: doc/tin.1:1584 +#: doc/tin.1:1589 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1587 doc/tin.5:1305 +#: doc/tin.1:1592 doc/tin.5:1354 msgid "Color of sender (From:)" msgstr "" #. type: TP -#: doc/tin.1:1587 +#: doc/tin.1:1592 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1590 doc/tin.5:1308 +#: doc/tin.1:1595 doc/tin.5:1357 msgid "Color of header-lines" msgstr "" #. type: TP -#: doc/tin.1:1590 +#: doc/tin.1:1595 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1593 doc/tin.5:1311 +#: doc/tin.1:1598 doc/tin.5:1360 msgid "Color of help pages" msgstr "" #. type: TP -#: doc/tin.1:1593 +#: doc/tin.1:1598 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1596 doc/tin.5:1314 +#: doc/tin.1:1601 doc/tin.5:1363 msgid "Color of background for inverse text" msgstr "" #. type: TP -#: doc/tin.1:1596 +#: doc/tin.1:1601 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1599 doc/tin.5:1317 +#: doc/tin.1:1604 doc/tin.5:1366 msgid "Color of foreground for inverse text" msgstr "" #. type: TP -#: doc/tin.1:1599 +#: doc/tin.1:1604 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1607 doc/tin.5:1385 +msgid "Color of status messages in last line" +msgstr "" + +#. type: TP +#: doc/tin.1:1607 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1603 doc/tin.5:1321 +#: doc/tin.1:1611 doc/tin.5:1370 msgid "" "Color of words emphasized like _this_. See also B and " "B." msgstr "" #. type: TP -#: doc/tin.1:1603 +#: doc/tin.1:1611 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1607 doc/tin.5:1325 +#: doc/tin.1:1615 doc/tin.5:1374 msgid "" "Color of words emphasized like /this/. See also B and " "B." msgstr "" #. type: TP -#: doc/tin.1:1607 +#: doc/tin.1:1615 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1611 doc/tin.5:1329 +#: doc/tin.1:1619 doc/tin.5:1378 msgid "" "Color of words emphasized like *this*. See also B and " "B." msgstr "" #. type: TP -#: doc/tin.1:1611 +#: doc/tin.1:1619 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1615 doc/tin.5:1333 +#: doc/tin.1:1623 doc/tin.5:1382 msgid "" "Color of words emphasized like -this-. See also B and " "B." msgstr "" #. type: TP -#: doc/tin.1:1615 +#: doc/tin.1:1623 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1618 doc/tin.5:1336 +#: doc/tin.1:1626 doc/tin.5:1388 msgid "Color of mini help menu" msgstr "" #. type: TP -#: doc/tin.1:1618 +#: doc/tin.1:1626 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1621 doc/tin.5:1339 +#: doc/tin.1:1629 doc/tin.5:1391 msgid "Color of actual news header fields" msgstr "" #. type: TP -#: doc/tin.1:1621 +#: doc/tin.1:1629 #, fuzzy, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1624 doc/tin.5:1342 +#: doc/tin.1:1632 doc/tin.5:1394 #, fuzzy msgid "Standard foreground color" msgstr "Color de primer plano estándar" #. type: TP -#: doc/tin.1:1624 +#: doc/tin.1:1632 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1627 doc/tin.5:1345 +#: doc/tin.1:1635 doc/tin.5:1397 msgid "Color of quoted lines" msgstr "" #. type: TP -#: doc/tin.1:1627 +#: doc/tin.1:1635 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1630 doc/tin.5:1348 +#: doc/tin.1:1638 doc/tin.5:1400 msgid "Color of twice quoted lines" msgstr "" #. type: TP -#: doc/tin.1:1630 +#: doc/tin.1:1638 #, no-wrap msgid "B3 times quoted line (col_quote3)>" msgstr "" #. type: Plain text -#: doc/tin.1:1633 doc/tin.5:1351 +#: doc/tin.1:1641 doc/tin.5:1403 msgid "Color of E=3 times quoted lines" msgstr "" #. type: TP -#: doc/tin.1:1633 +#: doc/tin.1:1641 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1637 doc/tin.5:1355 +#: doc/tin.1:1645 doc/tin.5:1407 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:1637 +#: doc/tin.1:1645 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1640 doc/tin.5:1358 +#: doc/tin.1:1648 doc/tin.5:1410 msgid "Color of signatures" msgstr "" #. type: TP -#: doc/tin.1:1640 +#: doc/tin.1:1648 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1643 doc/tin.5:1361 +#: doc/tin.1:1651 doc/tin.5:1413 msgid "Color of urls highlight" msgstr "" #. type: TP -#: doc/tin.1:1643 +#: doc/tin.1:1651 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1646 doc/tin.5:1364 +#: doc/tin.1:1654 doc/tin.5:1416 msgid "Color of verbatim blocks" msgstr "" #. type: TP -#: doc/tin.1:1646 +#: doc/tin.1:1654 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1649 doc/tin.5:1367 +#: doc/tin.1:1657 doc/tin.5:1419 msgid "Color of article subject" msgstr "" #. type: TP -#: doc/tin.1:1649 +#: doc/tin.1:1657 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1652 doc/tin.5:1370 +#: doc/tin.1:1660 doc/tin.5:1422 msgid "Color of text-lines" msgstr "" #. type: TP -#: doc/tin.1:1652 +#: doc/tin.1:1660 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1655 doc/tin.5:1373 +#: doc/tin.1:1663 doc/tin.5:1425 msgid "Color of help/mail sign" msgstr "" #. type: TP -#: doc/tin.1:1655 +#: doc/tin.1:1663 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1658 +#: doc/tin.1:1666 msgid "Ask for manual confirmation to protect the user." msgstr "" #. type: IP -#: doc/tin.1:1659 doc/tin.1:1665 doc/tin.1:1669 +#: doc/tin.1:1667 doc/tin.1:1673 doc/tin.1:1677 #, no-wrap msgid "\\(bu" msgstr "" #. TODO: check if all affected commands are marked [after confirmation] #. type: Plain text -#: doc/tin.1:1665 +#: doc/tin.1:1673 msgid "" "B Ask for confirmation before executing certain dangerous commands " "(e.g., B ('B')). Commands that this affects are marked in this " @@ -3846,21 +3865,21 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1669 +#: doc/tin.1:1677 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:1673 +#: doc/tin.1:1681 msgid "" "B: Ask for confirmation before marking all not selected (with " "B ('B') command) articles as read." msgstr "" #. type: Plain text -#: doc/tin.5:1394 +#: doc/tin.5:1446 msgid "Default is commands & quit." msgstr "" #. type: Plain text -#: doc/tin.5:1405 +#: doc/tin.5:1457 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<\\" @@ -10932,61 +11061,61 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1405 +#: doc/tin.5:1457 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1407 +#: doc/tin.5:1459 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1409 +#: doc/tin.5:1461 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1412 +#: doc/tin.5:1464 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1415 +#: doc/tin.5:1467 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1419 +#: doc/tin.5:1471 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1424 +#: doc/tin.5:1476 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1428 +#: doc/tin.5:1480 #, no-wrap msgid "B" msgstr "B" #. type: ta -#: doc/tin.5:1433 doc/tin.5:1462 +#: doc/tin.5:1485 doc/tin.5:1514 #, no-wrap msgid "\\w'0,1 'u +\\w'\\'\\'Message-ID:\\'\\' & last \\'\\'References:\\'\\' entry only'u" msgstr "" #. type: Plain text -#: doc/tin.5:1442 doc/tin.5:1471 +#: doc/tin.5:1494 doc/tin.5:1523 #, no-wrap msgid "" "0\t''Subject:'' (case sensitive)\n" @@ -11000,139 +11129,139 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1444 +#: doc/tin.5:1496 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1448 +#: doc/tin.5:1500 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1453 +#: doc/tin.5:1505 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1457 +#: doc/tin.5:1509 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1473 +#: doc/tin.5:1525 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1475 +#: doc/tin.5:1527 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1477 +#: doc/tin.5:1529 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1479 +#: doc/tin.5:1531 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1481 +#: doc/tin.5:1533 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1483 +#: doc/tin.5:1535 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1485 +#: doc/tin.5:1537 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1487 +#: doc/tin.5:1539 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1489 +#: doc/tin.5:1541 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1491 +#: doc/tin.5:1543 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1493 +#: doc/tin.5:1545 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1495 +#: doc/tin.5:1547 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1497 +#: doc/tin.5:1549 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1499 +#: doc/tin.5:1551 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1501 +#: doc/tin.5:1553 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1503 +#: doc/tin.5:1555 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1505 +#: doc/tin.5:1557 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1507 +#: doc/tin.5:1559 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1516 +#: doc/tin.5:1568 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., /" @@ -11140,13 +11269,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1519 +#: doc/tin.5:1571 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1526 +#: doc/tin.5:1578 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, " @@ -11154,19 +11283,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1526 +#: doc/tin.5:1578 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1530 +#: doc/tin.5:1582 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1537 +#: doc/tin.5:1589 msgid "" "If B is E 0 not more than the last B " "articles/group are fetched from the server. If B is E 0 B<" @@ -11175,13 +11304,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1537 +#: doc/tin.5:1589 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1551 +#: doc/tin.5:1603 msgid "" "Which keys B<\\%tin>(1) should accept to jump to the next unread article. " "Possible is any combination of B and B. When " @@ -11192,20 +11321,20 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1558 +#: doc/tin.5:1610 msgid "" "The format string used for the Group level. Default is \"%n\\ %m\\ %R\\ %L\\ " "\\ %s\\ \\ %F\". The following substitutions are supported:" msgstr "" #. type: ta -#: doc/tin.5:1560 +#: doc/tin.5:1612 #, no-wrap msgid "\\w'%G 'u +\\w'number of responses in thread'u" msgstr "" #. type: Plain text -#: doc/tin.5:1572 +#: doc/tin.5:1624 #, no-wrap msgid "" "%D\tdate\n" @@ -11222,31 +11351,31 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1574 +#: doc/tin.5:1626 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1584 +#: doc/tin.5:1636 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1591 +#: doc/tin.5:1643 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1597 +#: doc/tin.5:1649 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1603 +#: doc/tin.5:1655 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, " @@ -11255,32 +11384,32 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1603 +#: doc/tin.5:1655 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1607 +#: doc/tin.5:1659 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1612 +#: doc/tin.5:1664 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1616 +#: doc/tin.5:1668 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:1624 +#: doc/tin.5:1676 msgid "" "B is the 'traditional' behavior of B<\\%tin>(1). " "Only unread articles are killed once only by marking them read. As filtering " @@ -11290,104 +11419,104 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1640 +#: doc/tin.5:1692 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1650 +#: doc/tin.5:1702 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1655 +#: doc/tin.5:1707 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1674 +#: doc/tin.5:1726 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1711 +#: doc/tin.5:1763 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1723 doc/tin.5:2426 +#: doc/tin.5:1775 doc/tin.5:2492 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1756 +#: doc/tin.5:1808 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1761 +#: doc/tin.5:1813 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1766 +#: doc/tin.5:1818 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1771 +#: doc/tin.5:1823 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1776 +#: doc/tin.5:1828 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1782 +#: doc/tin.5:1834 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: TP -#: doc/tin.5:1803 +#: doc/tin.5:1855 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1806 +#: doc/tin.5:1858 msgid "Time in seconds to wait for a response from the server. Default is 120." msgstr "" #. type: TP -#: doc/tin.5:1806 +#: doc/tin.5:1858 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1810 +#: doc/tin.5:1862 msgid "" "The normalization form which should be used to normalize unicode input. The " "possible values are:" msgstr "" #. type: Plain text -#: doc/tin.5:1828 +#: doc/tin.5:1880 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 " @@ -11395,7 +11524,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1856 +#: doc/tin.5:1908 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 " @@ -11403,7 +11532,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1862 +#: doc/tin.5:1914 msgid "" "This specifies whether to perform post processing on saved articles. " "Because the shell archive may contain commands you may not want to be " @@ -11412,7 +11541,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1870 +#: doc/tin.5:1922 msgid "" "B, unpacking of multi-part B<\\%shar>(1) files only. " "Because the shell archive may contain commands you may not want to be " @@ -11420,19 +11549,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1873 +#: doc/tin.5:1925 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1883 +#: doc/tin.5:1937 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1893 +#: doc/tin.5:1947 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 " @@ -11441,20 +11570,20 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1901 +#: doc/tin.5:1955 msgid "" "If ON show empty ''Followup-To:'' header when editing an article. Default " "is OFF." msgstr "" #. type: TP -#: doc/tin.5:1906 +#: doc/tin.5:1960 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1912 +#: doc/tin.5:1966 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 " @@ -11463,7 +11592,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1917 +#: doc/tin.5:1971 msgid "" "B Compress quote characters together when quoting multiple " "times (for example, 'E E E' will be turned into " @@ -11471,7 +11600,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1923 +#: doc/tin.5:1977 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 " @@ -11480,18 +11609,18 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1925 +#: doc/tin.5:1979 msgid "B This option is on by default." msgstr "" #. type: TP -#: doc/tin.5:1926 +#: doc/tin.5:1980 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1933 +#: doc/tin.5:1987 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, then B<" @@ -11499,13 +11628,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1933 +#: doc/tin.5:1987 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1940 +#: doc/tin.5:1994 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, then " @@ -11513,13 +11642,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1940 +#: doc/tin.5:1994 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1947 +#: doc/tin.5:2001 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, then " @@ -11527,19 +11656,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1947 +#: doc/tin.5:2001 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1951 +#: doc/tin.5:2005 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1958 +#: doc/tin.5:2012 msgid "" "If ON B<\\%tin>(1) does the rendering of bi-directional text. If OFF B<\\" "%tin>(1) leaves the rendering of bi-directional text to the terminal. " @@ -11547,62 +11676,62 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1958 +#: doc/tin.5:2012 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1967 +#: doc/tin.5:2021 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1971 +#: doc/tin.5:2025 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1975 +#: doc/tin.5:2029 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1979 +#: doc/tin.5:2033 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1983 +#: doc/tin.5:2037 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1991 +#: doc/tin.5:2045 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1995 +#: doc/tin.5:2049 msgid "" "The format string used for the Selection level. Default is \"%f\\ %n\\ %U\\ " "\\ %G\\ \\ %d\". The following substitutions are supported:" msgstr "" #. type: ta -#: doc/tin.5:1997 +#: doc/tin.5:2051 #, no-wrap msgid "\\w'%G 'u +\\w'current group number'u" msgstr "" #. type: Plain text -#: doc/tin.5:2004 +#: doc/tin.5:2058 #, no-wrap msgid "" "%G\tgroup name\n" @@ -11614,19 +11743,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2006 +#: doc/tin.5:2060 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2037 +#: doc/tin.5:2091 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2046 +#: doc/tin.5:2100 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 " @@ -11637,19 +11766,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2068 +#: doc/tin.5:2122 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2091 +#: doc/tin.5:2145 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2098 +#: doc/tin.5:2152 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -11657,19 +11786,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2144 +#: doc/tin.5:2198 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2151 +#: doc/tin.5:2205 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2158 +#: doc/tin.5:2212 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -11677,31 +11806,50 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2163 +#: doc/tin.5:2217 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2167 +#: doc/tin.5:2221 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2176 +#: doc/tin.5:2230 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2180 +#: doc/tin.5:2234 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.5:2240 +msgid "" +"A regular expression to find Subject prefixes like \"Re:\" to remove If " +"B is blank, then B<\\%tin>(1) uses a built-in default." +msgstr "" + +#. type: TP +#: doc/tin.5:2240 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:2246 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2187 +#: doc/tin.5:2253 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -11709,7 +11857,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2192 +#: doc/tin.5:2258 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 " @@ -11717,7 +11865,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2202 +#: doc/tin.5:2268 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 " @@ -11729,20 +11877,20 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2206 +#: doc/tin.5:2272 msgid "" "The format string used for the Thread level. Default is \"%n\\ %m\\ \\ " "[%L]\\ \\ %T\\ \\ %F\". The following substitutions are supported:" msgstr "" #. type: ta -#: doc/tin.5:2208 +#: doc/tin.5:2274 #, no-wrap msgid "\\w'%G 'u +\\w'from, name and/or address'u" msgstr "" #. type: Plain text -#: doc/tin.5:2219 +#: doc/tin.5:2285 #, no-wrap msgid "" "%D\tdate\n" @@ -11758,7 +11906,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2226 +#: doc/tin.5:2292 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 " @@ -11766,19 +11914,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2230 +#: doc/tin.5:2296 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2242 +#: doc/tin.5:2308 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2256 +#: doc/tin.5:2322 msgid "" "Allows you to select how B<\\%tin>(1) treats blank lines in article " "bodies. Default is 0. This option does not affect lines within verbatim " @@ -11786,13 +11934,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2275 +#: doc/tin.5:2341 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2282 +#: doc/tin.5:2348 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -11800,66 +11948,66 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2282 +#: doc/tin.5:2348 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2286 +#: doc/tin.5:2352 msgid "" "If ON remove I<${TIN_HOMEDIR:-\"$HOME\"}/.article> after posting. Default is " "ON." msgstr "" #. type: TP -#: doc/tin.5:2286 +#: doc/tin.5:2352 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2291 +#: doc/tin.5:2357 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2294 +#: doc/tin.5:2360 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2299 +#: doc/tin.5:2365 msgid "If enabled B<\\%tin>(1) uses ANSI-colors. Default is OFF." msgstr "" #. type: TP -#: doc/tin.5:2299 +#: doc/tin.5:2365 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2302 +#: doc/tin.5:2368 msgid "Use scroll keys on keypad. Default is OFF." msgstr "" #. type: TP -#: doc/tin.5:2302 +#: doc/tin.5:2368 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2308 +#: doc/tin.5:2374 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2320 +#: doc/tin.5:2386 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 " @@ -11868,45 +12016,45 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2320 +#: doc/tin.5:2386 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2324 +#: doc/tin.5:2390 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2328 +#: doc/tin.5:2394 msgid "" "A regular expression that B will use to find the begin of a verbatim " "block. Default is #v+" msgstr "" #. type: TP -#: doc/tin.5:2328 +#: doc/tin.5:2394 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2332 +#: doc/tin.5:2398 msgid "" "A regular expression that B will use to find the end of a verbatim " "block. Default is #v-" msgstr "" #. type: TP -#: doc/tin.5:2335 +#: doc/tin.5:2401 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2351 +#: doc/tin.5:2417 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 " @@ -11918,31 +12066,31 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2351 +#: doc/tin.5:2417 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2363 +#: doc/tin.5:2429 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2371 +#: doc/tin.5:2437 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2387 +#: doc/tin.5:2453 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2403 +#: doc/tin.5:2469 msgid "" "Yet another global configuration file with \"I=I\" pairs. " "This one is for the more general options which usually can't be controlled " @@ -11952,31 +12100,31 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2403 +#: doc/tin.5:2469 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2406 +#: doc/tin.5:2472 msgid "Sets a global domain name used in From lines" msgstr "" #. type: Plain text -#: doc/tin.5:2410 +#: doc/tin.5:2476 msgid "" "Defines the name of your organization. $B overrides any " "specified value." msgstr "" #. type: TP -#: doc/tin.5:2410 +#: doc/tin.5:2476 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2415 +#: doc/tin.5:2481 msgid "" "Defines the default place for some configuration files, common values are I, I, I or I. " @@ -11984,13 +12132,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2415 +#: doc/tin.5:2481 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2421 +#: doc/tin.5:2487 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." @@ -11999,44 +12147,44 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2421 +#: doc/tin.5:2487 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2426 +#: doc/tin.5:2492 msgid "Defines the directory containing the B<\\%inews>(1) executable." msgstr "" #. type: Plain text -#: doc/tin.5:2430 +#: doc/tin.5:2496 msgid "" "Default charset to be used in MIME's ''Content-Type:'' header. " "$B overrides any specified value." msgstr "" #. type: Plain text -#: doc/tin.5:2433 +#: doc/tin.5:2499 msgid "" "Default encoding scheme used in MIME articles. 8bit might be the best value." msgstr "" #. type: Plain text -#: doc/tin.5:2437 +#: doc/tin.5:2503 msgid "" "Default encoding scheme used in MIME letters. quoted-printable is a good " "choice here." msgstr "" #. type: TP -#: doc/tin.5:2437 +#: doc/tin.5:2503 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2443 +#: doc/tin.5:2509 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<\\" @@ -12044,26 +12192,26 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2443 +#: doc/tin.5:2509 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2447 +#: doc/tin.5:2513 msgid "" "Don't generate a ''Sender:'' header. This has an effect only if " "B is set to --internal." msgstr "" #. type: TP -#: doc/tin.5:2447 +#: doc/tin.5:2513 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2452 +#: doc/tin.5:2518 msgid "" "Base of your newsspool (Bnews, Cnews and INN traditional spool style), " "common values are I, I, I. " @@ -12071,13 +12219,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2452 +#: doc/tin.5:2518 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2460 +#: doc/tin.5:2526 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:2464 +#: doc/tin.5:2530 msgid "" "Name of a single overview file, common values are I<.overview>, I. $B overrides any specified value." msgstr "" #. type: TP -#: doc/tin.5:2464 +#: doc/tin.5:2530 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2469 +#: doc/tin.5:2535 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 " @@ -12113,13 +12261,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2469 +#: doc/tin.5:2535 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2475 +#: doc/tin.5:2541 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 " @@ -12128,13 +12276,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2475 +#: doc/tin.5:2541 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2480 +#: doc/tin.5:2546 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 " @@ -12142,13 +12290,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2480 +#: doc/tin.5:2546 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2485 +#: doc/tin.5:2551 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 " @@ -12156,13 +12304,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2485 +#: doc/tin.5:2551 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2490 +#: doc/tin.5:2556 msgid "" "Full pathname of your newssystem's subscriptions file; usually the " "subscriptions file is in I, so you only have to change this " @@ -12170,12 +12318,12 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2494 +#: doc/tin.5:2560 msgid "I" msgstr "I" #. type: Plain text -#: doc/tin.5:2498 +#: doc/tin.5:2564 msgid "" "translation into language specified in $B, $B or " "$B" @@ -12184,7 +12332,7 @@ msgstr "" "$B" #. type: Plain text -#: doc/tin.5:2512 +#: doc/tin.5:2578 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 " @@ -12194,7 +12342,7 @@ msgstr "" #. TODO: IIRC tin issues just a warning in that case? #. type: Plain text -#: doc/tin.5:2517 +#: doc/tin.5:2583 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 " @@ -12202,37 +12350,37 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2520 +#: doc/tin.5:2586 msgid "" "Each line consists of four space-separated fields \"I I " "I I\"." msgstr "" #. type: TP -#: doc/tin.5:2520 doc/tin.5:2573 +#: doc/tin.5:2586 doc/tin.5:2639 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:2523 +#: doc/tin.5:2589 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2526 +#: doc/tin.5:2592 msgid "is the highest article number that has been used in that newsgroup" msgstr "" #. type: TP -#: doc/tin.5:2526 +#: doc/tin.5:2592 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2533 +#: doc/tin.5:2599 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 " @@ -12242,90 +12390,90 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2533 +#: doc/tin.5:2599 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2536 +#: doc/tin.5:2602 msgid "can be one of those" msgstr "" #. type: TP -#: doc/tin.5:2537 +#: doc/tin.5:2603 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2540 +#: doc/tin.5:2606 msgid "local postings are allowed" msgstr "" #. type: TP -#: doc/tin.5:2540 +#: doc/tin.5:2606 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2543 +#: doc/tin.5:2609 msgid "no local postings are allowed, only remote ones" msgstr "" #. type: TP -#: doc/tin.5:2543 +#: doc/tin.5:2609 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2546 +#: doc/tin.5:2612 msgid "the group is moderated and all postings must be approved" msgstr "" #. type: TP -#: doc/tin.5:2546 +#: doc/tin.5:2612 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2549 +#: doc/tin.5:2615 msgid "articles in this group are not kept, but only passed on" msgstr "" #. type: TP -#: doc/tin.5:2549 +#: doc/tin.5:2615 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2552 +#: doc/tin.5:2618 msgid "articles cannot be posted to this newsgroup" msgstr "" #. type: TP -#: doc/tin.5:2552 +#: doc/tin.5:2618 #, no-wrap msgid "B<=foo.bar>" msgstr "B<=foo.bar>" #. type: Plain text -#: doc/tin.5:2555 +#: doc/tin.5:2621 msgid "articles are locally filed into the ''foo.bar'' group" msgstr "" #. type: TP -#: doc/tin.5:2556 doc/tin.5:2583 doc/tin.5:2606 +#: doc/tin.5:2622 doc/tin.5:2649 doc/tin.5:2672 #, no-wrap msgid "B<\\%tin>(1)" msgstr "B<\\%tin>(1)" #. type: Plain text -#: doc/tin.5:2562 +#: doc/tin.5:2628 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 " @@ -12333,7 +12481,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2573 +#: doc/tin.5:2639 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 " @@ -12342,25 +12490,25 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2580 +#: doc/tin.5:2646 msgid "" "is the time when the group was created, expressed as the number of seconds " "since the Epoch." msgstr "" #. type: TP -#: doc/tin.5:2580 +#: doc/tin.5:2646 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2583 +#: doc/tin.5:2649 msgid "is the electronic mail address of the person who created the group." msgstr "" #. type: Plain text -#: doc/tin.5:2589 +#: doc/tin.5:2655 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) " @@ -12368,7 +12516,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2600 +#: doc/tin.5:2666 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 " @@ -12377,7 +12525,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2612 +#: doc/tin.5:2678 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:2639 +#: doc/tin.5:2705 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 " @@ -12403,7 +12551,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2654 +#: doc/tin.5:2720 msgid "" "This file contains a list of newsgroups \\(em one per line \\(em which the " "client should subscribe to when the user has no ${TIN_HOMEDIR:-\"$HOME\"}/." @@ -12413,7 +12561,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2701 +#: doc/tin.5:2767 msgid "" "B<\\%elm>(1), B<\\%inews>(1), B<\\%ispell>(1), B<\\%lp>(1), B<\\%lpr>(1), B<" "\\%metamail>(1), B<\\%perl>(1), B<\\%perlre>(1), B<\\%pgp>(1), B<\\%rn>(1), " diff -Nurp '--exclude=.bzr*' tin-2.4.4/doc/l10n/tin-man.pot tin-2.4.5/doc/l10n/tin-man.pot --- tin-2.4.4/doc/l10n/tin-man.pot 2019-12-24 10:55:54.000000000 +0100 +++ tin-2.4.5/doc/l10n/tin-man.pot 2020-12-01 11:58:45.000000000 +0100 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2019-12-24 10:55+0100\n" +"POT-Creation-Date: 2020-12-01 11:58+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,13 +25,13 @@ msgstr "" #. type: TH #: doc/tin.1:12 doc/tin.5:9 #, no-wrap -msgid "December 24th, 2019" +msgid "December 24th, 2020" msgstr "" #. type: TH #: doc/tin.1:12 doc/tin.5:9 #, no-wrap -msgid "2.4.4" +msgid "2.4.5" msgstr "" #. type: TH @@ -120,7 +120,7 @@ msgid "EXIT STATUS" msgstr "" #. type: TP -#: doc/tin.1:79 doc/tin.1:1094 doc/tin.1:3473 +#: doc/tin.1:79 doc/tin.1:1099 doc/tin.1:3495 #, no-wrap msgid "B<0>" msgstr "" @@ -131,7 +131,7 @@ msgid "Successful program execution. No msgstr "" #. type: TP -#: doc/tin.1:82 doc/tin.1:3476 +#: doc/tin.1:82 doc/tin.1:3498 #, no-wrap msgid "B<1>" msgstr "" @@ -142,7 +142,7 @@ msgid "Usage, syntax, configuration file msgstr "" #. type: TP -#: doc/tin.1:85 doc/tin.1:3479 +#: doc/tin.1:85 doc/tin.1:3501 #, no-wrap msgid "B<2>" msgstr "" @@ -153,7 +153,7 @@ msgid "Unread news available (batch mode msgstr "" #. type: TP -#: doc/tin.1:88 doc/tin.1:3482 +#: doc/tin.1:88 doc/tin.1:3504 #, no-wrap msgid "B<3>" msgstr "" @@ -468,7 +468,7 @@ msgstr "" #: doc/tin.1:198 msgid "" "Quick start. Start B as quickly as possible. Currently this is " -"equivalent to ''B<-nqd>''." +"equivalent to ''B<-dnq>''." msgstr "" #. type: TP @@ -545,7 +545,7 @@ msgstr "" #. type: Plain text #: doc/tin.1:225 msgid "" -"Verbose mode for ''B<-D>'', ''B<-c>'', ''B<-M>'', ''B<-N>'', \\&''B<-S>'', " +"Verbose mode for ''B<-c>'', ''B<-D>'', ''B<-M>'', ''B<-N>'', \\&''B<-S>'', " "''B<-u>'' and ''B<-Z>'' options. Can be used multiple times to increase " "verbosity." msgstr "" @@ -1131,7 +1131,7 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:492 doc/tin.1:1366 doc/tin.1:1419 +#: doc/tin.1:492 doc/tin.1:1371 doc/tin.1:1424 #, no-wrap msgid "B" msgstr "" @@ -1211,7 +1211,7 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:523 doc/tin.1:1372 doc/tin.1:1426 +#: doc/tin.1:523 doc/tin.1:1377 doc/tin.1:1431 #, no-wrap msgid "B" msgstr "" @@ -1225,13 +1225,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:529 doc/tin.1:1375 doc/tin.1:1429 +#: doc/tin.1:529 doc/tin.1:1380 doc/tin.1:1434 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:532 doc/tin.1:1378 doc/tin.1:1432 +#: doc/tin.1:532 doc/tin.1:1383 doc/tin.1:1437 msgid "Toggle the display of help mini menu at the bottom of the screen." msgstr "" @@ -1256,7 +1256,7 @@ msgstr "" msgid "B" msgstr "" -#. -------------------------------------------------------------------- +#. ------------------------------------------------------------------- #. type: Plain text #: doc/tin.1:543 msgid "Print B version information." @@ -1269,7 +1269,7 @@ msgid "NEWSGROUP SELECTION COMMANDS" msgstr "" #. type: TP -#: doc/tin.1:544 doc/tin.1:682 doc/tin.1:933 doc/tin.1:1097 doc/tin.1:3485 +#: doc/tin.1:544 doc/tin.1:682 doc/tin.1:934 doc/tin.1:1102 doc/tin.1:3507 #, no-wrap msgid "B<4>" msgstr "" @@ -1293,13 +1293,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:551 doc/tin.1:703 doc/tin.1:954 +#: doc/tin.1:551 doc/tin.1:703 doc/tin.1:955 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:555 doc/tin.1:707 doc/tin.1:958 +#: doc/tin.1:555 doc/tin.1:707 doc/tin.1:959 msgid "" "Choose a range of articles to be affected by the next command. See the " "section \"RANGES\" for more information." @@ -1317,18 +1317,18 @@ msgid "Sort the list of newsgroups." msgstr "" #. type: TP -#: doc/tin.1:558 doc/tin.1:710 doc/tin.1:961 doc/tin.1:1151 doc/tin.1:1363 doc/tin.1:1413 +#: doc/tin.1:558 doc/tin.1:710 doc/tin.1:962 doc/tin.1:1156 doc/tin.1:1368 doc/tin.1:1418 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:561 doc/tin.1:713 doc/tin.1:964 doc/tin.1:1154 doc/tin.1:1366 doc/tin.1:1416 +#: doc/tin.1:561 doc/tin.1:713 doc/tin.1:965 doc/tin.1:1159 doc/tin.1:1371 doc/tin.1:1421 msgid "Repeat the previous search." msgstr "" #. type: TP -#: doc/tin.1:561 doc/tin.1:713 doc/tin.1:964 doc/tin.1:1154 doc/tin.1:1357 doc/tin.1:1407 +#: doc/tin.1:561 doc/tin.1:713 doc/tin.1:965 doc/tin.1:1159 doc/tin.1:1362 doc/tin.1:1412 #, no-wrap msgid "B" msgstr "" @@ -1339,7 +1339,7 @@ msgid "Search for a group by name and de msgstr "" #. type: TP -#: doc/tin.1:564 doc/tin.1:716 doc/tin.1:967 doc/tin.1:1157 doc/tin.1:1360 doc/tin.1:1410 +#: doc/tin.1:564 doc/tin.1:716 doc/tin.1:968 doc/tin.1:1162 doc/tin.1:1365 doc/tin.1:1415 #, no-wrap msgid "B" msgstr "" @@ -1374,7 +1374,7 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:574 doc/tin.1:791 doc/tin.1:1005 doc/tin.1:1215 +#: doc/tin.1:574 doc/tin.1:791 doc/tin.1:1006 doc/tin.1:1220 #, no-wrap msgid "B" msgstr "" @@ -1387,7 +1387,7 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:578 doc/tin.1:795 doc/tin.1:1009 doc/tin.1:1219 +#: doc/tin.1:578 doc/tin.1:795 doc/tin.1:1010 doc/tin.1:1224 #, no-wrap msgid "B" msgstr "" @@ -1413,13 +1413,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:586 doc/tin.1:808 doc/tin.1:1022 doc/tin.1:1231 +#: doc/tin.1:586 doc/tin.1:808 doc/tin.1:1023 doc/tin.1:1236 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:589 doc/tin.1:811 doc/tin.1:1025 doc/tin.1:1234 +#: doc/tin.1:589 doc/tin.1:811 doc/tin.1:1026 doc/tin.1:1239 msgid "Edit the filter file and reload it afterwards." msgstr "" @@ -1437,7 +1437,7 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:593 doc/tin.1:818 doc/tin.1:1025 doc/tin.1:1247 doc/tin.1:1369 doc/tin.1:1422 +#: doc/tin.1:593 doc/tin.1:818 doc/tin.1:1026 doc/tin.1:1252 doc/tin.1:1374 doc/tin.1:1427 #, no-wrap msgid "B" msgstr "" @@ -1451,18 +1451,18 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:598 doc/tin.1:822 doc/tin.1:1028 doc/tin.1:1250 +#: doc/tin.1:598 doc/tin.1:822 doc/tin.1:1029 doc/tin.1:1255 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:601 doc/tin.1:825 doc/tin.1:1031 doc/tin.1:1253 +#: doc/tin.1:601 doc/tin.1:825 doc/tin.1:1032 doc/tin.1:1258 msgid "Toggle inverse video." msgstr "" #. type: TP -#: doc/tin.1:601 doc/tin.1:834 doc/tin.1:1037 doc/tin.1:1259 +#: doc/tin.1:601 doc/tin.1:834 doc/tin.1:1038 doc/tin.1:1264 #, no-wrap msgid "B" msgstr "" @@ -1493,13 +1493,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:614 doc/tin.1:842 doc/tin.1:1267 +#: doc/tin.1:614 doc/tin.1:842 doc/tin.1:1272 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:618 doc/tin.1:846 doc/tin.1:1271 +#: doc/tin.1:618 doc/tin.1:846 doc/tin.1:1276 msgid "" "User configurable options menu (for more information see section \"GLOBAL " "OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES\")." @@ -1517,7 +1517,7 @@ msgid "Positions the cursor on the next msgstr "" #. type: TP -#: doc/tin.1:621 doc/tin.1:863 doc/tin.1:1050 doc/tin.1:1288 +#: doc/tin.1:621 doc/tin.1:863 doc/tin.1:1051 doc/tin.1:1293 #, no-wrap msgid "B" msgstr "" @@ -1530,13 +1530,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:625 doc/tin.1:866 doc/tin.1:1053 doc/tin.1:1291 +#: doc/tin.1:625 doc/tin.1:866 doc/tin.1:1054 doc/tin.1:1296 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:628 doc/tin.1:869 doc/tin.1:1056 doc/tin.1:1294 +#: doc/tin.1:628 doc/tin.1:869 doc/tin.1:1057 doc/tin.1:1299 msgid "Quit B \\(em don't ask the user to confirm." msgstr "" @@ -1555,13 +1555,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:633 doc/tin.1:872 doc/tin.1:1056 +#: doc/tin.1:633 doc/tin.1:872 doc/tin.1:1057 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:637 doc/tin.1:876 doc/tin.1:1060 +#: doc/tin.1:637 doc/tin.1:876 doc/tin.1:1061 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,7 +1621,7 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:655 doc/tin.1:900 doc/tin.1:1075 doc/tin.1:1328 +#: doc/tin.1:655 doc/tin.1:901 doc/tin.1:1080 doc/tin.1:1333 #, no-wrap msgid "B" msgstr "" @@ -1679,7 +1679,7 @@ msgstr "" msgid "B" msgstr "" -#. -------------------------------------------------------------------- +#. ------------------------------------------------------------------- #. type: Plain text #: doc/tin.1:678 msgid "Mark all articles in the current group as unread." @@ -1705,39 +1705,39 @@ msgid "Select article 4." msgstr "" #. type: TP -#: doc/tin.1:685 doc/tin.1:936 doc/tin.1:1100 +#: doc/tin.1:685 doc/tin.1:937 doc/tin.1:1105 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:689 doc/tin.1:940 doc/tin.1:1104 +#: doc/tin.1:689 doc/tin.1:941 doc/tin.1:1109 msgid "" "Auto select article(s) using a menu. Read the section \"FILTERING ARTICLES\" " "for more information." msgstr "" #. type: TP -#: doc/tin.1:689 doc/tin.1:940 doc/tin.1:1116 +#: doc/tin.1:689 doc/tin.1:941 doc/tin.1:1121 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:693 doc/tin.1:944 doc/tin.1:1120 +#: doc/tin.1:693 doc/tin.1:945 doc/tin.1:1125 msgid "" "Kill article(s) using a menu. Read the section \"FILTERING ARTICLES\" for " "more information." msgstr "" #. type: TP -#: doc/tin.1:693 doc/tin.1:944 +#: doc/tin.1:693 doc/tin.1:945 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:698 doc/tin.1:949 +#: doc/tin.1:698 doc/tin.1:950 msgid "" "Mark current article, thread, range, auto-selected (hot) articles, articles " "matching pattern or tagged articles as read. A prompt asks which type should " @@ -1745,13 +1745,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:698 doc/tin.1:949 +#: doc/tin.1:698 doc/tin.1:950 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:703 doc/tin.1:954 +#: doc/tin.1:703 doc/tin.1:955 msgid "" "Mark current article, thread, range, auto-selected (hot) articles, articles " "matching pattern or tagged articles as unread. A prompt asks which type " @@ -1759,23 +1759,23 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:707 doc/tin.1:958 doc/tin.1:1148 +#: doc/tin.1:707 doc/tin.1:959 doc/tin.1:1153 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:710 doc/tin.1:961 doc/tin.1:1151 +#: doc/tin.1:710 doc/tin.1:962 doc/tin.1:1156 msgid "Re-enter the last message that was viewed." msgstr "" #. type: Plain text -#: doc/tin.1:716 doc/tin.1:967 +#: doc/tin.1:716 doc/tin.1:968 msgid "Search forward for specified subject." msgstr "" #. type: Plain text -#: doc/tin.1:719 doc/tin.1:970 +#: doc/tin.1:719 doc/tin.1:971 msgid "Search backwards for specified subject." msgstr "" @@ -1786,7 +1786,7 @@ msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:722 doc/tin.1:973 +#: doc/tin.1:722 doc/tin.1:974 msgid "Select current thread for later processing." msgstr "" @@ -1873,13 +1873,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:751 doc/tin.1:982 doc/tin.1:1174 +#: doc/tin.1:751 doc/tin.1:983 doc/tin.1:1179 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:756 doc/tin.1:987 doc/tin.1:1179 +#: doc/tin.1:756 doc/tin.1:988 doc/tin.1:1184 msgid "" "Pipe current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles into command. See the section \"MAILING " @@ -1887,7 +1887,7 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:756 doc/tin.1:1179 +#: doc/tin.1:756 doc/tin.1:1184 #, no-wrap msgid "B" msgstr "" @@ -1905,7 +1905,7 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:765 doc/tin.1:1188 +#: doc/tin.1:765 doc/tin.1:1193 #, no-wrap msgid "B" msgstr "" @@ -1945,7 +1945,7 @@ msgid "View next unread article or group msgstr "" #. type: TP -#: doc/tin.1:780 doc/tin.1:993 doc/tin.1:1205 +#: doc/tin.1:780 doc/tin.1:994 doc/tin.1:1210 #, no-wrap msgid "B" msgstr "" @@ -1958,24 +1958,24 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:784 doc/tin.1:998 doc/tin.1:1208 +#: doc/tin.1:784 doc/tin.1:999 doc/tin.1:1213 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:787 doc/tin.1:1001 +#: doc/tin.1:787 doc/tin.1:1002 msgid "Author backward search. Otherwise, see B ('B') above." msgstr "" #. type: TP -#: doc/tin.1:787 doc/tin.1:1001 doc/tin.1:1211 +#: doc/tin.1:787 doc/tin.1:1002 doc/tin.1:1216 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:791 doc/tin.1:1005 doc/tin.1:1215 +#: doc/tin.1:791 doc/tin.1:1006 doc/tin.1:1220 msgid "" "Search the body of all articles in group (can be slow). You can abort the " "search using B ('B')." @@ -2002,7 +2002,7 @@ msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:803 doc/tin.1:1017 +#: doc/tin.1:803 doc/tin.1:1018 msgid "" "Cycle the display of the author through all the possible options for the " "tinrc variable B." @@ -2015,7 +2015,7 @@ msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:808 doc/tin.1:1022 doc/tin.1:1228 +#: doc/tin.1:808 doc/tin.1:1023 doc/tin.1:1233 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 " @@ -2073,7 +2073,7 @@ msgid "Open the thread under the current msgstr "" #. type: Plain text -#: doc/tin.1:837 doc/tin.1:1040 doc/tin.1:1262 +#: doc/tin.1:837 doc/tin.1:1041 doc/tin.1:1267 msgid "Look up article by ''Message-ID:''." msgstr "" @@ -2084,7 +2084,7 @@ msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:842 doc/tin.1:1045 doc/tin.1:1267 +#: doc/tin.1:842 doc/tin.1:1046 doc/tin.1:1272 msgid "" "Mail current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles to someone. See the section \"MAILING " @@ -2109,18 +2109,18 @@ msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:852 doc/tin.1:1277 +#: doc/tin.1:852 doc/tin.1:1282 msgid "Go to the next unread article." msgstr "" #. type: TP -#: doc/tin.1:852 doc/tin.1:1045 doc/tin.1:1277 +#: doc/tin.1:852 doc/tin.1:1046 doc/tin.1:1282 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:857 doc/tin.1:1050 doc/tin.1:1282 +#: doc/tin.1:857 doc/tin.1:1051 doc/tin.1:1287 msgid "" "Send current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles to printer. See the section \"MAILING " @@ -2150,7 +2150,7 @@ msgid "Go to previous unread article." msgstr "" #. type: Plain text -#: doc/tin.1:866 doc/tin.1:1053 +#: doc/tin.1:866 doc/tin.1:1054 msgid "Return to previous level." msgstr "" @@ -2172,7 +2172,7 @@ msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:881 doc/tin.1:1065 doc/tin.1:1307 +#: doc/tin.1:881 doc/tin.1:1066 doc/tin.1:1312 msgid "" "Save current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles. See the section \"MAILING PIPING " @@ -2186,7 +2186,7 @@ msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:884 doc/tin.1:1068 doc/tin.1:1310 +#: doc/tin.1:884 doc/tin.1:1069 doc/tin.1:1315 msgid "Save marked articles automatically without further prompting." msgstr "" @@ -2211,18 +2211,20 @@ msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:892 -msgid "Automatically tag in order all the parts of the current multi-part message." +#: doc/tin.1:893 doc/tin.1:1077 +msgid "" +"Automatically tag/untag all the parts of the current multi-part message in " +"order." msgstr "" #. type: TP -#: doc/tin.1:892 +#: doc/tin.1:893 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:897 +#: doc/tin.1:898 msgid "" "Cycle the threading mode through no threading, threading by subject, " "threading by references, threading on both subject and references, group " @@ -2230,18 +2232,18 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:897 +#: doc/tin.1:898 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:900 +#: doc/tin.1:901 msgid "Untag all articles that were tagged." msgstr "" #. type: Plain text -#: doc/tin.1:907 doc/tin.1:1082 doc/tin.1:1335 +#: doc/tin.1:908 doc/tin.1:1087 doc/tin.1:1340 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'), " @@ -2250,13 +2252,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:907 +#: doc/tin.1:908 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:913 doc/tin.1:1341 +#: doc/tin.1:914 doc/tin.1:1346 msgid "" "Repost an already posted article / thread / auto-selected (hot) articles / " "articles matching pattern / tagged articles to another newsgroup(s). Useful " @@ -2265,13 +2267,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:913 +#: doc/tin.1:914 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:921 +#: doc/tin.1:922 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. " @@ -2282,25 +2284,25 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:921 doc/tin.1:1082 doc/tin.1:1341 +#: doc/tin.1:922 doc/tin.1:1087 doc/tin.1:1346 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:924 +#: doc/tin.1:925 msgid "Mark current article as unread." msgstr "" #. type: TP -#: doc/tin.1:924 doc/tin.1:1087 doc/tin.1:1344 +#: doc/tin.1:925 doc/tin.1:1092 doc/tin.1:1349 #, no-wrap msgid "B" msgstr "" -#. -------------------------------------------------------------------- +#. ------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:931 +#: doc/tin.1:932 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 " @@ -2308,79 +2310,79 @@ msgid "" msgstr "" #. type: SS -#: doc/tin.1:931 +#: doc/tin.1:932 #, no-wrap msgid "THREAD LISTING COMMANDS" msgstr "" #. type: Plain text -#: doc/tin.1:936 +#: doc/tin.1:937 msgid "Select article 4 within thread." msgstr "" #. type: TP -#: doc/tin.1:970 +#: doc/tin.1:971 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.1:973 +#: doc/tin.1:974 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:976 +#: doc/tin.1:977 msgid "Toggle selection of current article." msgstr "" #. type: TP -#: doc/tin.1:976 +#: doc/tin.1:977 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:979 +#: doc/tin.1:980 msgid "Reverse article selections." msgstr "" #. type: TP -#: doc/tin.1:979 +#: doc/tin.1:980 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:982 +#: doc/tin.1:983 msgid "Undo all selections on current thread." msgstr "" #. type: TP -#: doc/tin.1:987 +#: doc/tin.1:988 #, no-wrap msgid "BCRE'>" msgstr "" #. type: Plain text -#: doc/tin.1:990 +#: doc/tin.1:991 msgid "Read current article within thread." msgstr "" #. type: TP -#: doc/tin.1:990 +#: doc/tin.1:991 #, no-wrap msgid "BTABE'>" msgstr "" #. type: Plain text -#: doc/tin.1:993 +#: doc/tin.1:994 msgid "View next unread article within thread." msgstr "" #. type: Plain text -#: doc/tin.1:998 +#: doc/tin.1:999 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 " @@ -2388,44 +2390,44 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1009 +#: doc/tin.1:1010 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:1013 +#: doc/tin.1:1014 msgid "" "Mark thread as read [after confirmation] and enter the next thread " "containing unread news." msgstr "" #. type: TP -#: doc/tin.1:1013 +#: doc/tin.1:1014 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.1:1017 +#: doc/tin.1:1018 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1028 doc/tin.1:1250 +#: doc/tin.1:1029 doc/tin.1:1255 msgid "Display the subject of the current article in the last line." msgstr "" #. type: TP -#: doc/tin.1:1031 +#: doc/tin.1:1032 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1037 +#: doc/tin.1:1038 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 " @@ -2433,194 +2435,200 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1040 +#: doc/tin.1:1041 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.1:1060 +#: doc/tin.1:1061 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.1:1065 +#: doc/tin.1:1066 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.1:1068 +#: doc/tin.1:1069 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1072 doc/tin.1:1314 +#: doc/tin.1:1073 doc/tin.1:1319 msgid "" "Toggle tag status of current article for mailing, piping, printing, saving " "or reposting." msgstr "" #. type: TP -#: doc/tin.1:1072 +#: doc/tin.1:1073 +#, no-wrap +msgid "B" +msgstr "" + +#. type: TP +#: doc/tin.1:1077 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1075 +#: doc/tin.1:1080 msgid "Untag all tagged threads." msgstr "" #. type: Plain text -#: doc/tin.1:1087 +#: doc/tin.1:1092 msgid "" "Mark current article in thread as unread. If a range of articles is set, the " "range will be marked as unread instead of the current article. When tagged " "articles are present, a prompt asks how to proceed." msgstr "" -#. -------------------------------------------------------------------- +#. ------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:1092 +#: doc/tin.1:1097 msgid "Mark all articles in thread as unread." msgstr "" #. type: SS -#: doc/tin.1:1092 +#: doc/tin.1:1097 #, no-wrap msgid "ARTICLE VIEWER COMMANDS" msgstr "" #. type: Plain text -#: doc/tin.1:1097 +#: doc/tin.1:1102 msgid "Read the first (base) article in this thread." msgstr "" #. type: Plain text -#: doc/tin.1:1100 +#: doc/tin.1:1105 msgid "Read response 4 in this thread." msgstr "" #. type: TP -#: doc/tin.1:1104 +#: doc/tin.1:1109 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1108 +#: doc/tin.1:1113 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:1108 +#: doc/tin.1:1113 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1113 +#: doc/tin.1:1118 msgid "Perform B<\\%pgp>(1) operations on article." msgstr "" #. type: TP -#: doc/tin.1:1113 +#: doc/tin.1:1118 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1116 +#: doc/tin.1:1121 msgid "Toggles the display mode (raw including all headers vs. cooked)." msgstr "" #. type: TP -#: doc/tin.1:1120 +#: doc/tin.1:1125 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1123 +#: doc/tin.1:1128 msgid "Toggle the TAB width between 4 and 8 characters." msgstr "" #. type: TP -#: doc/tin.1:1123 +#: doc/tin.1:1128 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1127 +#: doc/tin.1:1132 msgid "" "Post a followup to the current article with a copy of the article with all " "headers included." msgstr "" #. type: TP -#: doc/tin.1:1127 +#: doc/tin.1:1132 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1131 +#: doc/tin.1:1136 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:1131 +#: doc/tin.1:1136 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1134 +#: doc/tin.1:1139 msgid "" "Toggles the display of all headers vs. headers in " "B." msgstr "" #. type: TP -#: doc/tin.1:1134 +#: doc/tin.1:1139 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1137 +#: doc/tin.1:1142 msgid "Toggle ROT-13 decoding for this article." msgstr "" #. type: TP -#: doc/tin.1:1137 +#: doc/tin.1:1142 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1141 +#: doc/tin.1:1146 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:1141 +#: doc/tin.1:1146 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1148 +#: doc/tin.1:1153 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 " @@ -2630,23 +2638,23 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1157 +#: doc/tin.1:1162 msgid "Forward search the text of this article." msgstr "" #. type: Plain text -#: doc/tin.1:1160 +#: doc/tin.1:1165 msgid "Backward search the text of this article." msgstr "" #. type: TP -#: doc/tin.1:1160 +#: doc/tin.1:1165 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1165 +#: doc/tin.1:1170 msgid "" "Skip to the end of the next quoted text-block in this article. Quoted text " "is everything which matches B, B or " @@ -2654,40 +2662,40 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1165 +#: doc/tin.1:1170 #, no-wrap msgid "B'>" msgstr "" #. type: Plain text -#: doc/tin.1:1168 +#: doc/tin.1:1173 msgid "Go to the first article in the current thread." msgstr "" #. type: TP -#: doc/tin.1:1168 +#: doc/tin.1:1173 #, no-wrap msgid "B'>" msgstr "" #. type: Plain text -#: doc/tin.1:1171 +#: doc/tin.1:1176 msgid "Go to the last article in the current thread." msgstr "" #. type: TP -#: doc/tin.1:1171 +#: doc/tin.1:1176 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1174 +#: doc/tin.1:1179 msgid "Toggle word highlighting on/off." msgstr "" #. type: Plain text -#: doc/tin.1:1188 +#: doc/tin.1:1193 msgid "" "Auto select article(s) with a single key. The defaults used for selection " "are set based upon the following four tinrc config variables: " @@ -2699,7 +2707,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1197 +#: doc/tin.1:1202 msgid "" "Kill article(s) with a single key. The defaults used for killing are based " "upon the following four tinrc config variables: B, " @@ -2710,24 +2718,24 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1197 +#: doc/tin.1:1202 #, no-wrap msgid "BCRE'>" msgstr "" #. type: Plain text -#: doc/tin.1:1200 +#: doc/tin.1:1205 msgid "Go to next base article." msgstr "" #. type: TP -#: doc/tin.1:1200 +#: doc/tin.1:1205 #, no-wrap msgid "BTABE'>" msgstr "" #. type: Plain text -#: doc/tin.1:1205 +#: doc/tin.1:1210 msgid "" "Go to next unread article. If the tinrc variable B doesn't " "contain PageNextUnread, then this key will first page through the current " @@ -2735,281 +2743,281 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1208 +#: doc/tin.1:1213 msgid "Author forward search." msgstr "" #. type: Plain text -#: doc/tin.1:1211 +#: doc/tin.1:1216 msgid "Author backward search." msgstr "" #. type: Plain text -#: doc/tin.1:1219 +#: doc/tin.1:1224 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:1223 +#: doc/tin.1:1228 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:1223 +#: doc/tin.1:1228 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.1:1228 +#: doc/tin.1:1233 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1231 +#: doc/tin.1:1236 msgid "Edit the current article. This is restricted to mailgroups and saved news." msgstr "" #. type: TP -#: doc/tin.1:1234 +#: doc/tin.1:1239 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1237 +#: doc/tin.1:1242 msgid "Post a followup to the current article with a copy of the article included." msgstr "" #. type: TP -#: doc/tin.1:1237 +#: doc/tin.1:1242 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1241 +#: doc/tin.1:1246 msgid "" "Post a followup to the current article without including a copy of the " "article." msgstr "" #. type: TP -#: doc/tin.1:1241 +#: doc/tin.1:1246 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1244 +#: doc/tin.1:1249 msgid "Go to the start of the article." msgstr "" #. type: TP -#: doc/tin.1:1244 +#: doc/tin.1:1249 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1247 +#: doc/tin.1:1252 msgid "Go to the end of the article." msgstr "" #. type: TP -#: doc/tin.1:1253 +#: doc/tin.1:1258 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1256 +#: doc/tin.1:1261 msgid "Mark rest of thread as read and move onto the next unread thread." msgstr "" #. type: TP -#: doc/tin.1:1256 +#: doc/tin.1:1261 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1259 +#: doc/tin.1:1264 msgid "Show the thread menu that the current article is a part of." msgstr "" #. type: TP -#: doc/tin.1:1262 +#: doc/tin.1:1267 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.1:1271 +#: doc/tin.1:1276 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1274 +#: doc/tin.1:1279 msgid "Go to the next article." msgstr "" #. type: TP -#: doc/tin.1:1274 +#: doc/tin.1:1279 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.1:1282 +#: doc/tin.1:1287 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1285 +#: doc/tin.1:1290 msgid "Go to the previous article." msgstr "" #. type: TP -#: doc/tin.1:1285 +#: doc/tin.1:1290 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1288 +#: doc/tin.1:1293 msgid "Go to the previous unread article." msgstr "" #. type: Plain text -#: doc/tin.1:1291 +#: doc/tin.1:1296 msgid "Return to the previous level." msgstr "" #. type: TP -#: doc/tin.1:1294 +#: doc/tin.1:1299 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1298 +#: doc/tin.1:1303 msgid "" "Reply through mail to the author of the current article with a copy of the " "article included." msgstr "" #. type: TP -#: doc/tin.1:1298 +#: doc/tin.1:1303 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1302 +#: doc/tin.1:1307 msgid "" "Reply through mail to the author of the current article without including " "the original article." msgstr "" #. type: TP -#: doc/tin.1:1302 +#: doc/tin.1:1307 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.1:1307 +#: doc/tin.1:1312 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.1:1310 +#: doc/tin.1:1315 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.1:1314 +#: doc/tin.1:1319 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1317 +#: doc/tin.1:1322 msgid "Return to group selection level." msgstr "" #. type: TP -#: doc/tin.1:1317 +#: doc/tin.1:1322 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1320 +#: doc/tin.1:1325 msgid "Go to parent article." msgstr "" #. type: TP -#: doc/tin.1:1320 +#: doc/tin.1:1325 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1324 +#: doc/tin.1:1329 msgid "" "Display a list of URLs in the current article. See the section \"URL " "LISTING\" for more information." msgstr "" #. type: TP -#: doc/tin.1:1324 +#: doc/tin.1:1329 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1328 +#: doc/tin.1:1333 msgid "" "Display a list of attachments of the current article. See the section " "\"ATTACHMENT LISTING\" for more information." msgstr "" #. type: TP -#: doc/tin.1:1335 +#: doc/tin.1:1340 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1344 +#: doc/tin.1:1349 msgid "Mark article as unread." msgstr "" -#. -------------------------------------------------------------------- +#. ------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:1349 +#: doc/tin.1:1354 msgid "Mark the current thread as unread." msgstr "" #. type: SS -#: doc/tin.1:1349 +#: doc/tin.1:1354 #, no-wrap msgid "URL LISTING" msgstr "" #. type: Plain text -#: doc/tin.1:1352 +#: doc/tin.1:1357 msgid "" "B ('B') displays a list of URLs in the current " "article. Besides the common moving keys, the following commands are " @@ -3017,52 +3025,52 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1353 +#: doc/tin.1:1358 #, no-wrap msgid "BCRE'>" msgstr "" #. type: Plain text -#: doc/tin.1:1357 +#: doc/tin.1:1362 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:1360 +#: doc/tin.1:1365 msgid "URL forward search." msgstr "" #. type: Plain text -#: doc/tin.1:1363 +#: doc/tin.1:1368 msgid "URL backward search." msgstr "" #. type: Plain text -#: doc/tin.1:1369 doc/tin.1:1422 +#: doc/tin.1:1374 doc/tin.1:1427 msgid "Shell escape." msgstr "" #. type: Plain text -#: doc/tin.1:1372 +#: doc/tin.1:1377 msgid "Toggle the display of the current URL in the last line." msgstr "" #. type: Plain text -#: doc/tin.1:1375 doc/tin.1:1429 +#: doc/tin.1:1380 doc/tin.1:1434 msgid "Help screen of commands available." msgstr "" -#. -------------------------------------------------------------------- +#. ------------------------------------------------------------------- #. type: SS -#: doc/tin.1:1381 +#: doc/tin.1:1386 #, no-wrap msgid "ATTACHMENT LISTING" msgstr "" #. type: Plain text -#: doc/tin.1:1384 +#: doc/tin.1:1389 msgid "" "B ('B') displays a list of attachments of the current " "article. Besides the common moving keys, the following commands are " @@ -3070,115 +3078,115 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1385 +#: doc/tin.1:1390 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1388 +#: doc/tin.1:1393 msgid "Pipe attachment into command." msgstr "" #. type: TP -#: doc/tin.1:1388 +#: doc/tin.1:1393 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1391 +#: doc/tin.1:1396 msgid "Save current attachment / tagged attachments to disk." msgstr "" #. type: TP -#: doc/tin.1:1391 +#: doc/tin.1:1396 #, no-wrap msgid "BCRE'>" msgstr "" #. type: Plain text -#: doc/tin.1:1394 +#: doc/tin.1:1399 msgid "View attachment." msgstr "" #. type: TP -#: doc/tin.1:1394 +#: doc/tin.1:1399 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1397 +#: doc/tin.1:1402 msgid "Tag one or more attachments for saving." msgstr "" #. type: TP -#: doc/tin.1:1397 +#: doc/tin.1:1402 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1404 +#: doc/tin.1:1409 msgid "Reverse tagging of all attachments." msgstr "" #. type: TP -#: doc/tin.1:1404 +#: doc/tin.1:1409 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1407 +#: doc/tin.1:1412 msgid "Untag all tagged attachments." msgstr "" #. type: Plain text -#: doc/tin.1:1410 +#: doc/tin.1:1415 msgid "Attachment forward search." msgstr "" #. type: Plain text -#: doc/tin.1:1413 +#: doc/tin.1:1418 msgid "Attachment backward search." msgstr "" #. type: TP -#: doc/tin.1:1416 +#: doc/tin.1:1421 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1419 +#: doc/tin.1:1424 msgid "Pipe attachment into command. Uses the raw attachment, no decoding is done." msgstr "" #. type: Plain text -#: doc/tin.1:1426 +#: doc/tin.1:1431 msgid "" "Toggle the display of the name/description of the current attachment in the " "last line." msgstr "" -#. -------------------------------------------------------------------- +#. ------------------------------------------------------------------- #. type: SS -#: doc/tin.1:1435 +#: doc/tin.1:1440 #, no-wrap msgid "GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES" msgstr "" @@ -3187,7 +3195,7 @@ msgstr "" #. - \fI${TIN_LIBDIR:\-NEWSLIBDIR}/tinrc\fR is used #. in the !TIN_DEFAULTS_DIR config case #. type: Plain text -#: doc/tin.1:1447 +#: doc/tin.1:1452 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 " @@ -3199,7 +3207,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1455 +#: doc/tin.1:1460 msgid "" "The variables are user configurable by editing " "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/tinrc> directly. Most of them can also be " @@ -3211,7 +3219,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1461 +#: doc/tin.1:1466 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 " @@ -3221,7 +3229,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1468 +#: doc/tin.1:1473 msgid "" "As with the other menus, B ('B<^L>') will redraw the screen. You " "can use B ('B'), B ('B') and B " @@ -3231,7 +3239,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1473 +#: doc/tin.1:1478 msgid "" "The options menu provides access to the attributes menu for the current " "group by the B ('BTABE>') command. Pressing " @@ -3240,14 +3248,14 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1476 +#: doc/tin.1:1481 msgid "" "The B ('B') command brings up the scopes menu. For more " "information see section \"SCOPES MENU\"." msgstr "" #. type: Plain text -#: doc/tin.1:1480 +#: doc/tin.1:1485 msgid "" "Here is a full list of all the available variables. The name in braces is " "the name of the corresponding setting in " @@ -3255,13 +3263,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1480 +#: doc/tin.1:1485 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1486 doc/tin.5:1204 +#: doc/tin.1:1491 doc/tin.5:1253 msgid "" "If ON abbreviate long newsgroup names at group selection level and article " "level (if necessary) like this: news.software.readers -E " @@ -3269,159 +3277,159 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1486 +#: doc/tin.1:1491 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1490 doc/tin.5:1208 +#: doc/tin.1:1495 doc/tin.5:1257 msgid "" "If ON add posted articles which start a new thread to filter for " "highlighting follow-ups. Default is ON." msgstr "" #. type: TP -#: doc/tin.1:1490 +#: doc/tin.1:1495 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1493 doc/tin.5:1211 +#: doc/tin.1:1498 doc/tin.5:1260 msgid "Turn ON advertising in header (''User-Agent:''). Default is ON." msgstr "" #. type: TP -#: doc/tin.1:1493 +#: doc/tin.1:1498 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1496 doc/tin.5:1214 +#: doc/tin.1:1501 doc/tin.5:1263 msgid "If ON strip multipart/alternative messages automatically. Default is ON." msgstr "" #. type: TP -#: doc/tin.1:1496 +#: doc/tin.1:1501 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1499 doc/tin.5:1217 +#: doc/tin.1:1504 doc/tin.5:1266 msgid "The character used to show that an article was deleted. Default is 'D'." msgstr "" #. type: TP -#: doc/tin.1:1499 +#: doc/tin.1:1504 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1502 doc/tin.5:1220 +#: doc/tin.1:1507 doc/tin.5:1269 msgid "The character used to show that an article is in a range. Default is '#'." msgstr "" #. type: TP -#: doc/tin.1:1502 +#: doc/tin.1:1507 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1506 doc/tin.5:1224 +#: doc/tin.1:1511 doc/tin.5:1273 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:1506 +#: doc/tin.1:1511 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1510 doc/tin.5:1228 +#: doc/tin.1:1515 doc/tin.5:1277 msgid "" "The character used to show that an article/thread is auto-selected (hot). " "Default is '*'." msgstr "" #. type: TP -#: doc/tin.1:1510 +#: doc/tin.1:1515 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1514 doc/tin.5:1232 +#: doc/tin.1:1519 doc/tin.5:1281 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:1514 +#: doc/tin.1:1519 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1518 doc/tin.5:1236 +#: doc/tin.1:1523 doc/tin.5:1285 msgid "" "The character used to show that an article has not been read. Default is " "'+'." msgstr "" #. type: TP -#: doc/tin.1:1518 +#: doc/tin.1:1523 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1521 doc/tin.5:1239 +#: doc/tin.1:1526 doc/tin.5:1288 msgid "The character used to show that an article was read. Default is ' '." msgstr "" #. type: TP -#: doc/tin.1:1521 +#: doc/tin.1:1526 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1525 doc/tin.5:1243 +#: doc/tin.1:1530 doc/tin.5:1292 msgid "" "The character used to show that an article was killed. Default is 'K'. " "B must be set accordingly." msgstr "" #. type: TP -#: doc/tin.1:1525 +#: doc/tin.1:1530 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1529 doc/tin.5:1247 +#: doc/tin.1:1534 doc/tin.5:1296 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:1529 doc/tin.5:1247 +#: doc/tin.1:1534 doc/tin.5:1296 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1534 +#: doc/tin.1:1539 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 " @@ -3429,50 +3437,50 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1534 +#: doc/tin.1:1539 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1538 doc/tin.5:1258 +#: doc/tin.1:1543 doc/tin.5:1307 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:1538 +#: doc/tin.1:1543 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1542 doc/tin.5:1262 +#: doc/tin.1:1547 doc/tin.5:1311 msgid "" "If ON automatically list thread when entering it using right arrow key. " "Default is ON." msgstr "" #. type: TP -#: doc/tin.1:1542 +#: doc/tin.1:1547 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1545 doc/tin.1:2528 +#: doc/tin.1:1550 doc/tin.1:2550 msgid "Default is OFF." msgstr "" #. type: TP -#: doc/tin.1:1545 +#: doc/tin.1:1550 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1551 doc/tin.5:1271 +#: doc/tin.1:1556 doc/tin.5:1320 msgid "" "If ON articles/threads with ''Archive-name:'' in header will be " "automatically saved with the Archive-name & part/patch no and post processed " @@ -3481,13 +3489,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1551 +#: doc/tin.1:1556 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1556 doc/tin.5:1276 +#: doc/tin.1:1561 doc/tin.5:1325 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 " @@ -3495,13 +3503,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1556 +#: doc/tin.1:1561 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1561 doc/tin.5:1281 +#: doc/tin.1:1566 doc/tin.5:1330 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 " @@ -3509,13 +3517,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1561 +#: doc/tin.1:1566 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1566 +#: doc/tin.1:1571 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. " @@ -3523,13 +3531,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1566 +#: doc/tin.1:1571 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1572 doc/tin.5:1292 +#: doc/tin.1:1577 doc/tin.5:1341 msgid "" "Use this hash algorithm for cancel-locks. Only available when build with " "cancel-lock support. none disables the generation of cancel-locks. Valid " @@ -3537,312 +3545,323 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1572 +#: doc/tin.1:1577 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1578 doc/tin.5:1296 +#: doc/tin.1:1583 doc/tin.5:1345 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:1578 +#: doc/tin.1:1583 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1581 doc/tin.5:1299 +#: doc/tin.1:1586 doc/tin.5:1348 msgid "Standard background color" msgstr "" #. type: TP -#: doc/tin.1:1581 +#: doc/tin.1:1586 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1584 doc/tin.5:1302 +#: doc/tin.1:1589 doc/tin.5:1351 msgid "Color of quoted text from external sources" msgstr "" #. type: TP -#: doc/tin.1:1584 +#: doc/tin.1:1589 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1587 doc/tin.5:1305 +#: doc/tin.1:1592 doc/tin.5:1354 msgid "Color of sender (From:)" msgstr "" #. type: TP -#: doc/tin.1:1587 +#: doc/tin.1:1592 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1590 doc/tin.5:1308 +#: doc/tin.1:1595 doc/tin.5:1357 msgid "Color of header-lines" msgstr "" #. type: TP -#: doc/tin.1:1590 +#: doc/tin.1:1595 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1593 doc/tin.5:1311 +#: doc/tin.1:1598 doc/tin.5:1360 msgid "Color of help pages" msgstr "" #. type: TP -#: doc/tin.1:1593 +#: doc/tin.1:1598 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1596 doc/tin.5:1314 +#: doc/tin.1:1601 doc/tin.5:1363 msgid "Color of background for inverse text" msgstr "" #. type: TP -#: doc/tin.1:1596 +#: doc/tin.1:1601 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1599 doc/tin.5:1317 +#: doc/tin.1:1604 doc/tin.5:1366 msgid "Color of foreground for inverse text" msgstr "" #. type: TP -#: doc/tin.1:1599 +#: doc/tin.1:1604 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1607 doc/tin.5:1385 +msgid "Color of status messages in last line" +msgstr "" + +#. type: TP +#: doc/tin.1:1607 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1603 doc/tin.5:1321 +#: doc/tin.1:1611 doc/tin.5:1370 msgid "" "Color of words emphasized like _this_. See also B and " "B." msgstr "" #. type: TP -#: doc/tin.1:1603 +#: doc/tin.1:1611 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1607 doc/tin.5:1325 +#: doc/tin.1:1615 doc/tin.5:1374 msgid "" "Color of words emphasized like /this/. See also B and " "B." msgstr "" #. type: TP -#: doc/tin.1:1607 +#: doc/tin.1:1615 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1611 doc/tin.5:1329 +#: doc/tin.1:1619 doc/tin.5:1378 msgid "" "Color of words emphasized like *this*. See also B and " "B." msgstr "" #. type: TP -#: doc/tin.1:1611 +#: doc/tin.1:1619 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1615 doc/tin.5:1333 +#: doc/tin.1:1623 doc/tin.5:1382 msgid "" "Color of words emphasized like -this-. See also B and " "B." msgstr "" #. type: TP -#: doc/tin.1:1615 +#: doc/tin.1:1623 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1618 doc/tin.5:1336 +#: doc/tin.1:1626 doc/tin.5:1388 msgid "Color of mini help menu" msgstr "" #. type: TP -#: doc/tin.1:1618 +#: doc/tin.1:1626 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1621 doc/tin.5:1339 +#: doc/tin.1:1629 doc/tin.5:1391 msgid "Color of actual news header fields" msgstr "" #. type: TP -#: doc/tin.1:1621 +#: doc/tin.1:1629 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1624 doc/tin.5:1342 +#: doc/tin.1:1632 doc/tin.5:1394 msgid "Standard foreground color" msgstr "" #. type: TP -#: doc/tin.1:1624 +#: doc/tin.1:1632 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1627 doc/tin.5:1345 +#: doc/tin.1:1635 doc/tin.5:1397 msgid "Color of quoted lines" msgstr "" #. type: TP -#: doc/tin.1:1627 +#: doc/tin.1:1635 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1630 doc/tin.5:1348 +#: doc/tin.1:1638 doc/tin.5:1400 msgid "Color of twice quoted lines" msgstr "" #. type: TP -#: doc/tin.1:1630 +#: doc/tin.1:1638 #, no-wrap msgid "B3 times quoted line (col_quote3)>" msgstr "" #. type: Plain text -#: doc/tin.1:1633 doc/tin.5:1351 +#: doc/tin.1:1641 doc/tin.5:1403 msgid "Color of E=3 times quoted lines" msgstr "" #. type: TP -#: doc/tin.1:1633 +#: doc/tin.1:1641 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1637 doc/tin.5:1355 +#: doc/tin.1:1645 doc/tin.5:1407 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:1637 +#: doc/tin.1:1645 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1640 doc/tin.5:1358 +#: doc/tin.1:1648 doc/tin.5:1410 msgid "Color of signatures" msgstr "" #. type: TP -#: doc/tin.1:1640 +#: doc/tin.1:1648 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1643 doc/tin.5:1361 +#: doc/tin.1:1651 doc/tin.5:1413 msgid "Color of urls highlight" msgstr "" #. type: TP -#: doc/tin.1:1643 +#: doc/tin.1:1651 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1646 doc/tin.5:1364 +#: doc/tin.1:1654 doc/tin.5:1416 msgid "Color of verbatim blocks" msgstr "" #. type: TP -#: doc/tin.1:1646 +#: doc/tin.1:1654 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1649 doc/tin.5:1367 +#: doc/tin.1:1657 doc/tin.5:1419 msgid "Color of article subject" msgstr "" #. type: TP -#: doc/tin.1:1649 +#: doc/tin.1:1657 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1652 doc/tin.5:1370 +#: doc/tin.1:1660 doc/tin.5:1422 msgid "Color of text-lines" msgstr "" #. type: TP -#: doc/tin.1:1652 +#: doc/tin.1:1660 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1655 doc/tin.5:1373 +#: doc/tin.1:1663 doc/tin.5:1425 msgid "Color of help/mail sign" msgstr "" #. type: TP -#: doc/tin.1:1655 +#: doc/tin.1:1663 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1658 +#: doc/tin.1:1666 msgid "Ask for manual confirmation to protect the user." msgstr "" #. type: IP -#: doc/tin.1:1659 doc/tin.1:1665 doc/tin.1:1669 +#: doc/tin.1:1667 doc/tin.1:1673 doc/tin.1:1677 #, no-wrap msgid "\\(bu" msgstr "" #. TODO: check if all affected commands are marked [after confirmation] #. type: Plain text -#: doc/tin.1:1665 +#: doc/tin.1:1673 msgid "" "B Ask for confirmation before executing certain dangerous commands " "(e.g., B ('B')). Commands that this affects are marked in this " @@ -3850,21 +3869,21 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1669 +#: doc/tin.1:1677 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:1673 +#: doc/tin.1:1681 msgid "" "B: Ask for confirmation before marking all not selected (with " "B ('B') command) articles as read." msgstr "" #. type: Plain text -#: doc/tin.5:1394 +#: doc/tin.5:1446 msgid "Default is commands & quit." msgstr "" #. type: Plain text -#: doc/tin.5:1405 +#: doc/tin.5:1457 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 " @@ -10909,55 +11026,55 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1405 +#: doc/tin.5:1457 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1407 +#: doc/tin.5:1459 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1409 +#: doc/tin.5:1461 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1412 +#: doc/tin.5:1464 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1415 +#: doc/tin.5:1467 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1419 +#: doc/tin.5:1471 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1424 +#: doc/tin.5:1476 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1428 +#: doc/tin.5:1480 #, no-wrap msgid "B" msgstr "" #. type: ta -#: doc/tin.5:1433 doc/tin.5:1462 +#: doc/tin.5:1485 doc/tin.5:1514 #, no-wrap msgid "" "\\w'0,1 'u +\\w'\\'\\'Message-ID:\\'\\' & last \\'\\'References:\\'\\' " @@ -10965,7 +11082,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1442 doc/tin.5:1471 +#: doc/tin.5:1494 doc/tin.5:1523 #, no-wrap msgid "" "0\t''Subject:'' (case sensitive)\n" @@ -10979,139 +11096,139 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1444 +#: doc/tin.5:1496 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1448 +#: doc/tin.5:1500 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1453 +#: doc/tin.5:1505 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1457 +#: doc/tin.5:1509 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1473 +#: doc/tin.5:1525 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1475 +#: doc/tin.5:1527 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1477 +#: doc/tin.5:1529 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1479 +#: doc/tin.5:1531 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1481 +#: doc/tin.5:1533 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1483 +#: doc/tin.5:1535 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1485 +#: doc/tin.5:1537 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1487 +#: doc/tin.5:1539 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1489 +#: doc/tin.5:1541 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1491 +#: doc/tin.5:1543 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1493 +#: doc/tin.5:1545 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1495 +#: doc/tin.5:1547 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1497 +#: doc/tin.5:1549 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1499 +#: doc/tin.5:1551 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1501 +#: doc/tin.5:1553 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1503 +#: doc/tin.5:1555 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1505 +#: doc/tin.5:1557 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1507 +#: doc/tin.5:1559 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:1516 +#: doc/tin.5:1568 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., " @@ -11119,13 +11236,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1519 +#: doc/tin.5:1571 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:1526 +#: doc/tin.5:1578 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, " @@ -11133,19 +11250,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1526 +#: doc/tin.5:1578 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1530 +#: doc/tin.5:1582 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:1537 +#: doc/tin.5:1589 msgid "" "If B is E 0 not more than the last B " "articles/group are fetched from the server. If B is E 0 " @@ -11154,13 +11271,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1537 +#: doc/tin.5:1589 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:1551 +#: doc/tin.5:1603 msgid "" "Which keys B<\\%tin>(1) should accept to jump to the next unread article. " "Possible is any combination of B and B. When " @@ -11171,20 +11288,20 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1558 +#: doc/tin.5:1610 msgid "" "The format string used for the Group level. Default is \"%n\\ %m\\ %R\\ %L\\ " "\\ %s\\ \\ %F\". The following substitutions are supported:" msgstr "" #. type: ta -#: doc/tin.5:1560 +#: doc/tin.5:1612 #, no-wrap msgid "\\w'%G 'u +\\w'number of responses in thread'u" msgstr "" #. type: Plain text -#: doc/tin.5:1572 +#: doc/tin.5:1624 #, no-wrap msgid "" "%D\tdate\n" @@ -11201,31 +11318,31 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1574 +#: doc/tin.5:1626 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1584 +#: doc/tin.5:1636 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1591 +#: doc/tin.5:1643 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1597 +#: doc/tin.5:1649 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:1603 +#: doc/tin.5:1655 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, " @@ -11234,32 +11351,32 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1603 +#: doc/tin.5:1655 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1607 +#: doc/tin.5:1659 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1612 +#: doc/tin.5:1664 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:1616 +#: doc/tin.5:1668 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:1624 +#: doc/tin.5:1676 msgid "" "B is the 'traditional' behavior of B<\\%tin>(1). " "Only unread articles are killed once only by marking them read. As filtering " @@ -11269,104 +11386,104 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1640 +#: doc/tin.5:1692 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1650 +#: doc/tin.5:1702 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1655 +#: doc/tin.5:1707 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1674 +#: doc/tin.5:1726 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1711 +#: doc/tin.5:1763 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1723 doc/tin.5:2426 +#: doc/tin.5:1775 doc/tin.5:2492 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1756 +#: doc/tin.5:1808 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1761 +#: doc/tin.5:1813 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1766 +#: doc/tin.5:1818 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1771 +#: doc/tin.5:1823 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1776 +#: doc/tin.5:1828 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:1782 +#: doc/tin.5:1834 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: TP -#: doc/tin.5:1803 +#: doc/tin.5:1855 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:1806 +#: doc/tin.5:1858 msgid "Time in seconds to wait for a response from the server. Default is 120." msgstr "" #. type: TP -#: doc/tin.5:1806 +#: doc/tin.5:1858 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:1810 +#: doc/tin.5:1862 msgid "" "The normalization form which should be used to normalize unicode input. The " "possible values are:" msgstr "" #. type: Plain text -#: doc/tin.5:1828 +#: doc/tin.5:1880 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 " @@ -11374,7 +11491,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1856 +#: doc/tin.5:1908 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 " @@ -11382,7 +11499,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1862 +#: doc/tin.5:1914 msgid "" "This specifies whether to perform post processing on saved articles. " "Because the shell archive may contain commands you may not want to be " @@ -11391,7 +11508,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1870 +#: doc/tin.5:1922 msgid "" "B, unpacking of multi-part B<\\%shar>(1) files " "only. Because the shell archive may contain commands you may not want to be " @@ -11399,19 +11516,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1873 +#: doc/tin.5:1925 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1883 +#: doc/tin.5:1937 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:1893 +#: doc/tin.5:1947 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 " @@ -11420,20 +11537,20 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1901 +#: doc/tin.5:1955 msgid "" "If ON show empty ''Followup-To:'' header when editing an article. Default " "is OFF." msgstr "" #. type: TP -#: doc/tin.5:1906 +#: doc/tin.5:1960 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:1912 +#: doc/tin.5:1966 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 " @@ -11442,7 +11559,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1917 +#: doc/tin.5:1971 msgid "" "B Compress quote characters together when quoting multiple " "times (for example, 'E E E' will be turned into " @@ -11450,7 +11567,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1923 +#: doc/tin.5:1977 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 " @@ -11459,18 +11576,18 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1925 +#: doc/tin.5:1979 msgid "B This option is on by default." msgstr "" #. type: TP -#: doc/tin.5:1926 +#: doc/tin.5:1980 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:1933 +#: doc/tin.5:1987 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, then " @@ -11478,13 +11595,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1933 +#: doc/tin.5:1987 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:1940 +#: doc/tin.5:1994 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, then " @@ -11492,13 +11609,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1940 +#: doc/tin.5:1994 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:1947 +#: doc/tin.5:2001 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, then " @@ -11506,19 +11623,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1947 +#: doc/tin.5:2001 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1951 +#: doc/tin.5:2005 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:1958 +#: doc/tin.5:2012 msgid "" "If ON B<\\%tin>(1) does the rendering of bi-directional text. If OFF " "B<\\%tin>(1) leaves the rendering of bi-directional text to the " @@ -11526,62 +11643,62 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1958 +#: doc/tin.5:2012 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1967 +#: doc/tin.5:2021 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1971 +#: doc/tin.5:2025 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1975 +#: doc/tin.5:2029 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1979 +#: doc/tin.5:2033 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1983 +#: doc/tin.5:2037 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:1991 +#: doc/tin.5:2045 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:1995 +#: doc/tin.5:2049 msgid "" "The format string used for the Selection level. Default is \"%f\\ %n\\ %U\\ " "\\ %G\\ \\ %d\". The following substitutions are supported:" msgstr "" #. type: ta -#: doc/tin.5:1997 +#: doc/tin.5:2051 #, no-wrap msgid "\\w'%G 'u +\\w'current group number'u" msgstr "" #. type: Plain text -#: doc/tin.5:2004 +#: doc/tin.5:2058 #, no-wrap msgid "" "%G\tgroup name\n" @@ -11593,19 +11710,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2006 +#: doc/tin.5:2060 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:2037 +#: doc/tin.5:2091 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2046 +#: doc/tin.5:2100 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 " @@ -11616,19 +11733,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2068 +#: doc/tin.5:2122 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:2091 +#: doc/tin.5:2145 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2098 +#: doc/tin.5:2152 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -11636,19 +11753,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2144 +#: doc/tin.5:2198 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:2151 +#: doc/tin.5:2205 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2158 +#: doc/tin.5:2212 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -11656,31 +11773,50 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2163 +#: doc/tin.5:2217 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:2167 +#: doc/tin.5:2221 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:2176 +#: doc/tin.5:2230 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:2180 +#: doc/tin.5:2234 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.5:2240 +msgid "" +"A regular expression to find Subject prefixes like \"Re:\" to remove If " +"B is blank, then B<\\%tin>(1) uses a built-in default." +msgstr "" + +#. type: TP +#: doc/tin.5:2240 +#, no-wrap +msgid "B" +msgstr "" + +#. type: TP +#: doc/tin.5:2246 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2187 +#: doc/tin.5:2253 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -11688,7 +11824,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2192 +#: doc/tin.5:2258 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 " @@ -11696,7 +11832,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2202 +#: doc/tin.5:2268 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 " @@ -11708,20 +11844,20 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2206 +#: doc/tin.5:2272 msgid "" "The format string used for the Thread level. Default is \"%n\\ %m\\ \\ " "[%L]\\ \\ %T\\ \\ %F\". The following substitutions are supported:" msgstr "" #. type: ta -#: doc/tin.5:2208 +#: doc/tin.5:2274 #, no-wrap msgid "\\w'%G 'u +\\w'from, name and/or address'u" msgstr "" #. type: Plain text -#: doc/tin.5:2219 +#: doc/tin.5:2285 #, no-wrap msgid "" "%D\tdate\n" @@ -11737,7 +11873,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2226 +#: doc/tin.5:2292 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 " @@ -11745,19 +11881,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2230 +#: doc/tin.5:2296 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:2242 +#: doc/tin.5:2308 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2256 +#: doc/tin.5:2322 msgid "" "Allows you to select how B<\\%tin>(1) treats blank lines in article " "bodies. Default is 0. This option does not affect lines within verbatim " @@ -11765,13 +11901,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2275 +#: doc/tin.5:2341 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2282 +#: doc/tin.5:2348 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -11779,66 +11915,66 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2282 +#: doc/tin.5:2348 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2286 +#: doc/tin.5:2352 msgid "" "If ON remove I<${TIN_HOMEDIR:-\"$HOME\"}/.article> after posting. Default is " "ON." msgstr "" #. type: TP -#: doc/tin.5:2286 +#: doc/tin.5:2352 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:2291 +#: doc/tin.5:2357 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:2294 +#: doc/tin.5:2360 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2299 +#: doc/tin.5:2365 msgid "If enabled B<\\%tin>(1) uses ANSI-colors. Default is OFF." msgstr "" #. type: TP -#: doc/tin.5:2299 +#: doc/tin.5:2365 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2302 +#: doc/tin.5:2368 msgid "Use scroll keys on keypad. Default is OFF." msgstr "" #. type: TP -#: doc/tin.5:2302 +#: doc/tin.5:2368 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:2308 +#: doc/tin.5:2374 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2320 +#: doc/tin.5:2386 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 " @@ -11847,45 +11983,45 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2320 +#: doc/tin.5:2386 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:2324 +#: doc/tin.5:2390 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2328 +#: doc/tin.5:2394 msgid "" "A regular expression that B will use to find the begin of a verbatim " "block. Default is #v+" msgstr "" #. type: TP -#: doc/tin.5:2328 +#: doc/tin.5:2394 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2332 +#: doc/tin.5:2398 msgid "" "A regular expression that B will use to find the end of a verbatim " "block. Default is #v-" msgstr "" #. type: TP -#: doc/tin.5:2335 +#: doc/tin.5:2401 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2351 +#: doc/tin.5:2417 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 " @@ -11897,31 +12033,31 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2351 +#: doc/tin.5:2417 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:2363 +#: doc/tin.5:2429 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:2371 +#: doc/tin.5:2437 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:2387 +#: doc/tin.5:2453 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2403 +#: doc/tin.5:2469 msgid "" "Yet another global configuration file with \"I=I\" " "pairs. This one is for the more general options which usually can't be " @@ -11931,31 +12067,31 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2403 +#: doc/tin.5:2469 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2406 +#: doc/tin.5:2472 msgid "Sets a global domain name used in From lines" msgstr "" #. type: Plain text -#: doc/tin.5:2410 +#: doc/tin.5:2476 msgid "" "Defines the name of your organization. $B overrides any " "specified value." msgstr "" #. type: TP -#: doc/tin.5:2410 +#: doc/tin.5:2476 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2415 +#: doc/tin.5:2481 msgid "" "Defines the default place for some configuration files, common values are " "I, I, I or " @@ -11963,13 +12099,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2415 +#: doc/tin.5:2481 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2421 +#: doc/tin.5:2487 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 " @@ -11978,43 +12114,43 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2421 +#: doc/tin.5:2487 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2426 +#: doc/tin.5:2492 msgid "Defines the directory containing the B<\\%inews>(1) executable." msgstr "" #. type: Plain text -#: doc/tin.5:2430 +#: doc/tin.5:2496 msgid "" "Default charset to be used in MIME's ''Content-Type:'' " "header. $B overrides any specified value." msgstr "" #. type: Plain text -#: doc/tin.5:2433 +#: doc/tin.5:2499 msgid "Default encoding scheme used in MIME articles. 8bit might be the best value." msgstr "" #. type: Plain text -#: doc/tin.5:2437 +#: doc/tin.5:2503 msgid "" "Default encoding scheme used in MIME letters. quoted-printable is a good " "choice here." msgstr "" #. type: TP -#: doc/tin.5:2437 +#: doc/tin.5:2503 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2443 +#: doc/tin.5:2509 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) " @@ -12022,26 +12158,26 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2443 +#: doc/tin.5:2509 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2447 +#: doc/tin.5:2513 msgid "" "Don't generate a ''Sender:'' header. This has an effect only if " "B is set to --internal." msgstr "" #. type: TP -#: doc/tin.5:2447 +#: doc/tin.5:2513 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2452 +#: doc/tin.5:2518 msgid "" "Base of your newsspool (Bnews, Cnews and INN traditional spool style), " "common values are I, I, I. " @@ -12049,13 +12185,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2452 +#: doc/tin.5:2518 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2460 +#: doc/tin.5:2526 msgid "" "Base of your NOV database B<\\%newsoverview>(5) (tradspool style; might be " "the same dir as I), common values are I, " @@ -12064,26 +12200,26 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2460 +#: doc/tin.5:2526 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2464 +#: doc/tin.5:2530 msgid "" "Name of a single overview file, common values are I<.overview>, " "I. $B overrides any specified value." msgstr "" #. type: TP -#: doc/tin.5:2464 +#: doc/tin.5:2530 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2469 +#: doc/tin.5:2535 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 " @@ -12091,13 +12227,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2469 +#: doc/tin.5:2535 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2475 +#: doc/tin.5:2541 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 " @@ -12106,13 +12242,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2475 +#: doc/tin.5:2541 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2480 +#: doc/tin.5:2546 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 " @@ -12120,13 +12256,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2480 +#: doc/tin.5:2546 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2485 +#: doc/tin.5:2551 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 " @@ -12134,13 +12270,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2485 +#: doc/tin.5:2551 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2490 +#: doc/tin.5:2556 msgid "" "Full pathname of your newssystem's subscriptions file; usually the " "subscriptions file is in I, so you only have to change this " @@ -12148,19 +12284,19 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2494 +#: doc/tin.5:2560 msgid "I" msgstr "" #. type: Plain text -#: doc/tin.5:2498 +#: doc/tin.5:2564 msgid "" "translation into language specified in $B, $B or " "$B" msgstr "" #. type: Plain text -#: doc/tin.5:2512 +#: doc/tin.5:2578 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 " @@ -12170,7 +12306,7 @@ msgstr "" #. TODO: IIRC tin issues just a warning in that case? #. type: Plain text -#: doc/tin.5:2517 +#: doc/tin.5:2583 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 " @@ -12178,37 +12314,37 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2520 +#: doc/tin.5:2586 msgid "" "Each line consists of four space-separated fields \"I I " "I I\"." msgstr "" #. type: TP -#: doc/tin.5:2520 doc/tin.5:2573 +#: doc/tin.5:2586 doc/tin.5:2639 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:2523 +#: doc/tin.5:2589 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2526 +#: doc/tin.5:2592 msgid "is the highest article number that has been used in that newsgroup" msgstr "" #. type: TP -#: doc/tin.5:2526 +#: doc/tin.5:2592 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2533 +#: doc/tin.5:2599 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 " @@ -12218,90 +12354,90 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2533 +#: doc/tin.5:2599 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2536 +#: doc/tin.5:2602 msgid "can be one of those" msgstr "" #. type: TP -#: doc/tin.5:2537 +#: doc/tin.5:2603 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2540 +#: doc/tin.5:2606 msgid "local postings are allowed" msgstr "" #. type: TP -#: doc/tin.5:2540 +#: doc/tin.5:2606 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2543 +#: doc/tin.5:2609 msgid "no local postings are allowed, only remote ones" msgstr "" #. type: TP -#: doc/tin.5:2543 +#: doc/tin.5:2609 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2546 +#: doc/tin.5:2612 msgid "the group is moderated and all postings must be approved" msgstr "" #. type: TP -#: doc/tin.5:2546 +#: doc/tin.5:2612 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2549 +#: doc/tin.5:2615 msgid "articles in this group are not kept, but only passed on" msgstr "" #. type: TP -#: doc/tin.5:2549 +#: doc/tin.5:2615 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2552 +#: doc/tin.5:2618 msgid "articles cannot be posted to this newsgroup" msgstr "" #. type: TP -#: doc/tin.5:2552 +#: doc/tin.5:2618 #, no-wrap msgid "B<=foo.bar>" msgstr "" #. type: Plain text -#: doc/tin.5:2555 +#: doc/tin.5:2621 msgid "articles are locally filed into the ''foo.bar'' group" msgstr "" #. type: TP -#: doc/tin.5:2556 doc/tin.5:2583 doc/tin.5:2606 +#: doc/tin.5:2622 doc/tin.5:2649 doc/tin.5:2672 #, no-wrap msgid "B<\\%tin>(1)" msgstr "" #. type: Plain text -#: doc/tin.5:2562 +#: doc/tin.5:2628 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 " @@ -12309,7 +12445,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2573 +#: doc/tin.5:2639 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 " @@ -12318,25 +12454,25 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2580 +#: doc/tin.5:2646 msgid "" "is the time when the group was created, expressed as the number of seconds " "since the Epoch." msgstr "" #. type: TP -#: doc/tin.5:2580 +#: doc/tin.5:2646 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:2583 +#: doc/tin.5:2649 msgid "is the electronic mail address of the person who created the group." msgstr "" #. type: Plain text -#: doc/tin.5:2589 +#: doc/tin.5:2655 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) " @@ -12344,7 +12480,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2600 +#: doc/tin.5:2666 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 " @@ -12353,7 +12489,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2612 +#: doc/tin.5:2678 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 " @@ -12361,14 +12497,14 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2621 +#: doc/tin.5:2687 msgid "" "This file might hold a default organization to be used in the " "''Organization:'' header. $B has a higher priority if set." msgstr "" #. type: Plain text -#: doc/tin.5:2639 +#: doc/tin.5:2705 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 " @@ -12379,7 +12515,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2654 +#: doc/tin.5:2720 msgid "" "This file contains a list of newsgroups \\(em one per line \\(em which the " "client should subscribe to when the user has no " @@ -12390,7 +12526,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2701 +#: doc/tin.5:2767 msgid "" "B<\\%elm>(1), B<\\%inews>(1), B<\\%ispell>(1), B<\\%lp>(1), B<\\%lpr>(1), " "B<\\%metamail>(1), B<\\%perl>(1), B<\\%perlre>(1), B<\\%pgp>(1), " diff -Nurp '--exclude=.bzr*' tin-2.4.4/doc/rcvars.txt tin-2.4.5/doc/rcvars.txt --- tin-2.4.4/doc/rcvars.txt 2017-05-03 19:47:32.000000000 +0200 +++ tin-2.4.5/doc/rcvars.txt 2020-06-19 09:39:10.367169991 +0200 @@ -6,7 +6,7 @@ Adding new tinrc variables: . Add an entry for it to the tin.1 man page under the "GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES" section and one to the tin.5 man page under the "FILES" section (subsection tinrc) -. Add NAME with the correct type to the master declaration in tinrc.h +. Add NAME with the correct type to the main declaration in tinrc.h . Add an initial value for NAME in the correct position in t_config tinrc={}; in init.c . In config.c/options_menu.c, add the following: diff -Nurp '--exclude=.bzr*' tin-2.4.4/doc/tin.1 tin-2.4.5/doc/tin.1 --- tin-2.4.4/doc/tin.1 2019-12-24 10:51:22.000000000 +0100 +++ tin-2.4.5/doc/tin.1 2020-12-01 11:58:29.643923701 +0100 @@ -3,13 +3,13 @@ .\" Module : tin.1 .\" Author : I. Lea, U. Janssen .\" Created : 1991-08-23 -.\" Updated : 2019-12-24 +.\" Updated : 2020-11-17 .\" Notes : use american english; still needs some work, e.g.: .\" - document authorization (.newsauth) .\" - document random organization feature .\" .\" -.TH tin 1 "December 24th, 2019" "2.4.4" "Usenet newsreader" +.TH tin 1 "December 24th, 2020" "2.4.5" "Usenet newsreader" .\" .\" .SH NAME @@ -194,7 +194,7 @@ Don't check for new newsgroups and skip .TP .B \-Q Quick start. Start \fBtin\fP as quickly as possible. Currently this is -equivalent to ''\fB\-nqd\fP''. +equivalent to ''\fB\-dnq\fP''. .TP .B \-r Read news remotely from the default NNTP server specified in the environment @@ -219,7 +219,7 @@ option. This option is disabled if \fBti NNTP server and \fBcache_overview_files\fP is turned off. .TP .B \-v -Verbose mode for ''\fB\-D\fP'', ''\fB\-c\fP'', ''\fB\-M\fP'', ''\fB\-N\fP'', +Verbose mode for ''\fB\-c\fP'', ''\fB\-D\fP'', ''\fB\-M\fP'', ''\fB\-N\fP'', \&''\fB\-S\fP'', ''\fB\-u\fP'' and ''\fB\-Z\fP'' options. Can be used multiple times to increase verbosity. .TP @@ -538,7 +538,7 @@ search on this screen. \fBQuit\fP ('\fBq .TP .B Version 'v' Print \fBtin\fP version information. -.\"-------------------------------------------------------------------- +.\" ------------------------------------------------------------------- .\" .SS "NEWSGROUP SELECTION COMMANDS" .TP 10 @@ -673,7 +673,7 @@ to see if any new news has arrived since .TP .B SelectMarkGrpUnread 'z' 'Z' Mark all articles in the current group as unread. -.\"-------------------------------------------------------------------- +.\" ------------------------------------------------------------------- .\" .SS "GROUP INDEX COMMANDS" All searches in this level are limited to unread articles if in @@ -888,7 +888,8 @@ Toggle tag-status of current article / t ('\fBs\fP') / \fBGroupRepost\fP ('\fBx\fP'). .TP .B GroupTagParts 'T' -Automatically tag in order all the parts of the current multi-part message. +Automatically tag/untag all the parts of the current multi-part message in +order. .TP .B GroupToggleThreading 'u' Cycle the threading mode through no threading, threading by subject, @@ -926,7 +927,7 @@ Mark current article as unread. Mark current thread as unread. If a range of threads is set, the range will be marked as unread instead of the current thread. When tagged threads are present, a prompt asks how to proceed. -.\"-------------------------------------------------------------------- +.\" ------------------------------------------------------------------- .\" .SS "THREAD LISTING COMMANDS" .\" this sections should be complete @@ -1070,6 +1071,10 @@ Save marked articles automatically witho Toggle tag status of current article for mailing, piping, printing, saving or reposting. .TP +.B ThreadTagParts 'T' +Automatically tag/untag all the parts of the current multi-part message in +order. +.TP .B ThreadUntag 'U' Untag all tagged threads. .TP @@ -1087,7 +1092,7 @@ tagged articles are present, a prompt as .TP .B MarkThdUnread 'Z' Mark all articles in thread as unread. -.\"-------------------------------------------------------------------- +.\" ------------------------------------------------------------------- .\" .SS "ARTICLE VIEWER COMMANDS" .\" FIXME - refine descriptions @@ -1344,7 +1349,7 @@ Mark article as unread. .TP .B MarkThdUnread 'Z' Mark the current thread as unread. -.\"-------------------------------------------------------------------- +.\" ------------------------------------------------------------------- .\" .SS "URL LISTING" \fBPageViewUrl\fP ('\fBU\fP') displays a list of URLs in the current @@ -1376,7 +1381,7 @@ Help screen of commands available. .B ToggleHelpDisplay 'H' Toggle the display of help mini menu at the bottom of the screen. .RE -.\"-------------------------------------------------------------------- +.\" ------------------------------------------------------------------- .\" .SS "ATTACHMENT LISTING" \fBPageViewAttach\fP ('\fBV\fP') displays a list of attachments of the current @@ -1430,7 +1435,7 @@ Help screen of commands available. .B ToggleHelpDisplay 'H' Toggle the display of help mini menu at the bottom of the screen. .RE -.\"-------------------------------------------------------------------- +.\" ------------------------------------------------------------------- .\" .SS "GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES" .\" FIXME - add missing descriptions @@ -1597,6 +1602,9 @@ Color of background for inverse text .B Color for inverse text (foreground) (col_invers_fg) Color of foreground for inverse text .TP +.B Color of status messages (col_message) +Color of status messages in last line +.TP .B Color of highlighting with _dash_ (col_markdash) Color of words emphasized like _this_. See also \fBword_h_display_marks\fP and \fBword_highlight\fP. @@ -2137,10 +2145,12 @@ files only. .RE .TP .B Filename to be used for storing posted articles (posted_articles_file) -Keep posted articles in -\fI${TIN_HOMEDIR:\-"$HOME"}/Mail/\fBposted_articles_file\fP\fR. -If no filename is set then postings will not be saved. -Default is 'posted'. +Keep posted articles in given file. If the given filename does not contain +any expandable strings it will be prefixed with +\fI${TIN_HOMEDIR:\-"$HOME"}/Mail/\fP. If no filename is set then postings +will not be saved. See the section "MAILING PIPING PRINTING +REPOSTING AND SAVING ARTICLES" for more information about the various +expansion characters. Default is 'posted'. .TP .B Print all headers when printing (print_header) If ON, then the full article header is sent to the printer. Otherwise only @@ -2411,6 +2421,18 @@ Keep). If ON, then unsubscribed groups will be permanently removed from your \fI${TIN_HOMEDIR:\-"$HOME"}/.newsrc\fR file. Default is OFF. .TP +.B Regex with Subject prefixes (strip_re_regex) +A regular expression to find Subject prefixes like "Re:" to remove. +If \fBstrip_re_regex\fP is blank, then +.BR \%tin (1) +uses a built-in default. +.TP +.B Regex with Subject suffixes (strip_was_regex) +A regular expression to find Subject suffixes like "(was:" to remove. +If \fBstrip_was_regex\fP is blank, then +.BR \%tin (1) +uses a built-in default. +.TP .B Regex used to highlight \-strokes\- (strokes_regex) A regular expression that will be applied when reading articles. All matching words are shown in \fBcol_markstroke\fP or \fBmono_markstroke\fP. @@ -2823,7 +2845,7 @@ but without \fBsavedir\fP prefixed. %P i with all '.' replaced by '/'. .PP If saving multiple files at once the filename (if not referring to a mailbox) -will be extended by ".num" where "num" is a at least 3 digit number counting +will be extended by ".num" where "num" is at least 3 digit number counting up from 1. Environment variables are allowed within a filename (e.g., \fI$SOURCES/dir/filename\fR). .PP @@ -3204,7 +3226,7 @@ with \fBtin \-u \-v\fP and go for a coff group will only need to do incremental updating of the index file and will be much faster as only new articles will need to be cached. .PP -As indexing might take some time you may want to run \fBtin\fP form +As indexing might take some time you may want to run \fBtin\fP from the system batcher .BR \%cron (8) with the ''\fB\-u\fP'' option: @@ -3388,7 +3410,7 @@ For a detailed description see .\" .SH ENVIRONMENT .\" TODO: - sort in a useful order -.\" - add undocumented env-vars (if any) +.\" - add undocumented env-vars (e.g. DEV_TCP (SCO)) .TP .B TINRC Define this variable if you want to specify command-line options that @@ -3835,7 +3857,6 @@ Urs Janssen .\" .\" .SH "SEE ALSO" -.BR \%cron (8), .BR \%elm (1), .BR \%emacs (1), .BR \%gpg (1), @@ -3875,6 +3896,7 @@ Urs Janssen .BR \%mmdf (5), .BR \%newsoverview (5), .BR \%tin (5), +.BR \%cron (8), .BR RFC\%1345 , .BR RFC\%1524 , .BR RFC\%2045 , diff -Nurp '--exclude=.bzr*' tin-2.4.4/doc/tin.5 tin-2.4.5/doc/tin.5 --- tin-2.4.4/doc/tin.5 2019-12-24 10:51:38.000000000 +0100 +++ tin-2.4.5/doc/tin.5 2020-12-01 11:58:41.004349207 +0100 @@ -2,11 +2,11 @@ .\" Module : tin.5 .\" Author : U. Janssen .\" Created : 2000-07-10 -.\" Updated : 2019-12-24 +.\" Updated : 2020-11-10 .\" Notes : needs a some work .\" .\" -.TH tin 5 "December 24th, 2019" "2.4.4" "Usenet newsreader" +.TH tin 5 "December 24th, 2020" "2.4.5" "Usenet newsreader" .SH NAME tin, rtin \- related files @@ -764,7 +764,7 @@ comments as those lines are ignored and on the next write of the file. .TP .B group -A comma-separated list of newsgroup patterns (wildmat-style) to which +A comma-separated list of newsgroup patterns in wildmat-style to which groups the filter rule will be applied. This line is mandatory! .TP .B case @@ -774,7 +774,8 @@ groups the filter rule will be applied. Score value of the rule; can also be one of the magic words "kill" or "hot". .TP .B subj -Match against ''Subject:'' +Match against ''Subject:''. The matching type used (wildmat or regex) depends +on the setting of the tinrc variable \fBwildcard\fP. .TP .B from Match against ''From:''. @@ -782,36 +783,83 @@ Match against ''From:''. converts the contents of the ''From:'' header to an old style e-mail address, e.g. ''some@body.example (John Doe)'' instead of ''John Doe '', before trying to match the patterns in -the filter rule. +the filter rule. The matching type used (wildmat or regex) depends on the +setting of the tinrc variable \fBwildcard\fP. .TP .B msgid -Match against ''Message\-ID:'' and full ''References:'' +Match against ''Message\-ID:'' and full ''References:''. The matching type +used (wildmat or regex) depends on the setting of the tinrc +variable \fBwildcard\fP. .TP .B msgid_last -Match against ''Message\-ID:'' and last ''References:'' entry only +Match against ''Message\-ID:'' and last ''References:'' entry only. The +matching type used (wildmat or regex) depends on the setting of the tinrc +variable \fBwildcard\fP. .TP .B msgid_only -Match against ''Message\-ID:'' +Match against ''Message\-ID:''. The matching type used (wildmat or regex) +depends on the setting of the tinrc variable \fBwildcard\fP. .TP .B refs_only -Match against ''References:'' +Match against ''References:''. The matching type used (wildmat or regex) +depends on the setting of the tinrc variable \fBwildcard\fP. .TP .B lines Match against ''Lines:'', num matches more than. .TP -.\" TODO: document option in detail .B gnksa -Match against ''From:'' address parser return codes. +Match against ''From:'' address parser return codes. num matches more than the returned numeric value. GNKSA_LOCAL_DOMAIN_LITERAL +or GNKSA_INVALID_DOMAIN are only returned if \fBdisable_gnksa_domain_check\fP +is set to false. As the built in domain list is outdated this should be +considered carefully. +.in +.3i +.nf +.ta \w'%406 'u +\w'GNKSA_ZERO_LENGTH_LOCAL_WORD'u +\fB 0\fP GNKSA_OK +\fB 1\fP GNKSA_INTERNAL_ERROR +\fB100\fP GNKSA_LANGLE_MISSING +\fB101\fP GNKSA_LPAREN_MISSING +\fB102\fP GNKSA_RPAREN_MISSING +\fB103\fP GNKSA_ATSIGN_MISSING +\fB104\fP GNKSA_RANGLE_MISSING +\fB200\fP GNKSA_SINGLE_DOMAIN +\fB201\fP GNKSA_INVALID_DOMAIN +\fB202\fP GNKSA_ILLEGAL_DOMAIN +\fB203\fP GNKSA_UNKNOWN_DOMAIN +\fB204\fP GNKSA_INVALID_FQDN_CHAR +\fB205\fP GNKSA_ZERO_LENGTH_LABEL +\fB206\fP GNKSA_ILLEGAL_LABEL_LENGTH +\fB207\fP GNKSA_ILLEGAL_LABEL_HYPHEN +\fB208\fP GNKSA_ILLEGAL_LABEL_BEGNUM +\fB209\fP GNKSA_BAD_DOMAIN_LITERAL +\fB210\fP GNKSA_LOCAL_DOMAIN_LITERAL +\fB211\fP GNKSA_RBRACKET_MISSING +\fB300\fP GNKSA_LOCALPART_MISSING +\fB301\fP GNKSA_INVALID_LOCALPART +\fB302\fP GNKSA_ZERO_LENGTH_LOCAL_WORD +\fB400\fP GNKSA_ILLEGAL_UNQUOTED_CHAR +\fB401\fP GNKSA_ILLEGAL_QUOTED_CHAR +\fB402\fP GNKSA_ILLEGAL_ENCODED_CHAR +\fB403\fP GNKSA_BAD_ENCODE_SYNTAX +\fB404\fP GNKSA_ILLEGAL_PAREN_CHAR +\fB405\fP GNKSA_INVALID_REALNAME +\fB406\fP GNKSA_MISSING_REALNAME +.fi +.in -.3i .TP .B xref 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 separated newsgroup list with all other information (i.e. -the article counter) removed. +the article counter) removed. The matching type used (wildmat or regex) +depends on the setting of the tinrc variable \fBwildcard\fP. .TP .\" TODO: document option in detail .B path -Match against ''Path:'' line. This may not work on some servers. +Match against ''Path:'' line. This may not work on some servers. The +matching type used (wildmat or regex) depends on the setting of the tinrc +variable \fBwildcard\fP. .TP .B time time_t value when rule expires @@ -1061,6 +1109,7 @@ their defaults. If a keyname is bound to \fBThreadMail\fP m \fBThreadSave\fP s \fBThreadTag\fP t +\fBThreadTagParts\fP T \fBThreadUndoSel\fP ~ .sp \fBUrlSelect\fP ^J ^M @@ -1331,6 +1380,9 @@ and \fBword_highlight\fP. Color of words emphasized like \-this\-. See also \fBword_h_display_marks\fP and \fBword_highlight\fP. .TP +.B col_message +Color of status messages in last line +.TP .B col_minihelp Color of mini help menu .TP @@ -1872,10 +1924,12 @@ not want to be executed, be careful with .RE .TP .B posted_articles_file -Keep posted articles in -\fI${TIN_HOMEDIR:\-"$HOME"}/Mail/\fBposted_articles_file\fP\fR. -If no filename is set then postings will not be saved. -Default is 'posted'. +Keep posted articles in given file. If the given filename does not contain +any expandable strings it will be prefixed with +\fI${TIN_HOMEDIR:\-"$HOME"}/Mail/\fP. If no filename is set then postings +will not be saved. See the section "MAILING PIPING PRINTING +REPOSTING AND SAVING ARTICLES" for more information about the various +expansion characters. Default is 'posted'. .TP .B print_header If ON, then the full article header is sent to the printer. Otherwise only @@ -2178,6 +2232,18 @@ Keep). If ON, then unsubscribed groups will be permanently removed from your \fI${TIN_HOMEDIR:\-"$HOME"}/.newsrc\fR file. Default is OFF. .TP +.B strip_re_regex +A regular expression to find Subject prefixes like "Re:" to remove +If \fBstrip_re_regex\fP is blank, then +.BR \%tin (1) +uses a built-in default. +.TP +.B strip_was_regex +A regular expression to find Subject suffixes like "(was:" to remove. +If \fBstrip_was_regex\fP is blank, then +.BR \%tin (1) +uses a built-in default. +.TP .B strokes_regex A regular expression that will be applied when reading articles. All matching words are shown in \fBcol_markstroke\fP or \fBmono_markstroke\fP. diff -Nurp '--exclude=.bzr*' tin-2.4.4/doc/tinews.1 tin-2.4.5/doc/tinews.1 --- tin-2.4.4/doc/tinews.1 2018-12-20 00:06:32.000000000 +0100 +++ tin-2.4.5/doc/tinews.1 2020-12-24 01:20:07.531452304 +0100 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "tinews.pl 1" -.TH tinews.pl 1 "December 19th, 2018" "1.1.50" "Post and sign an article via NNTP" +.TH tinews.pl 1 "December 24th, 2020" "1.1.57" "Post and sign an article via NNTP" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -159,7 +159,8 @@ to the article and send out the mail-cop If a Cancel-Lock secret file is defined it will automatically add a Cancel-Lock: (and Cancel-Key: if required) header. .PP -The input should have unix line endings (<\s-1LF\s0>, '\en'). +The input should have unix line endings (<\s-1LF\s0>, '\en'). Use \-\-\fBtransform\fR +to convert from <\s-1CR\s0><\s-1LF\s0> to just <\s-1LF\s0>. .SH "OPTIONS" .IX Xref "tinews, command-line options" .IX Header "OPTIONS" @@ -216,10 +217,10 @@ Set the article header field Organizatio .IX Xref "-p --port" .IX Item "-p port | --port port" use \f(CW\*(C`port\*(C'\fR as NNTP-port -.ie n .IP "\-\fBr\fR ""Reply\-To"" | \-\-\fBreplyto\fR ""Reply\-To""" 4 -.el .IP "\-\fBr\fR \f(CWReply\-To\fR | \-\-\fBreplyto\fR \f(CWReply\-To\fR" 4 -.IX Xref "-r --replyto" -.IX Item "-r Reply-To | --replyto Reply-To" +.ie n .IP "\-\fBr\fR ""Reply\-To"" | \-\-\fBreply-to\fR ""Reply\-To""" 4 +.el .IP "\-\fBr\fR \f(CWReply\-To\fR | \-\-\fBreply-to\fR \f(CWReply\-To\fR" 4 +.IX Xref "-r --reply-to" +.IX Item "-r Reply-To | --reply-to Reply-To" Set the article header field Reply-To: to the given value. .IP "\-\fBs\fR \fIdirectory\fR | \-\-\fBsavedir\fR \fIdirectory\fR" 4 .IX Xref "-s --savedir" @@ -230,20 +231,27 @@ Save signed article to directory \fIdire .IX Xref "-t --subject" .IX Item "-t Subject | --subject Subject" Set the article header field Subject: to the given value. -.IP "\-\fBv\fR | \-\-\fBversion\fR" 4 -.IX Xref "-v --version" -.IX Item "-v | --version" -Show version. -.ie n .IP "\-\fBw\fR ""Followup\-To"" | \-\-\fBfollowupto\fR ""Followup\-To""" 4 -.el .IP "\-\fBw\fR \f(CWFollowup\-To\fR | \-\-\fBfollowupto\fR \f(CWFollowup\-To\fR" 4 -.IX Xref "-w --followupto" -.IX Item "-w Followup-To | --followupto Followup-To" +.IP "\-\fBv\fR | \-\-\fBverbose\fR" 4 +.IX Xref "-v --verbose" +.IX Item "-v | --verbose" +Warn about disabled options due to lacking perl-modules or executables and +unreadable files and enable warnings about raw 8\-bit data. +.ie n .IP "\-\fBw\fR ""Followup\-To"" | \-\-\fBfollowup-to\fR ""Followup\-To""" 4 +.el .IP "\-\fBw\fR \f(CWFollowup\-To\fR | \-\-\fBfollowup-to\fR \f(CWFollowup\-To\fR" 4 +.IX Xref "-w --followup-to" +.IX Item "-w Followup-To | --followup-to Followup-To" Set the article header field Followup-To: to the given value. .ie n .IP "\-\fBx\fR ""Path"" | \-\-\fBpath\fR ""Path""" 4 .el .IP "\-\fBx\fR \f(CWPath\fR | \-\-\fBpath\fR \f(CWPath\fR" 4 .IX Xref "-x --path" .IX Item "-x Path | --path Path" Set the article header field Path: to the given value. +.IP "\-\fBD\fR | \-\fBN\fR | \-\-\fBdebug\fR" 4 +.IX Xref "-D -N --debug" +.IX Item "-D | -N | --debug" +Set \fINet::NNTP\fR\|(3pm) to debug mode, enable warnings about raw 8\-bit data, +warn about disabled options due to lacking perl-modules or executables and +unreadable files. .IP "\-\fBH\fR | \-\-\fBhelp\fR" 4 .IX Xref "-H --help" .IX Item "-H | --help" @@ -256,12 +264,10 @@ Do not add Injection-Date: header. .IX Xref "-L --no-canlock" .IX Item "-L | --no-canlock" Do not add Cancel-Lock: / Cancel-Key: headers. -.ie n .IP "\-\-\fBcanlock-algorithm\fR ""Algorithm""" 4 -.el .IP "\-\-\fBcanlock-algorithm\fR \f(CWAlgorithm\fR" 4 -.IX Xref "--canlock-algorithm" -.IX Item "--canlock-algorithm Algorithm" -Digest algorithm used for Cancel-Lock: / Cancel-Key: headers. -Supported algorithms are sha1, sha256 and sha512. Default is sha1. +.IP "\-\fBO\fR | \-\-\fBno-organization\fR" 4 +.IX Xref "-O --no-organization" +.IX Item "-O | --no-organization" +Do not add Organization: header. .IP "\-\fBR\fR | \-\-\fBno-control\fR" 4 .IX Xref "-R --no-control" .IX Item "-R | --no-control" @@ -278,6 +284,26 @@ Do not sign the article. .IX Xref "-Y --force-auth" .IX Item "-Y | --force-auth" Force authentication on connect even if not required by the server. +.ie n .IP "\-\-\fBcanlock-algorithm\fR ""Algorithm""" 4 +.el .IP "\-\-\fBcanlock-algorithm\fR \f(CWAlgorithm\fR" 4 +.IX Xref "--canlock-algorithm" +.IX Item "--canlock-algorithm Algorithm" +Digest algorithm used for Cancel-Lock: / Cancel-Key: headers. +Supported algorithms are sha1, sha256 and sha512. Default is sha1. +.IP "\-\-\fBssl\fR | \-\-\fBnntps\fR" 4 +.IX Xref "--ssl --nntps" +.IX Item "--ssl | --nntps" +Use \s-1NNTPS \s0(via port 563) if available. This requires a recent version +of \fINet::NNTP\fR\|(3pm) and \fIIO::Socket::SSL\fR\|(3pm). Be aware that no \s-1SSL\s0 +verification will be done. +.IP "\-\-\fBtransform\fR" 4 +.IX Xref "--transform" +.IX Item "--transform" +Convert network line endings (<\s-1CR\s0><\s-1LF\s0>) to unix line endings (<\s-1LF\s0>). +.IP "\-\-\fBversion\fR" 4 +.IX Xref "--version" +.IX Item "--version" +Show version. .IP "\-\fBA\fR \-\fBV\fR \-\fBW\fR" 4 .IX Xref "-A -V -W" .IX Item "-A -V -W" @@ -286,16 +312,6 @@ These options are accepted for compatibi .IX Xref "-h --headers" .IX Item "-h | --headers" These options are accepted for compatibility reasons but ignored. -.IP "\-\fBO\fR | \-\-\fBno-organization\fR" 4 -.IX Xref "-O --no-organization" -.IX Item "-O | --no-organization" -These options are accepted for compatibility reasons but ignored. -.IP "\-\fBD\fR | \-\fBN\fR | \-\-\fBdebug\fR" 4 -.IX Xref "-D -N --debug" -.IX Item "-D | -N | --debug" -Enable warnings about raw 8\-bit data and set \fINet::NNTP\fR\|(3pm) in debug -mode, enable warnings about raw 8\-bit data, warn about disabled options -due to lacking perl-modules or executables and unreadable files. .SH "EXIT STATUS" .IX Header "EXIT STATUS" The following exit values are returned: @@ -358,7 +374,8 @@ The '\-\fBr\fR' command-line option over .IX Item "$ORGANIZATION" Set the article header field Organization: to the contents of the variable if there isn't already an Organization: header in the article. The '\-\fBo\fR' -command-line option overrides \fB\f(CB$ORGANIZATION\fB\fR. +command-line option overrides \fB\f(CB$ORGANIZATION\fB\fR, The '\-\fBO\fR' command-line +option disables it. .ie n .IP "\fB\fB$DISTRIBUTION\fB\fR" 4 .el .IP "\fB\f(CB$DISTRIBUTION\fB\fR" 4 .IX Xref "$DISTRIBUTION DISTRIBUTION" @@ -407,7 +424,7 @@ it contains the user's unencrypted passw .el .IP "\fI\f(CI$XDG_CONFIG_HOME\fI/tinewsrc\fR \fI\f(CI$HOME\fI/.config/tinewsrc\fR \fI\f(CI$HOME\fI/.tinewsrc\fR" 4 .IX Item "$XDG_CONFIG_HOME/tinewsrc $HOME/.config/tinewsrc $HOME/.tinewsrc" \&\*(L"option=value\*(R" configuration pairs. Lines that start with \*(L"#\*(R" are ignored. -If the file contains unencrypted passwords (e.g. NNTPPass or PGPPass), it +If the file contains unencrypted passwords (e.g. nntp-pass or pgp-pass), it should be readable for the user only. .SH "SECURITY" .IX Header "SECURITY" @@ -415,6 +432,8 @@ If you've configured or entered a passwo contained that password has been erased, it may be possible for someone to find that password, in plaintext, in a core dump. In short, if serious security is an issue, don't use this script. +.PP +Be aware that even if \s-1NNTPS\s0 is used still no \s-1SSL\s0 verification will be done. .SH "NOTES" .IX Header "NOTES" \&\fBtinews.pl\fR is designed to be used with \fIpgp\fR\|(1)\-2.6.3, @@ -424,6 +443,10 @@ security is an issue, don't use this scr \&\fIGetopt::Long\fR\|(3pm), \fINet::NNTP\fR\|(3pm), <\fITime::Local\fR\|(3pm)> and \&\fITerm::Readline\fR\|(3pm). .PP +\&\s-1NNTPS \s0(\s-1NNTP\s0 with implicit \s-1TLS\s0; \s-1RFC 4642\s0 and \s-1RFC 8143\s0) may be unavailable +if \fINet::NNTP\fR\|(3pm) is too old or \fIIO::Socket::SSL\fR\|(3pm) is missing on +the system. \fBtinews.pl\fR will fallback to unencrypted \s-1NNTP\s0 in that case. +.PP If the Cancel-Lock feature (\s-1RFC 8315\s0) is enabled the following additional modules must be installed: \fIMIME::Base64\fR\|(3pm), \fIDigest::SHA\fR\|(3pm) or \&\fIDigest::SHA1\fR\|(3pm) and \fIDigest::HMAC_SHA1\fR\|(3pm). sha256 and sha512 as @@ -448,5 +471,5 @@ Marc Brockschmidt diff -Nurp '--exclude=.bzr*' tin-2.4.4/doc/w2r.1 tin-2.4.5/doc/w2r.1 --- tin-2.4.4/doc/w2r.1 2017-05-03 19:47:32.000000000 +0200 +++ tin-2.4.5/doc/w2r.1 2020-11-11 00:18:52.181815092 +0100 @@ -124,7 +124,7 @@ .\" ======================================================================== .\" .IX Title "w2r.pl 1" -.TH w2r.pl 1 "2012-02-18" "0.2.7" "Convert tin wildmat filters to tin regexp filters" +.TH w2r.pl 1 "2020-11-10" "0.2.8" "Convert tin wildmat filters to tin regexp filters" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -Nurp '--exclude=.bzr*' tin-2.4.4/include/autoconf.hin tin-2.4.5/include/autoconf.hin --- tin-2.4.4/include/autoconf.hin 2019-11-20 14:40:43.000000000 +0100 +++ tin-2.4.5/include/autoconf.hin 2020-12-01 11:52:11.587319331 +0100 @@ -3,10 +3,10 @@ * Module : autoconf.hin * Author : Thomas Dickey * Created : 1995-08-24 - * Updated : 2019-03-11 + * Updated : 2020-04-23 * Notes : #include files, #defines & struct's * - * Copyright (c) 1995-2020 Thomas Dickey + * Copyright (c) 1995-2021 Thomas Dickey * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -68,6 +68,11 @@ # undef SEIUX /* + * ISC_UNIX lacks EHOSTUNREACH from errno.h and fchmod(2) + */ +# undef ISC_UNIX + +/* * These are set as configure options, some must be guarded by ifdefs because * they're also used in makefile rules (e.g., lint, proto). */ @@ -163,6 +168,7 @@ # undef HAVE_IOCTL_H # undef HAVE_LANGINFO_H # undef HAVE_LIBC_H +# undef HAVE_LIBCANLOCK_3_CANLOCK_H # undef HAVE_LIBINTL_H # undef HAVE_LOCALE_H # undef HAVE_MALLOC_H @@ -234,6 +240,7 @@ # undef HAVE_CHMOD # undef HAVE_CLOCK_GETTIME # undef HAVE_EXECLP +# undef HAVE_FCHMOD # undef HAVE_FCNTL # undef HAVE_FDOPEN # undef HAVE_FLOCK diff -Nurp '--exclude=.bzr*' tin-2.4.4/include/bool.h tin-2.4.5/include/bool.h --- tin-2.4.4/include/bool.h 2019-11-20 14:40:43.000000000 +0100 +++ tin-2.4.5/include/bool.h 2020-12-01 11:52:08.671177509 +0100 @@ -6,7 +6,7 @@ * Updated : 2013-01-09 * Notes : * - * Copyright (c) 1997-2020 Urs Janssen + * Copyright (c) 1997-2021 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/include/bugrep.h tin-2.4.5/include/bugrep.h --- tin-2.4.4/include/bugrep.h 2019-11-20 14:40:44.000000000 +0100 +++ tin-2.4.5/include/bugrep.h 2020-12-01 11:52:08.683178093 +0100 @@ -6,7 +6,7 @@ * Updated : 2019-02-18 * Notes : * - * Copyright (c) 1997-2020 Urs Janssen + * Copyright (c) 1997-2021 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/include/debug.h tin-2.4.5/include/debug.h --- tin-2.4.4/include/debug.h 2019-11-20 14:40:44.000000000 +0100 +++ tin-2.4.5/include/debug.h 2020-12-01 11:52:08.691178482 +0100 @@ -6,7 +6,7 @@ * Updated : 2016-02-27 * Notes : * - * Copyright (c) 2007-2020 Urs Janssen + * Copyright (c) 2007-2021 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/include/extern.h tin-2.4.5/include/extern.h --- tin-2.4.4/include/extern.h 2019-11-20 14:40:44.000000000 +0100 +++ tin-2.4.5/include/extern.h 2020-12-02 11:31:55.574628646 +0100 @@ -3,10 +3,10 @@ * Module : extern.h * Author : I. Lea * Created : 1991-04-01 - * Updated : 2019-02-18 + * Updated : 2020-12-02 * Notes : * - * Copyright (c) 1997-2020 Iain Lea + * Copyright (c) 1997-2021 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -940,6 +940,7 @@ extern constext txt_help_thread_mark_art extern constext txt_help_thread_mark_article_unread[]; extern constext txt_help_thread_mark_thread_unread[]; extern constext txt_help_thread_read_article[]; +extern constext txt_help_thread_tag_parts[]; extern constext txt_help_title_disp[]; extern constext txt_help_title_misc[]; extern constext txt_help_title_navi[]; @@ -961,6 +962,7 @@ extern constext txt_index_page_com[]; extern constext txt_info_add_kill[]; extern constext txt_info_add_select[]; extern constext txt_info_all_parts_tagged[]; +extern constext txt_info_all_parts_untagged[]; extern constext txt_info_do_postpone[]; extern constext txt_info_enter_valid_character[]; extern constext txt_info_missing_part[]; @@ -1138,10 +1140,8 @@ extern constext txt_quit_edit_xpost[]; extern constext txt_quit_no_write[]; extern constext txt_quoted_printable[]; extern constext txt_range_invalid[]; -#ifdef NNTP_ABLE - extern constext txt_read_abort[]; - extern constext txt_read_exit[]; -#endif /* NNTP_ABLE */ +extern constext txt_read_abort[]; +extern constext txt_read_exit[]; extern constext txt_reading_article[]; extern constext txt_reading_arts[]; extern constext txt_reading_attributes_file[]; @@ -1575,6 +1575,7 @@ extern char *input_history[HIST_MAXNUM + #define GNKSA_LPAREN_MISSING 101 #define GNKSA_RPAREN_MISSING 102 #define GNKSA_ATSIGN_MISSING 103 +#define GNKSA_RANGLE_MISSING 104 /* FQDN checks */ #define GNKSA_SINGLE_DOMAIN 200 #define GNKSA_INVALID_DOMAIN 201 @@ -1599,6 +1600,7 @@ extern char *input_history[HIST_MAXNUM + #define GNKSA_BAD_ENCODE_SYNTAX 403 #define GNKSA_ILLEGAL_PAREN_CHAR 404 #define GNKSA_INVALID_REALNAME 405 +#define GNKSA_MISSING_REALNAME 406 /* address types */ #define GNKSA_ADDRTYPE_ROUTE 0 diff -Nurp '--exclude=.bzr*' tin-2.4.4/include/keymap.h tin-2.4.5/include/keymap.h --- tin-2.4.4/include/keymap.h 2019-11-20 14:40:44.000000000 +0100 +++ tin-2.4.5/include/keymap.h 2020-12-01 11:52:08.739180816 +0100 @@ -3,10 +3,10 @@ * Module : keymap.h * Author : J. Faultless, D. Nimmich * Created : 1999 - * Updated : 2011-01-25 + * Updated : 2020-06-10 * Notes : * - * Copyright (c) 1999-2020 Jason Faultless + * Copyright (c) 1999-2021 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -364,6 +364,7 @@ enum defined_functions { THREAD_SAVE, THREAD_SELECT_ARTICLE, THREAD_TAG, + THREAD_TAG_PARTS, THREAD_TOGGLE_ARTICLE_SELECTION, THREAD_TOGGLE_SUBJECT_DISPLAY, THREAD_UNDO_SELECTIONS, diff -Nurp '--exclude=.bzr*' tin-2.4.4/include/missing_fd.h tin-2.4.5/include/missing_fd.h --- tin-2.4.4/include/missing_fd.h 2019-11-20 14:40:44.000000000 +0100 +++ tin-2.4.5/include/missing_fd.h 2020-12-01 11:52:08.747181205 +0100 @@ -6,7 +6,7 @@ * Updated : 2019-03-13 * Notes : * - * Copyright (c) 2019-2020 Dennis Grevenstein + * Copyright (c) 2019-2021 Dennis Grevenstein * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/include/newsrc.h tin-2.4.5/include/newsrc.h --- tin-2.4.4/include/newsrc.h 2019-11-20 14:40:44.000000000 +0100 +++ tin-2.4.5/include/newsrc.h 2020-12-01 11:52:08.755181594 +0100 @@ -6,7 +6,7 @@ * Updated : 2003-11-18 * Notes : newsrc bit handling * - * Copyright (c) 1997-2020 Iain Lea , Rich Skrenta + * Copyright (c) 1997-2021 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/include/nntplib.h tin-2.4.5/include/nntplib.h --- tin-2.4.4/include/nntplib.h 2019-11-20 14:40:44.000000000 +0100 +++ tin-2.4.5/include/nntplib.h 2020-12-01 11:52:08.763181984 +0100 @@ -6,7 +6,7 @@ * Updated : 2018-02-10 * Notes : nntp.h 1.5.11/1.6 with extensions for tin * - * Copyright (c) 1991-2020 Iain Lea + * Copyright (c) 1991-2021 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/include/policy.h tin-2.4.5/include/policy.h --- tin-2.4.4/include/policy.h 2019-11-20 14:40:44.000000000 +0100 +++ tin-2.4.5/include/policy.h 2020-12-01 11:52:08.783182956 +0100 @@ -6,7 +6,7 @@ * Updated : 2015-09-14 * Notes : #defines and static data for policy configuration * - * Copyright (c) 1999-2020 Ralf Doeblitz + * Copyright (c) 1999-2021 Ralf Doeblitz * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/include/proto.h tin-2.4.5/include/proto.h --- tin-2.4.4/include/proto.h 2019-11-20 14:40:44.000000000 +0100 +++ tin-2.4.5/include/proto.h 2020-12-01 11:52:08.791183345 +0100 @@ -3,10 +3,10 @@ * Module : proto.h * Author : Urs Janssen * Created : - * Updated : 2019-07-16 + * Updated : 2020-06-10 * Notes : * - * Copyright (c) 1997-2020 Urs Janssen + * Copyright (c) 1997-2021 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -69,6 +69,8 @@ extern void load_newnews_info(char *info /* art.c */ extern int find_artnum(t_artnum art); extern int global_get_multipart_info(int aindex, MultiPartInfo *setme); +extern int global_get_multiparts(int aindex, MultiPartInfo **malloc_and_setme_info, t_bool tagging); +extern t_bool global_look_for_multipart(int aindex, char start, char stop); extern t_bool index_group(struct t_group *group); extern void do_update(t_bool catchup); extern void find_base(struct t_group *group); @@ -178,7 +180,7 @@ extern void word_highlight_string(int ro extern void debug_print_comment(const char *comment); extern void debug_print_filters(void); extern void debug_print_header(struct t_article *s); - extern void debug_print_malloc(int is_malloc, const char *xfile, int line, size_t size); + extern void debug_print_malloc(t_bool is_malloc, const char *xfile, int line, size_t size); # ifdef DEBUG extern const char *logtime(void); # endif /* DEBUG */ @@ -532,6 +534,9 @@ extern void prompt_yn_redraw(void); /* read.c */ extern char *tin_fgets(FILE *fp, t_bool header); +#ifdef HAVE_SELECT + extern t_bool wait_for_input(void); +#endif /* HAVE_SELECT */ #ifdef NNTP_ABLE extern void drain_buffer(FILE *fp); #endif /* NNTP_ABLE */ @@ -718,7 +723,7 @@ extern int my_toupper(int); /* tags.c */ extern int line_is_tagged(int n); -extern int tag_multipart(int base_index); +extern int tag_multipart(int arts_index); extern t_bool arts_selected(void); extern t_bool set_range(int level, int min, int max, int curr); extern t_bool tag_article(int art); diff -Nurp '--exclude=.bzr*' tin-2.4.4/include/rfc2046.h tin-2.4.5/include/rfc2046.h --- tin-2.4.4/include/rfc2046.h 2019-11-20 14:40:44.000000000 +0100 +++ tin-2.4.5/include/rfc2046.h 2020-12-01 11:52:08.803183929 +0100 @@ -6,7 +6,7 @@ * Updated : 2016-01-01 * Notes : rfc2046 MIME article definitions * - * Copyright (c) 2000-2020 Jason Faultless + * Copyright (c) 2000-2021 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/include/stpwatch.h tin-2.4.5/include/stpwatch.h --- tin-2.4.4/include/stpwatch.h 2019-11-20 14:40:44.000000000 +0100 +++ tin-2.4.5/include/stpwatch.h 2020-12-01 11:52:08.811184318 +0100 @@ -7,7 +7,7 @@ * Notes : Simple stopwatch routines for timing code using timeb * or gettimeofday structs * - * Copyright (c) 1993-2020 Iain Lea + * Copyright (c) 1993-2021 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -52,27 +52,28 @@ char tmp_tb[LEN]; struct timeb beg_tb; struct timeb end_tb; -# define LSECS 700000000 +# define LSECS 700000000 /* offset to keep numbers smaller (1992-03-07 20:26:40 UTC) */ # define BegStopWatch(msg) {strcpy (msg_tb, msg); ftime (&beg_tb);} # define EndStopWatch() {ftime (&end_tb);} -# define PrintStopWatch() {sprintf (tmp_tb, "%s: Beg=[%ld.%d] End=[%ld.%d] Elapsed=[%ld]", \ +# define PrintStopWatch() {sprintf (tmp_tb, "%s: Beg=[%ld.%d] End=[%ld.%d] Elap=[%ld ms]", \ msg_tb, beg_tb.time, beg_tb.millitm, \ end_tb.time, end_tb.millitm, \ (((end_tb.time - LSECS) * 1000) + end_tb.millitm) - \ (((beg_tb.time - LSECS) * 1000) + beg_tb.millitm)); \ - error_message(2, tmp_tb, "");} + error_message(2, tmp_tb);} # else /* HAVE_SYS_TIMEB_H && HAVE_FTIME */ # ifdef HAVE_SYS_TIME_H # include -char msg_tb[LEN], tmp_tb[LEN]; -struct timeval beg_tb, end_tb; +char msg_tb[LEN]; +char tmp_tb[LEN]; float d_time; +struct timeval beg_tb, end_tb; # define BegStopWatch(msg) {strcpy (msg_tb, msg); \ (void) gettimeofday (&beg_tb, NULL);} @@ -83,10 +84,10 @@ float d_time; end_tb.tv_usec += 1000000; \ } \ end_tb.tv_sec -= beg_tb.tv_sec; \ - d_time = (end_tb.tv_sec*1000.0 + ((float)end_tb.tv_usec)/1000.0);} + d_time = (end_tb.tv_sec * 1000.0 + ((float) end_tb.tv_usec) / 1000.0);} # define PrintStopWatch() {sprintf (tmp_tb, "StopWatch(%s): %6.3f ms", msg_tb, d_time); \ - error_message(2, tmp_tb, "");} + error_message(2, tmp_tb);} # endif /* HAVE_SYS_TIME_H */ # endif /* HAVE_SYS_TIMEB_H && HAVE_FTIME */ diff -Nurp '--exclude=.bzr*' tin-2.4.4/include/tcurses.h tin-2.4.5/include/tcurses.h --- tin-2.4.4/include/tcurses.h 2019-11-20 14:40:44.000000000 +0100 +++ tin-2.4.5/include/tcurses.h 2020-12-01 11:52:08.831185291 +0100 @@ -6,7 +6,7 @@ * Updated : 2011-04-02 * Notes : curses #include files, #defines & struct's * - * Copyright (c) 1997-2020 Thomas Dickey + * Copyright (c) 1997-2021 Thomas Dickey * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/include/tin.h tin-2.4.5/include/tin.h --- tin-2.4.4/include/tin.h 2019-11-20 14:40:44.000000000 +0100 +++ tin-2.4.5/include/tin.h 2020-12-01 11:52:08.839185680 +0100 @@ -3,10 +3,10 @@ * Module : tin.h * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2019-06-13 + * Updated : 2020-06-13 * Notes : #include files, #defines & struct's * - * Copyright (c) 1997-2020 Iain Lea , Rich Skrenta + * Copyright (c) 1997-2021 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -126,6 +126,9 @@ enum rc_state { RC_IGNORE, RC_UPGRADE, R extern int errno; # endif /* DECL_ERRNO */ #endif /* !errno */ +#if !defined(EHOSTUNREACH) +# define EHOSTUNREACH 113 +#endif /* !EHOSTUNREACH */ #ifdef HAVE_STDDEF_H # include @@ -1456,9 +1459,16 @@ typedef unsigned char t_bitmap; #define MSGID_REF 2 /* Add a msgid->ref entry */ /* - * Size of msgid hash table + * Size of hash tables for hash_str() and hash_msgid() + * Make sure it's prime! */ -#define MSGID_HASH_SIZE 2609 +#ifdef SMALL_MEMORY_MACHINE +# define HASHNODE_TABLE_SIZE 2411 +# define MSGID_HASH_SIZE 2609 +#else +# define HASHNODE_TABLE_SIZE 222199 +# define MSGID_HASH_SIZE 222199 +#endif /* MSGID_HASH_SIZE */ /* * cmd-line options @@ -1512,16 +1522,16 @@ struct t_article { char *subject; /* Subject: line from mail header */ char *from; /* From: line from mail header (address) */ char *name; /* From: line from mail header (full name) */ - int gnksa_code; /* From: line from mail header (GNKSA error code) */ - time_t date; /* Date: line from header in seconds */ char *xref; /* Xref: cross posted article reference line */ char *path; /* Path: line */ /* NB: The msgid and refs are only retained until the reference tree is built */ char *msgid; /* Message-ID: unique message identifier */ char *refs; /* References: article reference id's */ struct t_msgid *refptr; /* Pointer to us in the reference tree */ - int line_count; /* Lines: number of lines in article */ struct t_archive *archive; /* Archive-Name: header */ + time_t date; /* Date: line from header in seconds */ + int line_count; /* Lines: number of lines in article */ + int gnksa_code; /* From: line from mail header (GNKSA error code) */ int tagged; /* 0 = not tagged, >0 = tagged */ int thread; int prev; @@ -1534,6 +1544,7 @@ struct t_article { t_bool inrange:1; /* TRUE = article selected via # range command */ t_bool matched:1; /* TRUE = article matched regex in feed.c */ t_bool keep_in_base:1; /* TRUE = keep (read) article in base[] (show_only_unread_arts) */ + t_bool multipart_subj:1; /* TRUE = subject looks like multipart subject */ }; @@ -1995,7 +2006,7 @@ typedef struct { int subject_compare_len; int part_number; int total; - int base_index; + int arts_index; } MultiPartInfo; @@ -2377,7 +2388,11 @@ extern struct tm *localtime(time_t *); /* libcanlock */ #ifdef USE_CANLOCK -# include "../libcanlock/include/canlock.h" +# ifdef HAVE_LIBCANLOCK_3_CANLOCK_H +# include +# else +# include +# endif /* HAVE_LIBCANLOCK_3_CANLOCK_H */ #endif /* USE_CANLOCK */ /* gsasl */ diff -Nurp '--exclude=.bzr*' tin-2.4.4/include/tinrc.h tin-2.4.5/include/tinrc.h --- tin-2.4.4/include/tinrc.h 2019-11-20 14:40:44.000000000 +0100 +++ tin-2.4.5/include/tinrc.h 2020-12-01 11:52:08.867187042 +0100 @@ -6,7 +6,7 @@ * Updated : 2017-08-13 * Notes : * - * Copyright (c) 1999-2020 Jason Faultless + * Copyright (c) 1999-2021 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/include/tnntp.h tin-2.4.5/include/tnntp.h --- tin-2.4.4/include/tnntp.h 2019-11-20 14:40:44.000000000 +0100 +++ tin-2.4.5/include/tnntp.h 2020-12-01 11:52:08.875187431 +0100 @@ -6,7 +6,7 @@ * Updated : 2019-02-18 * Notes : #include files, #defines & struct's * - * Copyright (c) 1997-2020 Thomas Dickey + * Copyright (c) 1997-2021 Thomas Dickey * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/include/trace.h tin-2.4.5/include/trace.h --- tin-2.4.4/include/trace.h 2019-11-20 14:40:44.000000000 +0100 +++ tin-2.4.5/include/trace.h 2020-12-01 11:52:08.887188015 +0100 @@ -6,7 +6,7 @@ * Updated : 2002-11-10 * Notes : Interface of trace.c * - * Copyright (c) 1997-2020 Thomas Dickey + * Copyright (c) 1997-2021 Thomas Dickey * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/include/version.h tin-2.4.5/include/version.h --- tin-2.4.4/include/version.h 2019-12-24 11:00:16.000000000 +0100 +++ tin-2.4.5/include/version.h 2020-12-24 12:47:22.087865156 +0100 @@ -6,7 +6,7 @@ * Updated : 2019-02-18 * Notes : * - * Copyright (c) 1991-2020 Iain Lea + * Copyright (c) 1991-2021 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -43,14 +43,14 @@ # define PRODUCT "tin" # ifndef TIN_AUTOCONF_H -# define VERSION "2.4.4" +# define VERSION "2.4.5" # endif /* !TIN_AUTOCONF_H */ -# define RELEASEDATE "20191224" -# define RELEASENAME "Millburn" +# define RELEASEDATE "20201224" +# define RELEASENAME "Glen Albyn" /* config-file versions - must by dotted triples in the range 0 to 99 each */ # define TINRC_VERSION "1.3.17" # define ATTRIBUTES_VERSION "1.0.10" -# define FILTER_VERSION "1.0.1" +# define FILTER_VERSION "1.0.2" # define KEYMAP_VERSION "1.0.9" # define SERVERCONFIG_VERSION "1.0.0" diff -Nurp '--exclude=.bzr*' tin-2.4.4/libcanlock/src/canlock.c tin-2.4.5/libcanlock/src/canlock.c --- tin-2.4.4/libcanlock/src/canlock.c 2017-06-27 18:35:50.000000000 +0200 +++ tin-2.4.5/libcanlock/src/canlock.c 2019-12-27 14:18:01.226403015 +0100 @@ -161,7 +161,7 @@ char *lock_strip(char *key, char *type) * the location pointed to by 'klstring' (no memory is allocated, the address * points to the memory used for 'input'). * - * Returns the hash alorithm ID for scheme (on success). + * Returns the hash algorithm ID for scheme (on success). * Returns CL_INVALID (on failure, NULL was written to 'klstring' in this case). */ int cl_split(char *input, char **klstring) diff -Nurp '--exclude=.bzr*' tin-2.4.4/libcanlock/test/shatest.c tin-2.4.5/libcanlock/test/shatest.c --- tin-2.4.4/libcanlock/test/shatest.c 2017-06-04 11:38:39.000000000 +0200 +++ tin-2.4.5/libcanlock/test/shatest.c 2019-12-29 15:37:05.987172987 +0100 @@ -920,7 +920,7 @@ static int hash(int testno, int loopno, int err, i; uint8_t Message_Digest_Buf[USHAMaxHashSize]; uint8_t *Message_Digest = Message_Digest_Buf; - char buf[20]; + char buf[128]; if (printResults == PRINTTEXT) { printf("\nTest %d: Iteration %d, Repeat %ld\n\t'", testno+1, @@ -990,7 +990,7 @@ static int hash(int testno, int loopno, return err; } - sprintf(buf, "%d", testno+1); + snprintf(buf, (size_t) 128, "%d", testno+1); printResult(Message_Digest, info ? okmlen : hashsize, hashes[hashno].name, info ? "hkdf standard test" : keyarray ? "hmac standard test" : "sha standard test", buf, @@ -1012,7 +1012,7 @@ static int hashHkdf(int testno, int loop int err; unsigned char prk[USHAMaxHashSize+1]; uint8_t okm[255 * USHAMaxHashSize+1]; - char buf[20]; + char buf[128]; (void) hashno; /* Silence 'unused parameter' warning */ @@ -1043,7 +1043,7 @@ static int hashHkdf(int testno, int loop fprintf(stderr, "hashHkdf(): hkdf Error %d.\n", err); return err; } - sprintf(buf, "hkdf %d", testno+1); + snprintf(buf, (size_t) 128, "hkdf %d", testno+1); printResult(okm, hkdfhashes[testno].okmlength, USHAHashName(hkdfhashes[testno].whichSha), "hkdf standard test", buf, hkdfhashes[testno].okmarray, printResults, printPassFail); @@ -1059,7 +1059,7 @@ static int hashHkdf(int testno, int loop fprintf(stderr, "hashHkdf(): hkdfExtract Error %d.\n", err); return err; } - sprintf(buf, "hkdfExtract %d", testno+1); + snprintf(buf, (size_t) 128, "hkdfExtract %d", testno+1); printResult(prk, USHAHashSize(hkdfhashes[testno].whichSha), USHAHashName(hkdfhashes[testno].whichSha), "hkdf standard test", buf, hkdfhashes[testno].prkarray, printResults, printPassFail); @@ -1074,7 +1074,7 @@ static int hashHkdf(int testno, int loop fprintf(stderr, "hashHkdf(): hkdfExpand Error %d.\n", err); return err; } - sprintf(buf, "hkdfExpand %d", testno+1); + snprintf(buf, (size_t) 128, "hkdfExpand %d", testno+1); printResult(okm, hkdfhashes[testno].okmlength, USHAHashName(hkdfhashes[testno].whichSha), "hkdf standard test", buf, hkdfhashes[testno].okmarray, printResults, printPassFail); @@ -1202,7 +1202,8 @@ static void randomtest(int hashno, const const char **resultarrays, int randomcount, int printResults, int printPassFail) { - int i, j; char buf[20]; + int i, j; + char buf[128]; unsigned char SEED[USHAMaxHashSize], MD[1003][USHAMaxHashSize]; /* INPUT: Seed - A random seed n bits long */ @@ -1234,7 +1235,7 @@ static void randomtest(int hashno, const memcpy(SEED, MD[i-1], hashsize); /* OUTPUT: MDj */ - sprintf(buf, "%d", j); + snprintf(buf, (size_t) 128, "%d", j); printResult(SEED, hashsize, hashes[hashno].name, "random test", buf, resultarrays ? resultarrays[j] : 0, printResults, (j < RANDOMCOUNT) ? printPassFail : 0); diff -Nurp '--exclude=.bzr*' tin-2.4.4/pcre/configure.in tin-2.4.5/pcre/configure.in --- tin-2.4.4/pcre/configure.in 2017-05-03 19:47:33.000000000 +0200 +++ tin-2.4.5/pcre/configure.in 2020-03-21 08:03:17.814137324 +0100 @@ -183,7 +183,7 @@ dnl Handle --enable-ebcdic AC_ARG_ENABLE(ebcdic, [ --enable-ebcdic assume EBCDIC coding rather than ASCII], -if test "$enableval" == "yes"; then +if test "$enableval" = "yes"; then EBCDIC=-DEBCDIC=1 fi ) Binary files tin-2.4.4/po/da.gmo and tin-2.4.5/po/da.gmo differ diff -Nurp '--exclude=.bzr*' tin-2.4.4/po/da.po tin-2.4.5/po/da.po --- tin-2.4.4/po/da.po 2019-12-24 10:55:07.000000000 +0100 +++ tin-2.4.5/po/da.po 2020-12-24 00:24:53.345865670 +0100 @@ -74,7 +74,7 @@ msgid "" msgstr "" "Project-Id-Version: tin 2.4.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 13:24+0100\n" +"POT-Creation-Date: 2020-12-24 00:24+0100\n" "PO-Revision-Date: 2017-02-04 09:14+0100\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -84,6 +84,30 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" +#. -> lang.c +#: src/art.c:418 +#, fuzzy, c-format +msgid "Reading %s\n" +msgstr "Genlæser %s ..." + +#. TODO: -> lang.c +#: src/art.c:1205 +#, fuzzy +msgid "Threading by multipart" +msgstr "Opdeler artikler i tråde ..." + +#. -> lang.c +#: src/art.c:2539 +#, fuzzy, c-format +msgid "Writing %s\n" +msgstr "Forsøger %s" + +#. TODO: -> lang.c +#: src/art.c:2619 +#, fuzzy +msgid "Writing overview cache..." +msgstr "Skriver attributfil ..." + #: src/attrib.c:986 msgid "Processing attributes... " msgstr "Behandler attributter ... " @@ -1558,8 +1582,8 @@ msgid "Error making backup of %s file. F msgstr "Fejl under oprettelse af sikkerhedskopi af %s fil. Filsystem fyldt op?" #: src/lang.c:274 -#, c-format -msgid "Filtering global rules (%d/%d)..." +#, fuzzy, c-format +msgid "Filtering global rules (%d/%d) ('q' to quit)..." msgstr "Filtrerer globale regler (%d/%d) ..." #: src/lang.c:275 @@ -2313,8 +2337,9 @@ msgstr "vælg tråde hvis mindst en ulæ msgid "select threads that match user specified pattern" msgstr "vælg tråde som svarer til brugerangivet mønster" -#: src/lang.c:465 -msgid "tag all parts of current multipart-message in order" +#: src/lang.c:465 src/lang.c:521 +#, fuzzy +msgid "tag/untag all parts of current multipart-message in order" msgstr "mærk alle dele af nuværende flerdels-besked i rækkefølge" #: src/lang.c:466 @@ -2534,7 +2559,7 @@ msgstr "marker aktuel tråd som ulæst" msgid "read chosen article" msgstr "læs valgt artikel" -#: src/lang.c:521 +#: src/lang.c:522 msgid "" "Display properties\n" "------------------" @@ -2542,7 +2567,7 @@ msgstr "" "Vis egenskaber\n" "--------------" -#: src/lang.c:522 +#: src/lang.c:523 msgid "" "Miscellaneous\n" "-------------" @@ -2550,7 +2575,7 @@ msgstr "" "Diverse\n" "-------" -#: src/lang.c:523 +#: src/lang.c:524 msgid "" "Moving around\n" "-------------" @@ -2558,7 +2583,7 @@ msgstr "" "Flytter rundt\n" "-------------" -#: src/lang.c:524 +#: src/lang.c:525 msgid "" "Group/thread/article operations\n" "-------------------------------" @@ -2566,7 +2591,7 @@ msgstr "" "Gruppe/tråd/artikel-handlinger\n" "------------------------------" -#: src/lang.c:525 +#: src/lang.c:526 msgid "" "Attachment operations\n" "---------------------" @@ -2574,7 +2599,7 @@ msgstr "" "Vedhæftningshandlinger\n" "---------------------- " -#: src/lang.c:526 +#: src/lang.c:527 msgid "" "Attribute operations\n" "--------------------" @@ -2582,7 +2607,7 @@ msgstr "" "Attributhandlinger\n" "------------------" -#: src/lang.c:527 +#: src/lang.c:528 msgid "" "Option operations\n" "-----------------" @@ -2590,7 +2615,7 @@ msgstr "" "Tilvalgshandlinger\n" "------------------" -#: src/lang.c:528 +#: src/lang.c:529 msgid "" "Scope operations\n" "----------------" @@ -2598,7 +2623,7 @@ msgstr "" "Virkefeltshandlinger\n" "--------------------" -#: src/lang.c:529 +#: src/lang.c:530 msgid "" "URL operations\n" "--------------" @@ -2606,90 +2631,95 @@ msgstr "" "URL-handlinger\n" "--------------" -#: src/lang.c:530 +#: src/lang.c:531 msgid "choose first URL in list" msgstr "vælg første URL i listen" -#: src/lang.c:531 +#: src/lang.c:532 msgid "0 - 9\t choose URL by number" msgstr "0 - 9\t vælg URL efter nummer" -#: src/lang.c:532 +#: src/lang.c:533 msgid "choose last URL in list" msgstr "vælg sidste URL i listen" -#: src/lang.c:533 +#: src/lang.c:534 msgid "search for URLs forwards" msgstr "søg efter URL'er fremad" -#: src/lang.c:534 +#: src/lang.c:535 msgid "search for URLs backwards" msgstr "søg efter URL'er baglæns" -#: src/lang.c:535 +#: src/lang.c:536 msgid "Open URL in browser" msgstr "Åbn URL i browser" -#: src/lang.c:536 +#: src/lang.c:537 msgid "toggle info message in last line (URL)" msgstr "slå infobesked i sidste linje til/fra (URL)" -#: src/lang.c:538 +#: src/lang.c:539 msgid "Group Level Commands" msgstr "Kommandoer for gruppeniveau" -#: src/lang.c:539 +#: src/lang.c:540 msgid "Kill filter added" msgstr "Filter for dræb tilføjet" -#: src/lang.c:540 +#: src/lang.c:541 msgid "Auto-selection filter added" msgstr "Filter for automatisk markering tilføjet" -#: src/lang.c:541 +#: src/lang.c:542 msgid "All parts tagged" msgstr "Alle dele mærket" -#: src/lang.c:542 +#: src/lang.c:543 +#, fuzzy +msgid "All parts untagged" +msgstr "Alle dele mærket" + +#: src/lang.c:544 msgid "Storing article for later posting" msgstr "Gemmer artikel for senere indsendelse" -#: src/lang.c:543 +#: src/lang.c:545 msgid "Please enter a valid character" msgstr "Indtast venligst et gyldigt tegn" -#: src/lang.c:544 +#: src/lang.c:546 #, c-format msgid "Missing part #%d" msgstr "Manglende del #%d" -#: src/lang.c:545 +#: src/lang.c:547 msgid "*** No postponed articles ***" msgstr "*** Ingen udsatte artikler ***" -#: src/lang.c:546 +#: src/lang.c:548 msgid "Not a multi-part message" msgstr "Ikke en besked med flere dele" -#: src/lang.c:547 +#: src/lang.c:549 msgid "You are not subscribed to this group" msgstr "Du er ikke abonnent på denne gruppe" -#: src/lang.c:548 +#: src/lang.c:550 msgid "No previous expression" msgstr "Ingen tidligere udtryk" -#: src/lang.c:549 +#: src/lang.c:551 msgid "Operation disabled in no-overwrite mode" msgstr "Handling deaktiveret i tilstanden no-overwrite (ingen-overskrivning)" #. TODO: replace hard coded key-name in txt_info_postponed -#: src/lang.c:551 +#: src/lang.c:553 #, c-format msgid "%d postponed %s, reuse with ^O...\n" msgstr "%d udskudt %s, genbrug med ^O...\n" -#: src/lang.c:552 +#: src/lang.c:554 msgid "" "X-Conversion-Note: multipart/alternative contents have been removed.\n" " To get the whole article, turn alternative handling OFF in the Option " @@ -2700,21 +2730,21 @@ msgstr "" "(angives\n" " som OFF) i indstillingsmenuen\n" -#: src/lang.c:554 +#: src/lang.c:556 #, c-format msgid "Save filename for %s/%s is a mailbox. Attachment not saved" msgstr "Gem filnavn for %s/%s i en postkasse. Vedhæftning ikke gemt" -#: src/lang.c:555 +#: src/lang.c:557 msgid "TeX2Iso encoded article" msgstr "TeX2Iso-kodet artikel" -#: src/lang.c:556 +#: src/lang.c:558 msgid "incomplete " msgstr "ufuldstændig " #. TODO: replace hard coded key-names -#: src/lang.c:558 +#: src/lang.c:560 #, fuzzy, c-format msgid "" "\n" @@ -2784,44 +2814,44 @@ msgstr "" "FTP-filerne.\n" "Send venligst fejlrapporter/kommentarer til %s med kommandoen »R«.\n" -#: src/lang.c:574 +#: src/lang.c:576 #, c-format msgid "Invalid From: %s line. Read the INSTALL file again." msgstr "Ugyldig Fra: %s-linje. Læs filen INSTALL igen." -#: src/lang.c:576 +#: src/lang.c:578 msgid "Invalid multibyte sequence found\n" msgstr "Ugyldig multibyte-sekvens fundet\n" -#: src/lang.c:579 +#: src/lang.c:581 #, c-format msgid "Invalid Sender:-header %s" msgstr "Ugyldig Afsender:-teksthoved %s" -#: src/lang.c:581 +#: src/lang.c:583 msgid "Inverse video disabled" msgstr "Omvendt video deaktiveret" -#: src/lang.c:582 +#: src/lang.c:584 msgid "Inverse video enabled" msgstr "Omvendt video aktiveret" -#: src/lang.c:584 +#: src/lang.c:586 #, c-format msgid "Missing definition for %s\n" msgstr "Mangler definition for %s\n" -#: src/lang.c:585 +#: src/lang.c:587 #, c-format msgid "Invalid key definition '%s'\n" msgstr "Ugyldig nøgledefinition '%s'\n" -#: src/lang.c:586 +#: src/lang.c:588 #, c-format msgid "Invalid keyname '%s'\n" msgstr "Ugylidg nøglenavn '%s'\n" -#: src/lang.c:587 +#: src/lang.c:589 #, c-format msgid "Keymap file was upgraded to version %s\n" msgstr "Nøglekortfil blev opgraderet til version %s\n" @@ -2829,109 +2859,109 @@ msgstr "Nøglekortfil blev opgraderet ti # Hmm, så er spørgsmålet jo så, når der er sådan et tilfældigt antal # mellemrum efter : og positionen af : skal bevares i oversættelsen, det # er svært at vide når der ikke er nogen kommentarer -#: src/lang.c:588 +#: src/lang.c:590 #, c-format msgid "Kill From: [%s] (y/n): " msgstr "Dræb From: [%s] (j/n): " -#: src/lang.c:589 +#: src/lang.c:591 msgid "Kill Lines: (num): " msgstr "Dræb linjer: (num): " -#: src/lang.c:590 +#: src/lang.c:592 msgid "Kill Article Menu" msgstr "Dræb artikelmenu" -#: src/lang.c:591 +#: src/lang.c:593 #, fuzzy, c-format msgid "Kill Msg-ID: [%s] (f/l/o/n): " msgstr "Dræb Msg-Id: [%s] (f/l/o/n): " -#: src/lang.c:592 +#: src/lang.c:594 msgid "Kill pattern scope : " msgstr "Dræb mønstervirkefelt : " -#: src/lang.c:593 +#: src/lang.c:595 #, c-format msgid "Kill Subject: [%s] (y/n): " msgstr "Dræb Subject: [%s] (j/n): " -#: src/lang.c:594 +#: src/lang.c:596 msgid "Kill text pattern : " msgstr "Dræb tekstmønster : " -#: src/lang.c:595 +#: src/lang.c:597 msgid "Kill time in days : " msgstr "Dræb tidspunkt på dagen : " -#: src/lang.c:597 +#: src/lang.c:599 msgid "Last" msgstr "Sidste" -#: src/lang.c:598 +#: src/lang.c:600 msgid "-- Last response --" msgstr "-- Sidste svar --" -#: src/lang.c:599 +#: src/lang.c:601 #, c-format msgid "Lines %s " msgstr "Linjer %s " -#: src/lang.c:602 +#: src/lang.c:604 msgid "Function not available." msgstr "Funktionen er ikke tilgængelig." -#: src/lang.c:603 +#: src/lang.c:605 msgid "Not reading via NNTP." msgstr "Læser ikke via NNTP." -#: src/lang.c:604 +#: src/lang.c:606 #, c-format msgid "Group: %s" msgstr "Gruppe: %s" -#: src/lang.c:605 +#: src/lang.c:607 #, c-format msgid "Groups: %s" msgstr "Grupper: %s" -#: src/lang.c:608 +#: src/lang.c:610 msgid "Mail" msgstr "Post" -#: src/lang.c:609 +#: src/lang.c:611 msgid "mailbox " msgstr "postkasse " -#: src/lang.c:610 +#: src/lang.c:612 #, c-format msgid "Mail article(s) to [%.*s]> " msgstr "Send artikel(er) til [%.*s]> " -#: src/lang.c:611 +#: src/lang.c:613 #, c-format msgid "Mailing log to %s\n" msgstr "Sender log til %s\n" -#: src/lang.c:612 +#: src/lang.c:614 msgid "Mail bug report..." msgstr "Send fejlrapport ..." -#: src/lang.c:613 +#: src/lang.c:615 #, c-format msgid "Mail BUG REPORT to %s?" msgstr "Send FEJLRAPPORT til %s?" -#: src/lang.c:614 +#: src/lang.c:616 msgid "Mailed" msgstr "Sendt" -#: src/lang.c:615 +#: src/lang.c:617 #, c-format msgid "Mailing to %s..." msgstr "Sender til %s ..." -#: src/lang.c:616 +#: src/lang.c:618 msgid "" "# [Mail/Save] active file. Format is like news active file:\n" "# groupname max.artnum min.artnum /dir\n" @@ -2943,62 +2973,62 @@ msgstr "" "# Det 4. felt er basismappen (dvs. ~/Mail eller ~/News)\n" "#\n" -#: src/lang.c:619 +#: src/lang.c:621 #, c-format msgid "%s marked as read" msgstr "%s markeret som læst" -#: src/lang.c:620 +#: src/lang.c:622 #, c-format msgid "%s marked as unread" msgstr "%s markeret som ulæst" -#: src/lang.c:621 +#: src/lang.c:623 #, c-format msgid "Marked %d of %d %s as read" msgstr "Markerede %d af %d %s som læst" -#: src/lang.c:622 +#: src/lang.c:624 #, c-format msgid "Marked %d of %d %s as unread" msgstr "Markerede %d af %d %s som ulæste" -#: src/lang.c:623 src/lang.c:1352 +#: src/lang.c:625 src/lang.c:1352 msgid "Mark" msgstr "Marker" -#: src/lang.c:624 +#: src/lang.c:626 #, c-format msgid "Mark all articles as read%s?" msgstr "Marker alle artikler som læst%s?" -#: src/lang.c:625 +#: src/lang.c:627 #, c-format msgid "Mark article as read%s?" msgstr "Marker alle artikler som læst%s?" -#: src/lang.c:626 +#: src/lang.c:628 #, c-format msgid "Mark group %s as read?" msgstr "Marker gruppe %s som læst?" -#: src/lang.c:627 +#: src/lang.c:629 #, c-format msgid "Mark thread as read%s?" msgstr "Marker tråd som læst%s" -#: src/lang.c:628 +#: src/lang.c:630 #, c-format msgid "Matching %s groups..." msgstr "Sammenligner %s grupper ..." -#: src/lang.c:629 src/lang.c:643 src/lang.c:649 +#: src/lang.c:631 src/lang.c:645 src/lang.c:651 #, c-format msgid "=set current to n; %s=line down; %s=line up; %s=help; %s=quit" msgstr "" "=angiv nuværende som n; %s=linje ned; %s=linje op; %s=hjælp; %s=afslut" -#: src/lang.c:631 +#: src/lang.c:633 #, c-format msgid "" "%s=view; %s=pipe; %s=pipe raw; %s=save; %s=tag; %s=tag pattern; %s=untag all" @@ -3006,24 +3036,24 @@ msgstr "" "%s=vis; %s=datakanal; %s=datakanal rå; %s=gem; %s=mærke; %s=mærkemønster; " "%s=fjern mærke for alle" -#: src/lang.c:633 +#: src/lang.c:635 #, c-format msgid "%s=view; %s=save; %s=tag; %s=tag pattern; %s=untag all" msgstr "%s=vis; %s=gem; %s=mærke; %s=mærkemønster; %s=fjern mærke for alle" -#: src/lang.c:635 +#: src/lang.c:637 #, c-format msgid "" "%s=reverse tagging; %s=search forwards; %s=search backwards; %s=repeat search" msgstr "%s=vend mærkning om; %s=søg fremad; %s=søg bagud; %s=gentag søg" -#: src/lang.c:636 src/lang.c:640 +#: src/lang.c:638 src/lang.c:642 #, c-format msgid "=set current to n; %s=next unread; %s=search pattern; %s=kill/select" msgstr "" "=angiv nuværende som n; %s=næste ulæst; %s=søgemønster; %s=dræb/vælg" -#: src/lang.c:637 +#: src/lang.c:639 #, c-format msgid "" "%s=author search; %s=catchup; %s=line down; %s=line up; %s=mark read; " @@ -3032,35 +3062,35 @@ msgstr "" "%s=forfattersøgning; %s=opsamling; %s=linje ned; %s=linje op; %s=marker som " "læst; %s=vis tråd" -#: src/lang.c:638 +#: src/lang.c:640 #, c-format msgid "%s=line up; %s=line down; %s=page up; %s=page down; %s=top; %s=bottom" msgstr "%s=linje op; %s=linje ned; %s=side op; %s=side ned; %s=top; %s=bund" -#: src/lang.c:639 +#: src/lang.c:641 #, c-format msgid "%s=search forwards; %s=search backwards; %s=quit" msgstr "%s=søg fremad; %s=søg bagud; %s=afslut" -#: src/lang.c:641 +#: src/lang.c:643 #, c-format msgid "%s=author search; %s=body search; %s=catchup; %s=followup; %s=mark read" msgstr "" "%s=forfattersøgning; %s=indholdssøgning; %s=opsamling; %s=opfølgning; " "%s=marker som læst" -#: src/lang.c:642 +#: src/lang.c:644 #, c-format msgid "%s=add; %s=move; %s=rename; %s=delete" msgstr "%s=tilføj; %s=flyt; %s=omdøb; %s=slet" -#: src/lang.c:644 +#: src/lang.c:646 #, c-format msgid "=set current to n; %s=next unread; %s,%s=search pattern; %s=catchup" msgstr "" "=angiv nuværende som n; %s=næste ulæst; %s,%s=søgemønster; %s=opsamling" -#: src/lang.c:645 +#: src/lang.c:647 #, c-format msgid "" "%s=line down; %s=line up; %s=help; %s=move; %s=quit; %s=toggle all/unread" @@ -3068,7 +3098,7 @@ msgstr "" "%s=linje ned; %s=linje op; %s=hjælp; %s=flyt; %s=afslut; %s=slå alle/ulæste " "til/fra" -#: src/lang.c:646 +#: src/lang.c:648 #, c-format msgid "" "%s=subscribe; %s=sub pattern; %s=unsubscribe; %s=unsub pattern; %s=yank in/" @@ -3077,232 +3107,232 @@ msgstr "" "%s=abonner; %s=undermønster; %s=slut abonnement; %s=fjern undermønster; " "%s=ryk ind/ud" -#: src/lang.c:647 +#: src/lang.c:649 #, c-format msgid "=set current to n; %s=next unread; %s=catchup; %s=display toggle" msgstr "" "=angiv nuværende til n; %s=næste ulæst; %s=opsamling; %s=vis slå til/fra" -#: src/lang.c:648 +#: src/lang.c:650 #, c-format msgid "%s=help; %s=line down; %s=line up; %s=quit; %s=tag; %s=mark unread" msgstr "" "%s=hjælp; %s=linje ned; %s=linje op; %s=afslut; %s=mærke; %s=marker ulæst" -#: src/lang.c:650 +#: src/lang.c:652 #, c-format msgid "%s=search forwards; %s=search backwards; %s=repeat search" msgstr "%s=søg fremad; %s=søg bagud; %s=gentag søg" -#: src/lang.c:651 +#: src/lang.c:653 msgid "--More--" msgstr "--Mere--" -#: src/lang.c:652 +#: src/lang.c:654 #, c-format msgid "Moving %s..." msgstr "Flytter %s ..." -#: src/lang.c:653 +#: src/lang.c:655 msgid "Message-ID: & last Reference " msgstr "Message-ID: og sidste reference " -#: src/lang.c:654 +#: src/lang.c:656 msgid "Message-ID: line " msgstr "Message-ID: linje " -#: src/lang.c:655 +#: src/lang.c:657 msgid "Message-ID: & References: line" msgstr "Message-ID: og References: linje" -#: src/lang.c:657 +#: src/lang.c:659 msgid ", name: " msgstr ", navn: " -#: src/lang.c:658 +#: src/lang.c:660 #, c-format msgid "Go to newsgroup [%s]> " msgstr "Gå til nyhedsgruppe [%s]> " -#: src/lang.c:659 +#: src/lang.c:661 msgid "newsgroups" msgstr "nyhedsgrupper" -#: src/lang.c:660 +#: src/lang.c:662 #, c-format msgid "Position %s in group list (1,2,..,$) [%d]> " msgstr "Position %s i gruppeliste (1,2,..,$) [%d]> " -#: src/lang.c:661 +#: src/lang.c:663 msgid "newsgroup" msgstr "nyhedsgruppe" -#: src/lang.c:662 +#: src/lang.c:664 msgid "Try and save newsrc file again?" msgstr "Forsøg at gemme newsrc-fil igen?" -#: src/lang.c:663 +#: src/lang.c:665 msgid "Warning: No newsgroups were written to your newsrc file. Save aborted." msgstr "" "Advarsel: Ingen nyhedsgrupper blev skrevet til din newsrc-fil. Afbrudt." -#: src/lang.c:664 +#: src/lang.c:666 msgid "newsrc file saved successfully.\n" msgstr "newsrc-fil blev gemt.\n" -#: src/lang.c:665 +#: src/lang.c:667 msgid "-- Next response --" msgstr "-- Næste svar --" -#: src/lang.c:666 +#: src/lang.c:668 msgid "No " msgstr "Nej " -#: src/lang.c:667 +#: src/lang.c:669 msgid "*** No articles ***" msgstr "*** Ingen artikler ***" -#: src/lang.c:668 +#: src/lang.c:670 msgid "No articles have been posted" msgstr "Ingen artikler er udgivet" -#: src/lang.c:669 +#: src/lang.c:671 msgid "*** No attachments ***" msgstr "*** Ingen vedhæftninger ***" -#: src/lang.c:670 +#: src/lang.c:672 msgid "*** No description ***" msgstr "*** Ingen beskrivelse ***" -#: src/lang.c:671 +#: src/lang.c:673 msgid "No filename" msgstr "Intet filnavn" -#: src/lang.c:672 +#: src/lang.c:674 msgid "No group" msgstr "Ingen gruppe" -#: src/lang.c:673 +#: src/lang.c:675 msgid "*** No groups ***" msgstr "*** Ingen grupper ***" -#: src/lang.c:674 +#: src/lang.c:676 msgid "No more groups to read" msgstr "Ikke flere grupper der kan læses" -#: src/lang.c:675 +#: src/lang.c:677 msgid "No last message" msgstr "Ingen sidste besked" -#: src/lang.c:676 +#: src/lang.c:678 msgid "No mail address" msgstr "Ingen e-postadresse" -#: src/lang.c:677 +#: src/lang.c:679 msgid "No articles marked for saving" msgstr "Ingen artikler markeret til gemning" -#: src/lang.c:678 +#: src/lang.c:680 msgid "No match" msgstr "Intet resultat" -#: src/lang.c:679 +#: src/lang.c:681 msgid "No more groups" msgstr "Ikke flere grupper" -#: src/lang.c:680 +#: src/lang.c:682 msgid "No newsgroups" msgstr "Ingen nyhedsgrupper" -#: src/lang.c:681 +#: src/lang.c:683 msgid "No next unread article" msgstr "Ingen næste ulæst artikel" -#: src/lang.c:682 +#: src/lang.c:684 msgid "No previous group" msgstr "Ingen forrige gruppe" -#: src/lang.c:683 +#: src/lang.c:685 msgid "No previous search, nothing to repeat" msgstr "Ingen tidligere søgning, intet at gentage" -#: src/lang.c:684 +#: src/lang.c:686 msgid "No previous unread article" msgstr "Ingen forrige ulæst artikel" -#: src/lang.c:685 +#: src/lang.c:687 msgid "No responses" msgstr "Ingen svar" -#: src/lang.c:686 +#: src/lang.c:688 msgid "No responses to list in current thread" msgstr "Ingen svar at vise i aktuel tråd" -#: src/lang.c:687 +#: src/lang.c:689 msgid "*** No scopes ***" msgstr "*** Ingen virkefelter ***" -#: src/lang.c:688 +#: src/lang.c:690 msgid "No search string" msgstr "Ingen søgestreng" -#: src/lang.c:689 +#: src/lang.c:691 msgid "No subject" msgstr "Intet emne" -#: src/lang.c:691 +#: src/lang.c:693 #, c-format msgid "%s: Terminal must have clear to end-of-line (ce)\n" msgstr "%s: Terminal skal have en ryd til linjeafslutning (ce)\n" -#: src/lang.c:692 +#: src/lang.c:694 #, c-format msgid "%s: Terminal must have clear to end-of-screen (cd)\n" msgstr "%s: Terminal skal have en ryd til slut på skærm (cd)\n" -#: src/lang.c:693 +#: src/lang.c:695 #, c-format msgid "%s: Terminal must have clearscreen (cl) capability\n" msgstr "%s: Terminal skal have ryd skærm-funktionalitet (cl)\n" -#: src/lang.c:694 +#: src/lang.c:696 #, c-format msgid "%s: Terminal must have cursor motion (cm)\n" msgstr "%s: Terminal skal have markørbevægelse (cm)\n" -#: src/lang.c:695 +#: src/lang.c:697 #, c-format msgid "%s: TERM variable must be set to use screen capabilities\n" msgstr "%s: TERM-variabel skal være angivet for at bruge skærmfunktioner\n" -#: src/lang.c:697 +#: src/lang.c:699 #, c-format msgid "No viewer found for %s/%s\n" msgstr "Ingen fremviser fundet for %s/%s\n" -#: src/lang.c:698 +#: src/lang.c:700 msgid "Newsgroup does not exist on this server" msgstr "Nyhedsgruppe eksisterer ikke på denne server" -#: src/lang.c:699 +#: src/lang.c:701 #, c-format msgid "Group %s not found in active file" msgstr "Gruppe %s blev ikke fundet i aktiv fil" # tysk bruger = ("c=erzeuge, a=alternativer Name, d=voreingestellte .newsrc, q=beende tin: ") # det var også en mulighed, måske bedre=? -#: src/lang.c:700 +#: src/lang.c:702 msgid "c)reate it, use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "" "opret (c) den, brug et alternativt (a) navn, brug standarden (d) .newsrc, " "afslut (q) tin: " -#: src/lang.c:701 +#: src/lang.c:703 msgid "use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "" "brug alternativt (a) navn, brug standarden (d) .newsrc, afslut (a) tin: " -#: src/lang.c:702 +#: src/lang.c:704 #, c-format msgid "" "# NNTP-server -> newsrc translation table and NNTP-server\n" @@ -3330,44 +3360,44 @@ msgstr "" "# news.tin.org .newsrc-tin.org tinorg\n" "# news.example.org /tmp/nrc-ex eksempel ex\n" -#: src/lang.c:709 +#: src/lang.c:711 msgid "Only" msgstr "Kun" -#: src/lang.c:710 +#: src/lang.c:712 #, c-format msgid "Option not enabled. Recompile with %s." msgstr "Indstilling ikke slået til. Rekompiler med %s." -#: src/lang.c:711 +#: src/lang.c:713 msgid "Options Menu" msgstr "Indstillingsmenu" -#: src/lang.c:712 +#: src/lang.c:714 msgid "Options Menu Commands" msgstr "Kommandoer for indstillingsmenu" -#: src/lang.c:715 +#: src/lang.c:717 #, c-format msgid "Error in regex: %s at pos. %d '%s'" msgstr "Fejl i regulært udtryk: %s ved pos. %d »%s«" -#: src/lang.c:716 +#: src/lang.c:718 #, c-format msgid "Error in regex: pcre internal error %d" msgstr "Fejl i regulært udtryk: intern fejl i pcre %d" -#: src/lang.c:717 +#: src/lang.c:719 #, c-format msgid "Error in regex: study - pcre internal error %s" msgstr "Fejl i regulært udtryk: study - prcre-intern fejl %s" -#: src/lang.c:718 +#: src/lang.c:720 msgid "Post a followup..." msgstr "Indsend en opfølgning ..." #. TODO: replace hard coded key-name in txt_post_error_ask_postpone -#: src/lang.c:720 +#: src/lang.c:722 msgid "" "An error has occurred while posting the article. If you think that this\n" "error is temporary or otherwise correctable, you can postpone the article\n" @@ -3377,29 +3407,29 @@ msgstr "" "denne fejl er midlertidig eller på anden måde kan rettes, så kan du\n" "udsætte artiklen og samle den op igen senere med ^O senere.\n" -#: src/lang.c:723 +#: src/lang.c:725 msgid "Posted articles history" msgstr "Historik for indsendte artikler" -#: src/lang.c:724 +#: src/lang.c:726 #, c-format msgid "Post to newsgroup(s) [%s]> " msgstr "Send til nyhedsgruppe(r) [%s]> " -#: src/lang.c:725 +#: src/lang.c:727 msgid "-- post processing started --" msgstr "-- efterbehandling startet --" -#: src/lang.c:726 +#: src/lang.c:728 msgid "-- post processing completed --" msgstr "-- efterbehandling færdig --" -#: src/lang.c:727 +#: src/lang.c:729 #, c-format msgid "Post subject [%s]> " msgstr "Send emne [%s]> " -#: src/lang.c:728 +#: src/lang.c:730 msgid "" "# Summary of mailed/posted messages viewable by 'W' command from within " "tin.\n" @@ -3407,106 +3437,106 @@ msgstr "" "# Oversigt over sendte/indsendte beskeder kan ses med kommandoen »W« inden " "fra tin.\n" -#: src/lang.c:729 +#: src/lang.c:731 msgid "Posting article..." msgstr "Sender artikel ..." -#: src/lang.c:730 +#: src/lang.c:732 #, c-format msgid "Post postponed articles [%%s]? (%s/%s/%s/%s/%s): " msgstr "Send udsatte artikler [%%s]? (%s/%s/%s/%s/%s): " -#: src/lang.c:731 +#: src/lang.c:733 #, c-format msgid "Hot %s" msgstr "Populær %s" -#: src/lang.c:732 +#: src/lang.c:734 #, c-format msgid "Tagged %s" msgstr "Mærket %s" -#: src/lang.c:733 +#: src/lang.c:735 #, c-format msgid "Untagged %s" msgstr "Uden mærke %s" -#: src/lang.c:735 +#: src/lang.c:737 #, c-format msgid "Preparing for filtering on Path header (%d/%d)..." msgstr "" -#: src/lang.c:737 +#: src/lang.c:739 msgid "Processing mail messages marked for deletion." msgstr "Behandler postbeskeder markeret for sletning." -#: src/lang.c:738 +#: src/lang.c:740 msgid "Processing saved articles marked for deletion." msgstr "Behandler gemte artikler markeret for sletning." -#: src/lang.c:739 +#: src/lang.c:741 #, c-format msgid "Accept Followup-To? %s=post, %s=ignore, %s=quit: " msgstr "Accepter Followup-To? %s=post, %s=ignore, %s=quit: " -#: src/lang.c:740 +#: src/lang.c:742 msgid "Article unchanged, abort mailing?" msgstr "Artikel uændret, afbryd postleverance" -#: src/lang.c:741 +#: src/lang.c:743 #, c-format msgid "Do you want to see postponed articles (%d)?" msgstr "Ønsker du at se udsatte artikler (%d)?" -#: src/lang.c:743 +#: src/lang.c:745 msgid "Add quick kill filter?" msgstr "Tilføj filter for hurtig dræb" -#: src/lang.c:744 +#: src/lang.c:746 msgid "Add quick selection filter?" msgstr "Tilføj filter for hurtig markering" -#: src/lang.c:745 +#: src/lang.c:747 msgid "Do you really want to quit?" msgstr "Ønsker du at afslutte?" -#: src/lang.c:746 +#: src/lang.c:748 #, c-format msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%s]: " msgstr "%s=rediger afbrydbesked, %s=afslut, %s=slet (afbryd) [%%s]: " -#: src/lang.c:747 +#: src/lang.c:749 msgid "You have tagged articles in this group - quit anyway?" msgstr "Du har mærkede artikler i denne gruppe - afslut alligevel?" -#: src/lang.c:748 +#: src/lang.c:750 #, c-format msgid "%s=quit, %s=edit, %s=postpone: " msgstr "%s=afslut, %s=rediger, %s=udsæt: " -#: src/lang.c:749 +#: src/lang.c:751 #, c-format msgid "%s=quit %s=edit %s=save kill description: " msgstr "%s=afslut %s=rediger %s=gem dræbbeskrivelse: " -#: src/lang.c:750 +#: src/lang.c:752 #, c-format msgid "%s=quit %s=edit %s=save select description: " msgstr "%s=afslut %s=rediger %s=gem beskrivelse af vælg: " -#: src/lang.c:751 +#: src/lang.c:753 msgid "Do you really want to quit without saving your configuration?" msgstr "Ønsker du virkelig at afslutte uden at gemme din konfiguration?" -#: src/lang.c:754 +#: src/lang.c:756 msgid "Invalid range - valid are '0-9.$' eg. 1-$" msgstr "Ugyldigt interval - '0-9.$' f.eks. 1-$ er gyldige" -#: src/lang.c:756 +#: src/lang.c:757 msgid "Do you want to abort this operation?" msgstr "Ønsker du at afbryde denne handling?" -#: src/lang.c:757 +#: src/lang.c:758 msgid "Do you want to exit tin immediately?" msgstr "Ønsker du øjeblikkeligt at afslutte tin?" @@ -4834,8 +4864,9 @@ msgid " -p port use port as NNTP port msgstr " -p port brug port som NNTP-port [standard=%d]" #: src/lang.c:1118 -msgid " -Q quick start. Same as -nqd" -msgstr " -Q hurtigstart. Samme som -nqd" +#, fuzzy +msgid " -Q quick start. Same as -dnq" +msgstr " -Q hurtigstart. Samme som -dnq" #: src/lang.c:1119 msgid " -r read news remotely from default NNTP server" @@ -8284,21 +8315,27 @@ msgid "Insert 'X-Comment-To:' header" msgstr "Indsæt »X-Comment-To:«-teksthoved" #. TODO: lang.c -#: src/main.c:817 +#: src/main.c:819 msgid "reading from local spool" msgstr "læser fra lokal kø" -#: src/misc.c:3877 +#. TODO: != ENOENT ? and -> lang.c +#: src/misc.c:750 +#, c-format +msgid "Error: unlink %s" +msgstr "" + +#: src/misc.c:3928 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "Version: %s %s udgave %s (»%s«) %s %s\n" -#: src/misc.c:3880 +#: src/misc.c:3931 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "Version: %s %s udgave %s (»%s«)\n" -#: src/newsrc.c:460 +#: src/newsrc.c:472 msgid "Unreachable?\n" msgstr "Kan ikke nås?\n" @@ -8338,12 +8375,12 @@ msgstr "FUNKTIONER annoncerede ikke LÆS msgid "MOTD: " msgstr "MOTD: " -#: src/nrctbl.c:178 +#: src/nrctbl.c:184 #, c-format msgid "couldn't expand %s\n" msgstr "kunne ikke udvide %s\n" -#: src/post.c:1344 +#: src/post.c:1357 #, fuzzy, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" @@ -8352,7 +8389,7 @@ msgstr "" "Linje %d er længere end %d oktetter og bør foldes sammen, men\n" "kodningen er hverken sat til %s eller til %s\n" -#: src/post.c:1349 +#: src/post.c:1362 #, fuzzy, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" @@ -8364,7 +8401,7 @@ msgstr "" "eller beskeden indeholder ikke 8-bit tegn og foldning vil derfor\n" "ikke blive udført\n" -#: src/post.c:1351 +#: src/post.c:1364 #, fuzzy, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" @@ -8373,25 +8410,25 @@ msgstr "" "Linje %d er længere end %d oktetter og bør foldes sammen, men\n" "kodningen er ikke sat til %s\n" -#: src/post.c:2325 +#: src/post.c:2353 #, c-format msgid "Posting: %.*s ..." msgstr "Indsender: %.*s ..." -#: src/post.c:4075 +#: src/post.c:4119 msgid "Can't supersede in mailgroups, try repost instead." msgstr "" #. Check if okay to read -#: src/read.c:207 +#: src/read.c:204 msgid "Aborting read, please wait..." msgstr "Afbryder læsning, vent venligst ..." -#: src/read.c:354 +#: src/read.c:351 msgid "Aborted read\n" msgstr "Afbrød læsning\n" -#: src/read.c:409 +#: src/read.c:406 msgid "Draining\n" msgstr "" @@ -8404,6 +8441,18 @@ msgid "[- Unavailable -]" msgstr "[- Utilgængelig -]" #. +#. * Add the Message-ID headers to the cache, using the last Reference +#. * as the parent +#. +#. +#. * Add the References data to the cache +#. +#: src/refs.c:1015 src/refs.c:1077 +#, c-format +msgid "Building References-trees (%d/%d)..." +msgstr "" + +#. #. * preamble #. * TODO: -> lang.c #. @@ -8422,7 +8471,7 @@ msgstr "" "mærkeligt ud.\n" "\n" -#: src/save.c:1069 +#: src/save.c:1075 msgid "bytes" msgstr "byte" Binary files tin-2.4.4/po/de.gmo and tin-2.4.5/po/de.gmo differ diff -Nurp '--exclude=.bzr*' tin-2.4.4/po/de.po tin-2.4.5/po/de.po --- tin-2.4.4/po/de.po 2019-12-24 10:55:07.000000000 +0100 +++ tin-2.4.5/po/de.po 2020-12-24 00:25:49.780072261 +0100 @@ -4,20 +4,43 @@ # Kai Bojens , 2000-2002. # Andreas Metzler , 2001-2003. # Christian Garbs , 2003. -# Urs Janssen , 2004-2020 +# Urs Janssen , 2004-2021 # msgid "" msgstr "" -"Project-Id-Version: tin 2.4.4\n" +"Project-Id-Version: tin 2.4.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 13:24+0100\n" -"PO-Revision-Date: 2019-12-24 10:50+0100\n" +"POT-Creation-Date: 2020-12-24 00:24+0100\n" +"PO-Revision-Date: 2020-12-24 00:25+0100\n" "Last-Translator: Urs Janssen \n" "Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" + +#. -> lang.c +#: src/art.c:418 +#, c-format +msgid "Reading %s\n" +msgstr "Lese %s\n" + +#. TODO: -> lang.c +#: src/art.c:1205 +msgid "Threading by multipart" +msgstr "Multipart Threading" + +#. -> lang.c +#: src/art.c:2539 +#, c-format +msgid "Writing %s\n" +msgstr "Schreibe %s\n" + +#. TODO: -> lang.c +#: src/art.c:2619 +msgid "Writing overview cache..." +msgstr "Schreibe Overview Cache..." #: src/attrib.c:986 msgid "Processing attributes... " @@ -1619,8 +1642,8 @@ msgstr "Fehler beim Erzeugen der Sicheru #: src/lang.c:274 #, c-format -msgid "Filtering global rules (%d/%d)..." -msgstr "Filtern nach den globalen Regeln (%d/%d)..." +msgid "Filtering global rules (%d/%d) ('q' to quit)..." +msgstr "Filtern nach den globalen Regeln (%d/%d) ('q' zum Beenden)..." #: src/lang.c:275 msgid "Rule created by: " @@ -2369,9 +2392,9 @@ msgstr "" "Markierung 'hot'/wichtig für alle Threads setzen, die einem\n" " gewählten Muster entsprechen" -#: src/lang.c:465 -msgid "tag all parts of current multipart-message in order" -msgstr "markiert alle Teile der multipart-Nachrichten in der Reihenfolge" +#: src/lang.c:465 src/lang.c:521 +msgid "tag/untag all parts of current multipart-message in order" +msgstr "(un)markiert alle Teile der multipart-Nachrichten in der Reihenfolge" #: src/lang.c:466 msgid "0 - 9\t choose thread by number" @@ -2587,7 +2610,7 @@ msgstr "markiert den aktuellen Thread al msgid "read chosen article" msgstr "zeige gewählten Artikel" -#: src/lang.c:521 +#: src/lang.c:522 msgid "" "Display properties\n" "------------------" @@ -2595,7 +2618,7 @@ msgstr "" "Darstellungsoptionen\n" "--------------------" -#: src/lang.c:522 +#: src/lang.c:523 msgid "" "Miscellaneous\n" "-------------" @@ -2603,7 +2626,7 @@ msgstr "" "Verschiedenes\n" "-------------" -#: src/lang.c:523 +#: src/lang.c:524 msgid "" "Moving around\n" "-------------" @@ -2611,7 +2634,7 @@ msgstr "" "Position ändern\n" "---------------" -#: src/lang.c:524 +#: src/lang.c:525 msgid "" "Group/thread/article operations\n" "-------------------------------" @@ -2619,7 +2642,7 @@ msgstr "" "Gruppe/Thread/Artikel Aktionen\n" "-------------------------------" -#: src/lang.c:525 +#: src/lang.c:526 msgid "" "Attachment operations\n" "---------------------" @@ -2627,7 +2650,7 @@ msgstr "" "Anhangs Aktionen\n" "-----------------" -#: src/lang.c:526 +#: src/lang.c:527 msgid "" "Attribute operations\n" "--------------------" @@ -2635,7 +2658,7 @@ msgstr "" "Attribute Aktionen\n" "------------------" -#: src/lang.c:527 +#: src/lang.c:528 msgid "" "Option operations\n" "-----------------" @@ -2643,7 +2666,7 @@ msgstr "" "Options Aktionen\n" "----------------" -#: src/lang.c:528 +#: src/lang.c:529 msgid "" "Scope operations\n" "----------------" @@ -2651,7 +2674,7 @@ msgstr "" "Gültigkeitsbereich Aktionen\n" "---------------------------" -#: src/lang.c:529 +#: src/lang.c:530 msgid "" "URL operations\n" "--------------" @@ -2659,90 +2682,94 @@ msgstr "" "URL Aktionen\n" "------------" -#: src/lang.c:530 +#: src/lang.c:531 msgid "choose first URL in list" msgstr "Wähle erste URL in der Liste" -#: src/lang.c:531 +#: src/lang.c:532 msgid "0 - 9\t choose URL by number" msgstr "0 - 9\t wählt die URL anhand der Nummer" -#: src/lang.c:532 +#: src/lang.c:533 msgid "choose last URL in list" msgstr "Wähle letzte URL in der Liste" -#: src/lang.c:533 +#: src/lang.c:534 msgid "search for URLs forwards" msgstr "Suche vorwärts nach URLs" -#: src/lang.c:534 +#: src/lang.c:535 msgid "search for URLs backwards" msgstr "Suche rückwärts nach URLs" -#: src/lang.c:535 +#: src/lang.c:536 msgid "Open URL in browser" msgstr "URL im Browser öffnen" -#: src/lang.c:536 +#: src/lang.c:537 msgid "toggle info message in last line (URL)" msgstr "Informationen (URL) in der letzten Zeile ein/ausblenden" -#: src/lang.c:538 +#: src/lang.c:539 msgid "Group Level Commands" msgstr "Gruppenlevel Befehle" -#: src/lang.c:539 +#: src/lang.c:540 msgid "Kill filter added" msgstr "Killfilter hinzugefügt" -#: src/lang.c:540 +#: src/lang.c:541 msgid "Auto-selection filter added" msgstr "Automatischer Auswahlfilter hinzugefügt" -#: src/lang.c:541 +#: src/lang.c:542 msgid "All parts tagged" msgstr "Alle Teile markiert" -#: src/lang.c:542 +#: src/lang.c:543 +msgid "All parts untagged" +msgstr "Alle Teile unmarkiert " + +#: src/lang.c:544 msgid "Storing article for later posting" msgstr "Speichert Artikel, um ihn später zu posten" -#: src/lang.c:543 +#: src/lang.c:545 msgid "Please enter a valid character" msgstr "Bitte ein gültiges Zeichen eingeben" -#: src/lang.c:544 +#: src/lang.c:546 #, c-format msgid "Missing part #%d" msgstr "Teil Nummer %d fehlt." -#: src/lang.c:545 +#: src/lang.c:547 msgid "*** No postponed articles ***" msgstr "*** Keine zurückgelegten Artikel ***" -#: src/lang.c:546 +#: src/lang.c:548 msgid "Not a multi-part message" msgstr "Kein mehrteiliger Artikel" -#: src/lang.c:547 +#: src/lang.c:549 msgid "You are not subscribed to this group" msgstr "Sie haben diese Gruppe nicht abonniert" -#: src/lang.c:548 +#: src/lang.c:550 msgid "No previous expression" msgstr "Kein vorhergehender Ausdruck" -#: src/lang.c:549 +#: src/lang.c:551 msgid "Operation disabled in no-overwrite mode" msgstr "Ausführung nicht möglich im nicht-überschreiben Modus" #. TODO: replace hard coded key-name in txt_info_postponed -#: src/lang.c:551 +#: src/lang.c:553 #, c-format msgid "%d postponed %s, reuse with ^O...\n" msgstr "%d zurückgelegte %s, hervorholen mit ^O...\n" -#: src/lang.c:552 +#: src/lang.c:554 msgid "" "X-Conversion-Note: multipart/alternative contents have been removed.\n" " To get the whole article, turn alternative handling OFF in the Option " @@ -2752,21 +2779,21 @@ msgstr "" " Um das zu ändern, setzen Sie in der tinrc das alternative_handling auf " "OFF\n" -#: src/lang.c:554 +#: src/lang.c:556 #, c-format msgid "Save filename for %s/%s is a mailbox. Attachment not saved" msgstr "Dateiname für %s/%s ist eine Mailbox. Anhang nicht gespeichert" -#: src/lang.c:555 +#: src/lang.c:557 msgid "TeX2Iso encoded article" msgstr "TeX2Iso kodierter Artikel" -#: src/lang.c:556 +#: src/lang.c:558 msgid "incomplete " msgstr "unvollständige " #. TODO: replace hard coded key-names -#: src/lang.c:558 +#: src/lang.c:560 #, c-format msgid "" "\n" @@ -2829,151 +2856,151 @@ msgstr "" "Bitte senden Sie Fehlerberichte und Kommentare mittels des 'R' Kommandos an\n" "%s.\n" -#: src/lang.c:574 +#: src/lang.c:576 #, c-format msgid "Invalid From: %s line. Read the INSTALL file again." msgstr "Ungültige From: %s Zeile. Lesen Sie INSTALL nochmal." -#: src/lang.c:576 +#: src/lang.c:578 msgid "Invalid multibyte sequence found\n" msgstr "Ungültige Mehrbytezeichen-Folge vorhanden\n" -#: src/lang.c:579 +#: src/lang.c:581 #, c-format msgid "Invalid Sender:-header %s" msgstr "Ungültiger Sender:-Header %s" -#: src/lang.c:581 +#: src/lang.c:583 msgid "Inverse video disabled" msgstr "Inverse Bilddarstellung abgestellt" -#: src/lang.c:582 +#: src/lang.c:584 msgid "Inverse video enabled" msgstr "Inverse Bilddarstellung eingeschaltet" -#: src/lang.c:584 +#: src/lang.c:586 #, c-format msgid "Missing definition for %s\n" msgstr "Fehlende Definition für %s\n" -#: src/lang.c:585 +#: src/lang.c:587 #, c-format msgid "Invalid key definition '%s'\n" msgstr "Ungültige Tastenbelegung '%s'\n" -#: src/lang.c:586 +#: src/lang.c:588 #, c-format msgid "Invalid keyname '%s'\n" msgstr "Ungültiger Tastenname '%s'\n" -#: src/lang.c:587 +#: src/lang.c:589 #, c-format msgid "Keymap file was upgraded to version %s\n" msgstr "Keymap-Datei wurde auf Version %s umgestellt\n" -#: src/lang.c:588 +#: src/lang.c:590 #, c-format msgid "Kill From: [%s] (y/n): " msgstr "Filter From: [%s] (j/n): " -#: src/lang.c:589 +#: src/lang.c:591 msgid "Kill Lines: (num): " msgstr "Filter Z.: (num): " -#: src/lang.c:590 +#: src/lang.c:592 msgid "Kill Article Menu" msgstr "Filter Menü (Kill, Bewertung/Score verringern)" -#: src/lang.c:591 +#: src/lang.c:593 #, c-format msgid "Kill Msg-ID: [%s] (f/l/o/n): " msgstr "Filter Msg-ID: [%s] (v/l/n/n): " -#: src/lang.c:592 +#: src/lang.c:594 msgid "Kill pattern scope : " msgstr "Filter nach Muster : " -#: src/lang.c:593 +#: src/lang.c:595 #, c-format msgid "Kill Subject: [%s] (y/n): " msgstr "Filter Subject:[%s] (j/n): " -#: src/lang.c:594 +#: src/lang.c:596 msgid "Kill text pattern : " msgstr "Filter Textmuster : " -#: src/lang.c:595 +#: src/lang.c:597 msgid "Kill time in days : " msgstr "Filterzeit in Tagen : " -#: src/lang.c:597 +#: src/lang.c:599 msgid "Last" msgstr "Letzte" -#: src/lang.c:598 +#: src/lang.c:600 msgid "-- Last response --" msgstr "-- Letzte Antwort --" -#: src/lang.c:599 +#: src/lang.c:601 #, c-format msgid "Lines %s " msgstr "Zeilen %s " -#: src/lang.c:602 +#: src/lang.c:604 msgid "Function not available." msgstr "Funktion nicht verfügbar." -#: src/lang.c:603 +#: src/lang.c:605 msgid "Not reading via NNTP." msgstr "Es wird nicht via NNTP gelesen." -#: src/lang.c:604 +#: src/lang.c:606 #, c-format msgid "Group: %s" msgstr "Gruppe: %s" -#: src/lang.c:605 +#: src/lang.c:607 #, c-format msgid "Groups: %s" msgstr "Gruppen: %s" -#: src/lang.c:608 +#: src/lang.c:610 msgid "Mail" msgstr "Maile" -#: src/lang.c:609 +#: src/lang.c:611 msgid "mailbox " msgstr "Mailbox " -#: src/lang.c:610 +#: src/lang.c:612 #, c-format msgid "Mail article(s) to [%.*s]> " msgstr "Mailt Artikel an [%.*s]> " -#: src/lang.c:611 +#: src/lang.c:613 #, c-format msgid "Mailing log to %s\n" msgstr "Maile Log-Datei an %s\n" -#: src/lang.c:612 +#: src/lang.c:614 msgid "Mail bug report..." msgstr "Maile einen Fehlerbericht..." -#: src/lang.c:613 +#: src/lang.c:615 #, c-format msgid "Mail BUG REPORT to %s?" msgstr "Fehlerbericht an %s senden?" -#: src/lang.c:614 +#: src/lang.c:616 msgid "Mailed" msgstr "Gemailt" -#: src/lang.c:615 +#: src/lang.c:617 #, c-format msgid "Mailing to %s..." msgstr "Senden der Mail an %s..." -#: src/lang.c:616 +#: src/lang.c:618 msgid "" "# [Mail/Save] active file. Format is like news active file:\n" "# groupname max.artnum min.artnum /dir\n" @@ -2985,61 +3012,61 @@ msgstr "" "# Das 4. Feld ist das Basisverzeichnis (z.B. ~/Mail oder ~/News)\n" "#\n" -#: src/lang.c:619 +#: src/lang.c:621 #, c-format msgid "%s marked as read" msgstr "%s als gelesen markiert" -#: src/lang.c:620 +#: src/lang.c:622 #, c-format msgid "%s marked as unread" msgstr "%s als ungelesen markiert" -#: src/lang.c:621 +#: src/lang.c:623 #, c-format msgid "Marked %d of %d %s as read" msgstr "%d von %d %s als gelesen markiert" -#: src/lang.c:622 +#: src/lang.c:624 #, c-format msgid "Marked %d of %d %s as unread" msgstr "%d von %d %s als ungelesen markiert" -#: src/lang.c:623 src/lang.c:1352 +#: src/lang.c:625 src/lang.c:1352 msgid "Mark" msgstr "Markierung" -#: src/lang.c:624 +#: src/lang.c:626 #, c-format msgid "Mark all articles as read%s?" msgstr "Alle Artikel als gelesen markieren%s?" -#: src/lang.c:625 +#: src/lang.c:627 #, c-format msgid "Mark article as read%s?" msgstr "Artikel als gelesen markieren%s?" -#: src/lang.c:626 +#: src/lang.c:628 #, c-format msgid "Mark group %s as read?" msgstr "Die Gruppe %s als gelesen markieren?" -#: src/lang.c:627 +#: src/lang.c:629 #, c-format msgid "Mark thread as read%s?" msgstr "Den Thread als gelesen markieren%s?" -#: src/lang.c:628 +#: src/lang.c:630 #, c-format msgid "Matching %s groups..." msgstr "Übereinstimmende %s Gruppen..." -#: src/lang.c:629 src/lang.c:643 src/lang.c:649 +#: src/lang.c:631 src/lang.c:645 src/lang.c:651 #, c-format msgid "=set current to n; %s=line down; %s=line up; %s=help; %s=quit" msgstr "=springe zu n; %s=Zeile runter; %s=Zeile rauf; %s=Hilfe; %s=Beenden" -#: src/lang.c:631 +#: src/lang.c:633 #, c-format msgid "" "%s=view; %s=pipe; %s=pipe raw; %s=save; %s=tag; %s=tag pattern; %s=untag all" @@ -3047,14 +3074,14 @@ msgstr "" "%s=anzeigen; %s=pipen; %s=roh pipen; %s=speichern; %s=markieren; %s=Muster " "markieren; %s=Markierungen aufheben" -#: src/lang.c:633 +#: src/lang.c:635 #, c-format msgid "%s=view; %s=save; %s=tag; %s=tag pattern; %s=untag all" msgstr "" "%s=anzeigen; %s=speichern; %s=markieren; %s=Muster markieren; " "%s=Markierungen aufheben" -#: src/lang.c:635 +#: src/lang.c:637 #, c-format msgid "" "%s=reverse tagging; %s=search forwards; %s=search backwards; %s=repeat search" @@ -3062,12 +3089,12 @@ msgstr "" "%s=Markierungen umkehren; %s=Suche vorwärts; %s=Suche rückwärts; %s=Suche " "wiederholen" -#: src/lang.c:636 src/lang.c:640 +#: src/lang.c:638 src/lang.c:642 #, c-format msgid "=set current to n; %s=next unread; %s=search pattern; %s=kill/select" msgstr "=Wähle n; %s=n. ungel.; %s=Suche; %s=Filter" -#: src/lang.c:637 +#: src/lang.c:639 #, c-format msgid "" "%s=author search; %s=catchup; %s=line down; %s=line up; %s=mark read; " @@ -3076,34 +3103,34 @@ msgstr "" "%s=Autorsuche; %s=Catchup; %s=n. unten; %s=n. oben; %s=gelesen; %s=Thread " "anz." -#: src/lang.c:638 +#: src/lang.c:640 #, c-format msgid "%s=line up; %s=line down; %s=page up; %s=page down; %s=top; %s=bottom" msgstr "" "%s=n. oben; %s=n. unten; %s=Bildrauf; %s=Bildrunter; %s=Anfang; %s=letzte " "Zeile" -#: src/lang.c:639 +#: src/lang.c:641 #, c-format msgid "%s=search forwards; %s=search backwards; %s=quit" msgstr "%s=Suche vorwärts; %s=Suche rückwärts; %s=Beenden" -#: src/lang.c:641 +#: src/lang.c:643 #, c-format msgid "%s=author search; %s=body search; %s=catchup; %s=followup; %s=mark read" msgstr "%s=Autorsuche; %s=Su. Inhalt; %s=Catchup; %s=Antw in NG; %s=gelesen" -#: src/lang.c:642 +#: src/lang.c:644 #, c-format msgid "%s=add; %s=move; %s=rename; %s=delete" msgstr "%s=hinzufügen; %s=verschieben; %s=umbenennen; %s=löschen" -#: src/lang.c:644 +#: src/lang.c:646 #, c-format msgid "=set current to n; %s=next unread; %s,%s=search pattern; %s=catchup" msgstr "=Wähle n; %s=n. ungel.; %s,%s=Suche; %s=Catchup" -#: src/lang.c:645 +#: src/lang.c:647 #, c-format msgid "" "%s=line down; %s=line up; %s=help; %s=move; %s=quit; %s=toggle all/unread" @@ -3111,7 +3138,7 @@ msgstr "" "%s=n. unten; %s=n. oben; %s=Hilfe; %s=verschieben; %s=Ende; %s=Alle/Nur " "ungel." -#: src/lang.c:646 +#: src/lang.c:648 #, c-format msgid "" "%s=subscribe; %s=sub pattern; %s=unsubscribe; %s=unsub pattern; %s=yank in/" @@ -3120,227 +3147,227 @@ msgstr "" "%s=Abo; %s=Abo n. Muster; %s=Abbestellen; %s=Abbest. n. Muster; %s=Alle/Nur " "abon." -#: src/lang.c:647 +#: src/lang.c:649 #, c-format msgid "=set current to n; %s=next unread; %s=catchup; %s=display toggle" msgstr "=Wähle n; %s=n. ungel.; %s=Catchup; %s=Infozeile" -#: src/lang.c:648 +#: src/lang.c:650 #, c-format msgid "%s=help; %s=line down; %s=line up; %s=quit; %s=tag; %s=mark unread" msgstr "%s=Hilfe; %s=n. unten; %s=n. oben; %s=Ende; %s=tag; %s=ungelesen" -#: src/lang.c:650 +#: src/lang.c:652 #, c-format msgid "%s=search forwards; %s=search backwards; %s=repeat search" msgstr "%s=Suche vorwärts; %s=Suche rückwärts; %s=Suche wiederholen" -#: src/lang.c:651 +#: src/lang.c:653 msgid "--More--" msgstr "--Mehr--" -#: src/lang.c:652 +#: src/lang.c:654 #, c-format msgid "Moving %s..." msgstr "Verschiebe %s..." -#: src/lang.c:653 +#: src/lang.c:655 msgid "Message-ID: & last Reference " msgstr "Message-ID: & letzte Reference" -#: src/lang.c:654 +#: src/lang.c:656 msgid "Message-ID: line " msgstr "Message-ID: Zeile " -#: src/lang.c:655 +#: src/lang.c:657 msgid "Message-ID: & References: line" msgstr "Message-ID: & References: " -#: src/lang.c:657 +#: src/lang.c:659 msgid ", name: " msgstr ", Name: " -#: src/lang.c:658 +#: src/lang.c:660 #, c-format msgid "Go to newsgroup [%s]> " msgstr "Gehe zu Gruppe [%s]> " -#: src/lang.c:659 +#: src/lang.c:661 msgid "newsgroups" msgstr "Gruppen" -#: src/lang.c:660 +#: src/lang.c:662 #, c-format msgid "Position %s in group list (1,2,..,$) [%d]> " msgstr "Position %s in der Gruppenliste (1,2,..,$) [%d]> " -#: src/lang.c:661 +#: src/lang.c:663 msgid "newsgroup" msgstr "Gruppe" -#: src/lang.c:662 +#: src/lang.c:664 msgid "Try and save newsrc file again?" msgstr "Erneut versuchen, die newsrc-Datei zu schreiben?" -#: src/lang.c:663 +#: src/lang.c:665 msgid "Warning: No newsgroups were written to your newsrc file. Save aborted." msgstr "Warnung: Keine Newsgruppen in die newsrc geschrieben. Speicherabbruch." -#: src/lang.c:664 +#: src/lang.c:666 msgid "newsrc file saved successfully.\n" msgstr "newsrc-Datei erfolgreich geschrieben.\n" -#: src/lang.c:665 +#: src/lang.c:667 msgid "-- Next response --" msgstr "-- Nächste Antwort --" -#: src/lang.c:666 +#: src/lang.c:668 msgid "No " msgstr "Nein" -#: src/lang.c:667 +#: src/lang.c:669 msgid "*** No articles ***" msgstr "*** Keine Artikel ***" -#: src/lang.c:668 +#: src/lang.c:670 msgid "No articles have been posted" msgstr "Es wurden keine Artikel gepostet" -#: src/lang.c:669 +#: src/lang.c:671 msgid "*** No attachments ***" msgstr "*** Keine Anhänge ***" -#: src/lang.c:670 +#: src/lang.c:672 msgid "*** No description ***" msgstr "*** Keine Kurzbeschreibung ***" -#: src/lang.c:671 +#: src/lang.c:673 msgid "No filename" msgstr "Kein Dateiname" -#: src/lang.c:672 +#: src/lang.c:674 msgid "No group" msgstr "Keine Gruppe" -#: src/lang.c:673 +#: src/lang.c:675 msgid "*** No groups ***" msgstr "*** Keine Newsgruppen ***" -#: src/lang.c:674 +#: src/lang.c:676 msgid "No more groups to read" msgstr "Keine Gruppen zum Lesen übrig" -#: src/lang.c:675 +#: src/lang.c:677 msgid "No last message" msgstr "Keine letzte Nachricht" -#: src/lang.c:676 +#: src/lang.c:678 msgid "No mail address" msgstr "Keine EMail-Adresse" -#: src/lang.c:677 +#: src/lang.c:679 msgid "No articles marked for saving" msgstr "Keine Artikel zum Speichern markiert" -#: src/lang.c:678 +#: src/lang.c:680 msgid "No match" msgstr "Kein Treffer" -#: src/lang.c:679 +#: src/lang.c:681 msgid "No more groups" msgstr "Keine Gruppen mehr" -#: src/lang.c:680 +#: src/lang.c:682 msgid "No newsgroups" msgstr "Keine Newsgruppen" -#: src/lang.c:681 +#: src/lang.c:683 msgid "No next unread article" msgstr "Kein nächster ungelesener Artikel" -#: src/lang.c:682 +#: src/lang.c:684 msgid "No previous group" msgstr "Keine vorherige Gruppe" -#: src/lang.c:683 +#: src/lang.c:685 msgid "No previous search, nothing to repeat" msgstr "Keine vorherige Suche, nichts zu wiederholen" -#: src/lang.c:684 +#: src/lang.c:686 msgid "No previous unread article" msgstr "Kein vorheriger ungelesener Artikel" -#: src/lang.c:685 +#: src/lang.c:687 msgid "No responses" msgstr "Keine Antworten" -#: src/lang.c:686 +#: src/lang.c:688 msgid "No responses to list in current thread" msgstr "Keine Antworten vorhanden im aktuellen Thread" -#: src/lang.c:687 +#: src/lang.c:689 msgid "*** No scopes ***" msgstr "*** Keine Gültigkeitsbereiche ***" -#: src/lang.c:688 +#: src/lang.c:690 msgid "No search string" msgstr "Kein Suchmuster" -#: src/lang.c:689 +#: src/lang.c:691 msgid "No subject" msgstr "Kein Subject" -#: src/lang.c:691 +#: src/lang.c:693 #, c-format msgid "%s: Terminal must have clear to end-of-line (ce)\n" msgstr "%s: Terminal muss Löschen bis zum Ende der Zeile (ce) unterstützen\n" -#: src/lang.c:692 +#: src/lang.c:694 #, c-format msgid "%s: Terminal must have clear to end-of-screen (cd)\n" msgstr "" "%s: Terminal muss Löschen bis zum Ende des Schirmes unterstützen (cd)\n" -#: src/lang.c:693 +#: src/lang.c:695 #, c-format msgid "%s: Terminal must have clearscreen (cl) capability\n" msgstr "%s: Terminal muss Schirmlöschen (cl) unterstützen\n" -#: src/lang.c:694 +#: src/lang.c:696 #, c-format msgid "%s: Terminal must have cursor motion (cm)\n" msgstr "%s: Terminal muss Cursor-Bewegungen unterstützen (cm)\n" -#: src/lang.c:695 +#: src/lang.c:697 #, c-format msgid "%s: TERM variable must be set to use screen capabilities\n" msgstr "" "%s: TERM-Variable muss gesetzt sein, um das Terminal richtig anzusteuern\n" -#: src/lang.c:697 +#: src/lang.c:699 #, c-format msgid "No viewer found for %s/%s\n" msgstr "Kein Programm für %s/%s gefunden\n" -#: src/lang.c:698 +#: src/lang.c:700 msgid "Newsgroup does not exist on this server" msgstr "Newsgruppe existiert nicht auf diesem Server" -#: src/lang.c:699 +#: src/lang.c:701 #, c-format msgid "Group %s not found in active file" msgstr "Gruppe %s nicht in der Active-Datei gefunden" -#: src/lang.c:700 +#: src/lang.c:702 msgid "c)reate it, use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "" "c=erzeuge, a=alternativer Name, d=voreingestellte .newsrc, q=beende tin: " -#: src/lang.c:701 +#: src/lang.c:703 msgid "use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "a=alternativer Name, d=voreingestellte .newsrc, q=beende tin: " -#: src/lang.c:702 +#: src/lang.c:704 #, c-format msgid "" "# NNTP-server -> newsrc translation table and NNTP-server\n" @@ -3369,44 +3396,44 @@ msgstr "" "# news.example.org /tmp/nrc-ex example ex\n" "#\n" -#: src/lang.c:709 +#: src/lang.c:711 msgid "Only" msgstr "Nur" -#: src/lang.c:710 +#: src/lang.c:712 #, c-format msgid "Option not enabled. Recompile with %s." msgstr "Option nicht vorhanden. Neu kompilieren mit %s." -#: src/lang.c:711 +#: src/lang.c:713 msgid "Options Menu" msgstr "Optionsmenü" -#: src/lang.c:712 +#: src/lang.c:714 msgid "Options Menu Commands" msgstr "Optionsmenü Befehle" -#: src/lang.c:715 +#: src/lang.c:717 #, c-format msgid "Error in regex: %s at pos. %d '%s'" msgstr "Fehler im regulären Ausdruck: %s an Pos. %d '%s'" -#: src/lang.c:716 +#: src/lang.c:718 #, c-format msgid "Error in regex: pcre internal error %d" msgstr "Fehler im regulären Ausdruck: Interner Fehler %d des pcre" -#: src/lang.c:717 +#: src/lang.c:719 #, c-format msgid "Error in regex: study - pcre internal error %s" msgstr "Fehler im regulären Ausdruck: pcre interner Fehler %s" -#: src/lang.c:718 +#: src/lang.c:720 msgid "Post a followup..." msgstr "Schreibe eine Antwort..." #. TODO: replace hard coded key-name in txt_post_error_ask_postpone -#: src/lang.c:720 +#: src/lang.c:722 msgid "" "An error has occurred while posting the article. If you think that this\n" "error is temporary or otherwise correctable, you can postpone the article\n" @@ -3417,134 +3444,134 @@ msgstr "" "ein temporäres Problem ist, das später nicht mehr vorhanden ist, können Sie\n" "den Artikel zurückstellen und später mit ^O wieder hervorholen.\n" -#: src/lang.c:723 +#: src/lang.c:725 msgid "Posted articles history" msgstr "Übersicht der geposteten Artikel" -#: src/lang.c:724 +#: src/lang.c:726 #, c-format msgid "Post to newsgroup(s) [%s]> " msgstr "In Newsgruppe(n) [%s] posten> " -#: src/lang.c:725 +#: src/lang.c:727 msgid "-- post processing started --" msgstr "-- Nachbearbeitung gestartet --" -#: src/lang.c:726 +#: src/lang.c:728 msgid "-- post processing completed --" msgstr "-- Nachbearbeitung beendet --" -#: src/lang.c:727 +#: src/lang.c:729 #, c-format msgid "Post subject [%s]> " msgstr "Wähle Subject [%s]> " -#: src/lang.c:728 +#: src/lang.c:730 msgid "" "# Summary of mailed/posted messages viewable by 'W' command from within " "tin.\n" msgstr "# Zusammenfassung der gemailten/geposteten Artikel mit 'W' in tin.\n" -#: src/lang.c:729 +#: src/lang.c:731 msgid "Posting article..." msgstr "Poste Artikel..." -#: src/lang.c:730 +#: src/lang.c:732 #, c-format msgid "Post postponed articles [%%s]? (%s/%s/%s/%s/%s): " msgstr "Zurückgelegten Artikel [%%s]posten? (%s/%s/%s/%s/%s): " -#: src/lang.c:731 +#: src/lang.c:733 #, c-format msgid "Hot %s" msgstr "Wichtig/Hot %s" -#: src/lang.c:732 +#: src/lang.c:734 #, c-format msgid "Tagged %s" msgstr "%s markiert" -#: src/lang.c:733 +#: src/lang.c:735 #, c-format msgid "Untagged %s" msgstr "%s Markierung entfernt" -#: src/lang.c:735 +#: src/lang.c:737 #, c-format msgid "Preparing for filtering on Path header (%d/%d)..." msgstr "Bereite Path-Filter (%d/%d) vor..." -#: src/lang.c:737 +#: src/lang.c:739 msgid "Processing mail messages marked for deletion." msgstr "Bearbeite zum Löschen markierte EMails." -#: src/lang.c:738 +#: src/lang.c:740 msgid "Processing saved articles marked for deletion." msgstr "Bearbeite zum Löschen markierte gespeicherte Artikel." -#: src/lang.c:739 +#: src/lang.c:741 #, c-format msgid "Accept Followup-To? %s=post, %s=ignore, %s=quit: " msgstr "Followup-To akzeptieren? %s=posten, %s=ignorieren, %s=Ende: " -#: src/lang.c:740 +#: src/lang.c:742 msgid "Article unchanged, abort mailing?" msgstr "Mail unverändert, Versand abbrechen?" -#: src/lang.c:741 +#: src/lang.c:743 #, c-format msgid "Do you want to see postponed articles (%d)?" msgstr "Wollen Sie die zurückgestellten Artikel sehen (%d)?" -#: src/lang.c:743 +#: src/lang.c:745 msgid "Add quick kill filter?" msgstr "Artikel schnell (laut Voreinstellungen) killen?" -#: src/lang.c:744 +#: src/lang.c:746 msgid "Add quick selection filter?" msgstr "Filterregel (hochscoren) (laut Voreinstellungen) hinzufügen?" -#: src/lang.c:745 +#: src/lang.c:747 msgid "Do you really want to quit?" msgstr "Möchten Sie das Programm wirklich beenden?" -#: src/lang.c:746 +#: src/lang.c:748 #, c-format msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%s]: " msgstr "%s=cancel-Nachricht editieren, %s=Ende, %s=löschen [%%s]: " -#: src/lang.c:747 +#: src/lang.c:749 msgid "You have tagged articles in this group - quit anyway?" msgstr "Es befinden sich markierte Artikel in der Gruppe, trotzdem beenden?" -#: src/lang.c:748 +#: src/lang.c:750 #, c-format msgid "%s=quit, %s=edit, %s=postpone: " msgstr "%s=Ende, %s=bearbeiten, %s=zurücklegen: " -#: src/lang.c:749 +#: src/lang.c:751 #, c-format msgid "%s=quit %s=edit %s=save kill description: " msgstr "%s=Abbrechen %s=Editieren %s=Kill-Filter speichern: " -#: src/lang.c:750 +#: src/lang.c:752 #, c-format msgid "%s=quit %s=edit %s=save select description: " msgstr "%s=Abbrechen %s=Editieren %s=Filter (hot) speichern: " -#: src/lang.c:751 +#: src/lang.c:753 msgid "Do you really want to quit without saving your configuration?" msgstr "Wirklich ohne Speichern der Konfiguration beenden?" -#: src/lang.c:754 +#: src/lang.c:756 msgid "Invalid range - valid are '0-9.$' eg. 1-$" msgstr "Ungültige Bereichsangabe - Gültig wäre '0-9.$' z.B. 1-$" -#: src/lang.c:756 +#: src/lang.c:757 msgid "Do you want to abort this operation?" msgstr "Wollen Sie diese Operation abbrechen?" -#: src/lang.c:757 +#: src/lang.c:758 msgid "Do you want to exit tin immediately?" msgstr "Wollen Sie tin augenblicklich verlassen?" @@ -4842,7 +4869,7 @@ msgstr "%s=Ende, %s=bearbeiten, %s=Menü #: src/lang.c:1105 msgid "Try cache_overview_files to speed up things.\n" -msgstr "Setze cache_overview_files um das lesen zu beschleunigen.\n" +msgstr "Setze cache_overview_files um das Lesen zu beschleunigen.\n" #: src/lang.c:1106 msgid "Tin will use local index files instead.\n" @@ -4902,8 +4929,8 @@ msgid " -p port use port as NNTP port msgstr " -p port Benutze 'port' als NNTP-Port [Standard=%d]" #: src/lang.c:1118 -msgid " -Q quick start. Same as -nqd" -msgstr " -Q Schnellstart. Das Selbe wie -nqd" +msgid " -Q quick start. Same as -dnq" +msgstr " -Q Schnellstart. Das Selbe wie -dnq" #: src/lang.c:1119 msgid " -r read news remotely from default NNTP server" @@ -8419,21 +8446,27 @@ msgid "Insert 'X-Comment-To:' header" msgstr "Füge 'X-Comment-To:'-Header ein" #. TODO: lang.c -#: src/main.c:817 +#: src/main.c:819 msgid "reading from local spool" msgstr "Lese aus dem lokalen Spool" -#: src/misc.c:3877 +#. TODO: != ENOENT ? and -> lang.c +#: src/misc.c:750 +#, c-format +msgid "Error: unlink %s" +msgstr "Fehler: entferne %s" + +#: src/misc.c:3928 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "Version: %s %s Ausgabe %s (\"%s\") %s %s\n" -#: src/misc.c:3880 +#: src/misc.c:3931 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "Version: %s %s Ausgabe %s (\"%s\")\n" -#: src/newsrc.c:460 +#: src/newsrc.c:472 msgid "Unreachable?\n" msgstr "Unerreichbar?\n" @@ -8472,12 +8505,12 @@ msgstr "CAPABILITIES hat READER nicht be msgid "MOTD: " msgstr "MOTD: " -#: src/nrctbl.c:178 +#: src/nrctbl.c:184 #, c-format msgid "couldn't expand %s\n" msgstr "Kann %s nicht expandieren\n" -#: src/post.c:1344 +#: src/post.c:1357 #, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" @@ -8486,7 +8519,7 @@ msgstr "" "Zeile %d ist länger als %d Oktette und sollte gefaltet werden,\n" "aber die Kodierung ist weder auf %s noch auf %s gestellt.\n" -#: src/post.c:1349 +#: src/post.c:1362 #, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" @@ -8498,7 +8531,7 @@ msgstr "" "angeschaltet zu haben, oder der Artikel enthält keine 8Bit Zeichen\n" "und wird daher nicht automatisch gefaltet wird.\n" -#: src/post.c:1351 +#: src/post.c:1364 #, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" @@ -8507,26 +8540,26 @@ msgstr "" "Zeile %d ist länger als %d Oktette und sollte gefaltet werden,\n" "aber die Kodierung ist nicht auf %s gesetzt.\n" -#: src/post.c:2325 +#: src/post.c:2353 #, c-format msgid "Posting: %.*s ..." msgstr "Poste: %.*s ..." -#: src/post.c:4075 +#: src/post.c:4119 msgid "Can't supersede in mailgroups, try repost instead." msgstr "" "Überschreiben in Mailgruppen nicht möglich, stattdessen Reposting benutzen." #. Check if okay to read -#: src/read.c:207 +#: src/read.c:204 msgid "Aborting read, please wait..." msgstr "Breche Lesen ab, bitte warten..." -#: src/read.c:354 +#: src/read.c:351 msgid "Aborted read\n" msgstr "Lesen abgebrochen\n" -#: src/read.c:409 +#: src/read.c:406 msgid "Draining\n" msgstr "Ablassen\n" @@ -8539,6 +8572,18 @@ msgid "[- Unavailable -]" msgstr "[- Nicht Verfügbar -]" #. +#. * Add the Message-ID headers to the cache, using the last Reference +#. * as the parent +#. +#. +#. * Add the References data to the cache +#. +#: src/refs.c:1015 src/refs.c:1077 +#, c-format +msgid "Building References-trees (%d/%d)..." +msgstr "Baue References-Bäume (%d/%d)..." + +#. #. * preamble #. * TODO: -> lang.c #. @@ -8558,7 +8603,7 @@ msgstr "" "aussehen.\n" "\n" -#: src/save.c:1069 +#: src/save.c:1075 msgid "bytes" msgstr "Bytes" Binary files tin-2.4.4/po/en_GB.gmo and tin-2.4.5/po/en_GB.gmo differ diff -Nurp '--exclude=.bzr*' tin-2.4.4/po/en_GB.po tin-2.4.5/po/en_GB.po --- tin-2.4.4/po/en_GB.po 2019-12-24 10:55:08.000000000 +0100 +++ tin-2.4.5/po/en_GB.po 2020-12-24 01:04:30.926830450 +0100 @@ -1,14 +1,14 @@ # English (British) translation for tin. # This file is distributed under the same license as the tin package. # Robert Brady , 2000-2002. -# Urs Janssen , 2004-2020 +# Urs Janssen , 2004-2021 # msgid "" msgstr "" -"Project-Id-Version: tin 2.4.4\n" +"Project-Id-Version: tin 2.4.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 13:24+0100\n" -"PO-Revision-Date: 2019-01-30 15:05+0100\n" +"POT-Creation-Date: 2020-12-24 00:24+0100\n" +"PO-Revision-Date: 2020-12-25 01:05+0100\n" "Last-Translator: Urs Janssen \n" "Language-Team: \n" "Language: en_GB\n" @@ -16,9 +16,31 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +#. -> lang.c +#: src/art.c:418 +#, c-format +msgid "Reading %s\n" +msgstr "Rereading %s\n" + +#. TODO: -> lang.c +#: src/art.c:1205 +msgid "Threading by multipart" +msgstr "Threading by multipart" + +#. -> lang.c +#: src/art.c:2539 +#, c-format +msgid "Writing %s\n" +msgstr "Writing %s\n" + +#. TODO: -> lang.c +#: src/art.c:2619 +msgid "Writing overview cache..." +msgstr "Writing overview cache..." + #: src/attrib.c:986 msgid "Processing attributes... " -msgstr "" +msgstr "Processing attributes... " #: src/attrib.c:1205 #, c-format @@ -26,396 +48,398 @@ msgid "" "# Do not edit this comment block\n" "#\n" msgstr "" +"# Do not edit this comment block\n" +"#\n" #: src/attrib.c:1206 #, c-format msgid "# scope=STRING (eg. alt.*,!alt.bin*) [mandatory]\n" -msgstr "" +msgstr "# scope=STRING (eg. alt.*,!alt.bin*) [mandatory]\n" #: src/attrib.c:1207 #, c-format msgid "# add_posted_to_filter=ON/OFF\n" -msgstr "" +msgstr "# add_posted_to_filter=ON/OFF\n" #: src/attrib.c:1208 #, c-format msgid "# advertising=ON/OFF\n" -msgstr "" +msgstr "# advertising=ON/OFF\n" #: src/attrib.c:1209 #, c-format msgid "# alternative_handling=ON/OFF\n" -msgstr "" +msgstr "# alternative_handling=ON/OFF\n" #: src/attrib.c:1210 #, c-format msgid "# ask_for_metamail=ON/OFF\n" -msgstr "" +msgstr "# ask_for_metamail=ON/OFF\n" #: src/attrib.c:1211 #, c-format msgid "# auto_cc_bcc=NUM\n" -msgstr "" +msgstr "# auto_cc_bcc=NUM\n" #: src/attrib.c:1212 #, c-format msgid "# 0=No, 1=Cc, 2=Bcc, 3=Cc and Bcc\n" -msgstr "" +msgstr "# 0=No, 1=Cc, 2=Bcc, 3=Cc and Bcc\n" #: src/attrib.c:1213 #, c-format msgid "# auto_list_thread=ON/OFF\n" -msgstr "" +msgstr "# auto_list_thread=ON/OFF\n" #: src/attrib.c:1214 #, c-format msgid "# auto_save=ON/OFF\n" -msgstr "" +msgstr "# auto_save=ON/OFF\n" #: src/attrib.c:1215 #, c-format msgid "# auto_select=ON/OFF\n" -msgstr "" +msgstr "# auto_select=ON/OFF\n" #: src/attrib.c:1216 #, c-format msgid "# batch_save=ON/OFF\n" -msgstr "" +msgstr "# batch_save=ON/OFF\n" #: src/attrib.c:1217 #, c-format msgid "# date_format=STRING (eg. %%a, %%d %%b %%Y %%H:%%M:%%S)\n" -msgstr "" +msgstr "# date_format=STRING (eg. %%a, %%d %%b %%Y %%H:%%M:%%S)\n" #: src/attrib.c:1218 #, c-format msgid "# delete_tmp_files=ON/OFF\n" -msgstr "" +msgstr "# delete_tmp_files=ON/OFF\n" #: src/attrib.c:1219 #, c-format msgid "# editor_format=STRING (eg. %%E +%%N %%F)\n" -msgstr "" +msgstr "# editor_format=STRING (eg. %%E +%%N %%F)\n" #: src/attrib.c:1220 #, c-format msgid "# fcc=STRING (eg. =mailbox)\n" -msgstr "" +msgstr "# fcc=STRING (eg. =mailbox)\n" #: src/attrib.c:1221 #, c-format msgid "# followup_to=STRING\n" -msgstr "" +msgstr "# followup_to=STRING\n" #: src/attrib.c:1222 #, c-format msgid "# from=STRING (just append wanted From:-line, don't use quotes)\n" -msgstr "" +msgstr "# from=STRING (just append wanted From:-line, don't use quotes)\n" #: src/attrib.c:1223 #, c-format msgid "# group_catchup_on_exit=ON/OFF\n" -msgstr "" +msgstr "# group_catchup_on_exit=ON/OFF\n" #: src/attrib.c:1224 #, c-format msgid "# group_format=STRING (eg. %%n %%m %%R %%L %%s %%F)\n" -msgstr "" +msgstr "# group_format=STRING (eg. %%n %%m %%R %%L %%s %%F)\n" #: src/attrib.c:1225 #, c-format msgid "# mail_8bit_header=ON/OFF\n" -msgstr "" +msgstr "# mail_8bit_header=ON/OFF\n" #: src/attrib.c:1226 #, c-format msgid "# mail_mime_encoding=supported_encoding" -msgstr "" +msgstr "# mail_mime_encoding=supported_encoding" #: src/attrib.c:1234 #, c-format msgid "# ispell=STRING\n" -msgstr "" +msgstr "# ispell=STRING\n" #: src/attrib.c:1236 #, c-format msgid "# maildir=STRING (eg. ~/Mail)\n" -msgstr "" +msgstr "# maildir=STRING (eg. ~/Mail)\n" #: src/attrib.c:1237 #, c-format msgid "# mailing_list=STRING (eg. majordomo@example.org)\n" -msgstr "" +msgstr "# mailing_list=STRING (eg. majordomo@example.org)\n" #: src/attrib.c:1238 #, c-format msgid "# mime_types_to_save=STRING (eg. image/*,!image/bmp)\n" -msgstr "" +msgstr "# mime_types_to_save=STRING (eg. image/*,!image/bmp)\n" #: src/attrib.c:1239 #, c-format msgid "# mark_ignore_tags=ON/OFF\n" -msgstr "" +msgstr "# mark_ignore_tags=ON/OFF\n" #: src/attrib.c:1240 #, c-format msgid "# mark_saved_read=ON/OFF\n" -msgstr "" +msgstr "# mark_saved_read=ON/OFF\n" #: src/attrib.c:1241 #, c-format msgid "# mime_forward=ON/OFF\n" -msgstr "" +msgstr "# mime_forward=ON/OFF\n" #: src/attrib.c:1243 #, c-format msgid "# mm_network_charset=supported_charset" -msgstr "" +msgstr "# mm_network_charset=supported_charset" #: src/attrib.c:1250 #, c-format msgid "# undeclared_charset=STRING (default is US-ASCII)\n" -msgstr "" +msgstr "# undeclared_charset=STRING (default is US-ASCII)\n" #: src/attrib.c:1252 #, c-format msgid "# news_headers_to_display=STRING\n" -msgstr "" +msgstr "# news_headers_to_display=STRING\n" #: src/attrib.c:1253 #, c-format msgid "# news_headers_to_not_display=STRING\n" -msgstr "" +msgstr "# news_headers_to_not_display=STRING\n" #: src/attrib.c:1254 #, c-format msgid "# news_quote_format=STRING\n" -msgstr "" +msgstr "# news_quote_format=STRING\n" #: src/attrib.c:1255 #, c-format msgid "# organization=STRING (if beginning with '/' read from file)\n" -msgstr "" +msgstr "# organisation=STRING (if beginning with '/' read from file)\n" #: src/attrib.c:1256 #, c-format msgid "# pos_first_unread=ON/OFF\n" -msgstr "" +msgstr "# pos_first_unread=ON/OFF\n" #: src/attrib.c:1257 #, c-format msgid "# post_8bit_header=ON/OFF\n" -msgstr "" +msgstr "# post_8bit_header=ON/OFF\n" #: src/attrib.c:1258 #, c-format msgid "# post_mime_encoding=supported_encoding" -msgstr "" +msgstr "# post_mime_encoding=supported_encoding" #: src/attrib.c:1265 #, c-format msgid "# post_process_type=NUM\n" -msgstr "" +msgstr "# post_process_type=NUM\n" #: src/attrib.c:1270 #, c-format msgid "# post_process_view=ON/OFF\n" -msgstr "" +msgstr "# post_process_view=ON/OFF\n" #: src/attrib.c:1271 #, c-format msgid "# quick_kill_scope=STRING (ie. talk.*)\n" -msgstr "" +msgstr "# quick_kill_scope=STRING (ie. talk.*)\n" #: src/attrib.c:1272 #, c-format msgid "# quick_kill_expire=ON/OFF\n" -msgstr "" +msgstr "# quick_kill_expire=ON/OFF\n" #: src/attrib.c:1273 #, c-format msgid "# quick_kill_case=ON/OFF\n" -msgstr "" +msgstr "# quick_kill_case=ON/OFF\n" #: src/attrib.c:1274 #, c-format msgid "# quick_kill_header=NUM\n" -msgstr "" +msgstr "# quick_kill_header=NUM\n" #: src/attrib.c:1275 src/attrib.c:1284 #, c-format msgid "# 0=Subject: (case sensitive) 1=Subject: (ignore case)\n" -msgstr "" +msgstr "# 0=Subject: (case sensitive) 1=Subject: (ignore case)\n" #: src/attrib.c:1276 src/attrib.c:1285 #, c-format msgid "# 2=From: (case sensitive) 3=From: (ignore case)\n" -msgstr "" +msgstr "# 2=From: (case sensitive) 3=From: (ignore case)\n" #: src/attrib.c:1277 src/attrib.c:1286 #, c-format msgid "# 4=Message-ID: & full References: line\n" -msgstr "" +msgstr "# 4=Message-ID: & full References: line\n" #: src/attrib.c:1278 src/attrib.c:1287 #, c-format msgid "# 5=Message-ID: & last References: entry only\n" -msgstr "" +msgstr "# 5=Message-ID: & last References: entry only\n" #: src/attrib.c:1279 src/attrib.c:1288 #, c-format msgid "# 6=Message-ID: entry only 7=Lines:\n" -msgstr "" +msgstr "# 6=Message-ID: entry only 7=Lines:\n" #: src/attrib.c:1280 #, c-format msgid "# quick_select_scope=STRING\n" -msgstr "" +msgstr "# quick_select_scope=STRING\n" #: src/attrib.c:1281 #, c-format msgid "# quick_select_expire=ON/OFF\n" -msgstr "" +msgstr "# quick_select_expire=ON/OFF\n" #: src/attrib.c:1282 #, c-format msgid "# quick_select_case=ON/OFF\n" -msgstr "" +msgstr "# quick_select_case=ON/OFF\n" #: src/attrib.c:1283 #, c-format msgid "# quick_select_header=NUM\n" -msgstr "" +msgstr "# quick_select_header=NUM\n" #: src/attrib.c:1289 #, c-format msgid "# quote_chars=STRING (%%I for initials)\n" -msgstr "" +msgstr "# quote_chars=STRING (%%I for initials)\n" #: src/attrib.c:1291 #, c-format msgid "# print_header=ON/OFF\n" -msgstr "" +msgstr "# print_header=ON/OFF\n" #: src/attrib.c:1293 #, c-format msgid "# process_only_unread=ON/OFF\n" -msgstr "" +msgstr "# process_only_unread=ON/OFF\n" #: src/attrib.c:1294 #, c-format msgid "# prompt_followupto=ON/OFF\n" -msgstr "" +msgstr "# prompt_followupto=ON/OFF\n" #: src/attrib.c:1295 #, c-format msgid "# savedir=STRING (eg. ~user/News)\n" -msgstr "" +msgstr "# savedir=STRING (eg. ~user/News)\n" #: src/attrib.c:1296 #, c-format msgid "# savefile=STRING (eg. =linux)\n" -msgstr "" +msgstr "# savefile=STRING (eg. =linux)\n" #: src/attrib.c:1297 #, c-format msgid "# sigfile=STRING (eg. $var/sig)\n" -msgstr "" +msgstr "# sigfile=STRING (eg. $var/sig)\n" #: src/attrib.c:1298 #, c-format msgid "# show_author=NUM\n" -msgstr "" +msgstr "# show_author=NUM\n" #: src/attrib.c:1304 #, c-format msgid "# show_signatures=ON/OFF\n" -msgstr "" +msgstr "# show_signatures=ON/OFF\n" #: src/attrib.c:1305 #, c-format msgid "# show_only_unread_arts=ON/OFF\n" -msgstr "" +msgstr "# show_only_unread_arts=ON/OFF\n" #: src/attrib.c:1306 #, c-format msgid "# sigdashes=ON/OFF\n" -msgstr "" +msgstr "# sigdashes=ON/OFF\n" #: src/attrib.c:1307 #, c-format msgid "# signature_repost=ON/OFF\n" -msgstr "" +msgstr "# signature_repost=ON/OFF\n" #: src/attrib.c:1308 #, c-format msgid "# sort_article_type=NUM\n" -msgstr "" +msgstr "# sort_article_type=NUM\n" #: src/attrib.c:1326 #, c-format msgid "# sort_threads_type=NUM\n" -msgstr "" +msgstr "# sort_threads_type=NUM\n" #: src/attrib.c:1335 #, c-format msgid "# start_editor_offset=ON/OFF\n" -msgstr "" +msgstr "# start_editor_offset=ON/OFF\n" #: src/attrib.c:1336 #, c-format msgid "# tex2iso_conv=ON/OFF\n" -msgstr "" +msgstr "# tex2iso_conv=ON/OFF\n" #: src/attrib.c:1337 #, c-format msgid "# thread_catchup_on_exit=ON/OFF\n" -msgstr "" +msgstr "# thread_catchup_on_exit=ON/OFF\n" #: src/attrib.c:1338 #, c-format msgid "# thread_articles=NUM" -msgstr "" +msgstr "# thread_articles=NUM" #: src/attrib.c:1345 #, c-format msgid "# thread_format=STRING (eg. %%n %%m [%%L] %%T %%F)\n" -msgstr "" +msgstr "# thread_format=STRING (eg. %%n %%m [%%L] %%T %%F)\n" #: src/attrib.c:1346 #, c-format msgid "# thread_perc=NUM\n" -msgstr "" +msgstr "# thread_perc=NUM\n" #: src/attrib.c:1347 #, c-format msgid "# trim_article_body=NUM\n" -msgstr "" +msgstr "# trim_article_body=NUM\n" #: src/attrib.c:1348 #, c-format msgid "# 0 = Don't trim article body\n" -msgstr "" +msgstr "# 0 = Don't trim article body\n" #: src/attrib.c:1349 #, c-format msgid "# 1 = Skip leading blank lines\n" -msgstr "" +msgstr "# 1 = Skip leading blank lines\n" #: src/attrib.c:1350 #, c-format msgid "# 2 = Skip trailing blank lines\n" -msgstr "" +msgstr "# 2 = Skip trailing blank lines\n" #: src/attrib.c:1351 #, c-format msgid "# 3 = Skip leading and trailing blank lines\n" -msgstr "" +msgstr "# 3 = Skip leading and trailing blank lines\n" #: src/attrib.c:1352 #, c-format msgid "# 4 = Compact multiple blank lines between text blocks\n" -msgstr "" +msgstr "# 4 = Compact multiple blank lines between text blocks\n" #: src/attrib.c:1353 #, c-format @@ -423,6 +447,8 @@ msgid "" "# 5 = Compact multiple blank lines between text blocks and skip\n" "# leading blank lines\n" msgstr "" +"# 5 = Compact multiple blank lines between text blocks and skip\n" +"# leading blank lines\n" #: src/attrib.c:1354 #, c-format @@ -430,6 +456,8 @@ msgid "" "# 6 = Compact multiple blank lines between text blocks and skip\n" "# trailing blank lines\n" msgstr "" +"# 6 = Compact multiple blank lines between text blocks and skip\n" +"# trailing blank lines\n" #: src/attrib.c:1355 #, c-format @@ -437,36 +465,38 @@ msgid "" "# 7 = Compact multiple blank lines between text blocks and skip\n" "# leading and trailing blank lines\n" msgstr "" +"# 7 = Compact multiple blank lines between text blocks and skip\n" +"# leading and trailing blank lines\n" #: src/attrib.c:1356 #, c-format msgid "# verbatim_handling=ON/OFF\n" -msgstr "" +msgstr "# verbatim_handling=ON/OFF\n" #: src/attrib.c:1358 #, c-format msgid "# extquote_handling=ON/OFF\n" -msgstr "" +msgstr "# extquote_handling=ON/OFF\n" #: src/attrib.c:1360 #, c-format msgid "# wrap_on_next_unread=ON/OFF\n" -msgstr "" +msgstr "# wrap_on_next_unread=ON/OFF\n" #: src/attrib.c:1361 #, c-format msgid "# x_body=STRING (eg. ~/.tin/extra-body-text)\n" -msgstr "" +msgstr "# x_body=STRING (eg. ~/.tin/extra-body-text)\n" #: src/attrib.c:1362 #, c-format msgid "# x_comment_to=ON/OFF\n" -msgstr "" +msgstr "# x_comment_to=ON/OFF\n" #: src/attrib.c:1363 #, c-format msgid "# x_headers=STRING (eg. ~/.tin/extra-headers)\n" -msgstr "" +msgstr "# x_headers=STRING (eg. ~/.tin/extra-headers)\n" #: src/attrib.c:1364 #, c-format @@ -474,6 +504,8 @@ msgid "" "#\n" "# Note that it is best to put general (global scoping)\n" msgstr "" +"#\n" +"# Note that it is best to put general (global scoping)\n" #: src/attrib.c:1365 #, c-format @@ -481,23 +513,25 @@ msgid "" "# entries first followed by group specific entries.\n" "#\n" msgstr "" +"# entries first followed by group specific entries.\n" +"#\n" #: src/attrib.c:1366 #, c-format msgid "############################################################################\n" -msgstr "" +msgstr "############################################################################\n" #: src/cook.c:627 msgid "(unknown)" -msgstr "" +msgstr "(unknown)" #: src/keymap.c:280 msgid "NULL" -msgstr "" +msgstr "NULL" #: src/lang.c:45 msgid "1 Response" -msgstr "" +msgstr "1 Response" #: src/lang.c:49 #, c-format @@ -505,31 +539,33 @@ msgid "" "\n" "%s contains no newsgroups. Exiting." msgstr "" +"\n" +"%s contains no newsgroups. Exiting." #: src/lang.c:50 msgid "all " -msgstr "" +msgstr "all " #: src/lang.c:51 msgid "All groups" -msgstr "" +msgstr "All groups" #: src/lang.c:52 #, c-format msgid "File %s exists. %s=append, %s=overwrite, %s=quit: " -msgstr "" +msgstr "File %s exists. %s=append, %s=overwrite, %s=quit: " #: src/lang.c:53 msgid "Article cancelled (deleted)." -msgstr "" +msgstr "Article cancelled (deleted)." #: src/lang.c:55 msgid "Article cannot be cancelled (deleted)." -msgstr "" +msgstr "Article cannot be cancelled (deleted)." #: src/lang.c:57 msgid "Article deleted." -msgstr "" +msgstr "Article deleted." #: src/lang.c:58 #, c-format @@ -540,6 +576,11 @@ msgid "" "will be mailed to the following address:\n" " %s" msgstr "" +"\n" +"Your article:\n" +" \"%s\"\n" +"will be mailed to the following address:\n" +" %s" #: src/lang.c:59 #, c-format @@ -549,162 +590,167 @@ msgid "" " \"%s\"\n" "will be posted to the following %s:\n" msgstr "" +"\n" +"Your article:\n" +" \"%s\"\n" +"will be posted to the following %s:\n" #: src/lang.c:60 msgid "Article not posted!" -msgstr "" +msgstr "Article not posted!" #: src/lang.c:61 msgid "Article not saved" -msgstr "" +msgstr "Article not saved" #: src/lang.c:62 msgid "Article Level Commands" -msgstr "" +msgstr "Article Level Commands" #: src/lang.c:63 msgid "Article has no parent" -msgstr "" +msgstr "Article has no parent" #: src/lang.c:64 msgid "Parent article has been killed" -msgstr "" +msgstr "Parent article has been killed" #: src/lang.c:65 msgid "Parent article is unavailable" -msgstr "" +msgstr "Parent article is unavailable" #: src/lang.c:66 #, c-format msgid "Article posted: %s" -msgstr "" +msgstr "Article posted: %s" #: src/lang.c:67 #, c-format msgid "Article rejected (saved to %s)" -msgstr "" +msgstr "Article rejected (saved to %s)" #: src/lang.c:68 #, c-format msgid "" "%s=article, %s=thread, %s=range, %s=hot, %s=pattern, %s=tagged, %s=quit: " msgstr "" +"%s=article, %s=thread, %s=range, %s=hot, %s=pattern, %s=tagged, %s=quit: " #: src/lang.c:69 msgid "Article unavailable" -msgstr "" +msgstr "Article unavailable" #: src/lang.c:70 msgid "Article undeleted." -msgstr "" +msgstr "Article undeleted." #: src/lang.c:71 #, c-format msgid "Article %4d of %4d" -msgstr "" +msgstr "Article %4d of %4d" #: src/lang.c:73 msgid "articles" -msgstr "" +msgstr "articles" #: src/lang.c:74 msgid "This is a repost of the following article:" -msgstr "" +msgstr "This is a repost of the following article:" #: src/lang.c:75 msgid "article" -msgstr "" +msgstr "article" #: src/lang.c:76 msgid "Article" -msgstr "" +msgstr "Article" #: src/lang.c:77 #, c-format msgid "-- %d %s mailed --" -msgstr "" +msgstr "-- %d %s mailed --" #: src/lang.c:78 #, c-format msgid " at %s" -msgstr "" +msgstr " at %s" #: src/lang.c:79 #, c-format msgid "%*s[-- %s/%s, encoding %s%s%s, %d lines%s%s --]\n" -msgstr "" +msgstr "%*s[-- %s/%s, encoding %s%s%s, %d lines%s%s --]\n" #: src/lang.c:80 msgid ", charset: " -msgstr "" +msgstr ", charset: " #: src/lang.c:81 #, c-format msgid "%*s[-- charset %s not supported --]\n" -msgstr "" +msgstr "%*s[-- charset %s not supported --]\n" #: src/lang.c:82 #, c-format msgid "%*s[-- Description: %s --]\n" -msgstr "" +msgstr "%*s[-- Description: %s --]\n" #: src/lang.c:83 #, c-format msgid "%d lines" -msgstr "" +msgstr "%d lines" #: src/lang.c:84 msgid "Attachment Menu" -msgstr "" +msgstr "Attachment Menu" #: src/lang.c:85 msgid "Attachment Menu Commands" -msgstr "" +msgstr "Attachment Menu Commands" #: src/lang.c:86 msgid "" -msgstr "" +msgstr "" #: src/lang.c:87 #, c-format msgid "Attachment saved successfully. (%s)" -msgstr "" +msgstr "Attachment saved successfully. (%s)" #: src/lang.c:88 #, c-format msgid "%d of %d attachments saved successfully." -msgstr "" +msgstr "%d of %d attachments saved successfully." #: src/lang.c:89 msgid "Select attachment> " -msgstr "" +msgstr "Select attachment> " #: src/lang.c:90 msgid "Tagged attachment" -msgstr "" +msgstr "Tagged attachment" #: src/lang.c:91 #, c-format msgid "%d attachments tagged" -msgstr "" +msgstr "%d attachments tagged" #: src/lang.c:92 msgid "Untagged attachment" -msgstr "" +msgstr "Untagged attachment" #: src/lang.c:93 msgid "Attributes Menu Commands" -msgstr "" +msgstr "Attributes Menu Commands" #: src/lang.c:94 #, c-format msgid "attribute with no scope: %s" -msgstr "" +msgstr "attribute with no scope: %s" #: src/lang.c:96 #, c-format msgid "%d Authentication failed" -msgstr "" +msgstr "%d Authentication failed" #: src/lang.c:97 #, c-format @@ -713,15 +759,15 @@ msgstr "NNTP authorisation password not #: src/lang.c:98 msgid "Server expects authentication.\n" -msgstr "" +msgstr "Server expects authentication.\n" #: src/lang.c:99 msgid " Please enter password: " -msgstr "" +msgstr " Please enter password: " #: src/lang.c:100 msgid " Please enter username: " -msgstr "" +msgstr " Please enter username: " #: src/lang.c:101 #, c-format @@ -736,12 +782,12 @@ msgstr "Authorisation failed for user: % #: src/lang.c:104 #, c-format msgid "Author search backwards [%s]> " -msgstr "" +msgstr "Author search backwards [%s]> " #: src/lang.c:105 #, c-format msgid "Author search forwards [%s]> " -msgstr "" +msgstr "Author search forwards [%s]> " #: src/lang.c:106 #, c-format @@ -749,21 +795,24 @@ msgid "" "\n" "Autosubscribed to %s" msgstr "" +"\n" +"Autosubscribed to %s" #: src/lang.c:107 msgid "Autosubscribing groups...\n" -msgstr "" +msgstr "Autosubscribing groups...\n" #: src/lang.c:108 #, c-format msgid "Autoselecting articles (use '%s' to see all unread) ..." -msgstr "" +msgstr "Autoselecting articles (use '%s' to see all unread) ..." #: src/lang.c:110 #, c-format msgid "" "Article to be posted resulted in errors/warnings. %s=quit, %s=Menu, %s=edit: " msgstr "" +"Article to be posted resulted in errors/warnings. %s=quit, %s=Menu, %s=edit: " #: src/lang.c:111 #, c-format @@ -773,119 +822,119 @@ msgstr "Unrecognised attribute: %s" #: src/lang.c:112 #, c-format msgid "Bad command. Type '%s' for help." -msgstr "" +msgstr "Bad command. Type '%s' for help." #: src/lang.c:114 msgid "Base article" -msgstr "" +msgstr "Base article" #: src/lang.c:115 msgid "Base article range" -msgstr "" +msgstr "Base article range" #: src/lang.c:116 #, c-format msgid "%s: Updating of index files not supported: cache_overview_files=%s" -msgstr "" +msgstr "%s: Updating of index files not supported: cache_overview_files=%s" #: src/lang.c:117 msgid "*** Beginning of article ***" -msgstr "" +msgstr "*** Beginning of article ***" #: src/lang.c:118 msgid "*** Beginning of page ***" -msgstr "" +msgstr "*** Beginning of page ***" #: src/lang.c:120 #, c-format msgid "Cancel (delete) or supersede (overwrite) article [%%s]? (%s/%s/%s): " -msgstr "" +msgstr "Cancel (delete) or supersede (overwrite) article [%%s]? (%s/%s/%s): " #: src/lang.c:121 msgid "Cancelling article..." -msgstr "" +msgstr "Cancelling article..." #: src/lang.c:123 #, c-format msgid "Cannot create %s" -msgstr "" +msgstr "Cannot create %s" #: src/lang.c:126 #, c-format msgid "Can't find base article %d" -msgstr "" +msgstr "Can't find base article %d" #: src/lang.c:128 #, c-format msgid "Can't open %s" -msgstr "" +msgstr "Can't open %s" #: src/lang.c:129 #, c-format msgid "Couldn't open %s for saving" -msgstr "" +msgstr "Couldn't open %s for saving" #: src/lang.c:130 msgid "*** Posting not allowed ***" -msgstr "" +msgstr "*** Posting not allowed ***" #: src/lang.c:131 #, c-format msgid "Posting is not allowed to %s" -msgstr "" +msgstr "Posting is not allowed to %s" #: src/lang.c:133 #, c-format msgid "Can't retrieve %s" -msgstr "" +msgstr "Can't retrieve %s" #: src/lang.c:135 #, c-format msgid "%s is a directory" -msgstr "" +msgstr "%s is a directory" #: src/lang.c:136 msgid "Catchup" -msgstr "" +msgstr "Catchup" #: src/lang.c:137 #, c-format msgid "Catchup %s..." -msgstr "" +msgstr "Catchup %s..." #: src/lang.c:138 msgid "Catchup all groups entered during this session?" -msgstr "" +msgstr "Catchup all groups entered during this session?" #: src/lang.c:139 msgid "You have tagged articles in this group - catchup anyway?" -msgstr "" +msgstr "You have tagged articles in this group - catchup anyway?" #: src/lang.c:140 #, c-format msgid "%s %d %s in %lu seconds\n" -msgstr "" +msgstr "%s %d %s in %lu seconds\n" #: src/lang.c:141 msgid "Caughtup" -msgstr "" +msgstr "Caughtup" #: src/lang.c:142 msgid "Check Prepared Article" -msgstr "" +msgstr "Check Prepared Article" #: src/lang.c:143 msgid "Checking for new groups... " -msgstr "" +msgstr "Checking for new groups... " #: src/lang.c:144 msgid "Checking for news..." -msgstr "" +msgstr "Checking for news..." #: src/lang.c:145 #, c-format msgid "Post-process %s=no, %s=yes, %s=shar, %s=quit: " -msgstr "" +msgstr "Post-process %s=no, %s=yes, %s=shar, %s=quit: " #: src/lang.c:147 msgid "ANSI color disabled" @@ -898,300 +947,333 @@ msgstr "ANSI colour enabled" #: src/lang.c:150 #, c-format msgid "Command failed: %s" -msgstr "" +msgstr "Command failed: %s" #: src/lang.c:152 msgid "Mark not selected articles read?" -msgstr "" +msgstr "Mark not selected articles read?" #: src/lang.c:154 #, c-format msgid "Connecting to %s..." -msgstr "" +msgstr "Connecting to %s..." #: src/lang.c:156 #, c-format msgid "Cook article failed, %s is exiting" -msgstr "" +msgstr "Cook article failed, %s is exiting" #: src/lang.c:157 msgid "" -msgstr "" +msgstr "" #: src/lang.c:158 msgid "Creating active file for saved groups...\n" -msgstr "" +msgstr "Creating active file for saved groups...\n" #: src/lang.c:159 msgid "Creating newsrc file...\n" -msgstr "" +msgstr "Creating newsrc file...\n" #: src/lang.c:161 src/lang.c:1314 src/lang.c:1334 msgid "Default" -msgstr "" +msgstr "Default" #: src/lang.c:162 msgid "Delete saved files that have been post processed?" -msgstr "" +msgstr "Delete saved files that have been post processed?" #: src/lang.c:163 msgid "Deleting temporary files..." -msgstr "" +msgstr "Deleting temporary files..." #: src/lang.c:165 msgid "*** End of article ***" -msgstr "" +msgstr "*** End of article ***" #: src/lang.c:166 msgid "*** End of articles ***" -msgstr "" +msgstr "*** End of articles ***" #: src/lang.c:167 msgid "*** End of attachments ***" -msgstr "" +msgstr "*** End of attachments ***" #: src/lang.c:168 msgid "*** End of groups ***" -msgstr "" +msgstr "*** End of groups ***" #: src/lang.c:169 msgid "*** End of page ***" -msgstr "" +msgstr "*** End of page ***" #: src/lang.c:170 msgid "*** End of scopes ***" -msgstr "" +msgstr "*** End of scopes ***" #: src/lang.c:171 msgid "*** End of thread ***" -msgstr "" +msgstr "*** End of thread ***" #: src/lang.c:172 msgid "*** End of URLs ***" -msgstr "" +msgstr "*** End of URLs ***" #: src/lang.c:173 msgid "Enter limit of articles to get> " -msgstr "" +msgstr "Enter limit of articles to get> " #: src/lang.c:174 msgid "Enter Message-ID to go to> " -msgstr "" +msgstr "Enter Message-ID to go to> " #: src/lang.c:175 msgid " and enter next unread thread" -msgstr "" +msgstr " and enter next unread thread" #: src/lang.c:176 msgid " and enter next unread article" -msgstr "" +msgstr " and enter next unread article" #: src/lang.c:177 msgid " and enter next unread group" -msgstr "" +msgstr " and enter next unread group" #: src/lang.c:178 msgid "Enter option number> " -msgstr "" +msgstr "Enter option number> " #: src/lang.c:179 #, c-format msgid "Enter range [%s]> " -msgstr "" +msgstr "Enter range [%s]> " #: src/lang.c:180 msgid "" "\n" "Warning: Approved: header used.\n" msgstr "" +"\n" +"Warning: Approved: header used.\n" #: src/lang.c:182 msgid "" "\n" "Error: Bad address in Approved: header.\n" msgstr "" +"\n" +"Error: Bad address in Approved: header.\n" #: src/lang.c:183 msgid "" "\n" "Error: Bad address in From: header.\n" msgstr "" +"\n" +"Error: Bad address in From: header.\n" #: src/lang.c:184 msgid "" "\n" "Error: Bad FQDN in Message-ID: header.\n" msgstr "" +"\n" +"Error: Bad FQDN in Message-ID: header.\n" #: src/lang.c:185 msgid "" "\n" "Error: Bad address in Reply-To: header.\n" msgstr "" +"\n" +"Error: Bad address in Reply-To: header.\n" #: src/lang.c:186 msgid "" "\n" "Error: Bad address in To: header.\n" msgstr "" +"\n" +"Error: Bad address in To: header.\n" #: src/lang.c:188 #, c-format msgid "Can't unlock %s" -msgstr "" +msgstr "Can't unlock %s" #: src/lang.c:189 #, c-format msgid "Couldn't dotlock %s - article not appended!" -msgstr "" +msgstr "Couldn't dotlock %s - article not appended!" #: src/lang.c:190 #, c-format msgid "Couldn't lock %s - article not appended!" -msgstr "" +msgstr "Couldn't lock %s - article not appended!" #: src/lang.c:193 #, c-format msgid "Corrupted file %s" -msgstr "" +msgstr "Corrupted file %s" #: src/lang.c:195 msgid "" "\n" "Error: Followup-To \"poster\" and a newsgroup is not allowed!\n" msgstr "" +"\n" +"Error: Followup-To \"poster\" and a newsgroup is not allowed!\n" #: src/lang.c:196 #, c-format msgid "Error: Custom format exceeds screen width. Using default \"%s\"." -msgstr "" +msgstr "Error: Custom format exceeds screen width. Using default \"%s\"." #: src/lang.c:197 msgid "Internal error in GNKSA routine - send bug report.\n" -msgstr "" +msgstr "Internal error in GNKSA routine - send bug report.\n" #: src/lang.c:198 msgid "Left angle bracket missing in route address.\n" -msgstr "" +msgstr "Left angle bracket missing in route address.\n" #: src/lang.c:199 msgid "Left parenthesis missing in old-style address.\n" -msgstr "" +msgstr "Left parenthesis missing in old-style address.\n" #: src/lang.c:200 msgid "Right parenthesis missing in old-style address.\n" -msgstr "" +msgstr "Right parenthesis missing in old-style address.\n" #: src/lang.c:201 msgid "At-sign missing in mail address.\n" -msgstr "" +msgstr "At-sign missing in mail address.\n" #: src/lang.c:202 msgid "Single component FQDN is not allowed. Add your domain.\n" -msgstr "" +msgstr "Single component FQDN is not allowed. Add your domain.\n" #: src/lang.c:203 msgid "" "Invalid domain. Send bug report if your top level domain really exists.\n" "Use .invalid as top level domain for munged addresses.\n" msgstr "" +"Invalid domain. Send bug report if your top level domain really exists.\n" +"Use .invalid as top level domain for munged addresses.\n" #: src/lang.c:204 msgid "" "Illegal domain. Send bug report if your top level domain really exists.\n" "Use .invalid as top level domain for munged addresses.\n" msgstr "" +"Illegal domain. Send bug report if your top level domain really exists.\n" +"Use .invalid as top level domain for munged addresses.\n" #: src/lang.c:205 msgid "" "Unknown domain. Send bug report if your top level domain really exists.\n" "Use .invalid as top level domain for munged addresses.\n" msgstr "" +"Unknown domain. Send bug report if your top level domain really exists.\n" +"Use .invalid as top level domain for munged addresses.\n" #: src/lang.c:206 msgid "Illegal character in FQDN.\n" -msgstr "" +msgstr "Illegal character in FQDN.\n" #: src/lang.c:207 msgid "Zero length FQDN component not allowed.\n" -msgstr "" +msgstr "Zero length FQDN component not allowed.\n" #: src/lang.c:208 msgid "FQDN component exceeds maximum allowed length (63 chars).\n" -msgstr "" +msgstr "FQDN component exceeds maximum allowed length (63 chars).\n" #: src/lang.c:209 msgid "FQDN component may not start or end with hyphen.\n" -msgstr "" +msgstr "FQDN component may not start or end with hyphen.\n" #: src/lang.c:210 msgid "FQDN component may not start with digit.\n" -msgstr "" +msgstr "FQDN component may not start with digit.\n" #: src/lang.c:211 msgid "Domain literal has impossible numeric value.\n" -msgstr "" +msgstr "Domain literal has impossible numeric value.\n" #: src/lang.c:212 msgid "" "Domain literal is for private use only and not allowed for global use.\n" msgstr "" +"Domain literal is for private use only and not allowed for global use.\n" #: src/lang.c:213 msgid "Right bracket missing in domain literal.\n" -msgstr "" +msgstr "Right bracket missing in domain literal.\n" #: src/lang.c:214 msgid "Missing localpart of mail address.\n" -msgstr "" +msgstr "Missing localpart of mail address.\n" #: src/lang.c:215 msgid "Illegal character in localpart of mail address.\n" -msgstr "" +msgstr "Illegal character in localpart of mail address.\n" #: src/lang.c:216 msgid "Zero length localpart component not allowed.\n" -msgstr "" +msgstr "Zero length localpart component not allowed.\n" #: src/lang.c:217 msgid "" "Illegal character in realname.\n" "Unquoted words may not contain '!()<>@,;:\\.[]' in route addresses.\n" msgstr "" +"Illegal character in realname.\n" +"Unquoted words may not contain '!()<>@,;:\\.[]' in route addresses.\n" #: src/lang.c:218 msgid "" "Illegal character in realname.\n" "Quoted words may not contain '()<>\\'.\n" msgstr "" +"Illegal character in realname.\n" +"Quoted words may not contain '()<>\\'.\n" #: src/lang.c:219 msgid "" "Illegal character in realname.\n" "Encoded words may not contain '!()<>@,;:\"\\.[]/=' in parameter.\n" msgstr "" +"Illegal character in realname.\n" +"Encoded words may not contain '!()<>@,;:\"\\.[]/=' in parameter.\n" #: src/lang.c:220 msgid "Bad syntax in encoded word used in realname.\n" -msgstr "" +msgstr "Bad syntax in encoded word used in realname.\n" #: src/lang.c:221 msgid "" "Illegal character in realname.\n" "Unquoted words may not contain '()<>\\' in old-style addresses.\n" msgstr "" +"Illegal character in realname.\n" +"Unquoted words may not contain '()<>\\' in old-style addresses.\n" #: src/lang.c:222 msgid "" "Illegal character in realname.\n" "Control characters and unencoded 8bit characters > 127 are not allowed.\n" msgstr "" +"Illegal character in realname.\n" +"Control characters and unencoded 8bit characters > 127 are not allowed.\n" #: src/lang.c:223 msgid "" "\n" "Error: No blank line found after header.\n" msgstr "" +"\n" +"Error: No blank line found after header.\n" #: src/lang.c:224 #, c-format @@ -1199,6 +1281,8 @@ msgid "" "\n" "Error: Illegal formatted %s.\n" msgstr "" +"\n" +"Error: Illegal formatted %s.\n" #. TODO: fixme, US-ASCII is not the only 7bit charset we know about #: src/lang.c:226 @@ -1209,6 +1293,11 @@ msgid "" " your language using the M)enu of configurable options or by\n" " editing tinrc.\n" msgstr "" +"\n" +"Error: Posting contains non-ASCII characters but MM_CHARSET is set to\n" +" US-ASCII - please change this setting to a suitable value for\n" +" your language using the M)enu of configurable options or by\n" +" editing tinrc.\n" #: src/lang.c:231 msgid "" @@ -1219,12 +1308,20 @@ msgid "" " is more common in your part of the world. This can be done\n" " using the M)enu of configurable options or by editing tinrc.\n" msgstr "" +"\n" +"Error: Posting contains non-ASCII characters but the MIME encoding\n" +" for news messages is set to \"7bit\" - please change this\n" +" setting to \"8bit\" or \"quoted-printable\" depending on what\n" +" is more common in your part of the world. This can be done\n" +" using the M)enu of configurable options or by editing tinrc.\n" #: src/lang.c:237 msgid "" "\n" "Error: Article starts with blank line instead of header\n" msgstr "" +"\n" +"Error: Article starts with blank line instead of header\n" #: src/lang.c:238 #, c-format @@ -1233,6 +1330,9 @@ msgid "" "Error: Header on line %d does not have a colon after the header name:\n" "%s\n" msgstr "" +"\n" +"Error: Header on line %d does not have a colon after the header name:\n" +"%s\n" #: src/lang.c:239 #, c-format @@ -1240,6 +1340,8 @@ msgid "" "\n" "Error: The \"%s:\" line is empty.\n" msgstr "" +"\n" +"Error: The \"%s:\" line is empty.\n" #: src/lang.c:240 #, c-format @@ -1247,6 +1349,8 @@ msgid "" "\n" "Error: The \"%s:\" line is missing from the article header.\n" msgstr "" +"\n" +"Error: The \"%s:\" line is missing from the article header.\n" #: src/lang.c:241 #, c-format @@ -1254,6 +1358,8 @@ msgid "" "\n" "Error: %s contains non 7bit chars.\n" msgstr "" +"\n" +"Error: %s contains non 7bit chars.\n" #: src/lang.c:242 #, c-format @@ -1262,6 +1368,9 @@ msgid "" "Error: Header on line %d does not have a space after the colon:\n" "%s\n" msgstr "" +"\n" +"Error: Header on line %d does not have a space after the colon:\n" +"%s\n" #: src/lang.c:243 #, c-format @@ -1269,64 +1378,70 @@ msgid "" "\n" "Error: There are multiple (%d) \"%s:\" lines in the header.\n" msgstr "" +"\n" +"Error: There are multiple (%d) \"%s:\" lines in the header.\n" #: src/lang.c:244 #, c-format msgid "Insecure permissions of %s (%o)" -msgstr "" +msgstr "Insecure permissions of %s (%o)" #: src/lang.c:248 #, c-format msgid "MIME parse error: Unexpected end of %s/%s article" -msgstr "" +msgstr "MIME parse error: Unexpected end of %s/%s article" #: src/lang.c:249 msgid "MIME parse error: Start boundary whilst reading headers" -msgstr "" +msgstr "MIME parse error: Start boundary whilst reading headers" #: src/lang.c:250 msgid "" "\n" "Error: \"poster\" is not allowed in Newsgroups!\n" msgstr "" +"\n" +"Error: \"poster\" is not allowed in Newsgroups!\n" #: src/lang.c:251 msgid "Can't get a (fully-qualified) domain-name!" -msgstr "" +msgstr "Can't get a (fully-qualified) domain-name!" #: src/lang.c:252 #, c-format msgid "No permissions to go into %s\n" -msgstr "" +msgstr "No permissions to go into %s\n" #: src/lang.c:254 msgid "" "\n" "Error: From: line missing.\n" msgstr "" +"\n" +"Error: From: line missing.\n" #: src/lang.c:256 #, c-format msgid "No read permissions for %s\n" -msgstr "" +msgstr "No read permissions for %s\n" #: src/lang.c:257 #, c-format msgid "File %s does not exist\n" -msgstr "" +msgstr "File %s does not exist\n" #: src/lang.c:258 #, c-format msgid "No write permissions for %s\n" -msgstr "" +msgstr "No write permissions for %s\n" #: src/lang.c:259 msgid "Can't get user information (/etc/passwd missing?)" -msgstr "" +msgstr "Can't get user information (/etc/passwd missing?)" #: src/lang.c:260 msgid "errors" -msgstr "" +msgstr "errors" #: src/lang.c:262 #, c-format @@ -1334,60 +1449,62 @@ msgid "" "\n" "Error on line %d: \"Sender:\" header not allowed (it will be added for you)\n" msgstr "" +"\n" +"Error on line %d: \"Sender:\" header not allowed (it will be added for you)\n" #: src/lang.c:264 #, c-format msgid "Server has non of the groups listed in %s" -msgstr "" +msgstr "Server has non of the groups listed in %s" #: src/lang.c:265 msgid "error" -msgstr "" +msgstr "error" #: src/lang.c:266 msgid "Unknown display level" -msgstr "" +msgstr "Unknown display level" #: src/lang.c:267 msgid "" -msgstr "" +msgstr "" #: src/lang.c:268 msgid "Exiting..." -msgstr "" +msgstr "Exiting..." #: src/lang.c:269 msgid "leaving external mail-reader" -msgstr "" +msgstr "leaving external mail-reader" #: src/lang.c:270 #, c-format msgid "Extracting %s..." -msgstr "" +msgstr "Extracting %s..." #: src/lang.c:272 #, c-format msgid "Error writing %s file. Filesystem full? File reset to previous state." -msgstr "" +msgstr "Error writing %s file. Filesystem full? File reset to previous state." #: src/lang.c:273 #, c-format msgid "Error making backup of %s file. Filesystem full?" -msgstr "" +msgstr "Error making backup of %s file. Filesystem full?" #: src/lang.c:274 #, c-format -msgid "Filtering global rules (%d/%d)..." -msgstr "" +msgid "Filtering global rules (%d/%d) ('q' to quit)..." +msgstr "Filtering global rules (%d/%d) ('q' to quit)..." #: src/lang.c:275 msgid "Rule created by: " -msgstr "" +msgstr "Rule created by: " #: src/lang.c:276 #, c-format msgid "Enter pattern [%s]> " -msgstr "" +msgstr "Enter pattern [%s]> " #: src/lang.c:277 #, c-format @@ -1395,19 +1512,21 @@ msgid "" "\n" "You requested followups to your article to go to the following %s:\n" msgstr "" +"\n" +"You requested followups to your article to go to the following %s:\n" #: src/lang.c:278 #, c-format msgid " %s\t Answers will be directed to you by mail.\n" -msgstr "" +msgstr " %s\t Answers will be directed to you by mail.\n" #: src/lang.c:279 msgid "-- forwarded message --\n" -msgstr "" +msgstr "-- forwarded message --\n" #: src/lang.c:280 msgid "-- end of forwarded message --\n" -msgstr "" +msgstr "-- end of forwarded message --\n" #: src/lang.c:281 msgid "" @@ -1443,1003 +1562,1068 @@ msgid "" "# time=NUM Optional. time_t value when rule expires\n" "#\n" msgstr "" +"# Format:\n" +"# comment=STRING Optional. Multiple lines allowed. Comments must be " +"placed\n" +"# at the beginning of a rule, or they will be moved to " +"the\n" +"# next rule. '#' is not a valid keyword for a comment!\n" +"# group=STRING Mandatory. Newsgroups list (e.g. comp.*,!*sources*).\n" +"# case=NUM Mandatory. Compare=0 / ignore=1 case when filtering.\n" +"# score=NUM|STRING Mandatory. Score to give. Either:\n" +"# score=NUM A number (e.g. 70). Or:\n" +"# score=STRING One of the two keywords: 'hot' or 'kill'.\n" +"# subj=STRING Optional. Subject: line (e.g. How to be a wizard).\n" +"# from=STRING Optional. From: line (e.g. *Craig Shergold*).\n" +"# msgid=STRING Optional. Message-ID: line (e.g. <123@ether.net>) " +"with\n" +"# full references.\n" +"# msgid_last=STRING Optional. Like above, but with last reference only.\n" +"# msgid_only=STRING Optional. Like above, but without references.\n" +"# refs_only=STRING Optional. References: line (e.g. <123@ether.net>) " +"without\n" +"# Message-ID:\n" +"# lines=[<>]?NUM Optional. Lines: line. '<' or '>' are optional.\n" +"# gnksa=[<>]?NUM Optional. GNKSA parse_from() return code. '<' or '>' " +"opt.\n" +"# xref=PATTERN Optional. Kill pattern (e.g. alt.flame*)\n" +"# path=PATTERN Optional. Kill pattern (e.g. news.example.org)\n" +"# Be aware that filtering on Path: may significantly " +"slow\n" +"# down the process.\n" +"# time=NUM Optional. time_t value when rule expires\n" +"#\n" #: src/lang.c:305 #, c-format msgid "Enter score for rule (default=%d): " -msgstr "" +msgstr "Enter score for rule (default=%d): " #: src/lang.c:306 #, c-format msgid "Enter the score weight (range 0 < score <= %d)" -msgstr "" +msgstr "Enter the score weight (range 0 < score <= %d)" #. SCORE_MAX #: src/lang.c:307 msgid "Full" -msgstr "" +msgstr "Full" #: src/lang.c:308 msgid "Comment (optional) : " -msgstr "" +msgstr "Comment (optional) : " #: src/lang.c:309 msgid "Apply pattern to : " -msgstr "" +msgstr "Apply pattern to : " #: src/lang.c:310 msgid "From: line (ignore case) " -msgstr "" +msgstr "From: line (ignore case) " #: src/lang.c:311 msgid "From: line (case sensitive) " -msgstr "" +msgstr "From: line (case sensitive) " #: src/lang.c:313 #, c-format msgid "%s%s: Unknown host.\n" -msgstr "" +msgstr "%s%s: Unknown host.\n" #: src/lang.c:315 msgid "global " -msgstr "" +msgstr "global " #: src/lang.c:316 #, c-format msgid "Please use %.100s instead" -msgstr "" +msgstr "Please use %.100s instead" #: src/lang.c:317 #, c-format msgid "%s is bogus" -msgstr "" +msgstr "%s is bogus" #: src/lang.c:318 #, c-format msgid "Group %s is moderated. Continue?" -msgstr "" +msgstr "Group %s is moderated. Continue?" #: src/lang.c:319 msgid "groups" -msgstr "" +msgstr "groups" #: src/lang.c:320 #, c-format msgid "Rereading %s..." -msgstr "" +msgstr "Rereading %s..." #: src/lang.c:321 msgid "Top Level Commands" -msgstr "" +msgstr "Top Level Commands" #: src/lang.c:322 msgid "Group Selection" -msgstr "" +msgstr "Group Selection" #: src/lang.c:323 msgid "group" -msgstr "" +msgstr "group" #: src/lang.c:324 msgid "" "*** Group descriptions are disabled according to current select_format ***" msgstr "" +"*** Group descriptions are disabled according to current select_format ***" #: src/lang.c:326 msgid "" "One or more lines of comment. to add a line or proceed if line is empty." msgstr "" +"One or more lines of comment. to add a line or proceed if line is empty." #: src/lang.c:327 msgid "From: line to add to filter file. toggles & sets." -msgstr "" +msgstr "From: line to add to filter file. toggles & sets." #: src/lang.c:328 msgid "" "Linecount of articles to be filtered. < for less, > for more, = for equal." msgstr "" +"Linecount of articles to be filtered. < for less, > for more, = for equal." #: src/lang.c:329 msgid "Message-ID: line to add to filter file. toggles & sets." -msgstr "" +msgstr "Message-ID: line to add to filter file. toggles & sets." #: src/lang.c:330 msgid "Subject: line to add to filter file. toggles & sets." -msgstr "" +msgstr "Subject: line to add to filter file. toggles & sets." #: src/lang.c:331 msgid "" "Enter text pattern to filter if Subject: & From: lines are not what you want." msgstr "" +"Enter text pattern to filter if Subject: & From: lines are not what you want." #: src/lang.c:332 msgid "" "Select where text pattern should be applied. toggles & sets." msgstr "" +"Select where text pattern should be applied. toggles & sets." #: src/lang.c:333 msgid "" "Expiration time in days for the entered filter. toggles & sets." msgstr "" +"Expiration time in days for the entered filter. toggles & sets." #: src/lang.c:334 msgid "" "Apply kill only to current group or all groups. toggles & sets." msgstr "" +"Apply kill only to current group or all groups. toggles & sets." #: src/lang.c:335 msgid "" "Apply select to current group or all groups. toggles & sets." msgstr "" +"Apply select to current group or all groups. toggles & sets." #: src/lang.c:336 msgid "kill an article via a menu" -msgstr "" +msgstr "kill an article via a menu" #: src/lang.c:337 msgid "auto-select (hot) an article via a menu" -msgstr "" +msgstr "auto-select (hot) an article via a menu" #: src/lang.c:338 msgid "Browse URLs in article" -msgstr "" +msgstr "Browse URLs in article" #: src/lang.c:339 msgid "0 - 9\t display article by number in current thread" -msgstr "" +msgstr "0 - 9\t display article by number in current thread" #: src/lang.c:341 msgid "cancel (delete) or supersede (overwrite) current article" -msgstr "" +msgstr "cancel (delete) or supersede (overwrite) current article" #: src/lang.c:342 msgid "post followup to current article" -msgstr "" +msgstr "post followup to current article" #: src/lang.c:343 msgid "post followup (don't copy text) to current article" -msgstr "" +msgstr "post followup (don't copy text) to current article" #: src/lang.c:344 msgid "post followup to current article quoting complete headers" -msgstr "" +msgstr "post followup to current article quoting complete headers" #: src/lang.c:345 msgid "repost chosen article to another group" -msgstr "" +msgstr "repost chosen article to another group" #: src/lang.c:347 msgid "edit article (mail-groups only)" -msgstr "" +msgstr "edit article (mail-groups only)" #: src/lang.c:348 msgid "display first article in current thread" -msgstr "" +msgstr "display first article in current thread" #: src/lang.c:349 msgid "display first page of article" -msgstr "" +msgstr "display first page of article" #: src/lang.c:350 msgid "display last article in current thread" -msgstr "" +msgstr "display last article in current thread" #: src/lang.c:351 msgid "display last page of article" -msgstr "" +msgstr "display last page of article" #: src/lang.c:352 msgid "mark rest of thread as read and advance to next unread" -msgstr "" +msgstr "mark rest of thread as read and advance to next unread" #: src/lang.c:353 msgid "display next article" -msgstr "" +msgstr "display next article" #: src/lang.c:354 msgid "display first article in next thread" -msgstr "" +msgstr "display first article in next thread" #: src/lang.c:355 msgid "display next unread article" -msgstr "" +msgstr "display next unread article" #: src/lang.c:356 msgid "go to the article that this one followed up" -msgstr "" +msgstr "go to the article that this one followed up" #: src/lang.c:357 msgid "display previous article" -msgstr "" +msgstr "display previous article" #: src/lang.c:358 msgid "display previous unread article" -msgstr "" +msgstr "display previous unread article" #: src/lang.c:359 msgid "quickly kill an article using defaults" -msgstr "" +msgstr "quickly kill an article using defaults" #: src/lang.c:360 msgid "quickly auto-select (hot) an article using defaults" -msgstr "" +msgstr "quickly auto-select (hot) an article using defaults" #: src/lang.c:361 msgid "return to group selection level" -msgstr "" +msgstr "return to group selection level" #: src/lang.c:362 msgid "reply through mail to author" -msgstr "" +msgstr "reply through mail to author" #: src/lang.c:363 msgid "reply through mail (don't copy text) to author" -msgstr "" +msgstr "reply through mail (don't copy text) to author" #: src/lang.c:364 msgid "reply through mail to author quoting complete headers" -msgstr "" +msgstr "reply through mail to author quoting complete headers" #: src/lang.c:365 msgid "search backwards within this article" -msgstr "" +msgstr "search backwards within this article" #: src/lang.c:366 msgid "search forwards within this article" -msgstr "" +msgstr "search forwards within this article" #: src/lang.c:367 msgid "show article in raw-mode (including all headers)" -msgstr "" +msgstr "show article in raw-mode (including all headers)" #: src/lang.c:368 msgid "skip next block of included text" -msgstr "" +msgstr "skip next block of included text" #: src/lang.c:369 msgid "toggle display of sections hidden by a form-feed (^L) on/off" -msgstr "" +msgstr "toggle display of sections hidden by a form-feed (^L) on/off" #: src/lang.c:370 msgid "toggle display of all headers" -msgstr "" +msgstr "toggle display of all headers" #: src/lang.c:371 msgid "toggle word highlighting on/off" -msgstr "" +msgstr "toggle word highlighting on/off" #: src/lang.c:372 msgid "toggle ROT-13 (basic decode) for current article" -msgstr "" +msgstr "toggle ROT-13 (basic decode) for current article" #: src/lang.c:373 msgid "toggle tabwidth 4 <-> 8" -msgstr "" +msgstr "toggle tabwidth 4 <-> 8" #: src/lang.c:374 msgid "toggle german TeX style decoding for current article" -msgstr "" +msgstr "toggle german TeX style decoding for current article" #: src/lang.c:375 msgid "toggle display of uuencoded sections" -msgstr "" +msgstr "toggle display of uuencoded sections" #: src/lang.c:376 msgid "View/pipe/save multimedia attachments" -msgstr "" +msgstr "View/pipe/save multimedia attachments" #: src/lang.c:377 msgid "choose first attachment in list" -msgstr "" +msgstr "choose first attachment in list" #: src/lang.c:378 msgid "0 - 9\t choose attachment by number" -msgstr "" +msgstr "0 - 9\t choose attachment by number" #: src/lang.c:379 msgid "choose last attachment in list" -msgstr "" +msgstr "choose last attachment in list" #: src/lang.c:381 msgid "pipe attachment into command" -msgstr "" +msgstr "pipe attachment into command" #: src/lang.c:382 msgid "pipe raw attachment into command" -msgstr "" +msgstr "pipe raw attachment into command" #: src/lang.c:384 msgid "save attachment to disk" -msgstr "" +msgstr "save attachment to disk" #: src/lang.c:385 msgid "search for attachments forwards" -msgstr "" +msgstr "search for attachments forwards" #: src/lang.c:386 msgid "search for attachments backwards" -msgstr "" +msgstr "search for attachments backwards" #: src/lang.c:387 msgid "view attachment" -msgstr "" +msgstr "view attachment" #: src/lang.c:388 msgid "tag attachment" -msgstr "" +msgstr "tag attachment" #: src/lang.c:389 msgid "tag attachments that match user specified pattern" -msgstr "" +msgstr "tag attachments that match user specified pattern" #: src/lang.c:390 msgid "reverse tagging on all attachments (toggle)" -msgstr "" +msgstr "reverse tagging on all attachments (toggle)" #: src/lang.c:391 msgid "untag all tagged attachments" -msgstr "" +msgstr "untag all tagged attachments" #: src/lang.c:392 msgid "toggle info message in last line (name/description of attachment)" -msgstr "" +msgstr "toggle info message in last line (name/description of attachment)" #: src/lang.c:393 msgid "choose first attribute in list" -msgstr "" +msgstr "choose first attribute in list" #: src/lang.c:394 msgid "0 - 9\t choose attribute by number" -msgstr "" +msgstr "0 - 9\t choose attribute by number" #: src/lang.c:395 msgid "choose last attribute in list" -msgstr "" +msgstr "choose last attribute in list" #: src/lang.c:396 msgid "reset attribute to a default value" -msgstr "" +msgstr "reset attribute to a default value" #: src/lang.c:397 msgid "search forwards for an attribute" -msgstr "" +msgstr "search forwards for an attribute" #: src/lang.c:398 msgid "search backwards for an attribute" -msgstr "" +msgstr "search backwards for an attribute" #: src/lang.c:399 msgid "select attribute" -msgstr "" +msgstr "select attribute" #: src/lang.c:400 msgid "toggle back to options menu when invoked from there" -msgstr "" +msgstr "toggle back to options menu when invoked from there" #: src/lang.c:401 #, c-format msgid "report bug or comment via mail to %s" -msgstr "" +msgstr "report bug or comment via mail to %s" #: src/lang.c:402 msgid "choose first option in list" -msgstr "" +msgstr "choose first option in list" #: src/lang.c:403 msgid "0 - 9\t choose option by number" -msgstr "" +msgstr "0 - 9\t choose option by number" #: src/lang.c:404 msgid "choose last option in list" -msgstr "" +msgstr "choose last option in list" #: src/lang.c:405 msgid "start scopes menu" -msgstr "" +msgstr "start scopes menu" #: src/lang.c:406 msgid "search forwards for an option" -msgstr "" +msgstr "search forwards for an option" #: src/lang.c:407 msgid "search backwards for an option" -msgstr "" +msgstr "search backwards for an option" #: src/lang.c:408 msgid "select option" -msgstr "" +msgstr "select option" #: src/lang.c:409 msgid "toggle to attributes menu" -msgstr "" +msgstr "toggle to attributes menu" #: src/lang.c:410 msgid "choose range of articles to be affected by next command" -msgstr "" +msgstr "choose range of articles to be affected by next command" #: src/lang.c:411 msgid "escape from command prompt" -msgstr "" +msgstr "escape from command prompt" #: src/lang.c:412 msgid "edit filter file" -msgstr "" +msgstr "edit filter file" #: src/lang.c:413 msgid "get help" -msgstr "" +msgstr "get help" #: src/lang.c:414 msgid "display last article viewed" -msgstr "" +msgstr "display last article viewed" #: src/lang.c:415 msgid "down one line" -msgstr "" +msgstr "down one line" #: src/lang.c:416 msgid "up one line" -msgstr "" +msgstr "up one line" #: src/lang.c:417 msgid "go to article chosen by Message-ID" -msgstr "" +msgstr "go to article chosen by Message-ID" #: src/lang.c:418 msgid "mail article/thread/hot/pattern/tagged articles to someone" -msgstr "" +msgstr "mail article/thread/hot/pattern/tagged articles to someone" #: src/lang.c:419 msgid "menu of configurable options" -msgstr "" +msgstr "menu of configurable options" #: src/lang.c:420 msgid "down one page" -msgstr "" +msgstr "down one page" #: src/lang.c:421 msgid "up one page" -msgstr "" +msgstr "up one page" #: src/lang.c:423 msgid "post (write) article to current group" -msgstr "" +msgstr "post (write) article to current group" #: src/lang.c:424 msgid "post postponed articles" -msgstr "" +msgstr "post postponed articles" #: src/lang.c:426 msgid "list articles posted by you (from posted file)" -msgstr "" +msgstr "list articles posted by you (from posted file)" #: src/lang.c:427 msgid "return to previous menu" -msgstr "" +msgstr "return to previous menu" #: src/lang.c:428 msgid "quit tin immediately" -msgstr "" +msgstr "quit tin immediately" #: src/lang.c:429 msgid "redraw page" -msgstr "" +msgstr "redraw page" #: src/lang.c:430 msgid "save article/thread/hot/pattern/tagged articles to file" -msgstr "" +msgstr "save article/thread/hot/pattern/tagged articles to file" #: src/lang.c:431 msgid "save marked articles automatically without user prompts" -msgstr "" +msgstr "save marked articles automatically without user prompts" #: src/lang.c:432 msgid "scroll the screen one line down" -msgstr "" +msgstr "scroll the screen one line down" #: src/lang.c:433 msgid "scroll the screen one line up" -msgstr "" +msgstr "scroll the screen one line up" #: src/lang.c:434 msgid "search for articles by author backwards" -msgstr "" +msgstr "search for articles by author backwards" #: src/lang.c:435 msgid "search for articles by author forwards" -msgstr "" +msgstr "search for articles by author forwards" #: src/lang.c:436 msgid "search all articles for a given string (this may take some time)" -msgstr "" +msgstr "search all articles for a given string (this may take some time)" #: src/lang.c:437 msgid " \t (searches are case-insensitive and wrap around to all articles)" -msgstr "" +msgstr " \t (searches are case-insensitive and wrap around to all articles)" #: src/lang.c:438 msgid "search for articles by Subject line backwards" -msgstr "" +msgstr "search for articles by Subject line backwards" #: src/lang.c:439 msgid "search for articles by Subject line forwards" -msgstr "" +msgstr "search for articles by Subject line forwards" #: src/lang.c:440 msgid "repeat last search" -msgstr "" +msgstr "repeat last search" #: src/lang.c:441 msgid "tag current article for reposting/mailing/piping/printing/saving" -msgstr "" +msgstr "tag current article for reposting/mailing/piping/printing/saving" #: src/lang.c:442 msgid "toggle info message in last line (subject/description)" -msgstr "" +msgstr "toggle info message in last line (subject/description)" #: src/lang.c:443 msgid "toggle inverse video" -msgstr "" +msgstr "toggle inverse video" #: src/lang.c:444 msgid "toggle mini help menu display" -msgstr "" +msgstr "toggle mini help menu display" #: src/lang.c:445 msgid "cycle the display of authors email address, real name, both or neither" msgstr "" +"cycle the display of authors e-mail address, real name, both or neither" #: src/lang.c:446 msgid "show version information" -msgstr "" +msgstr "show version information" #: src/lang.c:447 msgid "mark all articles as read and return to group selection menu" -msgstr "" +msgstr "mark all articles as read and return to group selection menu" #: src/lang.c:448 msgid "mark all articles as read and enter next group with unread articles" -msgstr "" +msgstr "mark all articles as read and enter next group with unread articles" #: src/lang.c:449 msgid "choose first thread in list" -msgstr "" +msgstr "choose first thread in list" #: src/lang.c:450 msgid "choose last thread in list" -msgstr "" +msgstr "choose last thread in list" #: src/lang.c:451 msgid "list articles within current thread (bring up Thread sub-menu)" -msgstr "" +msgstr "list articles within current thread (bring up Thread sub-menu)" #: src/lang.c:452 msgid "mark article as unread" -msgstr "" +msgstr "mark article as unread" #: src/lang.c:453 msgid "mark current thread, range or tagged threads as read" -msgstr "" +msgstr "mark current thread, range or tagged threads as read" #: src/lang.c:454 msgid "mark current thread, range or tagged threads as unread" -msgstr "" +msgstr "mark current thread, range or tagged threads as unread" #: src/lang.c:455 msgid "mark current/range/selected/pattern/tagged as read after prompting" -msgstr "" +msgstr "mark current/range/selected/pattern/tagged as read after prompting" #: src/lang.c:456 msgid "mark current/range/selected/pattern/tagged as unread after prompting" -msgstr "" +msgstr "mark current/range/selected/pattern/tagged as unread after prompting" #: src/lang.c:457 msgid "toggle display of all/selected articles" -msgstr "" +msgstr "toggle display of all/selected articles" #: src/lang.c:458 msgid "display next group" -msgstr "" +msgstr "display next group" #: src/lang.c:459 msgid "display previous group" -msgstr "" +msgstr "display previous group" #: src/lang.c:460 msgid "toggle all selections (all articles)" -msgstr "" +msgstr "toggle all selections (all articles)" #: src/lang.c:461 msgid "select group (make \"hot\")" -msgstr "" +msgstr "select group (make \"hot\")" #: src/lang.c:462 msgid "select thread" -msgstr "" +msgstr "select thread" #: src/lang.c:463 msgid "select threads if at least one unread article is selected" -msgstr "" +msgstr "select threads if at least one unread article is selected" #: src/lang.c:464 msgid "select threads that match user specified pattern" -msgstr "" +msgstr "select threads that match user specified pattern" -#: src/lang.c:465 -msgid "tag all parts of current multipart-message in order" -msgstr "" +#: src/lang.c:465 src/lang.c:521 +msgid "tag/untag all parts of current multipart-message in order" +msgstr "tag/untag all parts of current multipart-message in order" #: src/lang.c:466 msgid "0 - 9\t choose thread by number" -msgstr "" +msgstr "0 - 9\t choose thread by number" #: src/lang.c:467 msgid "toggle limit number of articles to get, and reload" -msgstr "" +msgstr "toggle limit number of articles to get, and reload" #: src/lang.c:468 msgid "toggle display of all/unread articles" -msgstr "" +msgstr "toggle display of all/unread articles" #: src/lang.c:469 msgid "toggle selection of thread" -msgstr "" +msgstr "toggle selection of thread" #: src/lang.c:470 msgid "cycle through threading options available" -msgstr "" +msgstr "cycle through threading options available" #: src/lang.c:471 msgid "undo all selections (all articles)" -msgstr "" +msgstr "undo all selections (all articles)" #: src/lang.c:472 msgid "untag all tagged threads" -msgstr "" +msgstr "untag all tagged threads" #: src/lang.c:473 msgid "add new scope" -msgstr "" +msgstr "add new scope" #: src/lang.c:474 msgid "delete scope" -msgstr "" +msgstr "delete scope" #: src/lang.c:475 msgid "edit attributes file" -msgstr "" +msgstr "edit attributes file" #: src/lang.c:476 msgid "choose first scope in list" -msgstr "" +msgstr "choose first scope in list" #: src/lang.c:477 msgid "0 - 9\t choose scope by number" -msgstr "" +msgstr "0 - 9\t choose scope by number" #: src/lang.c:478 msgid "choose last scope in list" -msgstr "" +msgstr "choose last scope in list" #: src/lang.c:479 msgid "move scope" -msgstr "" +msgstr "move scope" #: src/lang.c:480 msgid "rename scope" -msgstr "" +msgstr "rename scope" #: src/lang.c:481 msgid "select scope" -msgstr "" +msgstr "select scope" #: src/lang.c:482 msgid "mark all articles in group as read" -msgstr "" +msgstr "mark all articles in group as read" #: src/lang.c:483 msgid "mark all articles in group as read and move to next unread group" -msgstr "" +msgstr "mark all articles in group as read and move to next unread group" #: src/lang.c:484 msgid "choose first group in list" -msgstr "" +msgstr "choose first group in list" #: src/lang.c:485 msgid "choose group by name" -msgstr "" +msgstr "choose group by name" #: src/lang.c:486 msgid "0 - 9\t choose group by number" -msgstr "" +msgstr "0 - 9\t choose group by number" #: src/lang.c:487 msgid "choose range of groups to be affected by next command" -msgstr "" +msgstr "choose range of groups to be affected by next command" #: src/lang.c:488 msgid "choose last group in list" -msgstr "" +msgstr "choose last group in list" #: src/lang.c:490 msgid "list groups which an article has been posted to (by Message-ID)" -msgstr "" +msgstr "list groups which an article has been posted to (by Message-ID)" #: src/lang.c:491 msgid " \t (go to article if at least one of the groups is available)" -msgstr "" +msgstr " \t (go to article if at least one of the groups is available)" #: src/lang.c:493 msgid "mark all articles in chosen group unread" -msgstr "" +msgstr "mark all articles in chosen group unread" #: src/lang.c:494 msgid "move chosen group within list" -msgstr "" +msgstr "move chosen group within list" #: src/lang.c:495 msgid "choose next group with unread news" -msgstr "" +msgstr "choose next group with unread news" #: src/lang.c:496 src/lang.c:1396 msgid "quit" -msgstr "" +msgstr "quit" #: src/lang.c:497 msgid "quit without saving configuration changes" -msgstr "" +msgstr "quit without saving configuration changes" #: src/lang.c:498 msgid "read chosen group" -msgstr "" +msgstr "read chosen group" #: src/lang.c:499 msgid "reset .newsrc (all available articles in groups marked unread)" -msgstr "" +msgstr "reset .newsrc (all available articles in groups marked unread)" #: src/lang.c:500 msgid "search backwards for a group name" -msgstr "" +msgstr "search backwards for a group name" #: src/lang.c:501 msgid " \t (all searches are case-insensitive and wrap around)" -msgstr "" +msgstr " \t (all searches are case-insensitive and wrap around)" #: src/lang.c:502 msgid "search forwards for a group name" -msgstr "" +msgstr "search forwards for a group name" #: src/lang.c:503 msgid "subscribe to chosen group" -msgstr "" +msgstr "subscribe to chosen group" #: src/lang.c:504 msgid "subscribe to groups that match pattern" -msgstr "" +msgstr "subscribe to groups that match pattern" #: src/lang.c:505 msgid "reread active file to check for any new news" -msgstr "" +msgstr "reread active file to check for any new news" #: src/lang.c:506 msgid "toggle display of group name only or group name plus description" -msgstr "" +msgstr "toggle display of group name only or group name plus description" #: src/lang.c:507 msgid "toggle display to show all/unread subscribed groups" -msgstr "" +msgstr "toggle display to show all/unread subscribed groups" #: src/lang.c:508 msgid "unsubscribe from chosen group" -msgstr "" +msgstr "unsubscribe from chosen group" #: src/lang.c:509 msgid "unsubscribe from groups that match pattern" -msgstr "" +msgstr "unsubscribe from groups that match pattern" #: src/lang.c:510 msgid "sort the list of groups" -msgstr "" +msgstr "sort the list of groups" #: src/lang.c:511 msgid "toggle display to show all/subscribed groups" -msgstr "" +msgstr "toggle display to show all/subscribed groups" #: src/lang.c:512 msgid "0 - 9\t choose article by number" -msgstr "" +msgstr "0 - 9\t choose article by number" #: src/lang.c:513 msgid "mark thread as read and return to group index page" -msgstr "" +msgstr "mark thread as read and return to group index page" #: src/lang.c:514 msgid "mark thread as read and enter next unread thread or group" -msgstr "" +msgstr "mark thread as read and enter next unread thread or group" #: src/lang.c:515 msgid "choose first article in list" -msgstr "" +msgstr "choose first article in list" #: src/lang.c:516 msgid "choose last article in list" -msgstr "" +msgstr "choose last article in list" #: src/lang.c:517 msgid "mark art, range or tagged arts as read; move crsr to next unread art" -msgstr "" +msgstr "mark art, range or tagged arts as read; move crsr to next unread art" #: src/lang.c:518 msgid "mark article, range or tagged articles as unread" -msgstr "" +msgstr "mark article, range or tagged articles as unread" #: src/lang.c:519 msgid "mark current thread as unread" -msgstr "" +msgstr "mark current thread as unread" #: src/lang.c:520 msgid "read chosen article" -msgstr "" +msgstr "read chosen article" -#: src/lang.c:521 +#: src/lang.c:522 msgid "" "Display properties\n" "------------------" msgstr "" +"Display properties\n" +"------------------" -#: src/lang.c:522 +#: src/lang.c:523 msgid "" "Miscellaneous\n" "-------------" msgstr "" +"Miscellaneous\n" +"-------------" -#: src/lang.c:523 +#: src/lang.c:524 msgid "" "Moving around\n" "-------------" msgstr "" +"Moving around\n" +"-------------" -#: src/lang.c:524 +#: src/lang.c:525 msgid "" "Group/thread/article operations\n" "-------------------------------" msgstr "" +"Group/thread/article operations\n" +"-------------------------------" -#: src/lang.c:525 +#: src/lang.c:526 msgid "" "Attachment operations\n" "---------------------" msgstr "" +"Attachment operations\n" +"---------------------" -#: src/lang.c:526 +#: src/lang.c:527 msgid "" "Attribute operations\n" "--------------------" msgstr "" +"Attribute operations\n" +"--------------------" -#: src/lang.c:527 +#: src/lang.c:528 msgid "" "Option operations\n" "-----------------" msgstr "" +"Option operations\n" +"-----------------" -#: src/lang.c:528 +#: src/lang.c:529 msgid "" "Scope operations\n" "----------------" msgstr "" +"Scope operations\n" +"----------------" -#: src/lang.c:529 +#: src/lang.c:530 msgid "" "URL operations\n" "--------------" msgstr "" +"URL operations\n" +"--------------" -#: src/lang.c:530 +#: src/lang.c:531 msgid "choose first URL in list" -msgstr "" +msgstr "choose first URL in list" -#: src/lang.c:531 +#: src/lang.c:532 msgid "0 - 9\t choose URL by number" -msgstr "" +msgstr "0 - 9\t choose URL by number" -#: src/lang.c:532 +#: src/lang.c:533 msgid "choose last URL in list" -msgstr "" +msgstr "choose last URL in list" -#: src/lang.c:533 +#: src/lang.c:534 msgid "search for URLs forwards" -msgstr "" +msgstr "search for URLs forwards" -#: src/lang.c:534 +#: src/lang.c:535 msgid "search for URLs backwards" -msgstr "" +msgstr "search for URLs backwards" -#: src/lang.c:535 +#: src/lang.c:536 msgid "Open URL in browser" -msgstr "" +msgstr "Open URL in browser" -#: src/lang.c:536 +#: src/lang.c:537 msgid "toggle info message in last line (URL)" -msgstr "" +msgstr "toggle info message in last line (URL)" -#: src/lang.c:538 +#: src/lang.c:539 msgid "Group Level Commands" -msgstr "" +msgstr "Group Level Commands" -#: src/lang.c:539 +#: src/lang.c:540 msgid "Kill filter added" -msgstr "" +msgstr "Kill filter added" -#: src/lang.c:540 +#: src/lang.c:541 msgid "Auto-selection filter added" -msgstr "" +msgstr "Auto-selection filter added" -#: src/lang.c:541 +#: src/lang.c:542 msgid "All parts tagged" -msgstr "" +msgstr "All parts tagged" -#: src/lang.c:542 +#: src/lang.c:543 +msgid "All parts untagged" +msgstr "All parts untagged" + +#: src/lang.c:544 msgid "Storing article for later posting" -msgstr "" +msgstr "Storing article for later posting" -#: src/lang.c:543 +#: src/lang.c:545 msgid "Please enter a valid character" -msgstr "" +msgstr "Please enter a valid character" -#: src/lang.c:544 +#: src/lang.c:546 #, c-format msgid "Missing part #%d" -msgstr "" +msgstr "Missing part #%d" -#: src/lang.c:545 +#: src/lang.c:547 msgid "*** No postponed articles ***" -msgstr "" +msgstr "*** No postponed articles ***" -#: src/lang.c:546 +#: src/lang.c:548 msgid "Not a multi-part message" -msgstr "" +msgstr "Not a multi-part message" -#: src/lang.c:547 +#: src/lang.c:549 msgid "You are not subscribed to this group" -msgstr "" +msgstr "You are not subscribed to this group" -#: src/lang.c:548 +#: src/lang.c:550 msgid "No previous expression" -msgstr "" +msgstr "No previous expression" -#: src/lang.c:549 +#: src/lang.c:551 msgid "Operation disabled in no-overwrite mode" -msgstr "" +msgstr "Operation disabled in no-overwrite mode" #. TODO: replace hard coded key-name in txt_info_postponed -#: src/lang.c:551 +#: src/lang.c:553 #, c-format msgid "%d postponed %s, reuse with ^O...\n" -msgstr "" +msgstr "%d postponed %s, reuse with ^O...\n" -#: src/lang.c:552 +#: src/lang.c:554 msgid "" "X-Conversion-Note: multipart/alternative contents have been removed.\n" " To get the whole article, turn alternative handling OFF in the Option " "Menu\n" msgstr "" +"X-Conversion-Note: multipart/alternative contents have been removed.\n" +" To get the whole article, turn alternative handling OFF in the Option " +"Menu\n" -#: src/lang.c:554 +#: src/lang.c:556 #, c-format msgid "Save filename for %s/%s is a mailbox. Attachment not saved" -msgstr "" +msgstr "Save filename for %s/%s is a mailbox. Attachment not saved" -#: src/lang.c:555 +#: src/lang.c:557 msgid "TeX2Iso encoded article" -msgstr "" +msgstr "TeX2Iso encoded article" -#: src/lang.c:556 +#: src/lang.c:558 msgid "incomplete " -msgstr "" +msgstr "incomplete " #. TODO: replace hard coded key-names -#: src/lang.c:558 +#: src/lang.c:560 #, c-format msgid "" "\n" @@ -2476,498 +2660,544 @@ msgid "" "files.\n" "Please send bug-reports/comments to %s with the 'R' command.\n" msgstr "" +"\n" +"Welcome to %s, a full screen threaded Netnews reader. It can read news " +"locally\n" +"(ie. /news) or remotely (-r option) from an NNTP (Network News " +"Transport\n" +"Protocol) server. -h lists the available command line options.\n" +"\n" +"%s has four newsreading levels, the newsgroup selection page, the group " +"index\n" +"page, the thread listing page and the article viewer. Help is available at " +"each\n" +"level by pressing the 'h' command.\n" +"\n" +"Move up/down by using the terminal arrow keys or 'j' and 'k'. Use PgUp/PgDn " +"or\n" +"Ctrl-U and Ctrl-D to page up/down. Enter a newsgroup by pressing RETURN/" +"TAB.\n" +"\n" +"Articles, threads, tagged articles or articles matching a pattern can be " +"mailed\n" +"('m' command), printed ('o' command), saved ('s' command), piped ('|' " +"command).\n" +"Use the 'w' command to post a news article, the 'f'/'F' commands to " +"post a\n" +"follow-up to an existing news article and the 'r'/'R' commands to reply " +"via\n" +"mail to an existing news article author. The 'M' command allows the " +"operation\n" +"of %s to be configured via a menu.\n" +"\n" +"For more information read the manual page, README, INSTALL, TODO and FTP " +"files.\n" +"Please send bug-reports/comments to %s with the 'R' command.\n" -#: src/lang.c:574 +#: src/lang.c:576 #, c-format msgid "Invalid From: %s line. Read the INSTALL file again." -msgstr "" +msgstr "Invalid From: %s line. Read the INSTALL file again." -#: src/lang.c:576 +#: src/lang.c:578 msgid "Invalid multibyte sequence found\n" -msgstr "" +msgstr "Invalid multibyte sequence found\n" -#: src/lang.c:579 +#: src/lang.c:581 #, c-format msgid "Invalid Sender:-header %s" -msgstr "" +msgstr "Invalid Sender:-header %s" -#: src/lang.c:581 +#: src/lang.c:583 msgid "Inverse video disabled" -msgstr "" +msgstr "Inverse video disabled" -#: src/lang.c:582 +#: src/lang.c:584 msgid "Inverse video enabled" -msgstr "" +msgstr "Inverse video enabled" -#: src/lang.c:584 +#: src/lang.c:586 #, c-format msgid "Missing definition for %s\n" -msgstr "" +msgstr "Missing definition for %s\n" -#: src/lang.c:585 +#: src/lang.c:587 #, c-format msgid "Invalid key definition '%s'\n" -msgstr "" +msgstr "Invalid key definition '%s'\n" -#: src/lang.c:586 +#: src/lang.c:588 #, c-format msgid "Invalid keyname '%s'\n" -msgstr "" +msgstr "Invalid keyname '%s'\n" -#: src/lang.c:587 +#: src/lang.c:589 #, c-format msgid "Keymap file was upgraded to version %s\n" -msgstr "" +msgstr "Keymap file was upgraded to version %s\n" -#: src/lang.c:588 +#: src/lang.c:590 #, c-format msgid "Kill From: [%s] (y/n): " -msgstr "" +msgstr "Kill From: [%s] (y/n): " -#: src/lang.c:589 +#: src/lang.c:591 msgid "Kill Lines: (num): " -msgstr "" +msgstr "Kill Lines: (num): " -#: src/lang.c:590 +#: src/lang.c:592 msgid "Kill Article Menu" -msgstr "" +msgstr "Kill Article Menu" -#: src/lang.c:591 +#: src/lang.c:593 #, c-format msgid "Kill Msg-ID: [%s] (f/l/o/n): " -msgstr "" +msgstr "Kill Msg-ID: [%s] (f/l/o/n): " -#: src/lang.c:592 +#: src/lang.c:594 msgid "Kill pattern scope : " -msgstr "" +msgstr "Kill pattern scope : " -#: src/lang.c:593 +#: src/lang.c:595 #, c-format msgid "Kill Subject: [%s] (y/n): " -msgstr "" +msgstr "Kill Subject: [%s] (y/n): " -#: src/lang.c:594 +#: src/lang.c:596 msgid "Kill text pattern : " -msgstr "" +msgstr "Kill text pattern : " -#: src/lang.c:595 +#: src/lang.c:597 msgid "Kill time in days : " -msgstr "" +msgstr "Kill time in days : " -#: src/lang.c:597 +#: src/lang.c:599 msgid "Last" -msgstr "" +msgstr "Last" -#: src/lang.c:598 +#: src/lang.c:600 msgid "-- Last response --" -msgstr "" +msgstr "-- Last response --" -#: src/lang.c:599 +#: src/lang.c:601 #, c-format msgid "Lines %s " -msgstr "" +msgstr "Lines %s " -#: src/lang.c:602 +#: src/lang.c:604 msgid "Function not available." -msgstr "" +msgstr "Function not available." -#: src/lang.c:603 +#: src/lang.c:605 msgid "Not reading via NNTP." -msgstr "" +msgstr "Not reading via NNTP." -#: src/lang.c:604 +#: src/lang.c:606 #, c-format msgid "Group: %s" -msgstr "" +msgstr "Group: %s" -#: src/lang.c:605 +#: src/lang.c:607 #, c-format msgid "Groups: %s" -msgstr "" +msgstr "Groups: %s" -#: src/lang.c:608 +#: src/lang.c:610 msgid "Mail" -msgstr "" +msgstr "Mail" -#: src/lang.c:609 +#: src/lang.c:611 msgid "mailbox " -msgstr "" +msgstr "mailbox " -#: src/lang.c:610 +#: src/lang.c:612 #, c-format msgid "Mail article(s) to [%.*s]> " -msgstr "" +msgstr "Mail article(s) to [%.*s]> " -#: src/lang.c:611 +#: src/lang.c:613 #, c-format msgid "Mailing log to %s\n" -msgstr "" +msgstr "Mailing log to %s\n" -#: src/lang.c:612 +#: src/lang.c:614 msgid "Mail bug report..." -msgstr "" +msgstr "Mail bug report..." -#: src/lang.c:613 +#: src/lang.c:615 #, c-format msgid "Mail BUG REPORT to %s?" -msgstr "" +msgstr "Mail BUG REPORT to %s?" -#: src/lang.c:614 +#: src/lang.c:616 msgid "Mailed" -msgstr "" +msgstr "Mailed" -#: src/lang.c:615 +#: src/lang.c:617 #, c-format msgid "Mailing to %s..." -msgstr "" +msgstr "Mailing to %s..." -#: src/lang.c:616 +#: src/lang.c:618 msgid "" "# [Mail/Save] active file. Format is like news active file:\n" "# groupname max.artnum min.artnum /dir\n" "# The 4th field is the basedir (ie. ~/Mail or ~/News)\n" "#\n" msgstr "" +"# [Mail/Save] active file. Format is like news active file:\n" +"# groupname max.artnum min.artnum /dir\n" +"# The 4th field is the basedir (ie. ~/Mail or ~/News)\n" +"#\n" -#: src/lang.c:619 +#: src/lang.c:621 #, c-format msgid "%s marked as read" -msgstr "" +msgstr "%s marked as read" -#: src/lang.c:620 +#: src/lang.c:622 #, c-format msgid "%s marked as unread" -msgstr "" +msgstr "%s marked as unread" -#: src/lang.c:621 +#: src/lang.c:623 #, c-format msgid "Marked %d of %d %s as read" -msgstr "" +msgstr "Marked %d of %d %s as read" -#: src/lang.c:622 +#: src/lang.c:624 #, c-format msgid "Marked %d of %d %s as unread" -msgstr "" +msgstr "Marked %d of %d %s as unread" -#: src/lang.c:623 src/lang.c:1352 +#: src/lang.c:625 src/lang.c:1352 msgid "Mark" -msgstr "" +msgstr "Mark" -#: src/lang.c:624 +#: src/lang.c:626 #, c-format msgid "Mark all articles as read%s?" -msgstr "" +msgstr "Mark all articles as read%s?" -#: src/lang.c:625 +#: src/lang.c:627 #, c-format msgid "Mark article as read%s?" -msgstr "" +msgstr "Mark article as read%s?" -#: src/lang.c:626 +#: src/lang.c:628 #, c-format msgid "Mark group %s as read?" -msgstr "" +msgstr "Mark group %s as read?" -#: src/lang.c:627 +#: src/lang.c:629 #, c-format msgid "Mark thread as read%s?" -msgstr "" +msgstr "Mark thread as read%s?" -#: src/lang.c:628 +#: src/lang.c:630 #, c-format msgid "Matching %s groups..." -msgstr "" +msgstr "Matching %s groups..." -#: src/lang.c:629 src/lang.c:643 src/lang.c:649 +#: src/lang.c:631 src/lang.c:645 src/lang.c:651 #, c-format msgid "=set current to n; %s=line down; %s=line up; %s=help; %s=quit" -msgstr "" +msgstr "=set current to n; %s=line down; %s=line up; %s=help; %s=quit" -#: src/lang.c:631 +#: src/lang.c:633 #, c-format msgid "" "%s=view; %s=pipe; %s=pipe raw; %s=save; %s=tag; %s=tag pattern; %s=untag all" msgstr "" +"%s=view; %s=pipe; %s=pipe raw; %s=save; %s=tag; %s=tag pattern; %s=untag all" -#: src/lang.c:633 +#: src/lang.c:635 #, c-format msgid "%s=view; %s=save; %s=tag; %s=tag pattern; %s=untag all" -msgstr "" +msgstr "%s=view; %s=save; %s=tag; %s=tag pattern; %s=untag all" -#: src/lang.c:635 +#: src/lang.c:637 #, c-format msgid "" "%s=reverse tagging; %s=search forwards; %s=search backwards; %s=repeat search" msgstr "" +"%s=reverse tagging; %s=search forwards; %s=search backwards; %s=repeat search" -#: src/lang.c:636 src/lang.c:640 +#: src/lang.c:638 src/lang.c:642 #, c-format msgid "=set current to n; %s=next unread; %s=search pattern; %s=kill/select" msgstr "" +"=set current to n; %s=next unread; %s=search pattern; %s=kill/select" -#: src/lang.c:637 +#: src/lang.c:639 #, c-format msgid "" "%s=author search; %s=catchup; %s=line down; %s=line up; %s=mark read; " "%s=list thread" msgstr "" +"%s=author search; %s=catchup; %s=line down; %s=line up; %s=mark read; " +"%s=list thread" -#: src/lang.c:638 +#: src/lang.c:640 #, c-format msgid "%s=line up; %s=line down; %s=page up; %s=page down; %s=top; %s=bottom" -msgstr "" +msgstr "%s=line up; %s=line down; %s=page up; %s=page down; %s=top; %s=bottom" -#: src/lang.c:639 +#: src/lang.c:641 #, c-format msgid "%s=search forwards; %s=search backwards; %s=quit" -msgstr "" +msgstr "%s=search forwards; %s=search backwards; %s=quit" -#: src/lang.c:641 +#: src/lang.c:643 #, c-format msgid "%s=author search; %s=body search; %s=catchup; %s=followup; %s=mark read" msgstr "" +"%s=author search; %s=body search; %s=catchup; %s=followup; %s=mark read" -#: src/lang.c:642 +#: src/lang.c:644 #, c-format msgid "%s=add; %s=move; %s=rename; %s=delete" -msgstr "" +msgstr "%s=add; %s=move; %s=rename; %s=delete" -#: src/lang.c:644 +#: src/lang.c:646 #, c-format msgid "=set current to n; %s=next unread; %s,%s=search pattern; %s=catchup" -msgstr "" +msgstr "=set current to n; %s=next unread; %s,%s=search pattern; %s=catchup" -#: src/lang.c:645 +#: src/lang.c:647 #, c-format msgid "" "%s=line down; %s=line up; %s=help; %s=move; %s=quit; %s=toggle all/unread" msgstr "" +"%s=line down; %s=line up; %s=help; %s=move; %s=quit; %s=toggle all/unread" -#: src/lang.c:646 +#: src/lang.c:648 #, c-format msgid "" "%s=subscribe; %s=sub pattern; %s=unsubscribe; %s=unsub pattern; %s=yank in/" "out" msgstr "" +"%s=subscribe; %s=sub pattern; %s=unsubscribe; %s=unsub pattern; %s=yank in/" +"out" -#: src/lang.c:647 +#: src/lang.c:649 #, c-format msgid "=set current to n; %s=next unread; %s=catchup; %s=display toggle" -msgstr "" +msgstr "=set current to n; %s=next unread; %s=catchup; %s=display toggle" -#: src/lang.c:648 +#: src/lang.c:650 #, c-format msgid "%s=help; %s=line down; %s=line up; %s=quit; %s=tag; %s=mark unread" -msgstr "" +msgstr "%s=help; %s=line down; %s=line up; %s=quit; %s=tag; %s=mark unread" -#: src/lang.c:650 +#: src/lang.c:652 #, c-format msgid "%s=search forwards; %s=search backwards; %s=repeat search" -msgstr "" +msgstr "%s=search forwards; %s=search backwards; %s=repeat search" -#: src/lang.c:651 +#: src/lang.c:653 msgid "--More--" -msgstr "" +msgstr "--More--" -#: src/lang.c:652 +#: src/lang.c:654 #, c-format msgid "Moving %s..." -msgstr "" +msgstr "Moving %s..." -#: src/lang.c:653 +#: src/lang.c:655 msgid "Message-ID: & last Reference " -msgstr "" +msgstr "Message-ID: & last Reference " -#: src/lang.c:654 +#: src/lang.c:656 msgid "Message-ID: line " -msgstr "" +msgstr "Message-ID: line " -#: src/lang.c:655 +#: src/lang.c:657 msgid "Message-ID: & References: line" -msgstr "" +msgstr "Message-ID: & References: line" -#: src/lang.c:657 +#: src/lang.c:659 msgid ", name: " -msgstr "" +msgstr ", name: " -#: src/lang.c:658 +#: src/lang.c:660 #, c-format msgid "Go to newsgroup [%s]> " -msgstr "" +msgstr "Go to newsgroup [%s]> " -#: src/lang.c:659 +#: src/lang.c:661 msgid "newsgroups" -msgstr "" +msgstr "newsgroups" -#: src/lang.c:660 +#: src/lang.c:662 #, c-format msgid "Position %s in group list (1,2,..,$) [%d]> " -msgstr "" +msgstr "Position %s in group list (1,2,..,$) [%d]> " -#: src/lang.c:661 +#: src/lang.c:663 msgid "newsgroup" -msgstr "" +msgstr "newsgroup" -#: src/lang.c:662 +#: src/lang.c:664 msgid "Try and save newsrc file again?" -msgstr "" +msgstr "Try and save newsrc file again?" -#: src/lang.c:663 +#: src/lang.c:665 msgid "Warning: No newsgroups were written to your newsrc file. Save aborted." -msgstr "" +msgstr "Warning: No newsgroups were written to your newsrc file. Save aborted." -#: src/lang.c:664 +#: src/lang.c:666 msgid "newsrc file saved successfully.\n" -msgstr "" +msgstr "newsrc file saved successfully.\n" -#: src/lang.c:665 +#: src/lang.c:667 msgid "-- Next response --" -msgstr "" +msgstr "-- Next response --" -#: src/lang.c:666 +#: src/lang.c:668 msgid "No " -msgstr "" +msgstr "No " -#: src/lang.c:667 +#: src/lang.c:669 msgid "*** No articles ***" -msgstr "" +msgstr "*** No articles ***" -#: src/lang.c:668 +#: src/lang.c:670 msgid "No articles have been posted" -msgstr "" +msgstr "No articles have been posted" -#: src/lang.c:669 +#: src/lang.c:671 msgid "*** No attachments ***" -msgstr "" +msgstr "*** No attachments ***" -#: src/lang.c:670 +#: src/lang.c:672 msgid "*** No description ***" -msgstr "" +msgstr "*** No description ***" -#: src/lang.c:671 +#: src/lang.c:673 msgid "No filename" -msgstr "" +msgstr "No filename" -#: src/lang.c:672 +#: src/lang.c:674 msgid "No group" -msgstr "" +msgstr "No group" -#: src/lang.c:673 +#: src/lang.c:675 msgid "*** No groups ***" -msgstr "" +msgstr "*** No groups ***" -#: src/lang.c:674 +#: src/lang.c:676 msgid "No more groups to read" -msgstr "" +msgstr "No more groups to read" -#: src/lang.c:675 +#: src/lang.c:677 msgid "No last message" -msgstr "" +msgstr "No last message" -#: src/lang.c:676 +#: src/lang.c:678 msgid "No mail address" -msgstr "" +msgstr "No mail address" -#: src/lang.c:677 +#: src/lang.c:679 msgid "No articles marked for saving" -msgstr "" +msgstr "No articles marked for saving" -#: src/lang.c:678 +#: src/lang.c:680 msgid "No match" -msgstr "" +msgstr "No match" -#: src/lang.c:679 +#: src/lang.c:681 msgid "No more groups" -msgstr "" +msgstr "No more groups" -#: src/lang.c:680 +#: src/lang.c:682 msgid "No newsgroups" -msgstr "" +msgstr "No newsgroups" -#: src/lang.c:681 +#: src/lang.c:683 msgid "No next unread article" -msgstr "" +msgstr "No next unread article" -#: src/lang.c:682 +#: src/lang.c:684 msgid "No previous group" -msgstr "" +msgstr "No previous group" -#: src/lang.c:683 +#: src/lang.c:685 msgid "No previous search, nothing to repeat" -msgstr "" +msgstr "No previous search, nothing to repeat" -#: src/lang.c:684 +#: src/lang.c:686 msgid "No previous unread article" -msgstr "" +msgstr "No previous unread article" -#: src/lang.c:685 +#: src/lang.c:687 msgid "No responses" -msgstr "" +msgstr "No responses" -#: src/lang.c:686 +#: src/lang.c:688 msgid "No responses to list in current thread" -msgstr "" +msgstr "No responses to list in current thread" -#: src/lang.c:687 +#: src/lang.c:689 msgid "*** No scopes ***" -msgstr "" +msgstr "*** No scopes ***" -#: src/lang.c:688 +#: src/lang.c:690 msgid "No search string" -msgstr "" +msgstr "No search string" -#: src/lang.c:689 +#: src/lang.c:691 msgid "No subject" -msgstr "" +msgstr "No subject" -#: src/lang.c:691 +#: src/lang.c:693 #, c-format msgid "%s: Terminal must have clear to end-of-line (ce)\n" -msgstr "" +msgstr "%s: Terminal must have clear to end-of-line (ce)\n" -#: src/lang.c:692 +#: src/lang.c:694 #, c-format msgid "%s: Terminal must have clear to end-of-screen (cd)\n" -msgstr "" +msgstr "%s: Terminal must have clear to end-of-screen (cd)\n" -#: src/lang.c:693 +#: src/lang.c:695 #, c-format msgid "%s: Terminal must have clearscreen (cl) capability\n" -msgstr "" +msgstr "%s: Terminal must have clearscreen (cl) capability\n" -#: src/lang.c:694 +#: src/lang.c:696 #, c-format msgid "%s: Terminal must have cursor motion (cm)\n" -msgstr "" +msgstr "%s: Terminal must have cursor motion (cm)\n" -#: src/lang.c:695 +#: src/lang.c:697 #, c-format msgid "%s: TERM variable must be set to use screen capabilities\n" -msgstr "" +msgstr "%s: TERM variable must be set to use screen capabilities\n" -#: src/lang.c:697 +#: src/lang.c:699 #, c-format msgid "No viewer found for %s/%s\n" -msgstr "" +msgstr "No viewer found for %s/%s\n" -#: src/lang.c:698 +#: src/lang.c:700 msgid "Newsgroup does not exist on this server" -msgstr "" +msgstr "Newsgroup does not exist on this server" -#: src/lang.c:699 +#: src/lang.c:701 #, c-format msgid "Group %s not found in active file" -msgstr "" +msgstr "Group %s not found in active file" -#: src/lang.c:700 +#: src/lang.c:702 msgid "c)reate it, use a)lternative name, use d)efault .newsrc, q)uit tin: " -msgstr "" +msgstr "c)reate it, use a)lternative name, use d)efault .newsrc, q)uit tin: " -#: src/lang.c:701 +#: src/lang.c:703 msgid "use a)lternative name, use d)efault .newsrc, q)uit tin: " -msgstr "" +msgstr "use a)lternative name, use d)efault .newsrc, q)uit tin: " -#: src/lang.c:702 +#: src/lang.c:704 #, c-format msgid "" "# NNTP-server -> newsrc translation table and NNTP-server\n" @@ -2983,325 +3213,342 @@ msgid "" "# news.example.org /tmp/nrc-ex example ex\n" "#\n" msgstr "" +"# NNTP-server -> newsrc translation table and NNTP-server\n" +"# shortname list for %s %s\n" +"#\n" +"# the format of this file is\n" +"# ...\n" +"#\n" +"# if is given without path, $HOME is assumed as its location\n" +"#\n" +"# examples:\n" +"# news.tin.org .newsrc-tin.org tinorg\n" +"# news.example.org /tmp/nrc-ex example ex\n" +"#\n" -#: src/lang.c:709 +#: src/lang.c:711 msgid "Only" -msgstr "" +msgstr "Only" -#: src/lang.c:710 +#: src/lang.c:712 #, c-format msgid "Option not enabled. Recompile with %s." -msgstr "" +msgstr "Option not enabled. Recompile with %s." -#: src/lang.c:711 +#: src/lang.c:713 msgid "Options Menu" -msgstr "" +msgstr "Options Menu" -#: src/lang.c:712 +#: src/lang.c:714 msgid "Options Menu Commands" -msgstr "" +msgstr "Options Menu Commands" -#: src/lang.c:715 +#: src/lang.c:717 #, c-format msgid "Error in regex: %s at pos. %d '%s'" -msgstr "" +msgstr "Error in regex: %s at pos. %d '%s'" -#: src/lang.c:716 +#: src/lang.c:718 #, c-format msgid "Error in regex: pcre internal error %d" -msgstr "" +msgstr "Error in regex: pcre internal error %d" -#: src/lang.c:717 +#: src/lang.c:719 #, c-format msgid "Error in regex: study - pcre internal error %s" -msgstr "" +msgstr "Error in regex: study - pcre internal error %s" -#: src/lang.c:718 +#: src/lang.c:720 msgid "Post a followup..." -msgstr "" +msgstr "Post a followup..." #. TODO: replace hard coded key-name in txt_post_error_ask_postpone -#: src/lang.c:720 +#: src/lang.c:722 msgid "" "An error has occurred while posting the article. If you think that this\n" "error is temporary or otherwise correctable, you can postpone the article\n" "and pick it up again with ^O later.\n" msgstr "" +"An error has occurred while posting the article. If you think that this\n" +"error is temporary or otherwise correctable, you can postpone the article\n" +"and pick it up again with ^O later.\n" -#: src/lang.c:723 +#: src/lang.c:725 msgid "Posted articles history" -msgstr "" +msgstr "Posted articles history" -#: src/lang.c:724 +#: src/lang.c:726 #, c-format msgid "Post to newsgroup(s) [%s]> " -msgstr "" +msgstr "Post to newsgroup(s) [%s]> " -#: src/lang.c:725 +#: src/lang.c:727 msgid "-- post processing started --" -msgstr "" +msgstr "-- post processing started --" -#: src/lang.c:726 +#: src/lang.c:728 msgid "-- post processing completed --" -msgstr "" +msgstr "-- post processing completed --" -#: src/lang.c:727 +#: src/lang.c:729 #, c-format msgid "Post subject [%s]> " -msgstr "" +msgstr "Post subject [%s]> " -#: src/lang.c:728 +#: src/lang.c:730 msgid "" "# Summary of mailed/posted messages viewable by 'W' command from within " "tin.\n" msgstr "" +"# Summary of mailed/posted messages viewable by 'W' command from within " +"tin.\n" -#: src/lang.c:729 +#: src/lang.c:731 msgid "Posting article..." -msgstr "" +msgstr "Posting article..." -#: src/lang.c:730 +#: src/lang.c:732 #, c-format msgid "Post postponed articles [%%s]? (%s/%s/%s/%s/%s): " -msgstr "" +msgstr "Post postponed articles [%%s]? (%s/%s/%s/%s/%s): " -#: src/lang.c:731 +#: src/lang.c:733 #, c-format msgid "Hot %s" -msgstr "" +msgstr "Hot %s" -#: src/lang.c:732 +#: src/lang.c:734 #, c-format msgid "Tagged %s" -msgstr "" +msgstr "Tagged %s" -#: src/lang.c:733 +#: src/lang.c:735 #, c-format msgid "Untagged %s" -msgstr "" +msgstr "Untagged %s" -#: src/lang.c:735 +#: src/lang.c:737 #, c-format msgid "Preparing for filtering on Path header (%d/%d)..." -msgstr "" +msgstr "Preparing for filtering on Path header (%d/%d)..." -#: src/lang.c:737 +#: src/lang.c:739 msgid "Processing mail messages marked for deletion." -msgstr "" +msgstr "Processing mail messages marked for deletion." -#: src/lang.c:738 +#: src/lang.c:740 msgid "Processing saved articles marked for deletion." -msgstr "" +msgstr "Processing saved articles marked for deletion." -#: src/lang.c:739 +#: src/lang.c:741 #, c-format msgid "Accept Followup-To? %s=post, %s=ignore, %s=quit: " -msgstr "" +msgstr "Accept Followup-To? %s=post, %s=ignore, %s=quit: " -#: src/lang.c:740 +#: src/lang.c:742 msgid "Article unchanged, abort mailing?" -msgstr "" +msgstr "Article unchanged, abort mailing?" -#: src/lang.c:741 +#: src/lang.c:743 #, c-format msgid "Do you want to see postponed articles (%d)?" -msgstr "" +msgstr "Do you want to see postponed articles (%d)?" -#: src/lang.c:743 +#: src/lang.c:745 msgid "Add quick kill filter?" -msgstr "" +msgstr "Add quick kill filter?" -#: src/lang.c:744 +#: src/lang.c:746 msgid "Add quick selection filter?" -msgstr "" +msgstr "Add quick selection filter?" -#: src/lang.c:745 +#: src/lang.c:747 msgid "Do you really want to quit?" -msgstr "" +msgstr "Do you really want to quit?" -#: src/lang.c:746 +#: src/lang.c:748 #, c-format msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%s]: " -msgstr "" +msgstr "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%s]: " -#: src/lang.c:747 +#: src/lang.c:749 msgid "You have tagged articles in this group - quit anyway?" -msgstr "" +msgstr "You have tagged articles in this group - quit anyway?" -#: src/lang.c:748 +#: src/lang.c:750 #, c-format msgid "%s=quit, %s=edit, %s=postpone: " -msgstr "" +msgstr "%s=quit, %s=edit, %s=postpone: " -#: src/lang.c:749 +#: src/lang.c:751 #, c-format msgid "%s=quit %s=edit %s=save kill description: " -msgstr "" +msgstr "%s=quit %s=edit %s=save kill description: " -#: src/lang.c:750 +#: src/lang.c:752 #, c-format msgid "%s=quit %s=edit %s=save select description: " -msgstr "" +msgstr "%s=quit %s=edit %s=save select description: " -#: src/lang.c:751 +#: src/lang.c:753 msgid "Do you really want to quit without saving your configuration?" -msgstr "" +msgstr "Do you really want to quit without saving your configuration?" -#: src/lang.c:754 +#: src/lang.c:756 msgid "Invalid range - valid are '0-9.$' eg. 1-$" -msgstr "" +msgstr "Invalid range - valid are '0-9.$' eg. 1-$" -#: src/lang.c:756 +#: src/lang.c:757 msgid "Do you want to abort this operation?" -msgstr "" +msgstr "Do you want to abort this operation?" -#: src/lang.c:757 +#: src/lang.c:758 msgid "Do you want to exit tin immediately?" -msgstr "" +msgstr "Do you want to exit tin immediately?" #: src/lang.c:759 msgid "Reading ('q' to quit)..." -msgstr "" +msgstr "Reading ('q' to quit)..." #: src/lang.c:760 #, c-format msgid "Reading %sarticles..." -msgstr "" +msgstr "Reading %sarticles..." #: src/lang.c:761 #, c-format msgid "Reading %sattributes file...\n" -msgstr "" +msgstr "Reading %sattributes file...\n" #: src/lang.c:762 #, c-format msgid "Reading %sconfig file...\n" -msgstr "" +msgstr "Reading %sconfig file...\n" #: src/lang.c:763 msgid "Reading filter file...\n" -msgstr "" +msgstr "Reading filter file...\n" #: src/lang.c:764 #, c-format msgid "Reading %s groups..." -msgstr "" +msgstr "Reading %s groups..." #: src/lang.c:765 msgid "Reading input history file...\n" -msgstr "" +msgstr "Reading input history file...\n" #: src/lang.c:766 msgid "Reading keymap file...\n" -msgstr "" +msgstr "Reading keymap file...\n" #: src/lang.c:767 msgid "Reading groups from active file... " -msgstr "" +msgstr "Reading groups from active file... " #: src/lang.c:768 msgid "Reading groups from newsrc file... " -msgstr "" +msgstr "Reading groups from newsrc file... " #: src/lang.c:769 msgid "Reading newsgroups file... " -msgstr "" +msgstr "Reading newsgroups file... " #: src/lang.c:770 msgid "Reading newsrc file..." -msgstr "" +msgstr "Reading newsrc file..." #: src/lang.c:771 msgid "References: line " -msgstr "" +msgstr "References: line " #: src/lang.c:773 #, c-format msgid "(%d:%02d remaining)" -msgstr "" +msgstr "(%d:%02d remaining)" #: src/lang.c:775 #, c-format msgid "Bogus group %s removed." -msgstr "" +msgstr "Bogus group %s removed." #: src/lang.c:776 msgid "Removed from the previous rule: " -msgstr "" +msgstr "Removed from the previous rule: " #: src/lang.c:777 #, c-format msgid "Error: rename %s to %s" -msgstr "" +msgstr "Error: rename %s to %s" #: src/lang.c:778 msgid "Reply to author..." -msgstr "" +msgstr "Reply to author..." #: src/lang.c:779 msgid "Repost" -msgstr "" +msgstr "Repost" #: src/lang.c:780 msgid "Reposting article..." -msgstr "" +msgstr "Reposting article..." #: src/lang.c:781 #, c-format msgid "Repost article(s) to group(s) [%s]> " -msgstr "" +msgstr "Repost article(s) to group(s) [%s]> " #: src/lang.c:782 msgid "Reset newsrc?" -msgstr "" +msgstr "Reset newsrc?" #: src/lang.c:783 msgid "Responses have been directed to the following newsgroups" -msgstr "" +msgstr "Responses have been directed to the following newsgroups" #: src/lang.c:784 #, c-format msgid "Responses have been directed to poster. %s=mail, %s=post, %s=quit: " -msgstr "" +msgstr "Responses have been directed to poster. %s=mail, %s=post, %s=quit: " #: src/lang.c:786 msgid "Press to continue..." -msgstr "" +msgstr "Press to continue..." #: src/lang.c:788 #, c-format msgid "Select From [%s] (y/n): " -msgstr "" +msgstr "Select From [%s] (y/n): " #: src/lang.c:789 msgid "Select Lines: (num): " -msgstr "" +msgstr "Select Lines: (num): " #: src/lang.c:790 msgid "Auto-select Article Menu" -msgstr "" +msgstr "Auto-select Article Menu" #: src/lang.c:791 #, c-format msgid "Select Msg-ID [%s] (f/l/o/n): " -msgstr "" +msgstr "Select Msg-ID [%s] (f/l/o/n): " #: src/lang.c:792 msgid "Select pattern scope: " -msgstr "" +msgstr "Select pattern scope: " #: src/lang.c:793 #, c-format msgid "Select Subject [%s] (y/n): " -msgstr "" +msgstr "Select Subject [%s] (y/n): " #: src/lang.c:794 msgid "Select text pattern : " -msgstr "" +msgstr "Select text pattern : " #: src/lang.c:795 msgid "Select time in days : " -msgstr "" +msgstr "Select time in days : " #: src/lang.c:796 #, c-format @@ -3315,53 +3562,61 @@ msgid "" "############################################################################\n" "\n" msgstr "" +"# %s server configuration file\n" +"# This file was automatically saved by %s %s %s (\"%s\")\n" +"#\n" +"# Do not edit while %s is running, since all your changes to this file\n" +"# will be overwritten when you leave %s.\n" +"# Do not edit at all if you don't know what you do.\n" +"############################################################################\n" +"\n" #: src/lang.c:802 msgid "Showing unread groups only" -msgstr "" +msgstr "Showing unread groups only" #: src/lang.c:803 msgid "Subject: line (ignore case) " -msgstr "" +msgstr "Subject: line (ignore case) " #: src/lang.c:804 msgid "Subject: line (case sensitive)" -msgstr "" +msgstr "Subject: line (case sensitive)" #: src/lang.c:805 msgid "Save" -msgstr "" +msgstr "Save" #: src/lang.c:806 #, c-format msgid "Save '%s' (%s/%s)?" -msgstr "" +msgstr "Save '%s' (%s/%s)?" #: src/lang.c:807 msgid "Save configuration before continuing?" -msgstr "" +msgstr "Save configuration before continuing?" #: src/lang.c:808 msgid "Save filename> " -msgstr "" +msgstr "Save filename> " #: src/lang.c:809 msgid "Saved" -msgstr "" +msgstr "Saved" #: src/lang.c:810 #, c-format msgid "%4d unread (%4d hot) %s in %s\n" -msgstr "" +msgstr "%4d unread (%4d hot) %s in %s\n" #: src/lang.c:811 #, c-format msgid "Saved %s...\n" -msgstr "" +msgstr "Saved %s...\n" #: src/lang.c:812 msgid "Nothing was saved" -msgstr "" +msgstr "Nothing was saved" #: src/lang.c:813 #, c-format @@ -3369,20 +3624,22 @@ msgid "" "\n" "%s %d %s from %d %s\n" msgstr "" +"\n" +"%s %d %s from %d %s\n" #: src/lang.c:814 #, c-format msgid "-- %s saved to %s%s --" -msgstr "" +msgstr "-- %s saved to %s%s --" #: src/lang.c:815 #, c-format msgid "-- %s saved to %s - %s --" -msgstr "" +msgstr "-- %s saved to %s - %s --" #: src/lang.c:816 msgid "Saving..." -msgstr "" +msgstr "Saving..." #: src/lang.c:817 #, c-format @@ -3392,158 +3649,159 @@ msgstr "%s: Screen initialisation failed #: src/lang.c:819 #, c-format msgid "%s: screen is too small\n" -msgstr "" +msgstr "%s: screen is too small\n" #: src/lang.c:821 #, c-format msgid "screen is too small, %s is exiting" -msgstr "" +msgstr "screen is too small, %s is exiting" #: src/lang.c:822 msgid "Delete scope?" -msgstr "" +msgstr "Delete scope?" #: src/lang.c:823 msgid "Enter scope> " -msgstr "" +msgstr "Enter scope> " #: src/lang.c:824 msgid "Select new position> " -msgstr "" +msgstr "Select new position> " #: src/lang.c:825 msgid "New position cannot be a global scope" -msgstr "" +msgstr "New position cannot be a global scope" #: src/lang.c:826 msgid "Global scope, operation not allowed" -msgstr "" +msgstr "Global scope, operation not allowed" #: src/lang.c:827 msgid "Rename scope> " -msgstr "" +msgstr "Rename scope> " #: src/lang.c:828 msgid "Select scope> " -msgstr "" +msgstr "Select scope> " #: src/lang.c:829 msgid "Scopes Menu" -msgstr "" +msgstr "Scopes Menu" #: src/lang.c:830 msgid "Scopes Menu Commands" -msgstr "" +msgstr "Scopes Menu Commands" #: src/lang.c:831 #, c-format msgid "Search backwards [%s]> " -msgstr "" +msgstr "Search backwards [%s]> " #: src/lang.c:832 #, c-format msgid "Search body [%s]> " -msgstr "" +msgstr "Search body [%s]> " #: src/lang.c:833 #, c-format msgid "Search forwards [%s]> " -msgstr "" +msgstr "Search forwards [%s]> " #: src/lang.c:834 msgid "Searching..." -msgstr "" +msgstr "Searching..." #: src/lang.c:835 #, c-format msgid "Searching article %d of %d ('q' to abort)..." -msgstr "" +msgstr "Searching article %d of %d ('q' to abort)..." #: src/lang.c:836 msgid "Select article> " -msgstr "" +msgstr "Select article> " #: src/lang.c:837 msgid "" "Select option number before text or use arrow keys and . 'q' to quit." msgstr "" +"Select option number before text or use arrow keys and . 'q' to quit." #: src/lang.c:838 msgid "Select group> " -msgstr "" +msgstr "Select group> " #: src/lang.c:839 #, c-format msgid "Enter selection pattern [%s]> " -msgstr "" +msgstr "Enter selection pattern [%s]> " #: src/lang.c:840 msgid "Select thread> " -msgstr "" +msgstr "Select thread> " #: src/lang.c:841 #, c-format msgid "%s %s %s (\"%s\"): send a DETAILED bug report to %s\n" -msgstr "" +msgstr "%s %s %s (\"%s\"): send a DETAILED bug report to %s\n" #: src/lang.c:842 msgid "servers active-file" -msgstr "" +msgstr "servers active-file" #: src/lang.c:843 msgid "Cannot move into new newsgroups. Subscribe first..." -msgstr "" +msgstr "Cannot move into new newsgroups. Subscribe first..." #: src/lang.c:844 msgid "" -msgstr "" +msgstr "" #: src/lang.c:845 #, c-format msgid "Starting: (%s)" -msgstr "" +msgstr "Starting: (%s)" #: src/lang.c:846 #, c-format msgid "List Thread (%d of %d)" -msgstr "" +msgstr "List Thread (%d of %d)" #: src/lang.c:847 #, c-format msgid "Thread (%.*s)" -msgstr "" +msgstr "Thread (%.*s)" #: src/lang.c:848 msgid "Enter wildcard subscribe pattern> " -msgstr "" +msgstr "Enter wildcard subscribe pattern> " #: src/lang.c:849 #, c-format msgid "subscribed to %d groups" -msgstr "" +msgstr "subscribed to %d groups" #: src/lang.c:850 #, c-format msgid "Subscribed to %s" -msgstr "" +msgstr "Subscribed to %s" #: src/lang.c:851 msgid "Subscribing... " -msgstr "" +msgstr "Subscribing... " #: src/lang.c:852 #, c-format msgid "Repost or supersede article(s) [%%s]? (%s/%s/%s): " -msgstr "" +msgstr "Repost or supersede article(s) [%%s]? (%s/%s/%s): " #: src/lang.c:853 #, c-format msgid "Supersede article(s) to group(s) [%s]> " -msgstr "" +msgstr "Supersede article(s) to group(s) [%s]> " #: src/lang.c:854 msgid "Superseding article ..." -msgstr "" +msgstr "Superseding article ..." #: src/lang.c:855 #, c-format @@ -3551,23 +3809,25 @@ msgid "" "\n" "Stopped. Type 'fg' to restart %s\n" msgstr "" +"\n" +"Stopped. Type 'fg' to restart %s\n" #: src/lang.c:857 #, c-format msgid "%d days" -msgstr "" +msgstr "%d days" #: src/lang.c:858 msgid "" -msgstr "" +msgstr "" #: src/lang.c:859 msgid "TeX " -msgstr "" +msgstr "TeX " #: src/lang.c:860 msgid "# Default action/prompt strings\n" -msgstr "" +msgstr "# Default action/prompt strings\n" #: src/lang.c:861 msgid "" @@ -3579,107 +3839,115 @@ msgid "" "# case=ON/OFF ON=filter case sensitive OFF=ignore case\n" "# expire=ON/OFF ON=limit to default_filter_days OFF=don't ever expire\n" msgstr "" +"# Defaults for quick (1 key) kill & auto-selection filters\n" +"# header=NUM 0,1=Subject: 2,3=From: 4=Message-ID: & full References: line\n" +"# 5=Message-ID: & last References: entry only\n" +"# 6=Message-ID: entry only 7=Lines:\n" +"# global=ON/OFF ON=apply to all groups OFF=apply to current group\n" +"# case=ON/OFF ON=filter case sensitive OFF=ignore case\n" +"# expire=ON/OFF ON=limit to default_filter_days OFF=don't ever expire\n" #: src/lang.c:874 msgid "" "# If ON use print current subject or newsgroup description in the last line\n" msgstr "" +"# If ON use print current subject or newsgroup description in the last line\n" #: src/lang.c:875 msgid "# Host & time info used for detecting new groups (don't touch)\n" -msgstr "" +msgstr "# Host & time info used for detecting new groups (don't touch)\n" #: src/lang.c:876 msgid "There is no news\n" -msgstr "" +msgstr "There is no news\n" #: src/lang.c:877 msgid "Thread" -msgstr "" +msgstr "Thread" #: src/lang.c:878 msgid "Thread Level Commands" -msgstr "" +msgstr "Thread Level Commands" #: src/lang.c:879 msgid "Thread deselected" -msgstr "" +msgstr "Thread deselected" #: src/lang.c:880 msgid "Thread selected" -msgstr "" +msgstr "Thread selected" #: src/lang.c:882 msgid "threads" -msgstr "" +msgstr "threads" #: src/lang.c:884 msgid "thread" -msgstr "" +msgstr "thread" #: src/lang.c:885 #, c-format msgid "Thread %4s of %4s" -msgstr "" +msgstr "Thread %4s of %4s" #: src/lang.c:886 msgid "Threading articles..." -msgstr "" +msgstr "Threading articles..." #: src/lang.c:887 #, c-format msgid "Toggled word highlighting %s" -msgstr "" +msgstr "Toggled word highlighting %s" #: src/lang.c:888 msgid "Toggled rot13 encoding" -msgstr "" +msgstr "Toggled rot13 encoding" #: src/lang.c:889 #, c-format msgid "Toggled german TeX encoding %s" -msgstr "" +msgstr "Toggled german TeX encoding %s" #: src/lang.c:890 #, c-format msgid "Toggled tab-width to %d" -msgstr "" +msgstr "Toggled tab-width to %d" #: src/lang.c:892 #, c-format msgid "%d Trying to dotlock %s" -msgstr "" +msgstr "%d Trying to dotlock %s" #: src/lang.c:893 #, c-format msgid "%d Trying to lock %s" -msgstr "" +msgstr "%d Trying to lock %s" #: src/lang.c:895 msgid " h=help" -msgstr "" +msgstr " h=help" #: src/lang.c:897 msgid "Unlimited" -msgstr "" +msgstr "Unlimited" #: src/lang.c:898 msgid "Enter wildcard unsubscribe pattern> " -msgstr "" +msgstr "Enter wildcard unsubscribe pattern> " #: src/lang.c:899 #, c-format msgid "Error decoding %s : %s" -msgstr "" +msgstr "Error decoding %s : %s" #: src/lang.c:900 msgid "No end." -msgstr "" +msgstr "No end." #: src/lang.c:901 #, c-format msgid "%s successfully decoded." -msgstr "" +msgstr "%s successfully decoded." #: src/lang.c:902 #, c-format @@ -3687,108 +3955,110 @@ msgid "" "%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n" "\n" msgstr "" +"%*s[-- %s/%s, %suuencoded file, %d lines, name: %s --]\n" +"\n" #: src/lang.c:903 msgid "unread " -msgstr "" +msgstr "unread " #: src/lang.c:904 #, c-format msgid "unsubscribed from %d groups" -msgstr "" +msgstr "unsubscribed from %d groups" #: src/lang.c:905 #, c-format msgid "Unsubscribed from %s" -msgstr "" +msgstr "Unsubscribed from %s" #: src/lang.c:906 msgid "Unsubscribing... " -msgstr "" +msgstr "Unsubscribing... " #: src/lang.c:907 msgid "Unthreading articles..." -msgstr "" +msgstr "Unthreading articles..." #: src/lang.c:908 msgid "Updated" -msgstr "" +msgstr "Updated" #: src/lang.c:909 msgid "Updating" -msgstr "" +msgstr "Updating" #: src/lang.c:910 msgid "URL Menu" -msgstr "" +msgstr "URL Menu" #: src/lang.c:911 msgid "URL Menu Commands" -msgstr "" +msgstr "URL Menu Commands" #: src/lang.c:912 #, c-format msgid "Opening %s" -msgstr "" +msgstr "Opening %s" #: src/lang.c:913 msgid "Select URL> " -msgstr "" +msgstr "Select URL> " #: src/lang.c:914 msgid "No URLs in this article" -msgstr "" +msgstr "No URLs in this article" #: src/lang.c:915 msgid "Use MIME display program for this message?" -msgstr "" +msgstr "Use MIME display program for this message?" #: src/lang.c:916 msgid " -c mark all news as read in subscribed newsgroups (batch mode)" -msgstr "" +msgstr " -c mark all news as read in subscribed newsgroups (batch mode)" #: src/lang.c:917 msgid " -Z return status indicating if any unread news (batch mode)" -msgstr "" +msgstr " -Z return status indicating if any unread news (batch mode)" #: src/lang.c:918 msgid " -q don't check for new newsgroups" -msgstr "" +msgstr " -q don't check for new newsgroups" #: src/lang.c:919 msgid " -X don't save any files on quit" -msgstr "" +msgstr " -X don't save any files on quit" #: src/lang.c:920 msgid " -d don't show newsgroup descriptions" -msgstr "" +msgstr " -d don't show newsgroup descriptions" #: src/lang.c:921 msgid " -G limit get only limit articles/group" -msgstr "" +msgstr " -G limit get only limit articles/group" #: src/lang.c:922 #, c-format msgid " -H help information about %s" -msgstr "" +msgstr " -H help information about %s" #: src/lang.c:923 msgid " -h this help message" -msgstr "" +msgstr " -h this help message" #: src/lang.c:924 #, c-format msgid " -I dir news index file directory [default=%s]" -msgstr "" +msgstr " -I dir news index file directory [default=%s]" #: src/lang.c:925 msgid " -u update index files (batch mode)" -msgstr "" +msgstr " -u update index files (batch mode)" #: src/lang.c:926 #, c-format msgid " -m dir mailbox directory [default=%s]" -msgstr "" +msgstr " -m dir mailbox directory [default=%s]" #: src/lang.c:927 #, c-format @@ -3796,48 +4066,50 @@ msgid "" "\n" "Mail bug reports/comments to %s" msgstr "" +"\n" +"Mail bug reports/comments to %s" #: src/lang.c:928 msgid " -N mail new news to your posts (batch mode)" -msgstr "" +msgstr " -N mail new news to your posts (batch mode)" #: src/lang.c:929 msgid " -M user mail new news to specified user (batch mode)" -msgstr "" +msgstr " -M user mail new news to specified user (batch mode)" #: src/lang.c:930 #, c-format msgid " -f file subscribed to newsgroups file [default=%s]" -msgstr "" +msgstr " -f file subscribed to newsgroups file [default=%s]" #: src/lang.c:931 msgid " -x no-posting mode" -msgstr "" +msgstr " -x no-posting mode" #: src/lang.c:932 msgid " -w post an article and exit" -msgstr "" +msgstr " -w post an article and exit" #: src/lang.c:933 msgid " -o post all postponed articles and exit" -msgstr "" +msgstr " -o post all postponed articles and exit" #: src/lang.c:934 msgid " -R read news saved by -S option" -msgstr "" +msgstr " -R read news saved by -S option" #: src/lang.c:935 #, c-format msgid " -s dir save news directory [default=%s]" -msgstr "" +msgstr " -s dir save news directory [default=%s]" #: src/lang.c:936 msgid " -S save new news for later reading (batch mode)" -msgstr "" +msgstr " -S save new news for later reading (batch mode)" #: src/lang.c:937 msgid " -z start if any unread news" -msgstr "" +msgstr " -z start if any unread news" #: src/lang.c:938 #, c-format @@ -3846,34 +4118,37 @@ msgid "" "\n" "Usage: %s [options] [newsgroup[,...]]" msgstr "" +"A Usenet reader.\n" +"\n" +"Usage: %s [options] [newsgroup[,...]]" #: src/lang.c:939 msgid " -v verbose output for batch mode options" -msgstr "" +msgstr " -v verbose output for batch mode options" #: src/lang.c:940 msgid " -V print version & date information" -msgstr "" +msgstr " -V print version & date information" #: src/lang.c:941 #, c-format msgid "%s only useful without batch mode operations\n" -msgstr "" +msgstr "%s only useful without batch mode operations\n" #: src/lang.c:942 #, c-format msgid "%s only useful for batch mode operations\n" -msgstr "" +msgstr "%s only useful for batch mode operations\n" #: src/lang.c:943 #, c-format msgid "%s only useful for batch or debug mode operations\n" -msgstr "" +msgstr "%s only useful for batch or debug mode operations\n" #: src/lang.c:944 #, c-format msgid "Useless combination %s and %s. Ignoring %s.\n" -msgstr "" +msgstr "Useless combination %s and %s. Ignoring %s.\n" #: src/lang.c:946 #, c-format @@ -3881,11 +4156,13 @@ msgid "" "\n" "%s%d out of range (0 - %d). Reset to 0" msgstr "" +"\n" +"%s%d out of range (0 - %d). Reset to 0" #: src/lang.c:947 #, c-format msgid "View '%s' (%s/%s)?" -msgstr "" +msgstr "View '%s' (%s/%s)?" #: src/lang.c:949 #, c-format @@ -3894,18 +4171,25 @@ msgid "" "Warning: posting exceeds %d columns. Line %d is the first long one:\n" "%-100s\n" msgstr "" +"\n" +"Warning: posting exceeds %d columns. Line %d is the first long one:\n" +"%-100s\n" #: src/lang.c:950 msgid "" "\n" "Warning: article unchanged after editing\n" msgstr "" +"\n" +"Warning: article unchanged after editing\n" #: src/lang.c:951 msgid "" "\n" "Warning: \"Subject:\" contains only whitespaces.\n" msgstr "" +"\n" +"Warning: \"Subject:\" contains only whitespaces.\n" #: src/lang.c:952 msgid "" @@ -3913,6 +4197,9 @@ msgid "" "Warning: \"Subject:\" begins with \"Re: \" but there are no \"References:" "\".\n" msgstr "" +"\n" +"Warning: \"Subject:\" begins with \"Re: \" but there are no \"References:" +"\".\n" #: src/lang.c:954 msgid "" @@ -3920,9 +4207,23 @@ msgid "" "Warning: Article has \"References:\" but \"Subject:\" does not begin\n" " with \"Re: \" and does not contain \"(was:\".\n" msgstr "" - -#: src/lang.c:957 -msgid "" +"\n" +"Warning: Article has \"References:\" but \"Subject:\" does not begin\n" +" with \"Re: \" and does not contain \"(was:\".\n" + +#: src/lang.c:957 +msgid "" +"Read carefully!\n" +"\n" +" You are about to cancel an article seemingly written by you. This will " +"wipe\n" +" the article from most news servers throughout the world, but there is " +"no\n" +" guarantee that it will work.\n" +"\n" +"This is the article you are about to cancel:\n" +"\n" +msgstr "" "Read carefully!\n" "\n" " You are about to cancel an article seemingly written by you. This will " @@ -3933,7 +4234,6 @@ msgid "" "\n" "This is the article you are about to cancel:\n" "\n" -msgstr "" #: src/lang.c:961 msgid "" @@ -3943,12 +4243,19 @@ msgid "" " article. If a signature is appended by that inews program it will\n" " not be encoded properly.\n" msgstr "" +"\n" +"Warning: You are using a non-plain transfer encoding (such as base64 or\n" +" quoted-printable) and an external inews program to submit your\n" +" article. If a signature is appended by that inews program it will\n" +" not be encoded properly.\n" #: src/lang.c:966 msgid "" "\n" "Warning: \"example\" is a reserved hierarchy!\n" msgstr "" +"\n" +"Warning: \"example\" is a reserved hierarchy!\n" #: src/lang.c:967 #, c-format @@ -3959,6 +4266,11 @@ msgid "" "Some values in your %s file have changed!\n" "Read WHATSNEW, etc...\n" msgstr "" +"\n" +"\n" +"You are upgrading to tin %s from an earlier version.\n" +"Some values in your %s file have changed!\n" +"Read WHATSNEW, etc...\n" #: src/lang.c:969 #, c-format @@ -3968,6 +4280,10 @@ msgid "" "You are downgrading to tin %s from a more recent version!\n" "Some values in your %s file may be ignored, others might have changed!\n" msgstr "" +"\n" +"\n" +"You are downgrading to tin %s from a more recent version!\n" +"Some values in your %s file may be ignored, others might have changed!\n" #: src/lang.c:972 #, c-format @@ -3978,6 +4294,11 @@ msgid "" "this session this indicates an error and you should backup your %s\n" "before you start tin once again!\n" msgstr "" +"Warning: tin wrote fewer groups to your\n" +"\t%s\n" +"than it read at startup. If you didn't unsubscribe from %ld %s during\n" +"this session this indicates an error and you should backup your %s\n" +"before you start tin once again!\n" #: src/lang.c:976 #, c-format @@ -3985,11 +4306,13 @@ msgid "" "\n" "Warning: Found %d '-- \\n' lines, this may confuse some people.\n" msgstr "" +"\n" +"Warning: Found %d '-- \\n' lines, this may confuse some people.\n" #: src/lang.c:977 #, c-format msgid "Warning: Only %d out of %d articles were saved" -msgstr "" +msgstr "Warning: Only %d out of %d articles were saved" #: src/lang.c:978 #, c-format @@ -4001,48 +4324,57 @@ msgid "" "as\n" " possible.\n" msgstr "" +"\n" +"Warning: Your signature is longer than %d lines. Since signatures usually " +"do\n" +" not transport any useful information, they should be as short " +"as\n" +" possible.\n" #: src/lang.c:982 #, c-format msgid "" "Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? " msgstr "" +"Warning: this mail address may contain a spamtrap. %s=continue, %s=abort? " #: src/lang.c:983 msgid "" "\n" "Warning: Signatures should start with '-- \\n' not with '--\\n'.\n" msgstr "" +"\n" +"Warning: Signatures should start with '-- \\n' not with '--\\n'.\n" #: src/lang.c:984 msgid "Writing attributes file..." -msgstr "" +msgstr "Writing attributes file..." #: src/lang.c:986 #, c-format msgid "%d Responses" -msgstr "" +msgstr "%d Responses" #: src/lang.c:988 #, c-format msgid "Added %d %s" -msgstr "" +msgstr "Added %d %s" #: src/lang.c:989 msgid "No unsubscribed groups to show" -msgstr "" +msgstr "No unsubscribed groups to show" #: src/lang.c:990 msgid "Showing subscribed to groups only" -msgstr "" +msgstr "Showing subscribed to groups only" #: src/lang.c:991 msgid "Yes " -msgstr "" +msgstr "Yes " #: src/lang.c:992 msgid " You have mail" -msgstr "" +msgstr " You have mail" #: src/lang.c:997 #, c-format @@ -4056,10 +4388,18 @@ msgid "" " MM_NETWORK_CHARSET to a suitable value for your posting via the\n" " M)enu option.\n" msgstr "" +"\n" +"Warning: Posting is in %s and contains characters which are not\n" +" in your selected MM_NETWORK_CHARSET: %s.\n" +" These characters will be replaced by '?' if you post this\n" +" article unchanged. To avoid garbling your article please either\n" +" edit it and remove those characters or change the setting of\n" +" MM_NETWORK_CHARSET to a suitable value for your posting via the\n" +" M)enu option.\n" #: src/lang.c:1008 msgid " -D mode debug mode" -msgstr "" +msgstr " -D mode debug mode" #: src/lang.c:1012 msgid "" @@ -4077,6 +4417,19 @@ msgid "" "This is the article you are about to cancel:\n" "\n" msgstr "" +"Read carefully!\n" +"\n" +" You are about to cancel an article seemingly not written by you. This " +"will\n" +" wipe the article from lots of news servers throughout the world;\n" +" Usenet's majority considers this rather inappropriate, to say the " +"least.\n" +" Only press 'd' if you are absolutely positive that you are ready to " +"take\n" +" the rap.\n" +"\n" +"This is the article you are about to cancel:\n" +"\n" #: src/lang.c:1021 msgid "toggle color" @@ -4106,7 +4459,7 @@ msgid "" "# 15 = light white\n" "\n" msgstr "" -"# Changing colours of several screen parts\n" +"# Changing colors of several screen parts\n" "# Possible values are:\n" "# -1 = default (white for foreground and black for background)\n" "# 0 = black\n" @@ -4137,6 +4490,8 @@ msgid "" "\n" "Error: Followup-To set to more than one newsgroup!\n" msgstr "" +"\n" +"Error: Followup-To set to more than one newsgroup!\n" #: src/lang.c:1047 #, c-format @@ -4144,6 +4499,8 @@ msgid "" "\n" "Error: \"%s\" is renamed, use \"%s\" instead!\n" msgstr "" +"\n" +"Error: \"%s\" is renamed, use \"%s\" instead!\n" #: src/lang.c:1048 #, c-format @@ -4151,6 +4508,8 @@ msgid "" "\n" "Error: cross-posting to %d newsgroups and no Followup-To line!\n" msgstr "" +"\n" +"Error: cross-posting to %d newsgroups and no Followup-To line!\n" #: src/lang.c:1049 #, c-format @@ -4158,12 +4517,16 @@ msgid "" "\n" "Error: \"%s\" is not a valid newsgroup!\n" msgstr "" +"\n" +"Error: \"%s\" is not a valid newsgroup!\n" #: src/lang.c:1051 msgid "" "\n" "Warning: Followup-To set to more than one newsgroup!\n" msgstr "" +"\n" +"Warning: Followup-To set to more than one newsgroup!\n" #: src/lang.c:1052 #, c-format @@ -4171,6 +4534,8 @@ msgid "" "\n" "Warning: \"%s\" is renamed, you should use \"%s\" instead!\n" msgstr "" +"\n" +"Warning: \"%s\" is renamed, you should use \"%s\" instead!\n" #: src/lang.c:1053 #, c-format @@ -4178,6 +4543,8 @@ msgid "" "\n" "Warning: cross-posting to %d newsgroups and no Followup-To line!\n" msgstr "" +"\n" +"Warning: cross-posting to %d newsgroups and no Followup-To line!\n" #: src/lang.c:1054 #, c-format @@ -4185,6 +4552,8 @@ msgid "" "\n" "Warning: \"%s\" is not in your newsrc, it may be invalid at this site!\n" msgstr "" +"\n" +"Warning: \"%s\" is not in your newsrc, it may be invalid at this site!\n" #: src/lang.c:1055 #, c-format @@ -4192,166 +4561,169 @@ msgid "" "\n" "Warning: \"%s\" is not a valid newsgroup at this site!\n" msgstr "" +"\n" +"Warning: \"%s\" is not a valid newsgroup at this site!\n" #: src/lang.c:1059 #, c-format msgid "%d files successfully written from %d articles. %d %s occurred." -msgstr "" +msgstr "%d files successfully written from %d articles. %d %s occurred." #: src/lang.c:1060 msgid "Missing parts." -msgstr "" +msgstr "Missing parts." #: src/lang.c:1061 msgid "No beginning." -msgstr "" +msgstr "No beginning." #: src/lang.c:1062 msgid "No data." -msgstr "" +msgstr "No data." #: src/lang.c:1063 msgid "Unknown error." -msgstr "" +msgstr "Unknown error." #: src/lang.c:1066 #, c-format msgid "\tChecksum of %s (%ld %s)" -msgstr "" +msgstr "\tChecksum of %s (%ld %s)" #: src/lang.c:1071 msgid "Reading mail active file... " -msgstr "" +msgstr "Reading mail active file... " #: src/lang.c:1072 msgid "Reading mailgroups file... " -msgstr "" +msgstr "Reading mailgroups file... " #: src/lang.c:1076 msgid "perform PGP operations on article" -msgstr "" +msgstr "perform PGP operations on article" #: src/lang.c:1077 msgid "Add key(s) to public keyring?" -msgstr "" +msgstr "Add key(s) to public keyring?" #: src/lang.c:1078 #, c-format msgid "%s=encrypt, %s=sign, %s=both, %s=quit: " -msgstr "" +msgstr "%s=encrypt, %s=sign, %s=both, %s=quit: " #: src/lang.c:1079 #, c-format msgid "%s=sign, %s=sign & include public key, %s=quit: " -msgstr "" +msgstr "%s=sign, %s=sign & include public key, %s=quit: " #: src/lang.c:1080 #, c-format msgid "PGP has not been set up (can't open %s)" -msgstr "" +msgstr "PGP has not been set up (can't open %s)" #: src/lang.c:1081 msgid "Article not signed and no public keys found" -msgstr "" +msgstr "Article not signed and no public keys found" #: src/lang.c:1083 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: " -msgstr "" +msgstr "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone: " #: src/lang.c:1084 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%s]: " -msgstr "" +msgstr "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=send [%%s]: " #: src/lang.c:1085 #, c-format msgid "" "%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " msgstr "" +"%s=quit, %s=edit, %s=ispell, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " #: src/lang.c:1087 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: " -msgstr "" +msgstr "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone: " #: src/lang.c:1088 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=send [%%s]: " -msgstr "" +msgstr "%s=quit, %s=edit, %s=pgp, %s=send [%%s]: " #: src/lang.c:1089 #, c-format msgid "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " -msgstr "" +msgstr "%s=quit, %s=edit, %s=pgp, %s=menu, %s=post, %s=postpone [%%s]: " #: src/lang.c:1093 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: " -msgstr "" +msgstr "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone: " #: src/lang.c:1094 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=send [%%s]: " -msgstr "" +msgstr "%s=quit, %s=edit, %s=ispell, %s=send [%%s]: " #: src/lang.c:1095 #, c-format msgid "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone [%%s]: " -msgstr "" +msgstr "%s=quit, %s=edit, %s=ispell, %s=menu, %s=post, %s=postpone [%%s]: " #: src/lang.c:1097 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: " -msgstr "" +msgstr "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone: " #: src/lang.c:1098 #, c-format msgid "%s=quit, %s=edit, %s=send [%%s]: " -msgstr "" +msgstr "%s=quit, %s=edit, %s=send [%%s]: " #: src/lang.c:1099 #, c-format msgid "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone [%%s]: " -msgstr "" +msgstr "%s=quit, %s=edit, %s=menu, %s=post, %s=postpone [%%s]: " #: src/lang.c:1105 msgid "Try cache_overview_files to speed up things.\n" -msgstr "" +msgstr "Try cache_overview_files to speed up things.\n" #: src/lang.c:1106 msgid "Tin will use local index files instead.\n" -msgstr "" +msgstr "Tin will use local index files instead.\n" #: src/lang.c:1107 msgid "Cannot find NNTP server name" -msgstr "" +msgstr "Cannot find NNTP server name" #: src/lang.c:1108 #, c-format msgid "Connecting to %s:%u..." -msgstr "" +msgstr "Connecting to %s:%u..." #: src/lang.c:1109 msgid "Disconnecting from server..." -msgstr "" +msgstr "Disconnecting from server..." #: src/lang.c:1110 #, c-format msgid "Failed to connect to NNTP server %s. Exiting..." -msgstr "" +msgstr "Failed to connect to NNTP server %s. Exiting..." #: src/lang.c:1111 msgid "205 Closing connection" -msgstr "" +msgstr "205 Closing connection" #: src/lang.c:1112 msgid "Your server does not support the NNTP XOVER or OVER command.\n" -msgstr "" +msgstr "Your server does not support the NNTP XOVER or OVER command.\n" #: src/lang.c:1113 msgid "Connection to news server has timed out. Reconnect?" -msgstr "" +msgstr "Connection to news server has timed out. Reconnect?" #: src/lang.c:1114 #, c-format @@ -4359,50 +4731,54 @@ msgid "" "Put the server name in the file %s,\n" "or set the environment variable NNTPSERVER" msgstr "" +"Put the server name in the file %s,\n" +"or set the environment variable NNTPSERVER" #: src/lang.c:1115 msgid " -A force authentication on connect" -msgstr "" +msgstr " -A force authentication on connect" #: src/lang.c:1116 #, c-format msgid " -g serv read news from NNTP server serv [default=%s]" -msgstr "" +msgstr " -g serv read news from NNTP server serv [default=%s]" #: src/lang.c:1117 #, c-format msgid " -p port use port as NNTP port [default=%d]" -msgstr "" +msgstr " -p port use port as NNTP port [default=%d]" #: src/lang.c:1118 -msgid " -Q quick start. Same as -nqd" -msgstr "" +msgid " -Q quick start. Same as -dnq" +msgstr " -Q quick start. Same as -dnq" #: src/lang.c:1119 msgid " -r read news remotely from default NNTP server" -msgstr "" +msgstr " -r read news remotely from default NNTP server" #: src/lang.c:1120 msgid " -l use only LIST instead of GROUP (-n) command" -msgstr "" +msgstr " -l use only LIST instead of GROUP (-n) command" #: src/lang.c:1121 msgid " -n only read subscribed .newsrc groups from NNTP server" -msgstr "" +msgstr " -n only read subscribed .newsrc groups from NNTP server" #: src/lang.c:1123 msgid " -4 force connecting via IPv4" -msgstr "" +msgstr " -4 force connecting via IPv4" #: src/lang.c:1124 msgid " -6 force connecting via IPv6" -msgstr "" +msgstr " -6 force connecting via IPv6" #: src/lang.c:1125 msgid "" "\n" "socket or connect problem\n" msgstr "" +"\n" +"socket or connect problem\n" #: src/lang.c:1127 #, c-format @@ -4410,101 +4786,106 @@ msgid "" "\n" "Connection to %s: " msgstr "" +"\n" +"Connection to %s: " #: src/lang.c:1128 msgid "Giving up...\n" -msgstr "" +msgstr "Giving up...\n" #: src/lang.c:1130 #, c-format msgid "%s/tcp: Unknown service.\n" -msgstr "" +msgstr "%s/tcp: Unknown service.\n" #: src/lang.c:1134 msgid "" "Your server does not have Xref: in its XOVER information.\n" "Tin will try to use XHDR XREF instead (slows down things a bit).\n" msgstr "" +"Your server does not have Xref: in its XOVER information.\n" +"Tin will try to use XHDR XREF instead (slows down things a bit).\n" #: src/lang.c:1137 msgid "Your server does not have Xref: in its XOVER information.\n" -msgstr "" +msgstr "Your server does not have Xref: in its XOVER information.\n" #: src/lang.c:1140 #, c-format msgid "Can't open %s. Try %s -r to read news via NNTP." -msgstr "" +msgstr "Can't open %s. Try %s -r to read news via NNTP." #: src/lang.c:1143 msgid " -Q quick start. Same as -qd" -msgstr "" +msgstr " -Q quick start. Same as -qd" #: src/lang.c:1144 msgid " -l read only active file instead of scanning spool (-n) command" msgstr "" +" -l read only active file instead of scanning spool (-n) command" #: src/lang.c:1145 msgid " -n only read subscribed .newsrc groups from spool" -msgstr "" +msgstr " -n only read subscribed .newsrc groups from spool" #: src/lang.c:1146 msgid "Your server does not have Xref: in its NOV-files.\n" -msgstr "" +msgstr "Your server does not have Xref: in its NOV-files.\n" #: src/lang.c:1150 msgid "Posting using external inews failed. Use built in inews instead?" -msgstr "" +msgstr "Posting using external inews failed. Use built in inews instead?" #: src/lang.c:1151 msgid "It worked! Should I always use my built in inews from now on?" -msgstr "" +msgstr "It worked! Should I always use my built in inews from now on?" #: src/lang.c:1155 #, c-format msgid "%d %s printed" -msgstr "" +msgstr "%d %s printed" #: src/lang.c:1156 msgid "output article/thread/hot/pattern/tagged articles to printer" -msgstr "" +msgstr "output article/thread/hot/pattern/tagged articles to printer" #: src/lang.c:1157 msgid "Print" -msgstr "" +msgstr "Print" #: src/lang.c:1158 msgid "Printing..." -msgstr "" +msgstr "Printing..." #: src/lang.c:1162 #, c-format msgid "%d %s piped to \"%s\"" -msgstr "" +msgstr "%d %s piped to \"%s\"" #: src/lang.c:1163 msgid "pipe article/thread/hot/pattern/tagged articles into command" -msgstr "" +msgstr "pipe article/thread/hot/pattern/tagged articles into command" #: src/lang.c:1164 msgid "No command" -msgstr "" +msgstr "No command" #: src/lang.c:1165 msgid "Pipe" -msgstr "" +msgstr "Pipe" #: src/lang.c:1166 #, c-format msgid "Pipe to command [%.*s]> " -msgstr "" +msgstr "Pipe to command [%.*s]> " #: src/lang.c:1167 msgid "Piping..." -msgstr "" +msgstr "Piping..." #: src/lang.c:1169 msgid "Piping not enabled." -msgstr "" +msgstr "Piping not enabled." #: src/lang.c:1173 #, c-format @@ -4515,6 +4896,11 @@ msgid "" " from the contents. Use a comma (,) to separate multiple\n" " newsgroup names.\n" msgstr "" +"\n" +"Error: The \"%s:\" line has spaces in it that MUST be removed.\n" +" The only allowable space is the one separating the colon (:)\n" +" from the contents. Use a comma (,) to separate multiple\n" +" newsgroup names.\n" #: src/lang.c:1178 #, c-format @@ -4524,6 +4910,10 @@ msgid "" " the line may not contain whitespace, this is not allowed.\n" " Please write all newsgroups into a single line.\n" msgstr "" +"\n" +"Error: The \"%s:\" line is continued in the next line. Since\n" +" the line may not contain whitespace, this is not allowed.\n" +" Please write all newsgroups into a single line.\n" #: src/lang.c:1183 #, c-format @@ -4533,6 +4923,10 @@ msgid "" " This is a very new feature and may not be accepted by all servers.\n" " To avoid trouble please write all newsgroups into a single line.\n" msgstr "" +"\n" +"Warning: The \"%s:\" line is continued in the next line.\n" +" This is a very new feature and may not be accepted by all servers.\n" +" To avoid trouble please write all newsgroups into a single line.\n" #: src/lang.c:1187 #, c-format @@ -4540,6 +4934,8 @@ msgid "" "\n" "Warning: The \"%s:\" line has spaces in it that SHOULD be removed.\n" msgstr "" +"\n" +"Warning: The \"%s:\" line has spaces in it that SHOULD be removed.\n" #: src/lang.c:1192 msgid "" @@ -4562,39 +4958,57 @@ msgid "" "are\n" " likely to ignore it completely. It's a crowded net out there.\n" msgstr "" +"\n" +" If your article contains quoted text please take some time to pare it " +"down\n" +" to just the key points to which you are responding, or people will " +"think\n" +" you are a dweeb! Many people have the habit of skipping any article " +"whose\n" +" first page is largely quoted material. Format your article to fit in " +"less\n" +" then 80 chars, since that's the conventional size (72 is a good choice " +"as\n" +" it allows quoting without exceeding the limit). If your lines are too " +"long\n" +" they'll wrap around ugly and people won't read what you write. If " +"you\n" +" aren't careful and considerate in formatting your posting, people " +"are\n" +" likely to ignore it completely. It's a crowded net out there.\n" #: src/lang.c:1205 msgid "shell escape" -msgstr "" +msgstr "shell escape" #: src/lang.c:1206 #, c-format msgid "Shell Command (%s)" -msgstr "" +msgstr "Shell Command (%s)" #: src/lang.c:1207 #, c-format msgid "Enter shell command [%s]> " -msgstr "" +msgstr "Enter shell command [%s]> " #: src/lang.c:1211 #, c-format msgid "%s: Can't get entry for TERM\n" -msgstr "" +msgstr "%s: Can't get entry for TERM\n" #: src/lang.c:1215 #, c-format msgid "Group %.*s ('q' to quit)..." -msgstr "" +msgstr "Group %.*s ('q' to quit)..." #: src/lang.c:1217 #, c-format msgid "Group %.*s..." -msgstr "" +msgstr "Group %.*s..." #: src/lang.c:1221 msgid "Server unavailable\n" -msgstr "" +msgstr "Server unavailable\n" #: src/lang.c:1227 #, c-format @@ -4602,44 +5016,49 @@ msgid "" "%s=pipe; %s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; " "%s=post" msgstr "" +"%s=pipe; %s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; " +"%s=post" #: src/lang.c:1228 #, c-format msgid "" "%s=pipe; %s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" msgstr "" +"%s=pipe; %s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" #: src/lang.c:1230 #, c-format msgid "" "%s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" msgstr "" +"%s=mail; %s=print; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" #: src/lang.c:1231 #, c-format msgid "%s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" -msgstr "" +msgstr "%s=mail; %s=print; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" #: src/lang.c:1235 #, c-format msgid "" "%s=pipe; %s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" msgstr "" +"%s=pipe; %s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" #: src/lang.c:1236 #, c-format msgid "%s=pipe; %s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" -msgstr "" +msgstr "%s=pipe; %s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" #: src/lang.c:1238 #, c-format msgid "%s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" -msgstr "" +msgstr "%s=mail; %s=quit; %s=toggle all/unread; %s=save; %s=tag; %s=post" #: src/lang.c:1239 #, c-format msgid "%s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" -msgstr "" +msgstr "%s=mail; %s=quit; %s=reply mail; %s=save; %s=tag; %s=post" #: src/lang.c:1245 msgid "Terminal does not support color" @@ -4648,99 +5067,99 @@ msgstr "Terminal does not support colour #: src/lang.c:1250 #, c-format msgid "Trying %s" -msgstr "" +msgstr "Trying %s" #: src/lang.c:1264 src/lang.c:1292 src/lang.c:1574 src/refs.c:292 msgid "None" -msgstr "" +msgstr "None" #: src/lang.c:1265 msgid "Subject" -msgstr "" +msgstr "Subject" #: src/lang.c:1266 msgid "References" -msgstr "" +msgstr "References" #: src/lang.c:1267 msgid "Both Subject and References" -msgstr "" +msgstr "Both Subject and References" #: src/lang.c:1268 msgid "Multipart Subject" -msgstr "" +msgstr "Multipart Subject" #: src/lang.c:1269 msgid "Percentage Match" -msgstr "" +msgstr "Percentage Match" #: src/lang.c:1282 src/lang.c:1373 src/lang.c:1463 msgid "No" -msgstr "" +msgstr "No" #: src/lang.c:1283 src/lang.c:1465 msgid "Yes" -msgstr "" +msgstr "Yes" #: src/lang.c:1284 msgid "Hide All" -msgstr "" +msgstr "Hide All" #: src/lang.c:1293 msgid "Address" -msgstr "" +msgstr "Address" #: src/lang.c:1294 msgid "Full Name" -msgstr "" +msgstr "Full Name" #: src/lang.c:1295 msgid "Address and Name" -msgstr "" +msgstr "Address and Name" #: src/lang.c:1303 msgid "Max" -msgstr "" +msgstr "Max" #: src/lang.c:1304 msgid "Sum" -msgstr "" +msgstr "Sum" #: src/lang.c:1305 msgid "Average" -msgstr "" +msgstr "Average" #: src/lang.c:1315 src/lang.c:1335 msgid "Black" -msgstr "" +msgstr "Black" #: src/lang.c:1316 src/lang.c:1336 msgid "Red" -msgstr "" +msgstr "Red" #: src/lang.c:1317 src/lang.c:1337 msgid "Green" -msgstr "" +msgstr "Green" #: src/lang.c:1318 src/lang.c:1338 msgid "Brown" -msgstr "" +msgstr "Brown" #: src/lang.c:1319 src/lang.c:1339 msgid "Blue" -msgstr "" +msgstr "Blue" #: src/lang.c:1320 src/lang.c:1340 msgid "Pink" -msgstr "" +msgstr "Pink" #: src/lang.c:1321 src/lang.c:1341 msgid "Cyan" -msgstr "" +msgstr "Cyan" #: src/lang.c:1322 src/lang.c:1342 msgid "White" -msgstr "" +msgstr "White" #: src/lang.c:1323 msgid "Gray" @@ -4748,336 +5167,336 @@ msgstr "Grey" #: src/lang.c:1324 msgid "Light Red" -msgstr "" +msgstr "Light Red" #: src/lang.c:1325 msgid "Light Green" -msgstr "" +msgstr "Light Green" #: src/lang.c:1326 msgid "Yellow" -msgstr "" +msgstr "Yellow" #: src/lang.c:1327 msgid "Light Blue" -msgstr "" +msgstr "Light Blue" #: src/lang.c:1328 msgid "Light Pink" -msgstr "" +msgstr "Light Pink" #: src/lang.c:1329 msgid "Light Cyan" -msgstr "" +msgstr "Light Cyan" #: src/lang.c:1330 msgid "Light White" -msgstr "" +msgstr "Light White" #: src/lang.c:1351 src/lang.c:1470 src/lang.c:1485 msgid "Nothing" -msgstr "" +msgstr "Nothing" #: src/lang.c:1353 msgid "Space" -msgstr "" +msgstr "Space" #: src/lang.c:1361 msgid "Normal" -msgstr "" +msgstr "Normal" #: src/lang.c:1362 msgid "Best highlighting" -msgstr "" +msgstr "Best highlighting" #: src/lang.c:1363 msgid "Underline" -msgstr "" +msgstr "Underline" #: src/lang.c:1364 msgid "Reverse video" -msgstr "" +msgstr "Reverse video" #: src/lang.c:1365 msgid "Blinking" -msgstr "" +msgstr "Blinking" #: src/lang.c:1366 msgid "Half bright" -msgstr "" +msgstr "Half bright" #: src/lang.c:1367 msgid "Bold" -msgstr "" +msgstr "Bold" #: src/lang.c:1374 msgid "Cc" -msgstr "" +msgstr "Cc" #: src/lang.c:1375 msgid "Bcc" -msgstr "" +msgstr "Bcc" #: src/lang.c:1376 msgid "Cc and Bcc" -msgstr "" +msgstr "Cc and Bcc" #: src/lang.c:1393 src/lang.c:1406 msgid "none" -msgstr "" +msgstr "none" #: src/lang.c:1394 msgid "commands" -msgstr "" +msgstr "commands" #: src/lang.c:1395 msgid "select" -msgstr "" +msgstr "select" #: src/lang.c:1397 msgid "commands & quit" -msgstr "" +msgstr "commands & quit" #: src/lang.c:1398 msgid "commands & select" -msgstr "" +msgstr "commands & select" #: src/lang.c:1399 msgid "quit & select" -msgstr "" +msgstr "quit & select" #: src/lang.c:1400 msgid "commands & quit & select" -msgstr "" +msgstr "commands & quit & select" #: src/lang.c:1407 msgid "PageDown" -msgstr "" +msgstr "PageDown" #: src/lang.c:1408 msgid "PageNextUnread" -msgstr "" +msgstr "PageNextUnread" #: src/lang.c:1409 msgid "PageDown or PageNextUnread" -msgstr "" +msgstr "PageDown or PageNextUnread" #: src/lang.c:1415 msgid "Subject: (case sensitive)" -msgstr "" +msgstr "Subject: (case sensitive)" #: src/lang.c:1416 msgid "Subject: (ignore case)" -msgstr "" +msgstr "Subject: (ignore case)" #: src/lang.c:1417 msgid "From: (case sensitive)" -msgstr "" +msgstr "From: (case sensitive)" #: src/lang.c:1418 msgid "From: (ignore case)" -msgstr "" +msgstr "From: (ignore case)" #: src/lang.c:1419 msgid "Msg-ID: & full References: line" -msgstr "" +msgstr "Msg-ID: & full References: line" #: src/lang.c:1420 msgid "Msg-ID: & last References: only" -msgstr "" +msgstr "Msg-ID: & last References: only" #: src/lang.c:1421 msgid "Message-ID: entry only" -msgstr "" +msgstr "Message-ID: entry only" #: src/lang.c:1422 msgid "Lines:" -msgstr "" +msgstr "Lines:" #: src/lang.c:1428 msgid "Don't trim article body" -msgstr "" +msgstr "Don't trim article body" #: src/lang.c:1429 msgid "Skip leading blank lines" -msgstr "" +msgstr "Skip leading blank lines" #: src/lang.c:1430 msgid "Skip trailing blank lines" -msgstr "" +msgstr "Skip trailing blank lines" #: src/lang.c:1431 msgid "Skip leading and trailing blank l." -msgstr "" +msgstr "Skip leading and trailing blank l." #: src/lang.c:1432 msgid "Compact multiple between text" -msgstr "" +msgstr "Compact multiple between text" #: src/lang.c:1433 msgid "Compact multiple and skip leading" -msgstr "" +msgstr "Compact multiple and skip leading" #: src/lang.c:1434 msgid "Compact multiple and skip trailing" -msgstr "" +msgstr "Compact multiple and skip trailing" #: src/lang.c:1435 msgid "Compact mltpl., skip lead. & trai." -msgstr "" +msgstr "Compact mltpl., skip lead. & trai." #: src/lang.c:1464 msgid "Shell archive" -msgstr "" +msgstr "Shell archive" #: src/lang.c:1471 msgid "Subject: (descending)" -msgstr "" +msgstr "Subject: (descending)" #: src/lang.c:1472 msgid "Subject: (ascending)" -msgstr "" +msgstr "Subject: (ascending)" #: src/lang.c:1473 msgid "From: (descending)" -msgstr "" +msgstr "From: (descending)" #: src/lang.c:1474 msgid "From: (ascending)" -msgstr "" +msgstr "From: (ascending)" #: src/lang.c:1475 msgid "Date: (descending)" -msgstr "" +msgstr "Date: (descending)" #: src/lang.c:1476 msgid "Date: (ascending)" -msgstr "" +msgstr "Date: (ascending)" #: src/lang.c:1477 src/lang.c:1486 msgid "Score (descending)" -msgstr "" +msgstr "Score (descending)" #: src/lang.c:1478 src/lang.c:1487 msgid "Score (ascending)" -msgstr "" +msgstr "Score (ascending)" #: src/lang.c:1479 msgid "Lines: (descending)" -msgstr "" +msgstr "Lines: (descending)" #: src/lang.c:1480 msgid "Lines: (ascending)" -msgstr "" +msgstr "Lines: (ascending)" #: src/lang.c:1488 msgid "Last posting date (descending)" -msgstr "" +msgstr "Last posting date (descending)" #: src/lang.c:1489 msgid "Last posting date (ascending)" -msgstr "" +msgstr "Last posting date (ascending)" #: src/lang.c:1495 msgid "Quick-sort" -msgstr "" +msgstr "Quick-sort" #: src/lang.c:1496 msgid "Heap-sort" -msgstr "" +msgstr "Heap-sort" #: src/lang.c:1503 msgid "Always Keep" -msgstr "" +msgstr "Always Keep" #: src/lang.c:1504 msgid "Always Remove" -msgstr "" +msgstr "Always Remove" #: src/lang.c:1505 msgid "Mark with D on selection screen" -msgstr "" +msgstr "Mark with D on selection screen" #: src/lang.c:1511 msgid "Kill only unread arts" -msgstr "" +msgstr "Kill only unread arts" #: src/lang.c:1512 msgid "Kill all arts & show with K" -msgstr "" +msgstr "Kill all arts & show with K" #. TODO: s/K/art_marked_killed/ #: src/lang.c:1513 msgid "Kill all arts and never show" -msgstr "" +msgstr "Kill all arts and never show" #: src/lang.c:1519 msgid "Nothing special" -msgstr "" +msgstr "Nothing special" #: src/lang.c:1520 msgid "Compress quotes" -msgstr "" +msgstr "Compress quotes" #: src/lang.c:1521 msgid "Quote signatures" -msgstr "" +msgstr "Quote signatures" #: src/lang.c:1522 msgid "Compress quotes, quote sigs" -msgstr "" +msgstr "Compress quotes, quote sigs" #: src/lang.c:1523 msgid "Quote empty lines" -msgstr "" +msgstr "Quote empty lines" #: src/lang.c:1524 msgid "Compress quotes, quote empty lines" -msgstr "" +msgstr "Compress quotes, quote empty lines" #: src/lang.c:1525 msgid "Quote sigs & empty lines" -msgstr "" +msgstr "Quote sigs & empty lines" #: src/lang.c:1526 msgid "Comp. q., quote sigs & empty lines" -msgstr "" +msgstr "Comp. q., quote sigs & empty lines" #: src/lang.c:1566 msgid "no" -msgstr "" +msgstr "no" #: src/lang.c:1567 msgid "with headers" -msgstr "" +msgstr "with headers" #: src/lang.c:1568 msgid "without headers" -msgstr "" +msgstr "without headers" #: src/lang.c:1575 msgid "NFKC" -msgstr "" +msgstr "NFKC" #: src/lang.c:1577 msgid "NFKD" -msgstr "" +msgstr "NFKD" #: src/lang.c:1578 msgid "NFC" -msgstr "" +msgstr "NFC" #: src/lang.c:1579 msgid "NFD" -msgstr "" +msgstr "NFD" #: src/lang.c:1581 msgid "NFKC case fold" -msgstr "" +msgstr "NFKC case fold" #: src/lang.c:1590 msgid "Display Options" -msgstr "" +msgstr "Display Options" #: src/lang.c:1597 msgid "Color Options" @@ -5085,27 +5504,27 @@ msgstr "Colour Options" #: src/lang.c:1603 msgid "Highlight Options" -msgstr "" +msgstr "Highlight Options" #: src/lang.c:1610 msgid "Article-Limiting Options" -msgstr "" +msgstr "Article-Limiting Options" #: src/lang.c:1616 msgid "Posting/Mailing Options" -msgstr "" +msgstr "Posting/Mailing Options" #: src/lang.c:1622 msgid "Saving/Printing Options" -msgstr "" +msgstr "Saving/Printing Options" #: src/lang.c:1628 msgid "Expert Options" -msgstr "" +msgstr "Expert Options" #: src/lang.c:1634 msgid "Filtering Options" -msgstr "" +msgstr "Filtering Options" #: src/lang.c:1639 src/lang.c:1670 src/lang.c:1676 src/lang.c:1703 #: src/lang.c:1755 src/lang.c:1761 src/lang.c:1771 src/lang.c:1782 @@ -5127,41 +5546,48 @@ msgstr "" #: src/lang.c:2887 src/lang.c:2902 src/lang.c:2910 src/lang.c:2924 #: src/lang.c:2930 src/lang.c:2968 msgid " toggles, sets, cancels." -msgstr "" +msgstr " toggles, sets, cancels." #: src/lang.c:1640 msgid "Show mini menu & posting etiquette" -msgstr "" +msgstr "Show mini menu & posting etiquette" #: src/lang.c:1641 msgid "" "# If ON show a mini menu of useful commands at each level\n" "# and posting etiquette after composing an article\n" msgstr "" +"# If ON show a mini menu of useful commands at each level\n" +"# and posting etiquette after composing an article\n" #: src/lang.c:1646 msgid "Show short description for each newsgroup. toggles & sets." msgstr "" +"Show short description for each newsgroup. toggles & sets." #: src/lang.c:1647 msgid "Show description of each newsgroup" -msgstr "" +msgstr "Show description of each newsgroup" #: src/lang.c:1648 msgid "" "# If ON show group description text after newsgroup name at\n" "# group selection level\n" msgstr "" +"# If ON show group description text after newsgroup name at\n" +"# group selection level\n" #: src/lang.c:1653 msgid "" "Show From (author) fields in group & thread level. toggles & " "sets." msgstr "" +"Show From (author) fields in group & thread level. toggles & " +"sets." #: src/lang.c:1654 msgid "In group and thread level, show author by" -msgstr "" +msgstr "In group and thread level, show author by" #: src/lang.c:1655 msgid "" @@ -5172,30 +5598,36 @@ msgid "" "# * 2 = full name\n" "# 3 = both\n" msgstr "" +"# Part of From field to display in group and thread level\n" +"# Possible values are (the default is marked with *):\n" +"# 0 = none\n" +"# 1 = address\n" +"# * 2 = full name\n" +"# 3 = both\n" #: src/lang.c:1664 msgid "Draw -> or highlighted bar for selection. toggles & sets." -msgstr "" +msgstr "Draw -> or highlighted bar for selection. toggles & sets." #: src/lang.c:1665 msgid "Draw -> instead of highlighted bar" -msgstr "" +msgstr "Draw -> instead of highlighted bar" #: src/lang.c:1666 msgid "# If ON use -> otherwise highlighted bar for selection\n" -msgstr "" +msgstr "# If ON use -> otherwise highlighted bar for selection\n" #: src/lang.c:1671 msgid "Use inverse video for page headers" -msgstr "" +msgstr "Use inverse video for page headers" #: src/lang.c:1672 msgid "# If ON use inverse video for page headers at different levels\n" -msgstr "" +msgstr "# If ON use inverse video for page headers at different levels\n" #: src/lang.c:1677 msgid "Thread articles by" -msgstr "" +msgstr "Thread articles by" #: src/lang.c:1678 msgid "" @@ -5208,14 +5640,22 @@ msgid "" "# 4 = Multipart Subject\n" "# 5 = Percentage Match\n" msgstr "" +"# Thread articles by ...\n" +"# Possible values are (the default is marked with *):\n" +"# 0 = nothing\n" +"# 1 = Subject\n" +"# 2 = References\n" +"# * 3 = Both (Subject and References)\n" +"# 4 = Multipart Subject\n" +"# 5 = Percentage Match\n" #: src/lang.c:1689 msgid "Enter percentage match required to thread together. sets." -msgstr "" +msgstr "Enter percentage match required to thread together. sets." #: src/lang.c:1690 msgid "Thread percentage match" -msgstr "" +msgstr "Thread percentage match" #: src/lang.c:1692 #, no-c-format @@ -5231,10 +5671,20 @@ msgid "" "# thread. eg. 'happy' and 'harpy' would match, but 'harpie', 'happie' and\n" "# 'harppy' would be threaded separately from 'happy'\n" msgstr "" +"# Thread percentage match...\n" +"# the percentage of characters in the subject of an article that must match\n" +"# a base article for both those articles to be considered to belong to the\n" +"# same thread. This option is an integer percentage, eg. 80, no decimals " +"may\n" +"# follow. If 80 is used here, then 80% of the characters must match " +"exactly,\n" +"# no insertion of a character, for the two articles to be put in the same\n" +"# thread. eg. 'happy' and 'harpy' would match, but 'harpie', 'happie' and\n" +"# 'harppy' would be threaded separately from 'happy'\n" #: src/lang.c:1704 msgid "Score of a thread" -msgstr "" +msgstr "Score of a thread" #: src/lang.c:1705 msgid "" @@ -5244,15 +5694,21 @@ msgid "" "# 1 = sum\n" "# 2 = average\n" msgstr "" +"# Thread score\n" +"# Possible values are (the default is marked with *):\n" +"# * 0 = max\n" +"# 1 = sum\n" +"# 2 = average\n" #: src/lang.c:1713 msgid "" "Sort articles by Subject, From, Date or Score. toggles & sets." msgstr "" +"Sort articles by Subject, From, Date or Score. toggles & sets." #: src/lang.c:1714 msgid "Sort articles by" -msgstr "" +msgstr "Sort articles by" #: src/lang.c:1715 msgid "" @@ -5270,14 +5726,27 @@ msgid "" "# 9 = Lines descending\n" "# 10 = Lines ascending\n" msgstr "" +"# Sort articles by ...\n" +"# Possible values are (the default is marked with *):\n" +"# 0 = nothing\n" +"# 1 = Subject descending\n" +"# 2 = Subject ascending\n" +"# 3 = From descending\n" +"# 4 = From ascending\n" +"# 5 = Date descending\n" +"# * 6 = Date ascending\n" +"# 7 = Score descending\n" +"# 8 = Score ascending\n" +"# 9 = Lines descending\n" +"# 10 = Lines ascending\n" #: src/lang.c:1731 msgid "Sort threads by Nothing or Score. toggles & sets." -msgstr "" +msgstr "Sort threads by Nothing or Score. toggles & sets." #: src/lang.c:1732 msgid "Sort threads by" -msgstr "" +msgstr "Sort threads by" #: src/lang.c:1733 msgid "" @@ -5289,43 +5758,52 @@ msgid "" "# 3 = Last posting date descending\n" "# 4 = Last posting date ascending\n" msgstr "" +"# Sort thread by ...\n" +"# Possible values are (the default is marked with *):\n" +"# 0 = nothing\n" +"# * 1 = Score descending\n" +"# 2 = Score ascending\n" +"# 3 = Last posting date descending\n" +"# 4 = Last posting date ascending\n" #: src/lang.c:1743 msgid "" "Put cursor at first/last unread art in groups. toggles & sets." msgstr "" +"Put cursor at first/last unread art in groups. toggles & sets." #: src/lang.c:1744 msgid "Go to first unread article in group" -msgstr "" +msgstr "Go to first unread article in group" #: src/lang.c:1745 msgid "# If ON put cursor at first unread art in group otherwise last art\n" -msgstr "" +msgstr "# If ON put cursor at first unread art in group otherwise last art\n" #: src/lang.c:1749 msgid "Show all articles or only unread articles. toggles & sets." msgstr "" +"Show all articles or only unread articles. toggles & sets." #: src/lang.c:1750 msgid "Show only unread articles" -msgstr "" +msgstr "Show only unread articles" #: src/lang.c:1751 msgid "# If ON show only new/unread articles otherwise show all.\n" -msgstr "" +msgstr "# If ON show only new/unread articles otherwise show all.\n" #: src/lang.c:1756 msgid "Show only groups with unread arts" -msgstr "" +msgstr "Show only groups with unread arts" #: src/lang.c:1757 msgid "# If ON show only subscribed to groups that contain unread articles.\n" -msgstr "" +msgstr "# If ON show only subscribed to groups that contain unread articles.\n" #: src/lang.c:1762 msgid "Filter which articles" -msgstr "" +msgstr "Filter which articles" #: src/lang.c:1763 msgid "" @@ -5335,10 +5813,15 @@ msgid "" "# 1 = kill all articles and show in threads marked with K\n" "# 2 = kill all articles and never show them\n" msgstr "" +"# Filter which articles\n" +"# Possible values are (the default is marked with *):\n" +"# * 0 = only kill unread articles\n" +"# 1 = kill all articles and show in threads marked with K\n" +"# 2 = kill all articles and never show them\n" #: src/lang.c:1772 msgid "Go to the next unread article with" -msgstr "" +msgstr "Go to the next unread article with" #: src/lang.c:1773 msgid "" @@ -5349,10 +5832,16 @@ msgid "" "# * 2 = TAB\n" "# 3 = PAGE DOWN or TAB\n" msgstr "" +"# Go to the unread article with following key(s)\n" +"# Possible values are (the default is marked with *):\n" +"# 0 = nothing\n" +"# 1 = PAGE DOWN\n" +"# * 2 = TAB\n" +"# 3 = PAGE DOWN or TAB\n" #: src/lang.c:1783 msgid "How to treat blank lines" -msgstr "" +msgstr "How to treat blank lines" #: src/lang.c:1784 msgid "" @@ -5370,150 +5859,188 @@ msgid "" "# 7 = Compact multiple blank lines between text blocks and skip\n" "# leading and trailing blank lines\n" msgstr "" +"# Trim the article body, remove unnecessary blank lines.\n" +"# Possible values are (the default is marked with *):\n" +"# * 0 = Nothing special\n" +"# 1 = Skip leading blank lines\n" +"# 2 = Skip trailing blank lines\n" +"# 3 = Skip leading and trailing blank lines\n" +"# 4 = Compact multiple blank lines between text blocks\n" +"# 5 = Compact multiple blank lines between text blocks and skip\n" +"# leading blank lines\n" +"# 6 = Compact multiple blank lines between text blocks and skip\n" +"# trailing blank lines\n" +"# 7 = Compact multiple blank lines between text blocks and skip\n" +"# leading and trailing blank lines\n" #: src/lang.c:1801 msgid "List thread using right arrow key" -msgstr "" +msgstr "List thread using right arrow key" #: src/lang.c:1802 msgid "" "# If ON automatically list thread when entering it using right arrow key.\n" msgstr "" +"# If ON automatically list thread when entering it using right arrow key.\n" #: src/lang.c:1806 msgid "Enter character to indicate deleted articles. sets, cancels." msgstr "" +"Enter character to indicate deleted articles. sets, cancels." #: src/lang.c:1807 msgid "Character to show deleted articles" -msgstr "" +msgstr "Character to show deleted articles" #: src/lang.c:1808 msgid "" "# Character used to show that an art was deleted (default 'D')\n" "# _ is turned into ' '\n" msgstr "" +"# Character used to show that an art was deleted (default 'D')\n" +"# _ is turned into ' '\n" #: src/lang.c:1813 msgid "" "Enter character to indicate articles in a range. sets, cancels." msgstr "" +"Enter character to indicate articles in a range. sets, cancels." #: src/lang.c:1814 msgid "Character to show inrange articles" -msgstr "" +msgstr "Character to show inrange articles" #: src/lang.c:1815 msgid "" "# Character used to show that an art is in a range (default '#')\n" "# _ is turned into ' '\n" msgstr "" +"# Character used to show that an art is in a range (default '#')\n" +"# _ is turned into ' '\n" #: src/lang.c:1820 msgid "" "Enter character to indicate that article will return. sets, " "cancels." msgstr "" +"Enter character to indicate that article will return. sets, " +"cancels." #: src/lang.c:1821 msgid "Character to show returning arts" -msgstr "" +msgstr "Character to show returning arts" #: src/lang.c:1822 msgid "" "# Character used to show that an art will return (default '-')\n" "# _ is turned into ' '\n" msgstr "" +"# Character used to show that an art will return (default '-')\n" +"# _ is turned into ' '\n" #: src/lang.c:1827 msgid "" "Enter character to indicate selected articles. sets, cancels." msgstr "" +"Enter character to indicate selected articles. sets, cancels." #: src/lang.c:1828 msgid "Character to show selected articles" -msgstr "" +msgstr "Character to show selected articles" #: src/lang.c:1829 msgid "" "# Character used to show that an art was auto-selected (default '*')\n" "# _ is turned into ' '\n" msgstr "" +"# Character used to show that an art was auto-selected (default '*')\n" +"# _ is turned into ' '\n" #: src/lang.c:1834 msgid "Enter character to indicate recent articles. sets, cancels." -msgstr "" +msgstr "Enter character to indicate recent articles. sets, cancels." #: src/lang.c:1835 msgid "Character to show recent articles" -msgstr "" +msgstr "Character to show recent articles" #: src/lang.c:1836 msgid "" "# Character used to show that an art is recent (default 'o')\n" "# _ is turned into ' '\n" msgstr "" +"# Character used to show that an art is recent (default 'o')\n" +"# _ is turned into ' '\n" #: src/lang.c:1841 msgid "Enter character to indicate unread articles. sets, cancels." -msgstr "" +msgstr "Enter character to indicate unread articles. sets, cancels." #: src/lang.c:1842 msgid "Character to show unread articles" -msgstr "" +msgstr "Character to show unread articles" #: src/lang.c:1843 msgid "" "# Character used to show that an art is unread (default '+')\n" "# _ is turned into ' '\n" msgstr "" +"# Character used to show that an art is unread (default '+')\n" +"# _ is turned into ' '\n" #: src/lang.c:1848 msgid "Enter character to indicate read articles. sets, cancels." -msgstr "" +msgstr "Enter character to indicate read articles. sets, cancels." #: src/lang.c:1849 msgid "Character to show read articles" -msgstr "" +msgstr "Character to show read articles" #: src/lang.c:1850 msgid "" "# Character used to show that an art was read (default ' ')\n" "# _ is turned into ' '\n" msgstr "" +"# Character used to show that an art was read (default ' ')\n" +"# _ is turned into ' '\n" #: src/lang.c:1855 msgid "Enter character to indicate killed articles. sets, cancels." -msgstr "" +msgstr "Enter character to indicate killed articles. sets, cancels." #: src/lang.c:1856 msgid "Character to show killed articles" -msgstr "" +msgstr "Character to show killed articles" #: src/lang.c:1857 msgid "" "# Character used to show that an art was killed (default 'K')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" msgstr "" +"# Character used to show that an art was killed (default 'K')\n" +"# kill_level must be set accordingly, _ is turned into ' '\n" #: src/lang.c:1862 msgid "" "Enter character to indicate read selected articles. sets, cancels." msgstr "" +"Enter character to indicate read selected articles. sets, cancels." #: src/lang.c:1863 msgid "Character to show readselected arts" -msgstr "" +msgstr "Character to show readselected arts" #: src/lang.c:1864 msgid "" "# Character used to show that an art was selected before read (default ':')\n" "# kill_level must be set accordingly, _ is turned into ' '\n" msgstr "" +"# Character used to show that an art was selected before read (default ':')\n" +"# kill_level must be set accordingly, _ is turned into ' '\n" #: src/lang.c:1870 msgid "Abbreviate long newsgroup names" -msgstr "" +msgstr "Abbreviate long newsgroup names" #: src/lang.c:1871 msgid "" @@ -5521,16 +6048,21 @@ msgid "" "# level and article level like this:\n" "# news.software.readers -> n.software.readers -> n.s.readers -> n.s.r.\n" msgstr "" +"# If ON abbreviate (if necessary) long newsgroup names at group selection\n" +"# level and article level like this:\n" +"# news.software.readers -> n.software.readers -> n.s.readers -> n.s.r.\n" #: src/lang.c:1877 msgid "" "0 = full page scrolling, -1 = show previous last line as first on next page, " "-2 = half page" msgstr "" +"0 = full page scrolling, -1 = show previous last line as first on next page, " +"-2 = half page" #: src/lang.c:1878 msgid "Number of lines to scroll in pager" -msgstr "" +msgstr "Number of lines to scroll in pager" #: src/lang.c:1879 msgid "" @@ -5552,24 +6084,25 @@ msgstr "" #: src/lang.c:1889 msgid "Display signatures. toggles & sets." -msgstr "" +msgstr "Display signatures. toggles & sets." #: src/lang.c:1890 msgid "Display signatures" -msgstr "" +msgstr "Display signatures" #: src/lang.c:1891 msgid "# If OFF don't show signatures when displaying articles\n" -msgstr "" +msgstr "# If OFF don't show signatures when displaying articles\n" #: src/lang.c:1895 msgid "" "Display uuencoded data as tagged attachments. toggles & sets." msgstr "" +"Display uuencoded data as tagged attachments. toggles & sets." #: src/lang.c:1896 msgid "Display uue data as an attachment" -msgstr "" +msgstr "Display uue data as an attachment" #: src/lang.c:1897 msgid "" @@ -5582,29 +6115,40 @@ msgid "" "will\n" "# be folded into a tag line.\n" msgstr "" +"# Handling of uuencoded data in the pager\n" +"# Possible values are (the default is marked with *):\n" +"# * 0 = no, display raw uuencoded data\n" +"# 1 = yes, uuencoded data will be condensed to a single tag line showing\n" +"# size and filename, similar to how MIME attachments are displayed\n" +"# 2 = hide all, as for 1, but any line that looks like uuencoded data " +"will\n" +"# be folded into a tag line.\n" #: src/lang.c:1907 msgid "" "Decode German style TeX umlaut codes to ISO. toggles & sets." msgstr "" +"Decode German style TeX umlaut codes to ISO. toggles & sets." #: src/lang.c:1908 msgid "Display \"a as Umlaut-a" -msgstr "" +msgstr "Display \"a as Umlaut-a" #: src/lang.c:1909 msgid "" "# If ON decode German style TeX umlaut codes to ISO and\n" "# show \"a as Umlaut-a, etc.\n" msgstr "" +"# If ON decode German style TeX umlaut codes to ISO and\n" +"# show \"a as Umlaut-a, etc.\n" #: src/lang.c:1914 src/lang.c:1924 msgid "Space separated list of header fields" -msgstr "" +msgstr "Space separated list of header fields" #: src/lang.c:1915 msgid "Display these header fields (or *)" -msgstr "" +msgstr "Display these header fields (or *)" #: src/lang.c:1916 msgid "" @@ -5615,10 +6159,16 @@ msgid "" "with\n" "# spaces. Not defining anything turns off this option.\n" msgstr "" +"# Which news headers you wish to see. If you want to see _all_ the headers,\n" +"# place an '*' as this value. This is the only way a wildcard can be used.\n" +"# If you enter 'X-' as the value, you will see all headers beginning with\n" +"# 'X-' (like X-Alan or X-Pape). You can list more than one by delimiting " +"with\n" +"# spaces. Not defining anything turns off this option.\n" #: src/lang.c:1925 msgid "Do not display these header fields" -msgstr "" +msgstr "Do not display these header fields" #: src/lang.c:1926 msgid "" @@ -5631,39 +6181,48 @@ msgid "" "# news_headers_to_not_display=X-Alan X-Pape\n" "# Not defining anything turns off this option.\n" msgstr "" +"# Same as 'news_headers_to_display' except it denotes the opposite.\n" +"# An example of using both options might be if you thought X- headers were\n" +"# A Good Thing(tm), but thought Alan and Pape were miscreants...well then " +"you\n" +"# would do something like this:\n" +"# news_headers_to_display=X-\n" +"# news_headers_to_not_display=X-Alan X-Pape\n" +"# Not defining anything turns off this option.\n" #: src/lang.c:1936 msgid "" "Do you want to enable automatic handling of multipart/alternative articles?" msgstr "" +"Do you want to enable automatic handling of multipart/alternative articles?" #: src/lang.c:1937 msgid "Skip multipart/alternative parts" -msgstr "" +msgstr "Skip multipart/alternative parts" #: src/lang.c:1938 msgid "# If ON strip multipart/alternative messages automatically\n" -msgstr "" +msgstr "# If ON strip multipart/alternative messages automatically\n" #: src/lang.c:1942 msgid "Enable detection of verbatim blocks? toggles & sets." -msgstr "" +msgstr "Enable detection of verbatim blocks? toggles & sets." #: src/lang.c:1943 msgid "Detection of verbatim blocks" -msgstr "" +msgstr "Detection of verbatim blocks" #: src/lang.c:1944 msgid "# If ON detect verbatim blocks in articles\n" -msgstr "" +msgstr "# If ON detect verbatim blocks in articles\n" #: src/lang.c:1949 msgid "A regex used to decide which lines to show in col_quote." -msgstr "" +msgstr "A regex used to decide which lines to show in col_quote." #: src/lang.c:1950 msgid "Regex used to show quoted lines" -msgstr "" +msgstr "Regex used to show quoted lines" #: src/lang.c:1951 msgid "" @@ -5671,14 +6230,17 @@ msgid "" "# quoted when viewing articles. Quoted lines are shown in col_quote.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" +"# A regular expression that tin will use to decide which lines are\n" +"# quoted when viewing articles. Quoted lines are shown in col_quote.\n" +"# If you leave this blank, tin will use a built in default.\n" #: src/lang.c:1957 msgid "A regex used to decide which lines to show in col_quote2." -msgstr "" +msgstr "A regex used to decide which lines to show in col_quote2." #: src/lang.c:1958 msgid "Regex used to show twice quoted l." -msgstr "" +msgstr "Regex used to show twice quoted l." #: src/lang.c:1959 msgid "" @@ -5686,14 +6248,17 @@ msgid "" "# quoted twice. Twice quoted lines are shown in col_quote2.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" +"# A regular expression that tin will use to decide which lines are\n" +"# quoted twice. Twice quoted lines are shown in col_quote2.\n" +"# If you leave this blank, tin will use a built in default.\n" #: src/lang.c:1965 msgid "A regex used to decide which lines to show in col_quote3." -msgstr "" +msgstr "A regex used to decide which lines to show in col_quote3." #: src/lang.c:1966 msgid "Regex used to show >= 3 times q.l." -msgstr "" +msgstr "Regex used to show >= 3 times q.l." #: src/lang.c:1967 msgid "" @@ -5701,26 +6266,29 @@ msgid "" "# quoted >=3 times. >=3 times quoted lines are shown in col_quote3.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" +"# A regular expression that tin will use to decide which lines are\n" +"# quoted >=3 times. >=3 times quoted lines are shown in col_quote3.\n" +"# If you leave this blank, tin will use a built in default.\n" #: src/lang.c:1973 msgid "Enable detection of external quotes? toggles & sets." -msgstr "" +msgstr "Enable detection of external quotes? toggles & sets." #: src/lang.c:1974 msgid "Detection of external quotes" -msgstr "" +msgstr "Detection of external quotes" #: src/lang.c:1975 msgid "# If ON detect quoted text from external sources in articles\n" -msgstr "" +msgstr "# If ON detect quoted text from external sources in articles\n" #: src/lang.c:1979 msgid "A regex used to decide which lines to show in col_extquote." -msgstr "" +msgstr "A regex used to decide which lines to show in col_extquote." #: src/lang.c:1980 msgid "Regex used to show quotes from external sources" -msgstr "" +msgstr "Regex used to show quotes from external sources" #: src/lang.c:1981 msgid "" @@ -5728,14 +6296,17 @@ msgid "" "# external quotes. Text from external quotes is shown in col_extquote.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" +"# A regular expression that tin will use to decide which lines are\n" +"# external quotes. Text from external quotes is shown in col_extquote.\n" +"# If you leave this blank, tin will use a built in default.\n" #: src/lang.c:1988 msgid "A regex used to decide which words to show in col_markslashes." -msgstr "" +msgstr "A regex used to decide which words to show in col_markslashes." #: src/lang.c:1989 msgid "Regex used to highlight /slashes/" -msgstr "" +msgstr "Regex used to highlight /slashes/" #: src/lang.c:1990 msgid "" @@ -5743,14 +6314,17 @@ msgid "" "# bounded by '/' are to be shown in col_markslashes.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" +"# A regular expression that tin will use to decide which words\n" +"# bounded by '/' are to be shown in col_markslashes.\n" +"# If you leave this blank, tin will use a built in default.\n" #: src/lang.c:1996 msgid "A regex used to decide which words to show in col_markstars." -msgstr "" +msgstr "A regex used to decide which words to show in col_markstars." #: src/lang.c:1997 msgid "Regex used to highlight *stars*" -msgstr "" +msgstr "Regex used to highlight *stars*" #: src/lang.c:1998 msgid "" @@ -5758,14 +6332,17 @@ msgid "" "# bounded by '*' are to be shown in col_markstars.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" +"# A regular expression that tin will use to decide which words\n" +"# bounded by '*' are to be shown in col_markstars.\n" +"# If you leave this blank, tin will use a built in default.\n" #: src/lang.c:2004 msgid "A regex used to decide which words to show in col_markstroke." -msgstr "" +msgstr "A regex used to decide which words to show in col_markstroke." #: src/lang.c:2005 msgid "Regex used to highlight -strokes-" -msgstr "" +msgstr "Regex used to highlight -strokes-" #: src/lang.c:2006 msgid "" @@ -5773,14 +6350,17 @@ msgid "" "# bounded by '-' are to be shown in col_markstroke.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" +"# A regular expression that tin will use to decide which words\n" +"# bounded by '-' are to be shown in col_markstroke.\n" +"# If you leave this blank, tin will use a built in default.\n" #: src/lang.c:2012 msgid "A regex used to decide which words to show in col_markdash." -msgstr "" +msgstr "A regex used to decide which words to show in col_markdash." #: src/lang.c:2013 msgid "Regex used to highlight _underline_" -msgstr "" +msgstr "Regex used to highlight _underline_" #: src/lang.c:2014 msgid "" @@ -5788,72 +6368,87 @@ msgid "" "# bounded by '_' are to be shown in col_markdash.\n" "# If you leave this blank, tin will use a built in default.\n" msgstr "" +"# A regular expression that tin will use to decide which words\n" +"# bounded by '_' are to be shown in col_markdash.\n" +"# If you leave this blank, tin will use a built in default.\n" #: src/lang.c:2020 msgid "A regex used to find Subject prefixes to remove. Use '|' as separator." msgstr "" +"A regex used to find Subject prefixes to remove. Use '|' as separator." #: src/lang.c:2021 msgid "Regex with Subject prefixes" -msgstr "" +msgstr "Regex with Subject prefixes" #: src/lang.c:2022 msgid "" "# A regular expression that tin will use to find Subject prefixes\n" "# which will be removed before showing the header.\n" msgstr "" +"# A regular expression that tin will use to find Subject prefixes\n" +"# which will be removed before showing the header.\n" #: src/lang.c:2027 msgid "A regex used to find Subject suffixes to remove. Use '|' as separator." msgstr "" +"A regex used to find Subject suffixes to remove. Use '|' as separator." #: src/lang.c:2028 msgid "Regex with Subject suffixes" -msgstr "" +msgstr "Regex with Subject suffixes" #: src/lang.c:2029 msgid "" "# A regular expression that tin will use to find Subject suffixes\n" "# which will be removed when replying or posting followup.\n" msgstr "" +"# A regular expression that tin will use to find Subject suffixes\n" +"# which will be removed when replying or posting followup.\n" #: src/lang.c:2034 msgid "A regex used to find the begin of a verbatim block." -msgstr "" +msgstr "A regex used to find the begin of a verbatim block." #: src/lang.c:2035 msgid "Regex for begin of a verbatim block" -msgstr "" +msgstr "Regex for begin of a verbatim block" #: src/lang.c:2036 msgid "" "# A regular expression that tin will use to find the begin of\n" "# a verbatim block.\n" msgstr "" +"# A regular expression that tin will use to find the begin of\n" +"# a verbatim block.\n" #: src/lang.c:2041 msgid "A regex used to find the end of a verbatim block." -msgstr "" +msgstr "A regex used to find the end of a verbatim block." #: src/lang.c:2042 msgid "Regex for end of a verbatim block" -msgstr "" +msgstr "Regex for end of a verbatim block" #: src/lang.c:2043 msgid "" "# A regular expression that tin will use to find the end of\n" "# a verbatim block.\n" msgstr "" +"# A regular expression that tin will use to find the end of\n" +"# a verbatim block.\n" #: src/lang.c:2048 msgid "" "Enter name and options for external MIME viewer, --internal for built-in " "viewer" msgstr "" +"Enter name and options for external MIME viewer, --internal for built-in " +"viewer" #: src/lang.c:2049 msgid "MIME binary content viewer" -msgstr "" +msgstr "MIME binary content viewer" #: src/lang.c:2050 msgid "" @@ -5863,48 +6458,55 @@ msgid "" "blank\n" "# for no automatic viewing\n" msgstr "" +"# If --internal automatically use the built in MIME viewer for non-text\n" +"# parts of articles.\n" +"# Otherwise specify an external viewer program (eg. metamail) or leave " +"blank\n" +"# for no automatic viewing\n" #: src/lang.c:2057 msgid "Confirm before starting non-text viewing program" -msgstr "" +msgstr "Confirm before starting non-text viewing program" #: src/lang.c:2058 msgid "Ask before using MIME viewer" -msgstr "" +msgstr "Ask before using MIME viewer" #: src/lang.c:2059 msgid "" "# If ON tin will ask before using metamail to display MIME messages\n" "# this only happens if metamail_prog is set to something\n" msgstr "" +"# If ON tin will ask before using metamail to display MIME messages\n" +"# this only happens if metamail_prog is set to something\n" #: src/lang.c:2064 msgid "Ask to mark groups read when quitting. toggles & sets." -msgstr "" +msgstr "Ask to mark groups read when quitting. toggles & sets." #: src/lang.c:2065 msgid "Catchup read groups when quitting" -msgstr "" +msgstr "Catchup read groups when quitting" #: src/lang.c:2066 msgid "# If ON ask user if read groups should all be marked read\n" -msgstr "" +msgstr "# If ON ask user if read groups should all be marked read\n" #: src/lang.c:2071 msgid "Catchup group using left key" -msgstr "" +msgstr "Catchup group using left key" #: src/lang.c:2072 msgid "# If ON catchup group/thread when leaving with the left arrow key.\n" -msgstr "" +msgstr "# If ON catchup group/thread when leaving with the left arrow key.\n" #: src/lang.c:2077 msgid "Catchup thread by using left key" -msgstr "" +msgstr "Catchup thread by using left key" #: src/lang.c:2083 msgid "Which actions require confirmation" -msgstr "" +msgstr "Which actions require confirmation" #: src/lang.c:2084 msgid "" @@ -5919,78 +6521,92 @@ msgid "" "# 6 = quit & select\n" "# 7 = commands & quit & select\n" msgstr "" +"# What should we ask confirmation for.\n" +"# Possible values are (the default is marked with *):\n" +"# 0 = none\n" +"# 1 = commands\n" +"# 2 = select\n" +"# 3 = quit\n" +"# * 4 = commands & quit\n" +"# 5 = commands & select\n" +"# 6 = quit & select\n" +"# 7 = commands & quit & select\n" #: src/lang.c:2098 msgid "'Mark as (un)read' ignores tags" -msgstr "" +msgstr "'Mark as (un)read' ignores tags" #: src/lang.c:2099 msgid "" "# If ON the 'Mark as (un)read' function marks only the current article.\n" msgstr "" +"# If ON the 'Mark as (un)read' function marks only the current article.\n" #: src/lang.c:2103 msgid "Program to run to open URLs, sets, cancels." -msgstr "" +msgstr "Program to run to open URLs, sets, cancels." #: src/lang.c:2104 msgid "Program that opens URLs" -msgstr "" +msgstr "Program that opens URLs" #: src/lang.c:2105 msgid "# The program used to open URLs. The actual URL will be appended\n" -msgstr "" +msgstr "# The program used to open URLs. The actual URL will be appended\n" #: src/lang.c:2110 msgid "Use mouse in xterm" -msgstr "" +msgstr "Use mouse in xterm" #: src/lang.c:2111 msgid "# If ON enable mouse button support on xterm terminals\n" -msgstr "" +msgstr "# If ON enable mouse button support on xterm terminals\n" #: src/lang.c:2117 msgid "Use scroll keys on keypad" -msgstr "" +msgstr "Use scroll keys on keypad" #: src/lang.c:2118 msgid "# If ON enable scroll keys on terminals that support it\n" -msgstr "" +msgstr "# If ON enable scroll keys on terminals that support it\n" #: src/lang.c:2123 msgid "Enter maximum number of article to get. sets." -msgstr "" +msgstr "Enter maximum number of article to get. sets." #: src/lang.c:2124 msgid "Number of articles to get" -msgstr "" +msgstr "Number of articles to get" #: src/lang.c:2125 msgid "" "# Number of articles to get (0=no limit), if negative sets maximum number\n" "# of already read articles to be read before first unread one\n" msgstr "" +"# Number of articles to get (0=no limit), if negative sets maximum number\n" +"# of already read articles to be read before first unread one\n" #: src/lang.c:2130 msgid "Enter number of days article is considered recent. sets." -msgstr "" +msgstr "Enter number of days article is considered recent. sets." #: src/lang.c:2131 msgid "Article recentness time limit" -msgstr "" +msgstr "Article recentness time limit" #: src/lang.c:2132 msgid "# Number of days in which article is considered recent, (0=OFF)\n" -msgstr "" +msgstr "# Number of days in which article is considered recent, (0=OFF)\n" #: src/lang.c:2136 msgid "" "WILDMAT for normal wildcards, REGEX for full regular expression matching." msgstr "" +"WILDMAT for normal wildcards, REGEX for full regular expression matching." #: src/lang.c:2137 msgid "Wildcard matching" -msgstr "" +msgstr "Wildcard matching" #: src/lang.c:2138 msgid "" @@ -5999,64 +6615,70 @@ msgid "" "# * 0 = wildmat\n" "# 1 = regex\n" msgstr "" +"# Wildcard matching\n" +"# Possible values are (the default is marked with *):\n" +"# * 0 = wildmat\n" +"# 1 = regex\n" #: src/lang.c:2145 msgid "Enter minimal score before an article is marked killed. sets." -msgstr "" +msgstr "Enter minimal score before an article is marked killed. sets." #: src/lang.c:2146 msgid "Score limit (kill)" -msgstr "" +msgstr "Score limit (kill)" #: src/lang.c:2147 msgid "# Score limit before an article is marked killed\n" -msgstr "" +msgstr "# Score limit before an article is marked killed\n" #: src/lang.c:2151 msgid "Enter default score to kill articles. sets." -msgstr "" +msgstr "Enter default score to kill articles. sets." #: src/lang.c:2152 msgid "Default score to kill articles" -msgstr "" +msgstr "Default score to kill articles" #: src/lang.c:2153 msgid "# Default score to kill articles\n" -msgstr "" +msgstr "# Default score to kill articles\n" #: src/lang.c:2157 msgid "Enter minimal score before an article is marked hot. sets." -msgstr "" +msgstr "Enter minimal score before an article is marked hot. sets." #: src/lang.c:2158 msgid "Score limit (select)" -msgstr "" +msgstr "Score limit (select)" #: src/lang.c:2159 msgid "# Score limit before an article is marked hot\n" -msgstr "" +msgstr "# Score limit before an article is marked hot\n" #: src/lang.c:2163 msgid "Enter default score to select articles. sets." -msgstr "" +msgstr "Enter default score to select articles. sets." #: src/lang.c:2164 msgid "Default score to select articles" -msgstr "" +msgstr "Default score to select articles" #: src/lang.c:2165 msgid "# Default score to select articles\n" -msgstr "" +msgstr "# Default score to select articles\n" #: src/lang.c:2171 msgid "Use slrnface to show ''X-Face:''s" -msgstr "" +msgstr "Use slrnface to show ''X-Face:''s" #: src/lang.c:2172 msgid "" "# If ON using slrnface(1) to interpret the ''X-Face:'' header.\n" "# Only useful when running in an xterm.\n" msgstr "" +"# If ON using slrnface(1) to interpret the ''X-Face:'' header.\n" +"# Only useful when running in an xterm.\n" #: src/lang.c:2180 msgid "Use ANSI color" @@ -6092,7 +6714,7 @@ msgstr "" #: src/lang.c:2200 msgid "Color for inverse text (background)" -msgstr "Colour for inverse text (bg)" +msgstr "Colour for inverse text (background)" #: src/lang.c:2201 msgid "" @@ -6104,7 +6726,7 @@ msgstr "" #: src/lang.c:2207 msgid "Color for inverse text (foreground)" -msgstr "Colour for inverse text (fg)" +msgstr "Colour for inverse text (foreground)" #: src/lang.c:2208 msgid "" @@ -6356,7 +6978,7 @@ msgstr "" #: src/lang.c:2354 msgid "Color of highlighting with -stroke-" -msgstr "Colour of highlighting w. -stroke-" +msgstr "Colour of highlighting with -stroke-" #: src/lang.c:2355 msgid "" @@ -6368,7 +6990,7 @@ msgstr "" #: src/lang.c:2362 msgid "Attr. of highlighting with *stars*" -msgstr "" +msgstr "Attr. of highlighting with *stars*" #: src/lang.c:2363 msgid "" @@ -6385,56 +7007,74 @@ msgid "" "# Attribute of word highlighting with *stars*\n" "# Default: 6 (bold)\n" msgstr "" +"# Attributes of word highlighting on mono terminals\n" +"# Possible values are:\n" +"# 0 = Normal\n" +"# 1 = Underline\n" +"# 2 = Best highlighting\n" +"# 3 = Reverse video\n" +"# 4 = Blinking\n" +"# 5 = Half bright\n" +"# 6 = Bold\n" +"\n" +"# Attribute of word highlighting with *stars*\n" +"# Default: 6 (bold)\n" #: src/lang.c:2378 msgid "Attr. of highlighting with _dash_" -msgstr "" +msgstr "Attr. of highlighting with _dash_" #: src/lang.c:2379 msgid "" "# Attribute of word highlighting with _dash_\n" "# Default: 2 (best highlighting)\n" msgstr "" +"# Attribute of word highlighting with _dash_\n" +"# Default: 2 (best highlighting)\n" #: src/lang.c:2385 msgid "Attr. of highlighting with /slash/" -msgstr "" +msgstr "Attr. of highlighting with /slash/" #: src/lang.c:2386 msgid "" "# Attribute of word highlighting with /slash/\n" "# Default: 5 (half bright)\n" msgstr "" +"# Attribute of word highlighting with /slash/\n" +"# Default: 5 (half bright)\n" #: src/lang.c:2392 msgid "Attr. of highlighting with -stroke-" -msgstr "" +msgstr "Attr. of highlighting with -stroke-" #: src/lang.c:2393 msgid "" "# Attribute of word highlighting with -stroke-\n" "# Default: 3 (reverse video)\n" msgstr "" +"# Attribute of word highlighting with -stroke-\n" +"# Default: 3 (reverse video)\n" #: src/lang.c:2399 msgid "URL highlighting in message body" -msgstr "" +msgstr "URL highlighting in message body" #: src/lang.c:2400 msgid "# Enable URL highlighting?\n" -msgstr "" +msgstr "# Enable URL highlighting?\n" #: src/lang.c:2405 msgid "Word highlighting in message body" -msgstr "" +msgstr "Word highlighting in message body" #: src/lang.c:2406 msgid "# Enable word highlighting?\n" -msgstr "" +msgstr "# Enable word highlighting?\n" #: src/lang.c:2411 msgid "What to display instead of mark" -msgstr "" +msgstr "What to display instead of mark" #: src/lang.c:2412 msgid "" @@ -6445,55 +7085,63 @@ msgid "" "# 1 = yes, display mark\n" "# * 2 = print a space instead\n" msgstr "" +"# Should the leading and ending stars and dashes also be displayed,\n" +"# even when they are highlighting marks?\n" +"# Possible values are (the default is marked with *):\n" +"# 0 = no\n" +"# 1 = yes, display mark\n" +"# * 2 = print a space instead\n" #: src/lang.c:2421 msgid "Enter column number to wrap article lines to in the pager. sets." -msgstr "" +msgstr "Enter column number to wrap article lines to in the pager. sets." #: src/lang.c:2422 msgid "Page line wrap column" -msgstr "" +msgstr "Page line wrap column" #: src/lang.c:2423 msgid "# Wrap article lines at column\n" -msgstr "" +msgstr "# Wrap article lines at column\n" #: src/lang.c:2428 msgid "Wrap around threads on next unread" -msgstr "" +msgstr "Wrap around threads on next unread" #: src/lang.c:2429 msgid "# If ON wrap around threads on searching next unread article\n" -msgstr "" +msgstr "# If ON wrap around threads on searching next unread article\n" #: src/lang.c:2433 msgid "Enter default mail address (and fullname). sets." -msgstr "" +msgstr "Enter default mail address (and fullname). sets." #: src/lang.c:2434 src/lang.c:2949 msgid "Mail address (and fullname)" -msgstr "" +msgstr "Mail address (and fullname)" #: src/lang.c:2435 msgid "# User's mail address (and fullname), if not username@host (fullname)\n" msgstr "" +"# User's mail address (and fullname), if not username@host (fullname)\n" #: src/lang.c:2440 msgid "Show empty Followup-To in editor" -msgstr "" +msgstr "Show empty Followup-To in editor" #: src/lang.c:2441 msgid "# If ON show empty Followup-To header when editing an article\n" -msgstr "" +msgstr "# If ON show empty Followup-To header when editing an article\n" #: src/lang.c:2445 msgid "" "Enter path/! command/--none to create your default signature. sets." msgstr "" +"Enter path/! command/--none to create your default signature. sets." #: src/lang.c:2446 msgid "Create signature from path/command" -msgstr "" +msgstr "Create signature from path/command" #: src/lang.c:2447 #, c-format @@ -6504,45 +7152,53 @@ msgid "" "# (specify %G to pass name of current newsgroup)\n" "# sigfile=--none don't append a signature\n" msgstr "" +"# Signature path (random sigs)/file to be used when posting/replying\n" +"# sigfile=file appends file as signature\n" +"# sigfile=!command executes external command to generate a signature\n" +"# (specify %G to pass name of current newsgroup)\n" +"# sigfile=--none don't append a signature\n" #: src/lang.c:2455 msgid "" "Prepend signature with \"-- \" on own line. toggles & sets." msgstr "" +"Prepend signature with \"-- \" on own line. toggles & sets." #: src/lang.c:2456 msgid "Prepend signature with \"-- \"" -msgstr "" +msgstr "Prepend signature with \"-- \"" #: src/lang.c:2457 msgid "# If ON prepend the signature with dashes '\\n-- \\n'\n" -msgstr "" +msgstr "# If ON prepend the signature with dashes '\\n-- \\n'\n" #: src/lang.c:2461 msgid "Add signature when reposting articles. toggles & sets." -msgstr "" +msgstr "Add signature when reposting articles. toggles & sets." #: src/lang.c:2462 msgid "Add signature when reposting" -msgstr "" +msgstr "Add signature when reposting" #: src/lang.c:2463 msgid "# If ON add signature to reposted articles\n" -msgstr "" +msgstr "# If ON add signature to reposted articles\n" #: src/lang.c:2467 msgid "Enter quotation marks, %I for author's initials." -msgstr "" +msgstr "Enter quotation marks, %I for author's initials." #: src/lang.c:2468 msgid "Characters used as quote-marks" -msgstr "" +msgstr "Characters used as quote-marks" #: src/lang.c:2469 msgid "" "# Characters used in quoting to followups and replies.\n" "# '_' is replaced by ' ', %I is replaced by author's initials.\n" msgstr "" +"# Characters used in quoting to followups and replies.\n" +"# '_' is replaced by ' ', %I is replaced by author's initials.\n" #: src/lang.c:2475 msgid "Quoting behavior" @@ -6561,15 +7217,26 @@ msgid "" "# 6 = Quote signatures, quote empty lines\n" "# 7 = Compress quotes, quote signatures, quote empty lines\n" msgstr "" +"# How quoting should be handled when following up or replying.\n" +"# Possible values are (the default is marked with *):\n" +"# 0 = Nothing special\n" +"# 1 = Compress quotes\n" +"# 2 = Quote signatures\n" +"# 3 = Compress quotes, quote signatures\n" +"# 4 = Quote empty lines\n" +"# * 5 = Compress quotes, quote empty lines\n" +"# 6 = Quote signatures, quote empty lines\n" +"# 7 = Compress quotes, quote signatures, quote empty lines\n" #: src/lang.c:2489 src/lang.c:2497 src/lang.c:2503 msgid "" "%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name" msgstr "" +"%A Addr %D Date %F Addr+Name %G Groupname %M Message-ID %N Name %C First Name" #: src/lang.c:2490 msgid "Quote line when following up" -msgstr "" +msgstr "Quote line when following up" #: src/lang.c:2491 msgid "" @@ -6577,35 +7244,39 @@ msgid "" "# %A Address %D Date %F Addr+Name %G Groupname %M Message-ID\n" "# %N Full Name %C First Name %I Initials\n" msgstr "" +"# Format of quote line when mailing/posting/following-up an article\n" +"# %A Address %D Date %F Addr+Name %G Groupname %M Message-ID\n" +"# %N Full Name %C First Name %I Initials\n" #: src/lang.c:2498 msgid "Quote line when cross-posting" -msgstr "" +msgstr "Quote line when cross-posting" #: src/lang.c:2504 msgid "Quote line when mailing" -msgstr "" +msgstr "Quote line when mailing" #: src/lang.c:2509 msgid "If ON, include User-Agent: header. toggles & sets." -msgstr "" +msgstr "If ON, include User-Agent: header. toggles & sets." #: src/lang.c:2510 msgid "Insert 'User-Agent:' header" -msgstr "" +msgstr "Insert 'User-Agent:' header" #: src/lang.c:2511 msgid "# If ON include advertising User-Agent: header\n" -msgstr "" +msgstr "# If ON include advertising User-Agent: header\n" #: src/lang.c:2516 msgid "" "Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "" +"Enter charset name for MIME (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." #: src/lang.c:2517 msgid "MM_CHARSET" -msgstr "" +msgstr "MM_CHARSET" #: src/lang.c:2518 msgid "" @@ -6616,39 +7287,46 @@ msgid "" "# If MIME_STRICT_CHARSET is defined at compile-time, charset other than\n" "# mm_charset is considered not displayable and represented as '?'.\n" msgstr "" +"# Charset supported locally which is also used for MIME header and\n" +"# Content-Type header.\n" +"# If not set, the value of the environment variable MM_CHARSET is used.\n" +"# Set to US-ASCII or compile time default if neither of them is defined.\n" +"# If MIME_STRICT_CHARSET is defined at compile-time, charset other than\n" +"# mm_charset is considered not displayable and represented as '?'.\n" #: src/lang.c:2528 msgid "MM_NETWORK_CHARSET" -msgstr "" +msgstr "MM_NETWORK_CHARSET" #: src/lang.c:2529 msgid "# Charset used for MIME (Content-Type) header in postings.\n" -msgstr "" +msgstr "# Charset used for MIME (Content-Type) header in postings.\n" #: src/lang.c:2533 msgid "" "Enter local charset name (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." msgstr "" +"Enter local charset name (e.g. US-ASCII, ISO-8859-1, EUC-KR), to set." #: src/lang.c:2534 msgid "MM_LOCAL_CHARSET" -msgstr "" +msgstr "MM_LOCAL_CHARSET" #: src/lang.c:2535 msgid "# Charset supported locally.\n" -msgstr "" +msgstr "# Charset supported locally.\n" #: src/lang.c:2542 msgid "Mailbox format" -msgstr "" +msgstr "Mailbox format" #: src/lang.c:2543 msgid "# Format of the mailbox.\n" -msgstr "" +msgstr "# Format of the mailbox.\n" #: src/lang.c:2548 msgid "MIME encoding in news messages" -msgstr "" +msgstr "MIME encoding in news messages" #: src/lang.c:2549 msgid "" @@ -6658,14 +7336,19 @@ msgid "" "# while Base64 is more efficient for most 8bit East Asian, Greek, and\n" "# Russian charsets with a lot of 8bit characters.\n" msgstr "" +"# MIME encoding (8bit, base64, quoted-printable, 7bit) of the body\n" +"# for mails and posts, if necessary. QP is efficient for most European\n" +"# character sets (ISO-8859-X) with small fraction of non-US-ASCII chars,\n" +"# while Base64 is more efficient for most 8bit East Asian, Greek, and\n" +"# Russian charsets with a lot of 8bit characters.\n" #: src/lang.c:2557 src/lang.c:2578 msgid "Don't change unless you know what you are doing. cancels." -msgstr "" +msgstr "Don't change unless you know what you are doing. cancels." #: src/lang.c:2558 msgid "Use 8bit characters in news headers" -msgstr "" +msgstr "Use 8bit characters in news headers" #: src/lang.c:2559 msgid "" @@ -6674,27 +7357,32 @@ msgid "" "# 8bit chars in header are encoded regardless of the value of this\n" "# parameter unless post_mime_encoding is 8bit as well.\n" msgstr "" +"# If ON, 8bit characters in news headers are NOT encoded.\n" +"# default is OFF. Thus 8bit characters are encoded by default.\n" +"# 8bit chars in header are encoded regardless of the value of this\n" +"# parameter unless post_mime_encoding is 8bit as well.\n" #: src/lang.c:2566 msgid "" "Auto-view post-processed files toggles, sets, cancels." msgstr "" +"Auto-view post-processed files toggles, sets, cancels." #: src/lang.c:2567 msgid "View post-processed files" -msgstr "" +msgstr "View post-processed files" #: src/lang.c:2568 msgid "# If set, post processed files will be opened in a viewer\n" -msgstr "" +msgstr "# If set, post processed files will be opened in a viewer\n" #: src/lang.c:2573 msgid "MIME encoding in mail messages" -msgstr "" +msgstr "MIME encoding in mail messages" #: src/lang.c:2579 msgid "Use 8bit characters in mail headers" -msgstr "" +msgstr "Use 8bit characters in mail headers" #: src/lang.c:2580 msgid "" @@ -6706,24 +7394,33 @@ msgid "" "# prohibits 8bit characters in mail headers so that you are advised NOT to\n" "# turn it ON unless you have some compelling reason.\n" msgstr "" +"# If ON, 8bit characters in mail headers are NOT encoded.\n" +"# default is OFF. Thus 8bit characters are encoded by default.\n" +"# 8bit chars in headers are encoded regardless of the value of this " +"parameter\n" +"# unless mail_mime_encoding is 8bit as well. Note that RFC 2822\n" +"# prohibits 8bit characters in mail headers so that you are advised NOT to\n" +"# turn it ON unless you have some compelling reason.\n" #: src/lang.c:2591 msgid "Strip blanks from ends of lines" -msgstr "" +msgstr "Strip blanks from ends of lines" #: src/lang.c:2592 msgid "" "# If ON strip blanks from ends of lines for faster display on slow " "terminals.\n" msgstr "" +"# If ON strip blanks from ends of lines for faster display on slow " +"terminals.\n" #: src/lang.c:2598 msgid "If ON, use transliteration. toggles & sets." -msgstr "" +msgstr "If ON, use transliteration. toggles & sets." #: src/lang.c:2599 msgid "Transliteration" -msgstr "" +msgstr "Transliteration" #: src/lang.c:2600 msgid "" @@ -6731,10 +7428,13 @@ msgid "" "# be represented in the in the target character set, it can be approximated\n" "# through one or several similarly looking characters.\n" msgstr "" +"# If ON, use //TRANSLIT extension. This means that when a character cannot\n" +"# be represented in the in the target character set, it can be approximated\n" +"# through one or several similarly looking characters.\n" #: src/lang.c:2608 msgid "Send you a Cc/Bcc automatically" -msgstr "" +msgstr "Send you a Cc/Bcc automatically" #: src/lang.c:2609 msgid "" @@ -6744,129 +7444,150 @@ msgid "" "# 1 = Cc\n" "# 2 = Bcc\n" "# 3 = Cc and Bcc\n" -msgstr "" +msgstr "" +"# Put your name in the Cc: and/or Bcc: field when mailing an article.\n" +"# Possible values are (the default is marked with *):\n" +"# * 0 = No\n" +"# 1 = Cc\n" +"# 2 = Bcc\n" +"# 3 = Cc and Bcc\n" #: src/lang.c:2620 msgid "Hash algorithm for Cancel-Lock/Cancel-Key" -msgstr "" +msgstr "Hash algorithm for Cancel-Lock/Cancel-Key" #: src/lang.c:2621 msgid "" "# Hash algorithm for Cancel-Lock/Cancel-Key (default 'sha1')\n" "# Use 'none' to not generate Cancel-Lock headers.\n" msgstr "" +"# Hash algorithm for Cancel-Lock/Cancel-Key (default 'sha1')\n" +"# Use 'none' to not generate Cancel-Lock headers.\n" #: src/lang.c:2627 msgid "Enter address elements about which you want to be warned. sets." -msgstr "" +msgstr "Enter address elements about which you want to be warned. sets." #: src/lang.c:2628 msgid "Spamtrap warning address parts" -msgstr "" +msgstr "Spamtrap warning address parts" #: src/lang.c:2629 msgid "" "# A comma-delimited list of address-parts you want to be warned\n" "# about when trying to reply by email.\n" msgstr "" +"# A comma-delimited list of address-parts you want to be warned\n" +"# about when trying to reply by e-mail.\n" #: src/lang.c:2634 msgid "Enter default number of days a filter entry will be valid. sets." -msgstr "" +msgstr "Enter default number of days a filter entry will be valid. sets." #: src/lang.c:2635 msgid "No. of days a filter entry is valid" -msgstr "" +msgstr "No. of days a filter entry is valid" #: src/lang.c:2636 msgid "# Number of days a short term filter will be active\n" -msgstr "" +msgstr "# Number of days a short term filter will be active\n" #: src/lang.c:2640 msgid "Add posted articles to filter. toggles & sets." -msgstr "" +msgstr "Add posted articles to filter. toggles & sets." #: src/lang.c:2641 msgid "Add posted articles to filter" -msgstr "" +msgstr "Add posted articles to filter" #: src/lang.c:2642 msgid "" "# If ON add posted articles which start a new thread to filter for\n" "# highlighting follow-ups\n" msgstr "" +"# If ON add posted articles which start a new thread to filter for\n" +"# highlighting follow-ups\n" #: src/lang.c:2646 msgid "The directory where articles/threads are to be saved in mailbox format." msgstr "" +"The directory where articles/threads are to be saved in mailbox format." #: src/lang.c:2647 msgid "Mail directory" -msgstr "" +msgstr "Mail directory" #: src/lang.c:2648 msgid "# (-m) directory where articles/threads are saved in mailbox format\n" -msgstr "" +msgstr "# (-m) directory where articles/threads are saved in mailbox format\n" #: src/lang.c:2653 msgid "Save articles in batch mode (-S)" -msgstr "" +msgstr "Save articles in batch mode (-S)" #: src/lang.c:2654 msgid "" "# If ON articles/threads will be saved in batch mode when save -S\n" "# or mail (-M/-N) is specified on the command line\n" msgstr "" +"# If ON articles/threads will be saved in batch mode when save -S\n" +"# or mail (-M/-N) is specified on the command line\n" #: src/lang.c:2659 msgid "The directory where you want articles/threads saved." -msgstr "" +msgstr "The directory where you want articles/threads saved." #: src/lang.c:2660 msgid "Directory to save arts/threads in" -msgstr "" +msgstr "Directory to save arts/threads in" #: src/lang.c:2661 msgid "# Directory where articles/threads are saved\n" -msgstr "" +msgstr "# Directory where articles/threads are saved\n" #: src/lang.c:2665 msgid "" "Auto save article/thread by Archive-name: header. toggles & " "sets." msgstr "" +"Auto save article/thread by Archive-name: header. toggles & " +"sets." #: src/lang.c:2666 msgid "Use Archive-name: header for save" -msgstr "" +msgstr "Use Archive-name: header for save" #: src/lang.c:2667 msgid "" "# If ON articles/threads with Archive-name: in mail header will\n" "# be automatically saved with the Archive-name & part/patch no.\n" msgstr "" +"# If ON articles/threads with Archive-name: in mail header will\n" +"# be automatically saved with the Archive-name & part/patch no.\n" #: src/lang.c:2672 msgid "" "Mark saved articles/threads as read. toggles, sets, " "cancels." msgstr "" +"Mark saved articles/threads as read. toggles, sets, " +"cancels." #: src/lang.c:2673 msgid "Mark saved articles/threads as read" -msgstr "" +msgstr "Mark saved articles/threads as read" #: src/lang.c:2674 msgid "# If ON mark articles that are saved as read\n" -msgstr "" +msgstr "# If ON mark articles that are saved as read\n" #: src/lang.c:2678 msgid "Do post processing (eg. extract attachments) for saved articles." -msgstr "" +msgstr "Do post processing (eg. extract attachments) for saved articles." #: src/lang.c:2679 msgid "Post process saved articles" -msgstr "" +msgstr "Post process saved articles" #: src/lang.c:2680 msgid "" @@ -6876,105 +7597,125 @@ msgid "" "# 1 = extract shell archives (shar) only\n" "# 2 = yes\n" msgstr "" +"# Perform post processing (saving binary attachments) from saved articles.\n" +"# Possible values are (the default is marked with *):\n" +"# * 0 = no\n" +"# 1 = extract shell archives (shar) only\n" +"# 2 = yes\n" #: src/lang.c:2689 msgid "Process only unread articles" -msgstr "" +msgstr "Process only unread articles" #: src/lang.c:2690 msgid "" "# If ON only save/print/pipe/mail unread articles (tagged articles " "excepted)\n" msgstr "" +"# If ON only save/print/pipe/mail unread articles (tagged articles " +"excepted)\n" #: src/lang.c:2695 msgid "Print all or just part of header. toggles & sets." -msgstr "" +msgstr "Print all or just part of header. toggles & sets." #: src/lang.c:2696 msgid "Print all headers when printing" -msgstr "" +msgstr "Print all headers when printing" #: src/lang.c:2697 msgid "" "# If ON print all of article header otherwise just the important lines\n" msgstr "" +"# If ON print all of article header otherwise just the important lines\n" #: src/lang.c:2701 msgid "" "The printer program with options that is to be used to print articles/" "threads." msgstr "" +"The printer program with options that is to be used to print articles/" +"threads." #: src/lang.c:2702 msgid "Printer program with options" -msgstr "" +msgstr "Printer program with options" #: src/lang.c:2703 msgid "# Print program with parameters used to print articles/threads\n" -msgstr "" +msgstr "# Print program with parameters used to print articles/threads\n" #: src/lang.c:2709 msgid "Force redraw after certain commands" -msgstr "" +msgstr "Force redraw after certain commands" #: src/lang.c:2710 msgid "" "# If ON a screen redraw will always be done after certain external commands\n" msgstr "" +"# If ON a screen redraw will always be done after certain external commands\n" #: src/lang.c:2714 msgid "" "Start editor with line offset. toggles, sets, cancels." msgstr "" +"Start editor with line offset. toggles, sets, cancels." #: src/lang.c:2715 msgid "Start editor with line offset" -msgstr "" +msgstr "Start editor with line offset" #: src/lang.c:2716 msgid "" "# If ON editor will be started with cursor offset into the file\n" "# otherwise the cursor will be positioned at the first line\n" msgstr "" +"# If ON editor will be started with cursor offset into the file\n" +"# otherwise the cursor will be positioned at the first line\n" #: src/lang.c:2721 msgid "Enter %E for editor, %F for filename, %N for line-number, to set." -msgstr "" +msgstr "Enter %E for editor, %F for filename, %N for line-number, to set." #: src/lang.c:2722 msgid "Invocation of your editor" -msgstr "" +msgstr "Invocation of your editor" #: src/lang.c:2723 msgid "" "# Format of editor line including parameters\n" "# %E Editor %F Filename %N Linenumber\n" msgstr "" +"# Format of editor line including parameters\n" +"# %E Editor %F Filename %N Linenumber\n" #: src/lang.c:2728 msgid "" "Enter name and options for external-inews, --internal for internal inews" msgstr "" +"Enter name and options for external-inews, --internal for internal inews" #: src/lang.c:2729 msgid "External inews" -msgstr "" +msgstr "External inews" #: src/lang.c:2730 msgid "" "# If --internal use the built in mini inews for posting via NNTP\n" "# otherwise use an external inews program\n" msgstr "" +"# If --internal use the built in mini inews for posting via NNTP\n" +"# otherwise use an external inews program\n" #: src/lang.c:2734 msgid "" "Enter %M for mailer, %S for subject, %T for to, %F for filename, to set." msgstr "" +"Enter %M for mailer, %S for subject, %T for to, %F for filename, to set." #: src/lang.c:2735 msgid "Invocation of your mail command" -msgstr "" +msgstr "Invocation of your mail command" #: src/lang.c:2736 msgid "" @@ -6983,10 +7724,14 @@ msgid "" "# ie. to use elm as your mailer: elm -s \"%S\" \"%T\" < %F\n" "# ie. elm interactive : elm -i %F -s \"%S\" \"%T\"\n" msgstr "" +"# Format of mailer line including parameters\n" +"# %M Mailer %S Subject %T To %F Filename\n" +"# ie. to use elm as your mailer: elm -s \"%S\" \"%T\" < %F\n" +"# ie. elm interactive : elm -i %F -s \"%S\" \"%T\"\n" #: src/lang.c:2744 msgid "Use interactive mail reader" -msgstr "" +msgstr "Use interactive mail reader" #: src/lang.c:2745 msgid "" @@ -6996,66 +7741,75 @@ msgid "" "# 1 = use interactive mailreader with headers in file\n" "# 2 = use interactive mailreader without headers in file\n" msgstr "" +"# Interactive mailreader\n" +"# Possible values are (the default is marked with *):\n" +"# * 0 = no interactive mailreader\n" +"# 1 = use interactive mailreader with headers in file\n" +"# 2 = use interactive mailreader without headers in file\n" #: src/lang.c:2754 msgid "Remove ~/.article after posting" -msgstr "" +msgstr "Remove ~/.article after posting" #: src/lang.c:2755 msgid "# If ON remove ~/.article after posting.\n" -msgstr "" +msgstr "# If ON remove ~/.article after posting.\n" #: src/lang.c:2761 msgid "Use UTF-8 graphics (thread tree etc.)" -msgstr "" +msgstr "Use UTF-8 graphics (thread tree etc.)" #: src/lang.c:2762 msgid "" "# If ON use UTF-8 characters for indicator '->', tree and ellipsis '...'.\n" msgstr "" +"# If ON use UTF-8 characters for indicator '->', tree and ellipsis '...'.\n" #: src/lang.c:2767 msgid "Filename for all posted articles, sets, no filename=do not save." -msgstr "" +msgstr "Filename for all posted articles, sets, no filename=do not save." #: src/lang.c:2768 msgid "Filename for posted articles" -msgstr "" +msgstr "Filename for posted articles" #: src/lang.c:2769 msgid "" "# Filename where to keep all postings (default posted)\n" "# If no filename is set then postings will not be saved\n" msgstr "" +"# Filename where to keep all postings (default posted)\n" +"# If no filename is set then postings will not be saved\n" #: src/lang.c:2774 msgid "" "Keep all failed articles in ~/dead.articles. toggles & sets." msgstr "" +"Keep all failed articles in ~/dead.articles. toggles & sets." #: src/lang.c:2775 msgid "Keep failed arts in ~/dead.articles" -msgstr "" +msgstr "Keep failed arts in ~/dead.articles" #: src/lang.c:2776 msgid "# If ON keep all failed postings in ~/dead.articles\n" -msgstr "" +msgstr "# If ON keep all failed postings in ~/dead.articles\n" #: src/lang.c:2780 msgid "Do you want to strip unsubscribed groups from .newsrc" -msgstr "" +msgstr "Do you want to strip unsubscribed groups from .newsrc" #: src/lang.c:2781 msgid "No unsubscribed groups in newsrc" -msgstr "" +msgstr "No unsubscribed groups in newsrc" #: src/lang.c:2782 msgid "# If ON strip unsubscribed groups from newsrc\n" -msgstr "" +msgstr "# If ON strip unsubscribed groups from newsrc\n" #: src/lang.c:2787 msgid "Remove bogus groups from newsrc" -msgstr "" +msgstr "Remove bogus groups from newsrc" #: src/lang.c:2788 msgid "" @@ -7065,63 +7819,73 @@ msgid "" "# 1 = remove\n" "# 2 = highlight with D on selection screen\n" msgstr "" +"# What to do with bogus groups in newsrc file\n" +"# Possible values are (the default is marked with *):\n" +"# * 0 = keep\n" +"# 1 = remove\n" +"# 2 = highlight with D on selection screen\n" #: src/lang.c:2797 msgid "" "Enter number of seconds to wait for a response from the server. sets." msgstr "" +"Enter number of seconds to wait for a response from the server. sets." #: src/lang.c:2798 msgid "NNTP read timeout in seconds" -msgstr "" +msgstr "NNTP read timeout in seconds" #: src/lang.c:2799 msgid "" "# Time in seconds to wait for a response from the server (0=no timeout)\n" msgstr "" +"# Time in seconds to wait for a response from the server (0=no timeout)\n" #: src/lang.c:2804 msgid "Enter number of seconds until active file will be reread. sets." -msgstr "" +msgstr "Enter number of seconds until active file will be reread. sets." #: src/lang.c:2805 msgid "Interval in secs to reread active" -msgstr "" +msgstr "Interval in secs to reread active" #: src/lang.c:2806 msgid "" "# Time interval in seconds between rereading the active file (0=never)\n" msgstr "" +"# Time interval in seconds between rereading the active file (0=never)\n" #: src/lang.c:2811 msgid "Reconnect to server automatically" -msgstr "" +msgstr "Reconnect to server automatically" #: src/lang.c:2812 msgid "" "# If ON automatically reconnect to NNTP server if the connection is broken\n" msgstr "" +"# If ON automatically reconnect to NNTP server if the connection is broken\n" #: src/lang.c:2816 msgid "" "Create local copies of NNTP overview files. toggles & sets." msgstr "" +"Create local copies of NNTP overview files. toggles & sets." #: src/lang.c:2817 msgid "Cache NNTP overview files locally" -msgstr "" +msgstr "Cache NNTP overview files locally" #: src/lang.c:2818 msgid "# If ON, create local copies of NNTP overview files.\n" -msgstr "" +msgstr "# If ON, create local copies of NNTP overview files.\n" #: src/lang.c:2822 src/lang.c:2837 src/lang.c:2857 src/lang.c:2876 msgid "Enter format string. sets, cancels." -msgstr "" +msgstr "Enter format string. sets, cancels." #: src/lang.c:2823 msgid "Format string for selection level" -msgstr "" +msgstr "Format string for selection level" #: src/lang.c:2824 msgid "" @@ -7136,10 +7900,20 @@ msgid "" "# %n Number, linenumber on screen\n" "# %U Unread count\n" msgstr "" +"# Format string for selection level representation\n" +"# Default: %f %n %U %G %d\n" +"# Possible values are:\n" +"# %% '%'\n" +"# %d Description\n" +"# %f Newsgroup flag: 'D' bogus, 'X' not postable,\n" +"# 'M' moderated, '=' renamed, 'N' new, 'u' unsubscribed\n" +"# %G Group name\n" +"# %n Number, linenumber on screen\n" +"# %U Unread count\n" #: src/lang.c:2838 msgid "Format string for group level" -msgstr "" +msgstr "Format string for group level" #: src/lang.c:2839 msgid "" @@ -7159,10 +7933,25 @@ msgid "" "# %s Subject (only group level)\n" "# %S Score\n" msgstr "" +"# Format string for group level representation\n" +"# Default: %n %m %R %L %s %F\n" +"# Possible values are:\n" +"# %% '%'\n" +"# %D Date, like date_format\n" +"# %(formatstr)D Date, formatstr gets passed to my_strftime()\n" +"# %F From, name and/or address according to show_author\n" +"# %I Initials\n" +"# %L Line count\n" +"# %M Message-ID\n" +"# %m Article marks\n" +"# %n Number, linenumber on screen\n" +"# %R Count, number of responses in thread\n" +"# %s Subject (only group level)\n" +"# %S Score\n" #: src/lang.c:2858 msgid "Format string for thread level" -msgstr "" +msgstr "Format string for thread level" #: src/lang.c:2859 msgid "" @@ -7181,18 +7970,32 @@ msgid "" "# %S Score\n" "# %T Thread tree (only thread level)\n" msgstr "" +"# Format string for thread level representation\n" +"# Default: %n %m [%L] %T %F\n" +"# Possible values are:\n" +"# %% '%'\n" +"# %D Date, like date_format\n" +"# %(formatstr)D Date, formatstr gets passed to my_strftime()\n" +"# %F From, name and/or address according to show_author\n" +"# %I Initials\n" +"# %L Line count\n" +"# %M Message-ID\n" +"# %m Article marks\n" +"# %n Number, linenumber on screen\n" +"# %S Score\n" +"# %T Thread tree (only thread level)\n" #: src/lang.c:2877 msgid "Format string for display of dates" -msgstr "" +msgstr "Format string for display of dates" #: src/lang.c:2878 msgid "# Format string for date representation\n" -msgstr "" +msgstr "# Format string for date representation\n" #: src/lang.c:2888 msgid "Unicode normalization form" -msgstr "Unicode normalisation form" +msgstr "Unicode normalization form" #: src/lang.c:2889 msgid "" @@ -7205,7 +8008,7 @@ msgid "" "# 4 = NFD\n" "# 5 = NFKC_CF\n" msgstr "" -"# Unicode normalisation form\n" +"# Unicode normalization form\n" "# Possible values are:\n" "# 0 = None\n" "# 1 = NFKC\n" @@ -7216,15 +8019,15 @@ msgstr "" #: src/lang.c:2903 msgid "Render BiDi" -msgstr "" +msgstr "Render BiDi" #: src/lang.c:2904 msgid "# If ON, bi-directional text is rendered by tin\n" -msgstr "" +msgstr "# If ON, bi-directional text is rendered by tin\n" #: src/lang.c:2911 msgid "Function for sorting articles" -msgstr "" +msgstr "Function for sorting articles" #: src/lang.c:2912 msgid "" @@ -7233,181 +8036,195 @@ msgid "" "# * 0 = qsort\n" "# 1 = heapsort\n" msgstr "" +"# Function for sorting articles\n" +"# Possible values are (the default is marked with *):\n" +"# * 0 = qsort\n" +"# 1 = heapsort\n" #: src/lang.c:2925 msgid "Automatically GroupMarkUnselArtRead" -msgstr "" +msgstr "Automatically GroupMarkUnselArtRead" #: src/lang.c:2931 msgid "Delete post-process files" -msgstr "" +msgstr "Delete post-process files" #: src/lang.c:2936 msgid "Filename for all mailed articles, sets, no filename=do not save." -msgstr "" +msgstr "Filename for all mailed articles, sets, no filename=do not save." #: src/lang.c:2937 msgid "Mailbox to save sent mails" -msgstr "" +msgstr "Mailbox to save sent mails" #: src/lang.c:2942 msgid "Set Followup-To: header to this group(s). sets, cancels." -msgstr "" +msgstr "Set Followup-To: header to this group(s). sets, cancels." #: src/lang.c:2943 msgid "Followup-To: header" -msgstr "" +msgstr "Followup-To: header" #: src/lang.c:2948 msgid "Enter default mail address (and fullname). sets, cancels." -msgstr "" +msgstr "Enter default mail address (and fullname). sets, cancels." #: src/lang.c:2955 msgid "" "Path and options for ispell-like spell-checker. sets, cancels." msgstr "" +"Path and options for ispell-like spell-checker. sets, cancels." #: src/lang.c:2956 msgid "Ispell program" -msgstr "" +msgstr "Ispell program" #: src/lang.c:2962 msgid "When group is a mailing list, send responses to this email address." -msgstr "" +msgstr "When group is a mailing list, send responses to this e-mail address." #: src/lang.c:2963 msgid "Mailing list address" -msgstr "" +msgstr "Mailing list address" #: src/lang.c:2969 msgid "Forward articles as attachment" -msgstr "" +msgstr "Forward articles as attachment" #: src/lang.c:2974 msgid "" "A comma separated list of MIME major/minor Content-Types. cancels." msgstr "" +"A comma separated list of MIME major/minor Content-Types. cancels." #: src/lang.c:2975 msgid "Which MIME types will be saved" -msgstr "" +msgstr "Which MIME types will be saved" #: src/lang.c:2980 msgid "Value of the Organization: header. sets, cancels." -msgstr "" +msgstr "Value of the Organisation: header. sets, cancels." #: src/lang.c:2981 msgid "Organization: header" -msgstr "" +msgstr "Organisation: header" #: src/lang.c:2986 msgid "Filename for saved articles. sets, cancels." -msgstr "" +msgstr "Filename for saved articles. sets, cancels." #: src/lang.c:2987 msgid "savefile" -msgstr "" +msgstr "savefile" #: src/lang.c:2992 src/lang.c:3016 msgid "Scope for the filter rule. sets, cancels." -msgstr "" +msgstr "Scope for the filter rule. sets, cancels." #: src/lang.c:2993 msgid "Quick (1 key) select filter scope" -msgstr "" +msgstr "Quick (1 key) select filter scope" #: src/lang.c:2998 src/lang.c:3022 msgid "Header for filter rule. sets, cancels." -msgstr "" +msgstr "Header for filter rule. sets, cancels." #: src/lang.c:2999 msgid "Quick (1 key) select filter header" -msgstr "" +msgstr "Quick (1 key) select filter header" #: src/lang.c:3004 src/lang.c:3028 msgid "ON = case sensitive, OFF = ignore case. sets, cancels." -msgstr "" +msgstr "ON = case sensitive, OFF = ignore case. sets, cancels." #: src/lang.c:3005 msgid "Quick (1 key) select filter case" -msgstr "" +msgstr "Quick (1 key) select filter case" #: src/lang.c:3010 src/lang.c:3034 msgid "ON = expire, OFF = don't ever expire. sets, cancels." -msgstr "" +msgstr "ON = expire, OFF = don't ever expire. sets, cancels." #: src/lang.c:3011 msgid "Quick (1 key) select filter expire" -msgstr "" +msgstr "Quick (1 key) select filter expire" #: src/lang.c:3017 msgid "Quick (1 key) kill filter scope" -msgstr "" +msgstr "Quick (1 key) kill filter scope" #: src/lang.c:3023 msgid "Quick (1 key) kill filter header" -msgstr "" +msgstr "Quick (1 key) kill filter header" #: src/lang.c:3029 msgid "Quick (1 key) kill filter case" -msgstr "" +msgstr "Quick (1 key) kill filter case" #: src/lang.c:3035 msgid "Quick (1 key) kill filter expire" -msgstr "" +msgstr "Quick (1 key) kill filter expire" #: src/lang.c:3041 msgid "Assume this charset if no charset declaration is present, to set." -msgstr "" +msgstr "Assume this charset if no charset declaration is present, to set." #: src/lang.c:3042 msgid "UNDECLARED_CHARSET" -msgstr "" +msgstr "UNDECLARED_CHARSET" #: src/lang.c:3048 msgid "" "Add this text at the start of the message body. sets, cancels." msgstr "" +"Add this text at the start of the message body. sets, cancels." #: src/lang.c:3049 msgid "X_Body" -msgstr "" +msgstr "X_Body" #: src/lang.c:3054 msgid "Insert this header when posting. sets, cancels." -msgstr "" +msgstr "Insert this header when posting. sets, cancels." #: src/lang.c:3055 msgid "X_Headers" -msgstr "" +msgstr "X_Headers" #: src/lang.c:3060 msgid "" "Automatically insert an X-Comment-To: header? toggles & sets." msgstr "" +"Automatically insert an X-Comment-To: header? toggles & sets." #: src/lang.c:3061 msgid "Insert 'X-Comment-To:' header" -msgstr "" +msgstr "Insert 'X-Comment-To:' header" #. TODO: lang.c -#: src/main.c:817 +#: src/main.c:819 msgid "reading from local spool" -msgstr "" +msgstr "reading from local spool" + +#. TODO: != ENOENT ? and -> lang.c +#: src/misc.c:750 +#, c-format +msgid "Error: unlink %s" +msgstr "Error: unlink %s" -#: src/misc.c:3877 +#: src/misc.c:3928 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" -msgstr "" +msgstr "Version: %s %s release %s (\"%s\") %s %s\n" -#: src/misc.c:3880 +#: src/misc.c:3931 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" -msgstr "" +msgstr "Version: %s %s release %s (\"%s\")\n" -#: src/newsrc.c:460 +#: src/newsrc.c:472 msgid "Unreachable?\n" -msgstr "" +msgstr "Unreachable?\n" #: src/nntplib.c:833 #, c-format @@ -7415,89 +8232,110 @@ msgid "" "\n" "Server timed out, trying reconnect # %d\n" msgstr "" +"\n" +"Server timed out, trying reconnect # %d\n" #: src/nntplib.c:860 src/signal.c:432 msgid "NNTP connection error. Exiting..." -msgstr "" +msgstr "NNTP connection error. Exiting..." #: src/nntplib.c:872 src/nntplib.c:1864 msgid "Rejoin current group\n" -msgstr "" +msgstr "Rejoin current group\n" #: src/nntplib.c:880 src/nntplib.c:1872 #, c-format msgid "Read (%s)\n" -msgstr "" +msgstr "Read (%s)\n" #: src/nntplib.c:882 #, c-format msgid "Resend last command (%s)\n" -msgstr "" +msgstr "Resend last command (%s)\n" #: src/nntplib.c:1512 msgid "CAPABILITIES did not announce READER" -msgstr "" +msgstr "CAPABILITIES did not announce READER" #: src/nntplib.c:2018 msgid "MOTD: " -msgstr "" +msgstr "MOTD: " -#: src/nrctbl.c:178 +#: src/nrctbl.c:184 #, c-format msgid "couldn't expand %s\n" -msgstr "" +msgstr "couldn't expand %s\n" -#: src/post.c:1344 +#: src/post.c:1357 #, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" "encoding is neither set to %s nor to %s\n" msgstr "" +"Line %d is longer than %d octets and should be folded, but\n" +"encoding is neither set to %s nor to %s\n" -#: src/post.c:1349 +#: src/post.c:1362 #, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" "encoding is set to %s without enabling MIME_BREAK_LONG_LINES or\n" "posting doesn't contain any 8bit chars and thus folding won't happen\n" msgstr "" +"Line %d is longer than %d octets and should be folded, but\n" +"encoding is set to %s without enabling MIME_BREAK_LONG_LINES or\n" +"posting doesn't contain any 8bit chars and thus folding won't happen\n" -#: src/post.c:1351 +#: src/post.c:1364 #, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" "encoding is not set to %s\n" msgstr "" +"Line %d is longer than %d octets and should be folded, but\n" +"encoding is not set to %s\n" -#: src/post.c:2325 +#: src/post.c:2353 #, c-format msgid "Posting: %.*s ..." -msgstr "" +msgstr "Posting: %.*s ..." -#: src/post.c:4075 +#: src/post.c:4119 msgid "Can't supersede in mailgroups, try repost instead." -msgstr "" +msgstr "Can't supersede in mailgroups, try repost instead." #. Check if okay to read -#: src/read.c:207 +#: src/read.c:204 msgid "Aborting read, please wait..." -msgstr "" +msgstr "Aborting read, please wait..." -#: src/read.c:354 +#: src/read.c:351 msgid "Aborted read\n" -msgstr "" +msgstr "Aborted read\n" -#: src/read.c:409 +#: src/read.c:406 msgid "Draining\n" -msgstr "" +msgstr "Draining\n" #: src/refs.c:236 msgid "unchanged" -msgstr "" +msgstr "unchanged" #: src/refs.c:603 msgid "[- Unavailable -]" -msgstr "" +msgstr "[- Unavailable -]" + +#. +#. * Add the Message-ID headers to the cache, using the last Reference +#. * as the parent +#. +#. +#. * Add the References data to the cache +#. +#: src/refs.c:1015 src/refs.c:1077 +#, c-format +msgid "Building References-trees (%d/%d)..." +msgstr "Building References-trees (%d/%d)..." #. #. * preamble @@ -7512,36 +8350,41 @@ msgid "" "to understand the new format, and some of what follows may look strange.\n" "\n" msgstr "" +"This message has been composed in the 'multipart/mixed' MIME-format. If you\n" +"are reading this prefix, your mail reader probably has not yet been " +"modified\n" +"to understand the new format, and some of what follows may look strange.\n" +"\n" -#: src/save.c:1069 +#: src/save.c:1075 msgid "bytes" -msgstr "" +msgstr "bytes" #: src/select.c:411 msgid "unread" -msgstr "" +msgstr "unread" #: src/select.c:411 msgid "all" -msgstr "" +msgstr "all" #: src/select.c:594 src/select.c:596 msgid " R" -msgstr "" +msgstr " R" #: src/xface.c:73 msgid "Can't run slrnface: Not running in an xterm." -msgstr "" +msgstr "Can't run slrnface: Not running in an xterm." #: src/xface.c:85 src/xface.c:96 src/xface.c:111 #, c-format msgid "Can't run slrnface: Environment variable %s not found." -msgstr "" +msgstr "Can't run slrnface: Environment variable %s not found." #: src/xface.c:120 src/xface.c:152 #, c-format msgid "Can't run slrnface: failed to create %s" -msgstr "" +msgstr "Can't run slrnface: failed to create %s" #: src/xface.c:130 msgid "" @@ -7556,17 +8399,27 @@ msgid "" "special files created by your NFS server while slrnface is running.\n" "Do not try to remove them.\n" msgstr "" +"This directory is used to create named pipes for communication between\n" +"slrnface and its parent process. It should normally be empty because\n" +"the pipe is deleted right after it has been opened by both processes.\n" +"\n" +"File names generated by slrnface have the form \"hostname.pid\". It is\n" +"probably an error if they linger here longer than a fraction of a second.\n" +"\n" +"However, if the directory is mounted from an NFS server, you might see\n" +"special files created by your NFS server while slrnface is running.\n" +"Do not try to remove them.\n" #: src/xface.c:144 msgid "Can't run slrnface: couldn't construct fifo name." -msgstr "" +msgstr "Can't run slrnface: couldn't construct fifo name." #: src/xface.c:183 #, c-format msgid "Slrnface abnormally exited, code %d." -msgstr "" +msgstr "Slrnface abnormally exited, code %d." #: src/xface.c:230 #, c-format msgid "Slrnface failed: %s." -msgstr "" +msgstr "Slrnface failed: %s." Binary files tin-2.4.4/po/es.gmo and tin-2.4.5/po/es.gmo differ diff -Nurp '--exclude=.bzr*' tin-2.4.4/po/es.po tin-2.4.5/po/es.po --- tin-2.4.4/po/es.po 2019-12-24 10:55:08.000000000 +0100 +++ tin-2.4.5/po/es.po 2020-12-24 00:24:53.729880685 +0100 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tin 2.4.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 13:24+0100\n" +"POT-Creation-Date: 2020-12-24 00:24+0100\n" "PO-Revision-Date: 2018-04-19 13:04+0200\n" "Last-Translator: Francisco Javier Serrador \n" "Language-Team: Spanish \n" @@ -19,6 +19,32 @@ msgstr "" "X-Generator: Poedit 2.0.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. -> lang.c +#: src/art.c:418 +#, fuzzy, c-format +msgid "Reading %s\n" +msgstr "" +"\n" +" %s: " + +#. TODO: -> lang.c +#: src/art.c:1205 +#, fuzzy +msgid "Threading by multipart" +msgstr "Artículos anteriores" + +#. -> lang.c +#: src/art.c:2539 +#, fuzzy, c-format +msgid "Writing %s\n" +msgstr "Tratando de hacer 'bal' a %s" + +#. TODO: -> lang.c +#: src/art.c:2619 +#, fuzzy +msgid "Writing overview cache..." +msgstr "Escribiendo fichero…" + #: src/attrib.c:986 #, fuzzy msgid "Processing attributes... " @@ -1475,7 +1501,7 @@ msgstr "" #: src/lang.c:274 #, fuzzy, c-format -msgid "Filtering global rules (%d/%d)..." +msgid "Filtering global rules (%d/%d) ('q' to quit)..." msgstr "demasiadas reglas (> %d)!" #: src/lang.c:275 @@ -2237,8 +2263,8 @@ msgstr "" msgid "select threads that match user specified pattern" msgstr "" -#: src/lang.c:465 -msgid "tag all parts of current multipart-message in order" +#: src/lang.c:465 src/lang.c:521 +msgid "tag/untag all parts of current multipart-message in order" msgstr "" #: src/lang.c:466 @@ -2477,190 +2503,195 @@ msgstr "x marca la versión actual" msgid "read chosen article" msgstr "No ha elegido un foro" -#: src/lang.c:521 +#: src/lang.c:522 #, fuzzy msgid "" "Display properties\n" "------------------" msgstr " Propiedades: " -#: src/lang.c:522 +#: src/lang.c:523 #, fuzzy msgid "" "Miscellaneous\n" "-------------" msgstr "^Miscelánea" -#: src/lang.c:523 +#: src/lang.c:524 #, fuzzy msgid "" "Moving around\n" "-------------" msgstr "Se .. se mueve..." -#: src/lang.c:524 +#: src/lang.c:525 #, fuzzy msgid "" "Group/thread/article operations\n" "-------------------------------" msgstr "Deshacer la última operación o grupo de operaciones sobre los paquetes" -#: src/lang.c:525 +#: src/lang.c:526 #, fuzzy msgid "" "Attachment operations\n" "---------------------" msgstr "Operaciones" -#: src/lang.c:526 +#: src/lang.c:527 #, fuzzy msgid "" "Attribute operations\n" "--------------------" msgstr "Atributo" -#: src/lang.c:527 +#: src/lang.c:528 #, fuzzy msgid "" "Option operations\n" "-----------------" msgstr "Operaciones" -#: src/lang.c:528 +#: src/lang.c:529 #, fuzzy msgid "" "Scope operations\n" "----------------" msgstr "Operaciones" -#: src/lang.c:529 +#: src/lang.c:530 #, fuzzy msgid "" "URL operations\n" "--------------" msgstr "URL" -#: src/lang.c:530 +#: src/lang.c:531 #, fuzzy msgid "choose first URL in list" msgstr "Primero Debe Elegir Un Mensaje" -#: src/lang.c:531 +#: src/lang.c:532 msgid "0 - 9\t choose URL by number" msgstr "" -#: src/lang.c:532 +#: src/lang.c:533 #, fuzzy msgid "choose last URL in list" msgstr "Elija una lista para examinar, buscar y publicar mensajes." -#: src/lang.c:533 +#: src/lang.c:534 #, fuzzy msgid "search for URLs forwards" msgstr "Buscar hacia adelante" -#: src/lang.c:534 +#: src/lang.c:535 #, fuzzy msgid "search for URLs backwards" msgstr "Buscar hacia atrás: " -#: src/lang.c:535 +#: src/lang.c:536 #, fuzzy msgid "Open URL in browser" msgstr "EXPLORADOR" -#: src/lang.c:536 +#: src/lang.c:537 msgid "toggle info message in last line (URL)" msgstr "" -#: src/lang.c:538 +#: src/lang.c:539 #, fuzzy msgid "Group Level Commands" msgstr " órdenes:\n" -#: src/lang.c:539 +#: src/lang.c:540 #, fuzzy msgid "Kill filter added" msgstr "_Filtrar por…" -#: src/lang.c:540 +#: src/lang.c:541 msgid "Auto-selection filter added" msgstr "" -#: src/lang.c:541 +#: src/lang.c:542 #, fuzzy msgid "All parts tagged" msgstr "Directorio de Importación [partes de .idata]" -#: src/lang.c:542 +#: src/lang.c:543 +#, fuzzy +msgid "All parts untagged" +msgstr "Directorio de Importación [partes de .idata]" + +#: src/lang.c:544 msgid "Storing article for later posting" msgstr "" -#: src/lang.c:543 +#: src/lang.c:545 #, fuzzy msgid "Please enter a valid character" msgstr "Introduzca un URL válido" -#: src/lang.c:544 +#: src/lang.c:546 #, fuzzy, c-format msgid "Missing part #%d" msgstr "Fin de %s parte %d" -#: src/lang.c:545 +#: src/lang.c:547 #, fuzzy msgid "*** No postponed articles ***" msgstr "Pospuesto" -#: src/lang.c:546 +#: src/lang.c:548 #, fuzzy msgid "Not a multi-part message" msgstr ", parte de " -#: src/lang.c:547 +#: src/lang.c:549 #, fuzzy msgid "You are not subscribed to this group" msgstr "Grupo" -#: src/lang.c:548 +#: src/lang.c:550 #, fuzzy msgid "No previous expression" msgstr "Sin expresión regular previa" -#: src/lang.c:549 +#: src/lang.c:551 #, fuzzy msgid "Operation disabled in no-overwrite mode" msgstr "Modo operativo." #. TODO: replace hard coded key-name in txt_info_postponed -#: src/lang.c:551 +#: src/lang.c:553 #, c-format msgid "%d postponed %s, reuse with ^O...\n" msgstr "" -#: src/lang.c:552 +#: src/lang.c:554 msgid "" "X-Conversion-Note: multipart/alternative contents have been removed.\n" " To get the whole article, turn alternative handling OFF in the Option " "Menu\n" msgstr "" -#: src/lang.c:554 +#: src/lang.c:556 #, c-format msgid "Save filename for %s/%s is a mailbox. Attachment not saved" msgstr "" -#: src/lang.c:555 +#: src/lang.c:557 #, fuzzy msgid "TeX2Iso encoded article" msgstr "Artículo definido requerido" -#: src/lang.c:556 +#: src/lang.c:558 #, fuzzy msgid "incomplete " msgstr "Incompleto" #. TODO: replace hard coded key-names -#: src/lang.c:558 +#: src/lang.c:560 #, c-format msgid "" "\n" @@ -2698,170 +2729,170 @@ msgid "" "Please send bug-reports/comments to %s with the 'R' command.\n" msgstr "" -#: src/lang.c:574 +#: src/lang.c:576 #, c-format msgid "Invalid From: %s line. Read the INSTALL file again." msgstr "" -#: src/lang.c:576 +#: src/lang.c:578 #, fuzzy msgid "Invalid multibyte sequence found\n" msgstr "Secuencia de carácter UTF-8" -#: src/lang.c:579 +#: src/lang.c:581 #, fuzzy, c-format msgid "Invalid Sender:-header %s" msgstr "valor de cabecera inválido %s" -#: src/lang.c:581 +#: src/lang.c:583 #, fuzzy msgid "Inverse video disabled" msgstr "_Invertir" -#: src/lang.c:582 +#: src/lang.c:584 #, fuzzy msgid "Inverse video enabled" msgstr "_Invertir" -#: src/lang.c:584 +#: src/lang.c:586 #, fuzzy, c-format msgid "Missing definition for %s\n" msgstr "\tsin definición de «%s»" -#: src/lang.c:585 +#: src/lang.c:587 #, fuzzy, c-format msgid "Invalid key definition '%s'\n" msgstr "definición no válida para la impresora «%s»: %s" -#: src/lang.c:586 +#: src/lang.c:588 #, fuzzy, c-format msgid "Invalid keyname '%s'\n" msgstr "%s: modo inválido (%s)" -#: src/lang.c:587 +#: src/lang.c:589 #, fuzzy, c-format msgid "Keymap file was upgraded to version %s\n" msgstr "El fichero `%s' (versión %d) contiene:\n" -#: src/lang.c:588 +#: src/lang.c:590 #, fuzzy, c-format msgid "Kill From: [%s] (y/n): " msgstr "Mato %s(%s%d) ? (s/N) " -#: src/lang.c:589 +#: src/lang.c:591 #, fuzzy msgid "Kill Lines: (num): " msgstr "Núm" -#: src/lang.c:590 +#: src/lang.c:592 #, fuzzy msgid "Kill Article Menu" msgstr "Artículo definido requerido" -#: src/lang.c:591 +#: src/lang.c:593 #, fuzzy, c-format msgid "Kill Msg-ID: [%s] (f/l/o/n): " msgstr "Mato %s(%s%d) ? (s/N) " -#: src/lang.c:592 +#: src/lang.c:594 #, fuzzy msgid "Kill pattern scope : " msgstr "..mátalo, Dink..mátalo..." -#: src/lang.c:593 +#: src/lang.c:595 #, fuzzy, c-format msgid "Kill Subject: [%s] (y/n): " msgstr "Mato %s(%s%d) ? (s/N) " -#: src/lang.c:594 +#: src/lang.c:596 #, fuzzy msgid "Kill text pattern : " msgstr "Patrón" -#: src/lang.c:595 +#: src/lang.c:597 #, fuzzy msgid "Kill time in days : " msgstr "Tiempo Medio Abierto (en días)" -#: src/lang.c:597 +#: src/lang.c:599 msgid "Last" msgstr "Último" -#: src/lang.c:598 +#: src/lang.c:600 #, fuzzy msgid "-- Last response --" msgstr "Respuesta" -#: src/lang.c:599 +#: src/lang.c:601 #, fuzzy, c-format msgid "Lines %s " msgstr "Líneas leídas: %lu líneas en %.0lf segundos (%.0lf líneas/s)\n" -#: src/lang.c:602 +#: src/lang.c:604 #, fuzzy msgid "Function not available." msgstr "la función iconv no está disponible" -#: src/lang.c:603 +#: src/lang.c:605 #, fuzzy msgid "Not reading via NNTP." msgstr "No leído" -#: src/lang.c:604 +#: src/lang.c:606 #, fuzzy, c-format msgid "Group: %s" msgstr "no se puede crear un grupo: %s" -#: src/lang.c:605 +#: src/lang.c:607 #, fuzzy, c-format msgid "Groups: %s" msgstr "" "El índice de coincidencia %ls es demasiado largo; los grupos disponibles son " "(%s)" -#: src/lang.c:608 +#: src/lang.c:610 #, fuzzy msgid "Mail" msgstr "CORREO" -#: src/lang.c:609 +#: src/lang.c:611 #, fuzzy msgid "mailbox " msgstr "_Buzón:" -#: src/lang.c:610 +#: src/lang.c:612 #, fuzzy, c-format msgid "Mail article(s) to [%.*s]> " msgstr "Mensajes Masivos para subscriptores de %s" -#: src/lang.c:611 +#: src/lang.c:613 #, fuzzy, c-format msgid "Mailing log to %s\n" msgstr "Crear Lista de Correo %s" -#: src/lang.c:612 +#: src/lang.c:614 #, fuzzy msgid "Mail bug report..." msgstr "Por favor reporte este bicho.\n" -#: src/lang.c:613 +#: src/lang.c:615 #, fuzzy, c-format msgid "Mail BUG REPORT to %s?" msgstr "" "Correo-e del boletín de defectos a: <%s>.\n" " \n" -#: src/lang.c:614 +#: src/lang.c:616 #, fuzzy msgid "Mailed" msgstr "Último correo de id_usuario" -#: src/lang.c:615 +#: src/lang.c:617 #, fuzzy, c-format msgid "Mailing to %s..." msgstr "Actualizar Lista de Correo %s" -#: src/lang.c:616 +#: src/lang.c:618 msgid "" "# [Mail/Save] active file. Format is like news active file:\n" "# groupname max.artnum min.artnum /dir\n" @@ -2869,379 +2900,379 @@ msgid "" "#\n" msgstr "" -#: src/lang.c:619 +#: src/lang.c:621 #, fuzzy, c-format msgid "%s marked as read" msgstr "Campos marcados con %s son obligatorios." -#: src/lang.c:620 +#: src/lang.c:622 #, fuzzy, c-format msgid "%s marked as unread" msgstr "*** Tiene correo no leído. ***" -#: src/lang.c:621 +#: src/lang.c:623 #, fuzzy, c-format msgid "Marked %d of %d %s as read" msgstr "[%d] Incapaz de leer desde %s en el puerto %d" -#: src/lang.c:622 +#: src/lang.c:624 #, fuzzy, c-format msgid "Marked %d of %d %s as unread" msgstr "%s:%d:%d: %s" -#: src/lang.c:623 src/lang.c:1352 +#: src/lang.c:625 src/lang.c:1352 msgid "Mark" msgstr "Marcador" -#: src/lang.c:624 +#: src/lang.c:626 #, c-format msgid "Mark all articles as read%s?" msgstr "" -#: src/lang.c:625 +#: src/lang.c:627 #, fuzzy, c-format msgid "Mark article as read%s?" msgstr "Marca buzones leídos" -#: src/lang.c:626 +#: src/lang.c:628 #, fuzzy, c-format msgid "Mark group %s as read?" msgstr "Marca buzones leídos" -#: src/lang.c:627 +#: src/lang.c:629 #, fuzzy, c-format msgid "Mark thread as read%s?" msgstr "Hilo(s) encontrado(s)" -#: src/lang.c:628 +#: src/lang.c:630 #, fuzzy, c-format msgid "Matching %s groups..." msgstr "GRUPOS" -#: src/lang.c:629 src/lang.c:643 src/lang.c:649 +#: src/lang.c:631 src/lang.c:645 src/lang.c:651 #, c-format msgid "=set current to n; %s=line down; %s=line up; %s=help; %s=quit" msgstr "" -#: src/lang.c:631 +#: src/lang.c:633 #, c-format msgid "" "%s=view; %s=pipe; %s=pipe raw; %s=save; %s=tag; %s=tag pattern; %s=untag all" msgstr "" -#: src/lang.c:633 +#: src/lang.c:635 #, c-format msgid "%s=view; %s=save; %s=tag; %s=tag pattern; %s=untag all" msgstr "" -#: src/lang.c:635 +#: src/lang.c:637 #, c-format msgid "" "%s=reverse tagging; %s=search forwards; %s=search backwards; %s=repeat search" msgstr "" -#: src/lang.c:636 src/lang.c:640 +#: src/lang.c:638 src/lang.c:642 #, c-format msgid "=set current to n; %s=next unread; %s=search pattern; %s=kill/select" msgstr "" -#: src/lang.c:637 +#: src/lang.c:639 #, c-format msgid "" "%s=author search; %s=catchup; %s=line down; %s=line up; %s=mark read; " "%s=list thread" msgstr "" -#: src/lang.c:638 +#: src/lang.c:640 #, c-format msgid "%s=line up; %s=line down; %s=page up; %s=page down; %s=top; %s=bottom" msgstr "" -#: src/lang.c:639 +#: src/lang.c:641 #, c-format msgid "%s=search forwards; %s=search backwards; %s=quit" msgstr "" -#: src/lang.c:641 +#: src/lang.c:643 #, c-format msgid "%s=author search; %s=body search; %s=catchup; %s=followup; %s=mark read" msgstr "" -#: src/lang.c:642 +#: src/lang.c:644 #, fuzzy, c-format msgid "%s=add; %s=move; %s=rename; %s=delete" msgstr "Renombra ORIGEN a DESTINO, o mueve ORIGEN(es) a DIRECTORIO.\n" -#: src/lang.c:644 +#: src/lang.c:646 #, c-format msgid "=set current to n; %s=next unread; %s,%s=search pattern; %s=catchup" msgstr "" -#: src/lang.c:645 +#: src/lang.c:647 #, c-format msgid "" "%s=line down; %s=line up; %s=help; %s=move; %s=quit; %s=toggle all/unread" msgstr "" -#: src/lang.c:646 +#: src/lang.c:648 #, c-format msgid "" "%s=subscribe; %s=sub pattern; %s=unsubscribe; %s=unsub pattern; %s=yank in/" "out" msgstr "" -#: src/lang.c:647 +#: src/lang.c:649 #, c-format msgid "=set current to n; %s=next unread; %s=catchup; %s=display toggle" msgstr "" -#: src/lang.c:648 +#: src/lang.c:650 #, c-format msgid "%s=help; %s=line down; %s=line up; %s=quit; %s=tag; %s=mark unread" msgstr "" -#: src/lang.c:650 +#: src/lang.c:652 #, c-format msgid "%s=search forwards; %s=search backwards; %s=repeat search" msgstr "" -#: src/lang.c:651 +#: src/lang.c:653 #, fuzzy msgid "--More--" msgstr "Más…" -#: src/lang.c:652 +#: src/lang.c:654 #, fuzzy, c-format msgid "Moving %s..." msgstr "Error moviendo final %s a dir anterior %s" -#: src/lang.c:653 +#: src/lang.c:655 #, fuzzy msgid "Message-ID: & last Reference " msgstr "No se pudo obtener el id del mensaje" -#: src/lang.c:654 +#: src/lang.c:656 #, fuzzy msgid "Message-ID: line " msgstr "No se pudo obtener el id del mensaje" -#: src/lang.c:655 +#: src/lang.c:657 #, fuzzy msgid "Message-ID: & References: line" msgstr "No se pudo obtener el id del mensaje" -#: src/lang.c:657 +#: src/lang.c:659 #, fuzzy msgid ", name: " msgstr "" -#: src/lang.c:658 +#: src/lang.c:660 #, fuzzy, c-format msgid "Go to newsgroup [%s]> " msgstr "Ir" -#: src/lang.c:659 +#: src/lang.c:661 msgid "newsgroups" msgstr "" -#: src/lang.c:660 +#: src/lang.c:662 #, c-format msgid "Position %s in group list (1,2,..,$) [%d]> " msgstr "" -#: src/lang.c:661 +#: src/lang.c:663 msgid "newsgroup" msgstr "" -#: src/lang.c:662 +#: src/lang.c:664 msgid "Try and save newsrc file again?" msgstr "" -#: src/lang.c:663 +#: src/lang.c:665 msgid "Warning: No newsgroups were written to your newsrc file. Save aborted." msgstr "" -#: src/lang.c:664 +#: src/lang.c:666 #, fuzzy msgid "newsrc file saved successfully.\n" msgstr "Fichero subido con éxito" -#: src/lang.c:665 +#: src/lang.c:667 #, fuzzy msgid "-- Next response --" msgstr "Siguiente" -#: src/lang.c:666 +#: src/lang.c:668 msgid "No " msgstr "" -#: src/lang.c:667 +#: src/lang.c:669 #, fuzzy msgid "*** No articles ***" msgstr "Artículos anteriores" -#: src/lang.c:668 +#: src/lang.c:670 #, fuzzy msgid "No articles have been posted" msgstr "No se han enviado Comentarios" -#: src/lang.c:669 +#: src/lang.c:671 #, fuzzy msgid "*** No attachments ***" msgstr "Adjuntos" -#: src/lang.c:670 +#: src/lang.c:672 #, fuzzy msgid "*** No description ***" msgstr "(sin descripción)" -#: src/lang.c:671 +#: src/lang.c:673 #, fuzzy msgid "No filename" msgstr "el fichero \"$filename\" es desconocido" -#: src/lang.c:672 +#: src/lang.c:674 #, fuzzy msgid "No group" msgstr "** grupo" -#: src/lang.c:673 +#: src/lang.c:675 #, fuzzy msgid "*** No groups ***" msgstr " grupos=" -#: src/lang.c:674 +#: src/lang.c:676 #, fuzzy msgid "No more groups to read" msgstr "GRUPOS" -#: src/lang.c:675 +#: src/lang.c:677 #, fuzzy msgid "No last message" msgstr "Último" -#: src/lang.c:676 +#: src/lang.c:678 #, fuzzy msgid "No mail address" msgstr "Dirección personal para correo" -#: src/lang.c:677 +#: src/lang.c:679 #, fuzzy msgid "No articles marked for saving" msgstr "" "\n" "Ningún artículo dentro de este grupo.\n" -#: src/lang.c:678 +#: src/lang.c:680 msgid "No match" msgstr "Sin coincidencia" -#: src/lang.c:679 +#: src/lang.c:681 #, fuzzy msgid "No more groups" msgstr " grupos=" -#: src/lang.c:680 +#: src/lang.c:682 msgid "No newsgroups" msgstr "" -#: src/lang.c:681 +#: src/lang.c:683 #, fuzzy msgid "No next unread article" msgstr "*** Tiene correo no leído. ***" -#: src/lang.c:682 +#: src/lang.c:684 #, fuzzy msgid "No previous group" msgstr "Grupo" -#: src/lang.c:683 +#: src/lang.c:685 #, fuzzy msgid "No previous search, nothing to repeat" msgstr "n repetir / o ? en la última búsqueda" -#: src/lang.c:684 +#: src/lang.c:686 #, fuzzy msgid "No previous unread article" msgstr "*** Tiene correo no leído. ***" -#: src/lang.c:685 +#: src/lang.c:687 #, fuzzy msgid "No responses" msgstr "Respuestas existentes" -#: src/lang.c:686 +#: src/lang.c:688 #, fuzzy msgid "No responses to list in current thread" msgstr "Lista el contenido del directorio actual" -#: src/lang.c:687 +#: src/lang.c:689 msgid "*** No scopes ***" msgstr "" -#: src/lang.c:688 +#: src/lang.c:690 #, fuzzy msgid "No search string" msgstr "" "Advertencia: búsqueda de cadena textual es más larga que %d caracteres, la " "búsqueda quizá no funciona apropiadamente.\n" -#: src/lang.c:689 +#: src/lang.c:691 #, fuzzy msgid "No subject" msgstr "No hay Asunto" -#: src/lang.c:691 +#: src/lang.c:693 #, c-format msgid "%s: Terminal must have clear to end-of-line (ce)\n" msgstr "" -#: src/lang.c:692 +#: src/lang.c:694 #, c-format msgid "%s: Terminal must have clear to end-of-screen (cd)\n" msgstr "" -#: src/lang.c:693 +#: src/lang.c:695 #, c-format msgid "%s: Terminal must have clearscreen (cl) capability\n" msgstr "" -#: src/lang.c:694 +#: src/lang.c:696 #, c-format msgid "%s: Terminal must have cursor motion (cm)\n" msgstr "" -#: src/lang.c:695 +#: src/lang.c:697 #, c-format msgid "%s: TERM variable must be set to use screen capabilities\n" msgstr "" -#: src/lang.c:697 +#: src/lang.c:699 #, fuzzy, c-format msgid "No viewer found for %s/%s\n" msgstr "esperaba %s, pero encontré %s" -#: src/lang.c:698 +#: src/lang.c:700 #, fuzzy msgid "Newsgroup does not exist on this server" msgstr "" "el fichero «$filename» no existe, pero es un fichero de fuente del " "modificación" -#: src/lang.c:699 +#: src/lang.c:701 #, fuzzy, c-format msgid "Group %s not found in active file" msgstr "Fichero «%s» no encontrado\n" -#: src/lang.c:700 +#: src/lang.c:702 msgid "c)reate it, use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "" -#: src/lang.c:701 +#: src/lang.c:703 msgid "use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "" -#: src/lang.c:702 +#: src/lang.c:704 #, c-format msgid "" "# NNTP-server -> newsrc translation table and NNTP-server\n" @@ -3258,194 +3289,194 @@ msgid "" "#\n" msgstr "" -#: src/lang.c:709 +#: src/lang.c:711 #, fuzzy msgid "Only" msgstr "Sólo Extraer" -#: src/lang.c:710 +#: src/lang.c:712 #, fuzzy, c-format msgid "Option not enabled. Recompile with %s." msgstr "La opción --regex está activada por defecto." -#: src/lang.c:711 +#: src/lang.c:713 #, fuzzy msgid "Options Menu" msgstr "" "Dink Smallwood ('%s') no fue encontrado en su ordenador. Por favor configure " "el nombre del ejecutable del juego en las opciones del menú." -#: src/lang.c:712 +#: src/lang.c:714 #, fuzzy msgid "Options Menu Commands" msgstr "El menú de opciones" -#: src/lang.c:715 +#: src/lang.c:717 #, fuzzy, c-format msgid "Error in regex: %s at pos. %d '%s'" msgstr "" " expreg en desplazamiento %d: %s\n" "\n" -#: src/lang.c:716 +#: src/lang.c:718 #, fuzzy, c-format msgid "Error in regex: pcre internal error %d" msgstr "%s: pcre_exec() error %d mientras coincide " -#: src/lang.c:717 +#: src/lang.c:719 #, c-format msgid "Error in regex: study - pcre internal error %s" msgstr "" -#: src/lang.c:718 +#: src/lang.c:720 #, fuzzy msgid "Post a followup..." msgstr "Contabilizar a" #. TODO: replace hard coded key-name in txt_post_error_ask_postpone -#: src/lang.c:720 +#: src/lang.c:722 msgid "" "An error has occurred while posting the article. If you think that this\n" "error is temporary or otherwise correctable, you can postpone the article\n" "and pick it up again with ^O later.\n" msgstr "" -#: src/lang.c:723 +#: src/lang.c:725 #, fuzzy msgid "Posted articles history" msgstr "" "\n" "Ningún artículo dentro de este grupo.\n" -#: src/lang.c:724 +#: src/lang.c:726 #, c-format msgid "Post to newsgroup(s) [%s]> " msgstr "" -#: src/lang.c:725 +#: src/lang.c:727 #, fuzzy msgid "-- post processing started --" msgstr "Contabilizar" -#: src/lang.c:726 +#: src/lang.c:728 #, fuzzy msgid "-- post processing completed --" msgstr "Contabilizar" -#: src/lang.c:727 +#: src/lang.c:729 #, fuzzy, c-format msgid "Post subject [%s]> " msgstr "Asunto" -#: src/lang.c:728 +#: src/lang.c:730 msgid "" "# Summary of mailed/posted messages viewable by 'W' command from within " "tin.\n" msgstr "" -#: src/lang.c:729 +#: src/lang.c:731 #, fuzzy msgid "Posting article..." msgstr "Publicación Fallida" -#: src/lang.c:730 +#: src/lang.c:732 #, c-format msgid "Post postponed articles [%%s]? (%s/%s/%s/%s/%s): " msgstr "" -#: src/lang.c:731 +#: src/lang.c:733 #, fuzzy, c-format msgid "Hot %s" msgstr "¡Está caliente!" -#: src/lang.c:732 +#: src/lang.c:734 #, c-format msgid "Tagged %s" msgstr "" -#: src/lang.c:733 +#: src/lang.c:735 #, fuzzy, c-format msgid "Untagged %s" msgstr "[%d] Servidor no envía respuesta inetiquetada «%s» o preguntada" -#: src/lang.c:735 +#: src/lang.c:737 #, c-format msgid "Preparing for filtering on Path header (%d/%d)..." msgstr "" -#: src/lang.c:737 +#: src/lang.c:739 msgid "Processing mail messages marked for deletion." msgstr "" -#: src/lang.c:738 +#: src/lang.c:740 msgid "Processing saved articles marked for deletion." msgstr "" -#: src/lang.c:739 +#: src/lang.c:741 #, c-format msgid "Accept Followup-To? %s=post, %s=ignore, %s=quit: " msgstr "" -#: src/lang.c:740 +#: src/lang.c:742 msgid "Article unchanged, abort mailing?" msgstr "" -#: src/lang.c:741 +#: src/lang.c:743 #, c-format msgid "Do you want to see postponed articles (%d)?" msgstr "" -#: src/lang.c:743 +#: src/lang.c:745 msgid "Add quick kill filter?" msgstr "" -#: src/lang.c:744 +#: src/lang.c:746 msgid "Add quick selection filter?" msgstr "" -#: src/lang.c:745 +#: src/lang.c:747 #, fuzzy msgid "Do you really want to quit?" msgstr "¿Realmente quiere terminar MUIbase?" -#: src/lang.c:746 +#: src/lang.c:748 #, c-format msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%s]: " msgstr "" -#: src/lang.c:747 +#: src/lang.c:749 msgid "You have tagged articles in this group - quit anyway?" msgstr "" -#: src/lang.c:748 +#: src/lang.c:750 #, fuzzy, c-format msgid "%s=quit, %s=edit, %s=postpone: " msgstr "no se puede editar %s: es una terminal" -#: src/lang.c:749 +#: src/lang.c:751 #, c-format msgid "%s=quit %s=edit %s=save kill description: " msgstr "" -#: src/lang.c:750 +#: src/lang.c:752 #, c-format msgid "%s=quit %s=edit %s=save select description: " msgstr "" -#: src/lang.c:751 +#: src/lang.c:753 msgid "Do you really want to quit without saving your configuration?" msgstr "" -#: src/lang.c:754 +#: src/lang.c:756 msgid "Invalid range - valid are '0-9.$' eg. 1-$" msgstr "" -#: src/lang.c:756 +#: src/lang.c:757 #, fuzzy msgid "Do you want to abort this operation?" msgstr "¿Quiere realmente hacer eso?" -#: src/lang.c:757 +#: src/lang.c:758 msgid "Do you want to exit tin immediately?" msgstr "" @@ -4756,7 +4787,7 @@ msgid " -p port use port as NNTP port msgstr "" #: src/lang.c:1118 -msgid " -Q quick start. Same as -nqd" +msgid " -Q quick start. Same as -dnq" msgstr "" #: src/lang.c:1119 @@ -7967,22 +7998,28 @@ msgid "Insert 'X-Comment-To:' header" msgstr " cabecera mágica = %x\n" #. TODO: lang.c -#: src/main.c:817 +#: src/main.c:819 #, fuzzy msgid "reading from local spool" msgstr "error leyendo desde `%s'" -#: src/misc.c:3877 +#. TODO: != ENOENT ? and -> lang.c +#: src/misc.c:750 +#, c-format +msgid "Error: unlink %s" +msgstr "" + +#: src/misc.c:3928 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "" -#: src/misc.c:3880 +#: src/misc.c:3931 #, fuzzy, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "Regresar a la última publicación(es)" -#: src/newsrc.c:460 +#: src/newsrc.c:472 #, fuzzy msgid "Unreachable?\n" msgstr "estado %s no alcanzable desde %s" @@ -8022,19 +8059,19 @@ msgstr "" msgid "MOTD: " msgstr "" -#: src/nrctbl.c:178 +#: src/nrctbl.c:184 #, fuzzy, c-format msgid "couldn't expand %s\n" msgstr "Expandir" -#: src/post.c:1344 +#: src/post.c:1357 #, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" "encoding is neither set to %s nor to %s\n" msgstr "" -#: src/post.c:1349 +#: src/post.c:1362 #, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" @@ -8042,34 +8079,34 @@ msgid "" "posting doesn't contain any 8bit chars and thus folding won't happen\n" msgstr "" -#: src/post.c:1351 +#: src/post.c:1364 #, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" "encoding is not set to %s\n" msgstr "" -#: src/post.c:2325 +#: src/post.c:2353 #, fuzzy, c-format msgid "Posting: %.*s ..." msgstr "Publicación Fallida" -#: src/post.c:4075 +#: src/post.c:4119 msgid "Can't supersede in mailgroups, try repost instead." msgstr "" #. Check if okay to read -#: src/read.c:207 +#: src/read.c:204 #, fuzzy msgid "Aborting read, please wait..." msgstr "Enviando fichero por correo. Por favor espere..." -#: src/read.c:354 +#: src/read.c:351 #, fuzzy msgid "Aborted read\n" msgstr "Lectura abortada." -#: src/read.c:409 +#: src/read.c:406 msgid "Draining\n" msgstr "" @@ -8086,6 +8123,18 @@ msgid "[- Unavailable -]" msgstr "NO DISPONIBLE" #. +#. * Add the Message-ID headers to the cache, using the last Reference +#. * as the parent +#. +#. +#. * Add the References data to the cache +#. +#: src/refs.c:1015 src/refs.c:1077 +#, c-format +msgid "Building References-trees (%d/%d)..." +msgstr "" + +#. #. * preamble #. * TODO: -> lang.c #. @@ -8099,7 +8148,7 @@ msgid "" "\n" msgstr "" -#: src/save.c:1069 +#: src/save.c:1075 msgid "bytes" msgstr "bytes" Binary files tin-2.4.4/po/et.gmo and tin-2.4.5/po/et.gmo differ diff -Nurp '--exclude=.bzr*' tin-2.4.4/po/et.po tin-2.4.5/po/et.po --- tin-2.4.4/po/et.po 2019-12-24 10:55:08.000000000 +0100 +++ tin-2.4.5/po/et.po 2020-12-24 00:24:53.853885533 +0100 @@ -1,13 +1,13 @@ # Estonian translations for tin. # This file is distributed under the same license as the tin package. -# Toomas Soome , 2018. +# Toomas Soome , 2019. # msgid "" msgstr "" -"Project-Id-Version: tin 2.4.3\n" +"Project-Id-Version: tin 2.4.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 13:24+0100\n" -"PO-Revision-Date: 2018-12-25 10:47+0200\n" +"POT-Creation-Date: 2020-12-24 00:24+0100\n" +"PO-Revision-Date: 2019-12-25 12:29+0200\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" "Language: et\n" @@ -16,6 +16,30 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" +#. -> lang.c +#: src/art.c:418 +#, fuzzy, c-format +msgid "Reading %s\n" +msgstr "Loen %s uuesti..." + +#. TODO: -> lang.c +#: src/art.c:1205 +#, fuzzy +msgid "Threading by multipart" +msgstr "Järjestan artiklid teemade kaupa..." + +#. -> lang.c +#: src/art.c:2539 +#, fuzzy, c-format +msgid "Writing %s\n" +msgstr "Proovin %s" + +#. TODO: -> lang.c +#: src/art.c:2619 +#, fuzzy +msgid "Writing overview cache..." +msgstr "Kirjutan atribuutide faili..." + #: src/attrib.c:986 msgid "Processing attributes... " msgstr "Töötlen atribuute... " @@ -291,9 +315,9 @@ msgid "# quick_select_header=NUM\n" msgstr "# quick_select_header=NUM\n" #: src/attrib.c:1289 -#, fuzzy, c-format +#, c-format msgid "# quote_chars=STRING (%%I for initials)\n" -msgstr "# quote_chars=SÕNE (%%I annavad initsiaalid)\n" +msgstr "# quote_chars=SÕNE (%%I annab initsiaalid)\n" #: src/attrib.c:1291 #, c-format @@ -1475,8 +1499,8 @@ msgid "Error making backup of %s file. F msgstr "Failist %s ei õnnestu varukoopiat luua. Failisüsteem on täis?" #: src/lang.c:274 -#, c-format -msgid "Filtering global rules (%d/%d)..." +#, fuzzy, c-format +msgid "Filtering global rules (%d/%d) ('q' to quit)..." msgstr "Filtreerin globaalseid reegleid (%d/%d)..." #: src/lang.c:275 @@ -2203,8 +2227,9 @@ msgstr "vali teemad, kui on valitud väh msgid "select threads that match user specified pattern" msgstr "vali kasutaja määratud mustrile vastavad teemad" -#: src/lang.c:465 -msgid "tag all parts of current multipart-message in order" +#: src/lang.c:465 src/lang.c:521 +#, fuzzy +msgid "tag/untag all parts of current multipart-message in order" msgstr "märgi jooksva mitmeosalise teate kõik osad" #: src/lang.c:466 @@ -2420,7 +2445,7 @@ msgstr "märgi teema mitteloetuks" msgid "read chosen article" msgstr "loe valitud artiklit" -#: src/lang.c:521 +#: src/lang.c:522 msgid "" "Display properties\n" "------------------" @@ -2428,7 +2453,7 @@ msgstr "" "Ekraani omadused\n" "----------------" -#: src/lang.c:522 +#: src/lang.c:523 msgid "" "Miscellaneous\n" "-------------" @@ -2436,7 +2461,7 @@ msgstr "" "Muud\n" "----" -#: src/lang.c:523 +#: src/lang.c:524 msgid "" "Moving around\n" "-------------" @@ -2444,7 +2469,7 @@ msgstr "" "Liikumine\n" "---------" -#: src/lang.c:524 +#: src/lang.c:525 msgid "" "Group/thread/article operations\n" "-------------------------------" @@ -2452,7 +2477,7 @@ msgstr "" "Grupi/teema/artikli operatsioonid\n" "---------------------------------" -#: src/lang.c:525 +#: src/lang.c:526 msgid "" "Attachment operations\n" "---------------------" @@ -2460,7 +2485,7 @@ msgstr "" "Operatsioonid manustega\n" "-----------------------" -#: src/lang.c:526 +#: src/lang.c:527 msgid "" "Attribute operations\n" "--------------------" @@ -2468,7 +2493,7 @@ msgstr "" "Operatsioonid atribuutidega\n" "---------------------------" -#: src/lang.c:527 +#: src/lang.c:528 msgid "" "Option operations\n" "-----------------" @@ -2476,7 +2501,7 @@ msgstr "" "Operatsioonid seadetega\n" "-----------------------" -#: src/lang.c:528 +#: src/lang.c:529 msgid "" "Scope operations\n" "----------------" @@ -2484,7 +2509,7 @@ msgstr "" "Operatsioonid skoobiga\n" "----------------------" -#: src/lang.c:529 +#: src/lang.c:530 msgid "" "URL operations\n" "--------------" @@ -2492,90 +2517,95 @@ msgstr "" "Operatsioonid URL'idega\n" "-----------------------" -#: src/lang.c:530 +#: src/lang.c:531 msgid "choose first URL in list" msgstr "vali loetelust esimene URL" -#: src/lang.c:531 +#: src/lang.c:532 msgid "0 - 9\t choose URL by number" msgstr "0 - 9\t vali numbri järgi URL" -#: src/lang.c:532 +#: src/lang.c:533 msgid "choose last URL in list" msgstr "vali loetelust viimane URL" -#: src/lang.c:533 +#: src/lang.c:534 msgid "search for URLs forwards" msgstr "otsi URL'e edaspidi" -#: src/lang.c:534 +#: src/lang.c:535 msgid "search for URLs backwards" msgstr "otsi URL'e tagaspidi" -#: src/lang.c:535 +#: src/lang.c:536 msgid "Open URL in browser" msgstr "Ava URL brauseris" -#: src/lang.c:536 +#: src/lang.c:537 msgid "toggle info message in last line (URL)" msgstr "lülita viimase rea infoteadet (URL)" -#: src/lang.c:538 +#: src/lang.c:539 msgid "Group Level Commands" msgstr "Grupitaseme käsud" -#: src/lang.c:539 +#: src/lang.c:540 msgid "Kill filter added" msgstr "Surmamise filter lisatud" -#: src/lang.c:540 +#: src/lang.c:541 msgid "Auto-selection filter added" msgstr "Automaatse valiku filter lisatud" -#: src/lang.c:541 +#: src/lang.c:542 msgid "All parts tagged" msgstr "Kõik osad on märgitud" -#: src/lang.c:542 +#: src/lang.c:543 +#, fuzzy +msgid "All parts untagged" +msgstr "Kõik osad on märgitud" + +#: src/lang.c:544 msgid "Storing article for later posting" msgstr "Salvestan artikli hiljem postitamiseks" -#: src/lang.c:543 +#: src/lang.c:545 msgid "Please enter a valid character" msgstr "Palun sisestage lubatud sümbol" -#: src/lang.c:544 +#: src/lang.c:546 #, c-format msgid "Missing part #%d" msgstr "Puudub osa nr: %d" -#: src/lang.c:545 +#: src/lang.c:547 msgid "*** No postponed articles ***" msgstr "*** Postitusootel artikleid pole ***" -#: src/lang.c:546 +#: src/lang.c:548 msgid "Not a multi-part message" msgstr "Ei ole mitmeosaline teade" -#: src/lang.c:547 +#: src/lang.c:549 msgid "You are not subscribed to this group" msgstr "Te pole seda gruppi tellinud" -#: src/lang.c:548 +#: src/lang.c:550 msgid "No previous expression" msgstr "Eelmist avaldist pole" -#: src/lang.c:549 +#: src/lang.c:551 msgid "Operation disabled in no-overwrite mode" msgstr "Operatsioon on ülekirjutamist keelavas moodis keelatud" #. TODO: replace hard coded key-name in txt_info_postponed -#: src/lang.c:551 +#: src/lang.c:553 #, c-format msgid "%d postponed %s, reuse with ^O...\n" msgstr "%d ootel %s, kasutamiseks ^O...\n" -#: src/lang.c:552 +#: src/lang.c:554 msgid "" "X-Conversion-Note: multipart/alternative contents have been removed.\n" " To get the whole article, turn alternative handling OFF in the Option " @@ -2584,21 +2614,21 @@ msgstr "" "X-Conversion-Note: multipart/alternative sisu on eemaldatud.\n" " Et näha tervet artiklit, lülitage alternatiivide käsitlemine välja\n" -#: src/lang.c:554 +#: src/lang.c:556 #, c-format msgid "Save filename for %s/%s is a mailbox. Attachment not saved" msgstr "Fail %s/%s salvestamiseks on postkast. Lisa ei salvestatud" -#: src/lang.c:555 +#: src/lang.c:557 msgid "TeX2Iso encoded article" msgstr "TeX2Iso kodeeritud artikkel" -#: src/lang.c:556 +#: src/lang.c:558 msgid "incomplete " msgstr "mittetäielik " #. TODO: replace hard coded key-names -#: src/lang.c:558 +#: src/lang.c:560 #, c-format msgid "" "\n" @@ -2637,7 +2667,7 @@ msgid "" msgstr "" "\n" "See on %s, täisekraan teemadega Netnews lugeja. Uudiseid saab lugeda\n" -"lokaalselt (st /news) või üle võrgu (võti -r), kasutades NNTP\n" +"lokaalselt (st. /news) või üle võrgu (võti -r), kasutades NNTP\n" "(Network News Transport Protocol) serverit. Võti -h annab teile kasutata-\n" "vate võtmete loendi.\n" "\n" @@ -2659,151 +2689,151 @@ msgstr "" "Lisainfot leiate manualist, README, INSTALL, TODO ja FTP failidest.\n" "Palun saatke vearaportid/kommentaarid 'R' käsuga aadressil %s.\n" -#: src/lang.c:574 +#: src/lang.c:576 #, c-format msgid "Invalid From: %s line. Read the INSTALL file again." msgstr "Vigane From: %s rida. Lugege uuesti faili INSTALL." -#: src/lang.c:576 +#: src/lang.c:578 msgid "Invalid multibyte sequence found\n" msgstr "Leidsin vigase mitmebaidi järjendi\n" -#: src/lang.c:579 +#: src/lang.c:581 #, c-format msgid "Invalid Sender:-header %s" msgstr "Vigane Sender:-päis %s" -#: src/lang.c:581 +#: src/lang.c:583 msgid "Inverse video disabled" msgstr "Pööratud video keelatud" -#: src/lang.c:582 +#: src/lang.c:584 msgid "Inverse video enabled" msgstr "Pööratud video lubatud" -#: src/lang.c:584 +#: src/lang.c:586 #, c-format msgid "Missing definition for %s\n" msgstr "%s definitsioon puudub\n" -#: src/lang.c:585 +#: src/lang.c:587 #, c-format msgid "Invalid key definition '%s'\n" msgstr "Vigane klahvi definitsioon '%s'\n" -#: src/lang.c:586 +#: src/lang.c:588 #, c-format msgid "Invalid keyname '%s'\n" msgstr "Vigane klahvi nimi '%s'\n" -#: src/lang.c:587 +#: src/lang.c:589 #, c-format msgid "Keymap file was upgraded to version %s\n" msgstr "Keymap fail uuendati versioonini %s\n" -#: src/lang.c:588 +#: src/lang.c:590 #, c-format msgid "Kill From: [%s] (y/n): " msgstr "Surmake From: [%s] (j/e): " -#: src/lang.c:589 +#: src/lang.c:591 msgid "Kill Lines: (num): " msgstr "Surmake read: (num) : " -#: src/lang.c:590 +#: src/lang.c:592 msgid "Kill Article Menu" msgstr "Artuklite surmamise menüü" -#: src/lang.c:591 +#: src/lang.c:593 #, c-format msgid "Kill Msg-ID: [%s] (f/l/o/n): " msgstr "Surmake Msg-ID:[%s] (f/l/o/n): " -#: src/lang.c:592 +#: src/lang.c:594 msgid "Kill pattern scope : " msgstr "Surmamise mustri ulatus: " -#: src/lang.c:593 +#: src/lang.c:595 #, c-format msgid "Kill Subject: [%s] (y/n): " msgstr "Surmake teema: [%s] (j/e): " -#: src/lang.c:594 +#: src/lang.c:596 msgid "Kill text pattern : " msgstr "Surmake tekst mustriga : " -#: src/lang.c:595 +#: src/lang.c:597 msgid "Kill time in days : " msgstr "Surmamise aeg päevades : " -#: src/lang.c:597 +#: src/lang.c:599 msgid "Last" msgstr "Viimane" -#: src/lang.c:598 +#: src/lang.c:600 msgid "-- Last response --" msgstr "-- Viimane vastus --" -#: src/lang.c:599 +#: src/lang.c:601 #, c-format msgid "Lines %s " msgstr "Rida: %s " -#: src/lang.c:602 +#: src/lang.c:604 msgid "Function not available." msgstr "Funktsioon ei ole kasutatav." -#: src/lang.c:603 +#: src/lang.c:605 msgid "Not reading via NNTP." msgstr "Ei kasuta NNTP." -#: src/lang.c:604 +#: src/lang.c:606 #, c-format msgid "Group: %s" msgstr "Grupp: %s" -#: src/lang.c:605 +#: src/lang.c:607 #, c-format msgid "Groups: %s" msgstr "Grupid: %s" -#: src/lang.c:608 +#: src/lang.c:610 msgid "Mail" msgstr "E-post" -#: src/lang.c:609 +#: src/lang.c:611 msgid "mailbox " msgstr "postkasti " -#: src/lang.c:610 +#: src/lang.c:612 #, c-format msgid "Mail article(s) to [%.*s]> " msgstr "Saada artiklid aadressil [%.*s]> " -#: src/lang.c:611 +#: src/lang.c:613 #, c-format msgid "Mailing log to %s\n" msgstr "Saadan logi aadressil %s\n" -#: src/lang.c:612 +#: src/lang.c:614 msgid "Mail bug report..." msgstr "Saada vearaport..." -#: src/lang.c:613 +#: src/lang.c:615 #, c-format msgid "Mail BUG REPORT to %s?" msgstr "Saadan VEARAPORTI aadressil %s?" -#: src/lang.c:614 +#: src/lang.c:616 msgid "Mailed" msgstr "Saadetud" -#: src/lang.c:615 +#: src/lang.c:617 #, c-format msgid "Mailing to %s..." msgstr "Saadan aadressil %s..." -#: src/lang.c:616 +#: src/lang.c:618 msgid "" "# [Mail/Save] active file. Format is like news active file:\n" "# groupname max.artnum min.artnum /dir\n" @@ -2815,61 +2845,61 @@ msgstr "" "# Neljas väli on baaskataloog (näiteks ~/Mail või ~/News)\n" "#\n" -#: src/lang.c:619 +#: src/lang.c:621 #, c-format msgid "%s marked as read" msgstr "%s märgitud loetuks" -#: src/lang.c:620 +#: src/lang.c:622 #, c-format msgid "%s marked as unread" msgstr "%s märgitud mitteloetuks" -#: src/lang.c:621 +#: src/lang.c:623 #, c-format msgid "Marked %d of %d %s as read" msgstr "Märkisin %d (%d) %s loetuks" -#: src/lang.c:622 +#: src/lang.c:624 #, c-format msgid "Marked %d of %d %s as unread" msgstr "Märkisin %d (%d) %s mitteloetuks" -#: src/lang.c:623 src/lang.c:1352 +#: src/lang.c:625 src/lang.c:1352 msgid "Mark" msgstr "Märk" -#: src/lang.c:624 +#: src/lang.c:626 #, c-format msgid "Mark all articles as read%s?" msgstr "Märgin kõik artiklid loetuks%s?" -#: src/lang.c:625 +#: src/lang.c:627 #, c-format msgid "Mark article as read%s?" msgstr "Märgin artikli loetuks%s?" -#: src/lang.c:626 +#: src/lang.c:628 #, c-format msgid "Mark group %s as read?" msgstr "Märgin grupi %s loetuks?" -#: src/lang.c:627 +#: src/lang.c:629 #, c-format msgid "Mark thread as read%s?" msgstr "Märgin teema loetuks%s?" -#: src/lang.c:628 +#: src/lang.c:630 #, c-format msgid "Matching %s groups..." msgstr "Otsin %s gruppe..." -#: src/lang.c:629 src/lang.c:643 src/lang.c:649 +#: src/lang.c:631 src/lang.c:645 src/lang.c:651 #, c-format msgid "=set current to n; %s=line down; %s=line up; %s=help; %s=quit" msgstr "=jooksev n; %s=rida alla; %s=rida üles; %s=abiinfo; %s=välju" -#: src/lang.c:631 +#: src/lang.c:633 #, c-format msgid "" "%s=view; %s=pipe; %s=pipe raw; %s=save; %s=tag; %s=tag pattern; %s=untag all" @@ -2877,24 +2907,24 @@ msgstr "" "%s=vaata; %s=toru; %s=toru vormindamata; %s=salvesta; %s=märgi; %s=märgi " "muster %s=eemalda märk" -#: src/lang.c:633 +#: src/lang.c:635 #, c-format msgid "%s=view; %s=save; %s=tag; %s=tag pattern; %s=untag all" msgstr "%s=vaata; %s=salvesta; %s=märgi; %s=märgi muster; %s=eemalda märgid" -#: src/lang.c:635 +#: src/lang.c:637 #, c-format msgid "" "%s=reverse tagging; %s=search forwards; %s=search backwards; %s=repeat search" msgstr "" "%s=tagaspidi märgi; %s=otsi edaspidi; %s=otsi tagaspidi; %s=korda otsingut" -#: src/lang.c:636 src/lang.c:640 +#: src/lang.c:638 src/lang.c:642 #, c-format msgid "=set current to n; %s=next unread; %s=search pattern; %s=kill/select" msgstr "=n jooksvaks grupiks; %s=järgmine lugemata; %s=otsi; %s=surma/vali;" -#: src/lang.c:637 +#: src/lang.c:639 #, c-format msgid "" "%s=author search; %s=catchup; %s=line down; %s=line up; %s=mark read; " @@ -2903,266 +2933,266 @@ msgstr "" "%s=autori otsing; %s=loetud; %s=rida alla; %s=rida üles; %s=märgi loetuks; " "%s=teema" -#: src/lang.c:638 +#: src/lang.c:640 #, c-format msgid "%s=line up; %s=line down; %s=page up; %s=page down; %s=top; %s=bottom" msgstr "%s=rida üles; %s=rida alla; %s=lk. üles; %s=lk. alla; %s=üles; %s=alla" -#: src/lang.c:639 +#: src/lang.c:641 #, c-format msgid "%s=search forwards; %s=search backwards; %s=quit" msgstr "%s=otsi edaspidi; %s=otsi tagaspidi; %s=välju" -#: src/lang.c:641 +#: src/lang.c:643 #, c-format msgid "%s=author search; %s=body search; %s=catchup; %s=followup; %s=mark read" msgstr "%s=autori otsing; %s=otsi sisu; %s=loetud; %s=vasta; %s=märgi loetuks" -#: src/lang.c:642 +#: src/lang.c:644 #, c-format msgid "%s=add; %s=move; %s=rename; %s=delete" msgstr "%s=lisa; %s=liiguta; %s=uus nimi; %s=kustuta" -#: src/lang.c:644 +#: src/lang.c:646 #, c-format msgid "=set current to n; %s=next unread; %s,%s=search pattern; %s=catchup" msgstr "=n jooksvaks grupiks; %s=järgmine lugemata; %s,%s=otsi; %s=loetud" -#: src/lang.c:645 +#: src/lang.c:647 #, c-format msgid "" "%s=line down; %s=line up; %s=help; %s=move; %s=quit; %s=toggle all/unread" msgstr "" "%s=rida alla; %s=rida üles; %s=appi; %s=tõsta; %s=välju; %s=kõik/lugemata" -#: src/lang.c:646 +#: src/lang.c:648 #, c-format msgid "" "%s=subscribe; %s=sub pattern; %s=unsubscribe; %s=unsub pattern; %s=yank in/" "out" msgstr "%s=telli; %s=telli muster; %s=loobu; %s=loobu muster; %s=kõik/tellitud" -#: src/lang.c:647 +#: src/lang.c:649 #, c-format msgid "=set current to n; %s=next unread; %s=catchup; %s=display toggle" msgstr "=jooksev n; %s=järgmine lugemata; %s=loetud; %s=ekraani lülit" -#: src/lang.c:648 +#: src/lang.c:650 #, c-format msgid "%s=help; %s=line down; %s=line up; %s=quit; %s=tag; %s=mark unread" msgstr "%s=appi; %s=rida alla; %s=rida üles; %s=välju; %s=märgi; %s=lugemata" -#: src/lang.c:650 +#: src/lang.c:652 #, c-format msgid "%s=search forwards; %s=search backwards; %s=repeat search" msgstr "%s=otsi edaspidi; %s=otsi tagaspidi; %s=korda otsingut" -#: src/lang.c:651 +#: src/lang.c:653 msgid "--More--" msgstr "--Veel--" -#: src/lang.c:652 +#: src/lang.c:654 #, c-format msgid "Moving %s..." msgstr "Tõstan %s..." -#: src/lang.c:653 +#: src/lang.c:655 msgid "Message-ID: & last Reference " msgstr "Message-ID: & viimane viitamine " -#: src/lang.c:654 +#: src/lang.c:656 msgid "Message-ID: line " msgstr "Message-ID: rida " -#: src/lang.c:655 +#: src/lang.c:657 msgid "Message-ID: & References: line" msgstr "Message-ID: & References: rida" -#: src/lang.c:657 +#: src/lang.c:659 msgid ", name: " msgstr ", nimi: " -#: src/lang.c:658 +#: src/lang.c:660 #, c-format msgid "Go to newsgroup [%s]> " msgstr "Mine gruppi [%s]> " -#: src/lang.c:659 +#: src/lang.c:661 msgid "newsgroups" msgstr "gruppidesse" -#: src/lang.c:660 +#: src/lang.c:662 #, c-format msgid "Position %s in group list (1,2,..,$) [%d]> " msgstr "Positsioon %s gruppide nimistus (1,2,..,$) [%d]> " -#: src/lang.c:661 +#: src/lang.c:663 msgid "newsgroup" msgstr "gruppi" -#: src/lang.c:662 +#: src/lang.c:664 msgid "Try and save newsrc file again?" msgstr "Proovin newsrc faili uuesti salvestada?" -#: src/lang.c:663 +#: src/lang.c:665 msgid "Warning: No newsgroups were written to your newsrc file. Save aborted." msgstr "" "Hoiatus: Teie newsrc faili ei salvestatud ühtegi gruppi. Katkestasin " "salvestamise." -#: src/lang.c:664 +#: src/lang.c:666 msgid "newsrc file saved successfully.\n" msgstr "newsrc fail on edukalt salvestatud.\n" -#: src/lang.c:665 +#: src/lang.c:667 msgid "-- Next response --" msgstr "- Järgmine vastus -" -#: src/lang.c:666 +#: src/lang.c:668 msgid "No " msgstr "Ei " -#: src/lang.c:667 +#: src/lang.c:669 msgid "*** No articles ***" msgstr "*** Artikleid pole ***" -#: src/lang.c:668 +#: src/lang.c:670 msgid "No articles have been posted" msgstr "Postitatud artikleid pole" -#: src/lang.c:669 +#: src/lang.c:671 msgid "*** No attachments ***" msgstr "*** Manuseid pole ***" -#: src/lang.c:670 +#: src/lang.c:672 msgid "*** No description ***" msgstr "*** Kirjeldus puudub ***" -#: src/lang.c:671 +#: src/lang.c:673 msgid "No filename" msgstr "Failil pole nime" -#: src/lang.c:672 +#: src/lang.c:674 msgid "No group" msgstr "Gruppi pole" -#: src/lang.c:673 +#: src/lang.c:675 msgid "*** No groups ***" msgstr "*** Gruppe pole ***" -#: src/lang.c:674 +#: src/lang.c:676 msgid "No more groups to read" msgstr "Lugemiseks rohkem gruppe pole" -#: src/lang.c:675 +#: src/lang.c:677 msgid "No last message" msgstr "Viimast teadet pole" -#: src/lang.c:676 +#: src/lang.c:678 msgid "No mail address" msgstr "E-posti aadressi pole" -#: src/lang.c:677 +#: src/lang.c:679 msgid "No articles marked for saving" msgstr "Salvestamiseks märgitud artikleid pole" -#: src/lang.c:678 +#: src/lang.c:680 msgid "No match" msgstr "Ei leia" -#: src/lang.c:679 +#: src/lang.c:681 msgid "No more groups" msgstr "Rohkem gruppe pole" -#: src/lang.c:680 +#: src/lang.c:682 msgid "No newsgroups" msgstr "Gruppe pole" -#: src/lang.c:681 +#: src/lang.c:683 msgid "No next unread article" msgstr "Järgmist lugemata artiklit pole" -#: src/lang.c:682 +#: src/lang.c:684 msgid "No previous group" msgstr "Eelmist gruppi pole" -#: src/lang.c:683 +#: src/lang.c:685 msgid "No previous search, nothing to repeat" msgstr "Eelmist otsingut pole, ei saa korrata" -#: src/lang.c:684 +#: src/lang.c:686 msgid "No previous unread article" msgstr "Eelmist lugemata artiklit pole" -#: src/lang.c:685 +#: src/lang.c:687 msgid "No responses" msgstr "Vastuseid pole" -#: src/lang.c:686 +#: src/lang.c:688 msgid "No responses to list in current thread" msgstr "Jooksvas teemas pole vastuseid" -#: src/lang.c:687 +#: src/lang.c:689 msgid "*** No scopes ***" msgstr "*** Skoope pole ***" -#: src/lang.c:688 +#: src/lang.c:690 msgid "No search string" msgstr "Otsingusõne puudub" -#: src/lang.c:689 +#: src/lang.c:691 msgid "No subject" msgstr "Teema puudub" -#: src/lang.c:691 +#: src/lang.c:693 #, c-format msgid "%s: Terminal must have clear to end-of-line (ce)\n" msgstr "%s: Terminalil peab olema puhasta realõpuni (ce) omadus\n" -#: src/lang.c:692 +#: src/lang.c:694 #, c-format msgid "%s: Terminal must have clear to end-of-screen (cd)\n" msgstr "%s: Terminalil peab olema puhasta ekraanilõpuni (cd) omadus\n" -#: src/lang.c:693 +#: src/lang.c:695 #, c-format msgid "%s: Terminal must have clearscreen (cl) capability\n" msgstr "%s: Terminalil peab olema ekraanipuhastamise (cl) omadus\n" -#: src/lang.c:694 +#: src/lang.c:696 #, c-format msgid "%s: Terminal must have cursor motion (cm)\n" msgstr "%s: Terminal peab toetama kursori liigutamist (cm)\n" -#: src/lang.c:695 +#: src/lang.c:697 #, c-format msgid "%s: TERM variable must be set to use screen capabilities\n" msgstr "" "%s: ekraani omaduste kasutamiseks peab olema seatud keskkonnamuutuja TERM\n" -#: src/lang.c:697 +#: src/lang.c:699 #, c-format msgid "No viewer found for %s/%s\n" msgstr "%s/%s jaoks puudub vaatur\n" -#: src/lang.c:698 +#: src/lang.c:700 msgid "Newsgroup does not exist on this server" msgstr "Gruppi pole sellel serveril" -#: src/lang.c:699 +#: src/lang.c:701 #, c-format msgid "Group %s not found in active file" msgstr "Gruppi %s pole aktiivsete gruppide failis" -#: src/lang.c:700 +#: src/lang.c:702 msgid "c)reate it, use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "c=loo fail, a)lternatiivne nimi, d=vaikimisi .newsrc, q=välju: " -#: src/lang.c:701 +#: src/lang.c:703 msgid "use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "a)lternatiivne nimi, d=vaikimisi .newsrc, q=välju: " -#: src/lang.c:702 +#: src/lang.c:704 #, c-format msgid "" "# NNTP-server -> newsrc translation table and NNTP-server\n" @@ -3191,44 +3221,44 @@ msgstr "" "# news.example.org /tmp/nrc-ex example ex\n" "#\n" -#: src/lang.c:709 +#: src/lang.c:711 msgid "Only" msgstr "Ainult" -#: src/lang.c:710 +#: src/lang.c:712 #, c-format msgid "Option not enabled. Recompile with %s." msgstr "Võti pole lubatud. Kasutage kompileerimisel %s." -#: src/lang.c:711 +#: src/lang.c:713 msgid "Options Menu" msgstr "Omaduste menüü" -#: src/lang.c:712 +#: src/lang.c:714 msgid "Options Menu Commands" msgstr "Omaduste menüü käsud" -#: src/lang.c:715 +#: src/lang.c:717 #, c-format msgid "Error in regex: %s at pos. %d '%s'" msgstr "Viga regulaaravaldises: %s positsioonil %d '%s'" -#: src/lang.c:716 +#: src/lang.c:718 #, c-format msgid "Error in regex: pcre internal error %d" msgstr "Viga regulaaravaldises: pcre sisemine viga %d" -#: src/lang.c:717 +#: src/lang.c:719 #, c-format msgid "Error in regex: study - pcre internal error %s" msgstr "Viga regulaaravaldises: uurimiseks - pcre sisemine viga %s" -#: src/lang.c:718 +#: src/lang.c:720 msgid "Post a followup..." msgstr "Postita vastus..." #. TODO: replace hard coded key-name in txt_post_error_ask_postpone -#: src/lang.c:720 +#: src/lang.c:722 msgid "" "An error has occurred while posting the article. If you think that this\n" "error is temporary or otherwise correctable, you can postpone the article\n" @@ -3238,134 +3268,134 @@ msgstr "" "või muul viisil kõrvaldatav, võite artikli salvestada hiljem postitamiseks\n" "ja ^O käsuga hiljem postitada.\n" -#: src/lang.c:723 +#: src/lang.c:725 msgid "Posted articles history" msgstr "Postitatud artiklite ajalugu" -#: src/lang.c:724 +#: src/lang.c:726 #, c-format msgid "Post to newsgroup(s) [%s]> " msgstr "Postita gruppidesse [%s]> " -#: src/lang.c:725 +#: src/lang.c:727 msgid "-- post processing started --" msgstr "-- lõpptöötlus alustas --" -#: src/lang.c:726 +#: src/lang.c:728 msgid "-- post processing completed --" msgstr "-- lõpptöötlus lõpetas --" -#: src/lang.c:727 +#: src/lang.c:729 #, c-format msgid "Post subject [%s]> " msgstr "Postituse teema [%s]> " -#: src/lang.c:728 +#: src/lang.c:730 msgid "" "# Summary of mailed/posted messages viewable by 'W' command from within " "tin.\n" msgstr "# Kokkuvõtte saadetud/postitatud teadetest saate tinis 'W' käsuga.\n" -#: src/lang.c:729 +#: src/lang.c:731 msgid "Posting article..." msgstr "Postitan artiklit..." -#: src/lang.c:730 +#: src/lang.c:732 #, c-format msgid "Post postponed articles [%%s]? (%s/%s/%s/%s/%s): " msgstr "Postitan ootel artiklid [%%s]? (%s/%s/%s/%s/%s): " -#: src/lang.c:731 +#: src/lang.c:733 #, c-format msgid "Hot %s" msgstr "Kuum %s" -#: src/lang.c:732 +#: src/lang.c:734 #, c-format msgid "Tagged %s" msgstr "Märgitud %s" -#: src/lang.c:733 +#: src/lang.c:735 #, c-format msgid "Untagged %s" msgstr "Märkimata %s" -#: src/lang.c:735 +#: src/lang.c:737 #, c-format msgid "Preparing for filtering on Path header (%d/%d)..." msgstr "Valmistun filtreerima Path päist (%d/%d)..." -#: src/lang.c:737 +#: src/lang.c:739 msgid "Processing mail messages marked for deletion." msgstr "Töötlen kirju, mis on kustutamiseks märgitud." -#: src/lang.c:738 +#: src/lang.c:740 msgid "Processing saved articles marked for deletion." msgstr "Töötlen salvestatud ja kustutamiseks märgitud artikleid." -#: src/lang.c:739 +#: src/lang.c:741 #, c-format msgid "Accept Followup-To? %s=post, %s=ignore, %s=quit: " msgstr "Aktsepteerin Followup-To? %s=postita, %s=ignoreeri, %s=välju: " -#: src/lang.c:740 +#: src/lang.c:742 msgid "Article unchanged, abort mailing?" msgstr "Artiklit ei ole muudetud, katkestan saatmise?" -#: src/lang.c:741 +#: src/lang.c:743 #, c-format msgid "Do you want to see postponed articles (%d)?" msgstr "Kas soovite näha postitamisootel artikleid (%d)?" -#: src/lang.c:743 +#: src/lang.c:745 msgid "Add quick kill filter?" msgstr "Lisan kiirsurmamise filtri?" -#: src/lang.c:744 +#: src/lang.c:746 msgid "Add quick selection filter?" msgstr "Lisan kiirvaliku filtri?" -#: src/lang.c:745 +#: src/lang.c:747 msgid "Do you really want to quit?" msgstr "Kas te tõesti soovite väljuda?" -#: src/lang.c:746 +#: src/lang.c:748 #, c-format msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%s]: " msgstr "%s=toimeta katkestamisteadet, %s=välju, %s=kustuta (katkesta) [%%s]: " -#: src/lang.c:747 +#: src/lang.c:749 msgid "You have tagged articles in this group - quit anyway?" msgstr "Teil on siin grupis märgitud artikleid - väljun siiski?" -#: src/lang.c:748 +#: src/lang.c:750 #, c-format msgid "%s=quit, %s=edit, %s=postpone: " msgstr "%s=välju, %s=toimeta, %s=ootele: " -#: src/lang.c:749 +#: src/lang.c:751 #, c-format msgid "%s=quit %s=edit %s=save kill description: " msgstr "%s=välju %s=toimeta %s=salvesta surmamise kirjeldus: " -#: src/lang.c:750 +#: src/lang.c:752 #, c-format msgid "%s=quit %s=edit %s=save select description: " msgstr "%s=välju %s=toimeta %s=salvesta valiku kirjeldus: " -#: src/lang.c:751 +#: src/lang.c:753 msgid "Do you really want to quit without saving your configuration?" msgstr "Kas te tõesti soovite seadeid salvestamata väljuda?" -#: src/lang.c:754 +#: src/lang.c:756 msgid "Invalid range - valid are '0-9.$' eg. 1-$" msgstr "Vigane vahemik - lubatud on '0-9.$' näiteks 1-$" -#: src/lang.c:756 +#: src/lang.c:757 msgid "Do you want to abort this operation?" msgstr "Kas soovite seda operatsiooni katkestada?" -#: src/lang.c:757 +#: src/lang.c:758 msgid "Do you want to exit tin immediately?" msgstr "Kas soovite viivitamata tinist väljuda?" @@ -4721,8 +4751,8 @@ msgid " -p port use port as NNTP port msgstr " -p port kasuta NNTP porti [vaikimisi=%d]" #: src/lang.c:1118 -msgid " -Q quick start. Same as -nqd" -msgstr " -Q kiirstart. Sama kui -nqd" +msgid " -Q quick start. Same as -dnq" +msgstr " -Q kiirstart. Sama kui -dnq" #: src/lang.c:1119 msgid " -r read news remotely from default NNTP server" @@ -6485,7 +6515,6 @@ msgid "Which actions require confirmatio msgstr "Tegevused mis nõuavad kinnitust" #: src/lang.c:2084 -#, fuzzy msgid "" "# What should we ask confirmation for.\n" "# Possible values are (the default is marked with *):\n" @@ -6498,14 +6527,16 @@ msgid "" "# 6 = quit & select\n" "# 7 = commands & quit & select\n" msgstr "" -"# Artiklite teemadesse jagamine\n" +"# Mida me peaksime kinnitama.\n" "# Võimalikud väärtused on (vaikeväärtuse tähis on *):\n" -"# 0 = ei jaga\n" -"# 1 = Teema\n" -"# 2 = Viited\n" -"# * 3 = Mõlemad (Teema ja Viited)\n" -"# 4 = Mitmeosaline teema\n" -"# 5 = Protsentuaalne sobivus\n" +"# 0 = ei kinnita\n" +"# 1 = käsud\n" +"# 2 = valik\n" +"# 3 = väljumine\n" +"# * 4 = käsud ja väljumine\n" +"# 5 = käsud ja valik\n" +"# 6 = väljumine ja valik\n" +"# 7 = käsud, väljumine ja valik\n" #: src/lang.c:2098 msgid "'Mark as (un)read' ignores tags" @@ -7163,7 +7194,6 @@ msgid "# If ON add signature to reposted msgstr "# Kui väärtus on ON, lisa uuestipostitatud artiklile signatuur\n" #: src/lang.c:2467 -#, fuzzy msgid "Enter quotation marks, %I for author's initials." msgstr "Sisestage tsitaadimärgid, %I annab autori initsiaalid." @@ -7172,7 +7202,6 @@ msgid "Characters used as quote-marks" msgstr "Tsiteerimise märgid" #: src/lang.c:2469 -#, fuzzy msgid "" "# Characters used in quoting to followups and replies.\n" "# '_' is replaced by ' ', %I is replaced by author's initials.\n" @@ -8192,21 +8221,27 @@ msgid "Insert 'X-Comment-To:' header" msgstr "Sisestage 'X-Comment-To:' päis" #. TODO: lang.c -#: src/main.c:817 +#: src/main.c:819 msgid "reading from local spool" msgstr "loen lokaalsest spool kataloogist" -#: src/misc.c:3877 +#. TODO: != ENOENT ? and -> lang.c +#: src/misc.c:750 +#, c-format +msgid "Error: unlink %s" +msgstr "" + +#: src/misc.c:3928 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "Versioon: %s %s väljalase %s (\"%s\") %s %s\n" -#: src/misc.c:3880 +#: src/misc.c:3931 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "Versioon: %s %s väljalase %s (\"%s\")\n" -#: src/newsrc.c:460 +#: src/newsrc.c:472 msgid "Unreachable?\n" msgstr "Kättesaamatu?\n" @@ -8245,12 +8280,12 @@ msgstr "CAPABILITIES ei sisalda READER" msgid "MOTD: " msgstr "MOTD: " -#: src/nrctbl.c:178 +#: src/nrctbl.c:184 #, c-format msgid "couldn't expand %s\n" msgstr "ei saa laiendada %s\n" -#: src/post.c:1344 +#: src/post.c:1357 #, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" @@ -8259,7 +8294,7 @@ msgstr "" "Rida %d on pikem, kui %d sümbolit ja tuleks poolitada, aga kodeering\n" "pole ei %s ega %s\n" -#: src/post.c:1349 +#: src/post.c:1362 #, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" @@ -8270,7 +8305,7 @@ msgstr "" "on %s ja MIME_BREAK_LONG_LINES pole seatud või postitamine ei sisalda\n" "8 bitiseid sümboleid ja seetõttu poolitamist ei toimu\n" -#: src/post.c:1351 +#: src/post.c:1364 #, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" @@ -8279,25 +8314,25 @@ msgstr "" "Rida %d on pikem, kui %d sümbolit ja tuleks poolitada, aga kodeering\n" "pole %s\n" -#: src/post.c:2325 +#: src/post.c:2353 #, c-format msgid "Posting: %.*s ..." msgstr "Postitan: %.*s ..." -#: src/post.c:4075 +#: src/post.c:4119 msgid "Can't supersede in mailgroups, try repost instead." -msgstr "" +msgstr "e-posti gruppides ei saa asendada, proovide uuesti postitada." #. Check if okay to read -#: src/read.c:207 +#: src/read.c:204 msgid "Aborting read, please wait..." msgstr "Katkestan lugemise, palun oodake..." -#: src/read.c:354 +#: src/read.c:351 msgid "Aborted read\n" msgstr "Katkestatud lugemine\n" -#: src/read.c:409 +#: src/read.c:406 msgid "Draining\n" msgstr "Tühjendan\n" @@ -8310,6 +8345,18 @@ msgid "[- Unavailable -]" msgstr "[- Pole kasutatav -]" #. +#. * Add the Message-ID headers to the cache, using the last Reference +#. * as the parent +#. +#. +#. * Add the References data to the cache +#. +#: src/refs.c:1015 src/refs.c:1077 +#, c-format +msgid "Building References-trees (%d/%d)..." +msgstr "" + +#. #. * preamble #. * TODO: -> lang.c #. @@ -8327,7 +8374,7 @@ msgstr "" "vormingut kasutama ja järgnev tekst võib olla kummaline.\n" "\n" -#: src/save.c:1069 +#: src/save.c:1075 msgid "bytes" msgstr "baiti" @@ -8394,6 +8441,3 @@ msgstr "Slrnface lõpetas veaga, kood %d #, c-format msgid "Slrnface failed: %s." msgstr "Slrnface ebaõnnestus: %s." - -#~ msgid "# What should we ask confirmation for.\n" -#~ msgstr "# Millele me peaksime küsima kinnitust.\n" Binary files tin-2.4.4/po/fr.gmo and tin-2.4.5/po/fr.gmo differ diff -Nurp '--exclude=.bzr*' tin-2.4.4/po/fr.po tin-2.4.5/po/fr.po --- tin-2.4.4/po/fr.po 2019-12-24 10:55:09.000000000 +0100 +++ tin-2.4.5/po/fr.po 2020-12-24 00:24:53.965889912 +0100 @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: tin-2.4.2\n" +"Project-Id-Version: tin-2.4.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 13:24+0100\n" -"PO-Revision-Date: 2018-11-16 14:30+0100\n" +"POT-Creation-Date: 2020-12-24 00:24+0100\n" +"PO-Revision-Date: 2019-12-31 00:41+0100\n" "Last-Translator: Matt Anton \n" "Language-Team: French \n" "Language: fr\n" @@ -15,9 +15,33 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -"X-Generator: Poedit 2.0.6\n" +"X-Generator: Poedit 2.2\n" "X-Poedit-SourceCharset: UTF-8\n" +#. -> lang.c +#: src/art.c:418 +#, fuzzy, c-format +msgid "Reading %s\n" +msgstr "Relecture de %s..." + +#. TODO: -> lang.c +#: src/art.c:1205 +#, fuzzy +msgid "Threading by multipart" +msgstr "Regroupement des articles..." + +#. -> lang.c +#: src/art.c:2539 +#, fuzzy, c-format +msgid "Writing %s\n" +msgstr "Essai %s" + +#. TODO: -> lang.c +#: src/art.c:2619 +#, fuzzy +msgid "Writing overview cache..." +msgstr "Écriture du fichier attributes..." + #: src/attrib.c:986 msgid "Processing attributes... " msgstr "Traitement du fichier attributes... " @@ -292,7 +316,7 @@ msgid "# quick_select_header=NUM\n" msgstr "# quick_select_header=NUM\n" #: src/attrib.c:1289 -#, fuzzy, c-format +#, c-format msgid "# quote_chars=STRING (%%I for initials)\n" msgstr "# quote_chars=TERME (%%I pour les initiales)\n" @@ -704,7 +728,7 @@ msgstr "%d sur %d pièces-jointes enregi #: src/lang.c:89 msgid "Select attachment> " -msgstr "Sélectionner la pièce-jointe >" +msgstr "Sélectionner la pièce-jointe > " #: src/lang.c:90 msgid "Tagged attachment" @@ -1488,8 +1512,8 @@ msgid "Error making backup of %s file. F msgstr "Erreur lors de la sauvegarde du fichier %s. Disque plein ?" #: src/lang.c:274 -#, c-format -msgid "Filtering global rules (%d/%d)..." +#, fuzzy, c-format +msgid "Filtering global rules (%d/%d) ('q' to quit)..." msgstr "Filtrage selon les règles globales (%d/%d)..." #: src/lang.c:275 @@ -1525,7 +1549,6 @@ msgid "-- end of forwarded message --\n" msgstr "-- fin du message redirigé --\n" #: src/lang.c:281 -#, fuzzy msgid "" "# Format:\n" "# comment=STRING Optional. Multiple lines allowed. Comments must be " @@ -1567,7 +1590,8 @@ msgstr "" "# valide pour un commentaire !\n" "# group=TERME Obligatoire. Liste de groupe (pe. fr.comp.*,!" "*sources*).\n" -"# case=NUM Obligatoire. Casse sensible=0 / casse insensible=1.\n" +"# case=NUM Obligatoire. Casse sensible=0 / casse insensible=1 " +"lors du filtrage.\n" "# score=NUM|TERME Obligatoire. Score à attribuer. Soit :\n" "# score=NUM Un numéro (pe. 70). Ou :\n" "# score=TERME Un des deux mots-clé suivants : 'hot' ou 'kill'.\n" @@ -2225,8 +2249,9 @@ msgstr "sél. les fils si au moins un ar msgid "select threads that match user specified pattern" msgstr "sélectionner les fils qui correspondent au critère choisi" -#: src/lang.c:465 -msgid "tag all parts of current multipart-message in order" +#: src/lang.c:465 src/lang.c:521 +#, fuzzy +msgid "tag/untag all parts of current multipart-message in order" msgstr "marquer dans l'ordre toutes parties du message multiparties" #: src/lang.c:466 @@ -2442,7 +2467,7 @@ msgstr "marquer le fil actuel comme non msgid "read chosen article" msgstr "lire l'article choisi" -#: src/lang.c:521 +#: src/lang.c:522 msgid "" "Display properties\n" "------------------" @@ -2450,7 +2475,7 @@ msgstr "" "Propriétés de l'affichage\n" "-------------------------" -#: src/lang.c:522 +#: src/lang.c:523 msgid "" "Miscellaneous\n" "-------------" @@ -2458,7 +2483,7 @@ msgstr "" "Divers\n" "------" -#: src/lang.c:523 +#: src/lang.c:524 msgid "" "Moving around\n" "-------------" @@ -2466,7 +2491,7 @@ msgstr "" "Navigation\n" "----------" -#: src/lang.c:524 +#: src/lang.c:525 msgid "" "Group/thread/article operations\n" "-------------------------------" @@ -2474,7 +2499,7 @@ msgstr "" "Opérations sur les Groupes / fils / articles\n" "--------------------------------------------" -#: src/lang.c:525 +#: src/lang.c:526 msgid "" "Attachment operations\n" "---------------------" @@ -2482,7 +2507,7 @@ msgstr "" "Opérations sur les pièces-jointes\n" "---------------------------------" -#: src/lang.c:526 +#: src/lang.c:527 msgid "" "Attribute operations\n" "--------------------" @@ -2490,7 +2515,7 @@ msgstr "" "Opérations sur les attributs\n" "----------------------------" -#: src/lang.c:527 +#: src/lang.c:528 msgid "" "Option operations\n" "-----------------" @@ -2498,7 +2523,7 @@ msgstr "" "Options des opérations\n" "----------------------" -#: src/lang.c:528 +#: src/lang.c:529 msgid "" "Scope operations\n" "----------------" @@ -2506,7 +2531,7 @@ msgstr "" "Opérations sur les sélections\n" "-----------------------------" -#: src/lang.c:529 +#: src/lang.c:530 msgid "" "URL operations\n" "--------------" @@ -2514,90 +2539,95 @@ msgstr "" "Opérations sur les URL\n" "----------------------" -#: src/lang.c:530 +#: src/lang.c:531 msgid "choose first URL in list" msgstr "choisir la première URL de la liste" -#: src/lang.c:531 +#: src/lang.c:532 msgid "0 - 9\t choose URL by number" msgstr "0 - 9\t choisir l'URL par son numéro" -#: src/lang.c:532 +#: src/lang.c:533 msgid "choose last URL in list" msgstr "choisir la dernière URL de la liste" -#: src/lang.c:533 +#: src/lang.c:534 msgid "search for URLs forwards" msgstr "recherche avant des URLs" -#: src/lang.c:534 +#: src/lang.c:535 msgid "search for URLs backwards" msgstr "recherche arrière des URLs" -#: src/lang.c:535 +#: src/lang.c:536 msgid "Open URL in browser" msgstr "Ouvrir l'URL dans le navigateur" -#: src/lang.c:536 +#: src/lang.c:537 msgid "toggle info message in last line (URL)" msgstr "(dés)activer le message d'info. dans la dernière ligne (URL)" -#: src/lang.c:538 +#: src/lang.c:539 msgid "Group Level Commands" msgstr "Commandes du niveau Groupe" -#: src/lang.c:539 +#: src/lang.c:540 msgid "Kill filter added" msgstr "Filtre ajouté" -#: src/lang.c:540 +#: src/lang.c:541 msgid "Auto-selection filter added" msgstr "Filtre à auto-sélection ajouté" -#: src/lang.c:541 +#: src/lang.c:542 msgid "All parts tagged" msgstr "Toutes les parties sont marquées" -#: src/lang.c:542 +#: src/lang.c:543 +#, fuzzy +msgid "All parts untagged" +msgstr "Toutes les parties sont marquées" + +#: src/lang.c:544 msgid "Storing article for later posting" msgstr "Stockage de l'article afin de le poster plus tard" -#: src/lang.c:543 +#: src/lang.c:545 msgid "Please enter a valid character" msgstr "Entrez un caractère valide svp" -#: src/lang.c:544 +#: src/lang.c:546 #, c-format msgid "Missing part #%d" msgstr "Partie manquante #%d" -#: src/lang.c:545 +#: src/lang.c:547 msgid "*** No postponed articles ***" msgstr "*** Aucun brouillon ***" -#: src/lang.c:546 +#: src/lang.c:548 msgid "Not a multi-part message" msgstr "N'est pas un message en plusieurs parties" -#: src/lang.c:547 +#: src/lang.c:549 msgid "You are not subscribed to this group" msgstr "Vous n'êtes pas abonné à ce groupe" -#: src/lang.c:548 +#: src/lang.c:550 msgid "No previous expression" msgstr "Pas d'expression précédente" -#: src/lang.c:549 +#: src/lang.c:551 msgid "Operation disabled in no-overwrite mode" msgstr "Opération désactivée en mode lecture" #. TODO: replace hard coded key-name in txt_info_postponed -#: src/lang.c:551 +#: src/lang.c:553 #, c-format msgid "%d postponed %s, reuse with ^O...\n" msgstr "%d %s brouillon(s), réutilisez-le(s) avec ^O...\n" -#: src/lang.c:552 +#: src/lang.c:554 msgid "" "X-Conversion-Note: multipart/alternative contents have been removed.\n" " To get the whole article, turn alternative handling OFF in the Option " @@ -2608,21 +2638,21 @@ msgstr "" "dans\n" " le Menu Option.\n" -#: src/lang.c:554 +#: src/lang.c:556 #, c-format msgid "Save filename for %s/%s is a mailbox. Attachment not saved" msgstr "Enregistrer le fichier sous %s %s est une bàl. PJ non enregistrée" -#: src/lang.c:555 +#: src/lang.c:557 msgid "TeX2Iso encoded article" msgstr "Article encodé en TeX2Iso" -#: src/lang.c:556 +#: src/lang.c:558 msgid "incomplete " msgstr "incomplet " #. TODO: replace hard coded key-names -#: src/lang.c:558 +#: src/lang.c:560 #, c-format msgid "" "\n" @@ -2692,151 +2722,151 @@ msgstr "" "plaît\n" "un rapport de bogue/commentaires à %s via la touche 'R'.\n" -#: src/lang.c:574 +#: src/lang.c:576 #, c-format msgid "Invalid From: %s line. Read the INSTALL file again." msgstr "En-tête From: %s invalide. Lisez le fichier INSTALL une 2e fois." -#: src/lang.c:576 +#: src/lang.c:578 msgid "Invalid multibyte sequence found\n" msgstr "Séquence multibyte invalide trouvée\n" -#: src/lang.c:579 +#: src/lang.c:581 #, c-format msgid "Invalid Sender:-header %s" msgstr "En-tête Sender: %s invalide" -#: src/lang.c:581 +#: src/lang.c:583 msgid "Inverse video disabled" msgstr "Vidéo inversée désactivée" -#: src/lang.c:582 +#: src/lang.c:584 msgid "Inverse video enabled" msgstr "Vidéo inversée activée" -#: src/lang.c:584 +#: src/lang.c:586 #, c-format msgid "Missing definition for %s\n" msgstr "Définition manquante pour %s\n" -#: src/lang.c:585 +#: src/lang.c:587 #, c-format msgid "Invalid key definition '%s'\n" msgstr "Définition de clé invalide '%s'\n" -#: src/lang.c:586 +#: src/lang.c:588 #, c-format msgid "Invalid keyname '%s'\n" msgstr "Nom de clé invalide '%s'\n" -#: src/lang.c:587 +#: src/lang.c:589 #, c-format msgid "Keymap file was upgraded to version %s\n" msgstr "Le fichier keymap a été mis à jour en version %s\n" -#: src/lang.c:588 +#: src/lang.c:590 #, c-format msgid "Kill From: [%s] (y/n): " msgstr " De : [%s] (o/n) : " -#: src/lang.c:589 +#: src/lang.c:591 msgid "Kill Lines: (num): " msgstr "Nombre de lignes (num) : " -#: src/lang.c:590 +#: src/lang.c:592 msgid "Kill Article Menu" msgstr "Créer un filtre" -#: src/lang.c:591 +#: src/lang.c:593 #, c-format msgid "Kill Msg-ID: [%s] (f/l/o/n): " -msgstr " MID : [%s] (t/d/a/n) : " +msgstr "Filtrer par Msg-ID : [%s] (t/d/a/n) : " -#: src/lang.c:592 +#: src/lang.c:594 msgid "Kill pattern scope : " msgstr "Filtre s'appliquant à : " -#: src/lang.c:593 +#: src/lang.c:595 #, c-format msgid "Kill Subject: [%s] (y/n): " msgstr "Sujet : [%s] (o/n) : " -#: src/lang.c:594 +#: src/lang.c:596 msgid "Kill text pattern : " msgstr "Texte à filtrer : " -#: src/lang.c:595 +#: src/lang.c:597 msgid "Kill time in days : " msgstr "Durée du filtre : " -#: src/lang.c:597 +#: src/lang.c:599 msgid "Last" msgstr "Dernier" -#: src/lang.c:598 +#: src/lang.c:600 msgid "-- Last response --" msgstr "-- Dernière réponse --" -#: src/lang.c:599 +#: src/lang.c:601 #, c-format msgid "Lines %s " msgstr "%s lignes " -#: src/lang.c:602 +#: src/lang.c:604 msgid "Function not available." msgstr "Fonction indisponible." -#: src/lang.c:603 +#: src/lang.c:605 msgid "Not reading via NNTP." msgstr "Pas de lecture depuis NNTP." -#: src/lang.c:604 +#: src/lang.c:606 #, c-format msgid "Group: %s" msgstr "Groupe : %s" -#: src/lang.c:605 +#: src/lang.c:607 #, c-format msgid "Groups: %s" msgstr "Groupes : %s" -#: src/lang.c:608 +#: src/lang.c:610 msgid "Mail" msgstr "Envoyer" -#: src/lang.c:609 +#: src/lang.c:611 msgid "mailbox " msgstr "bàl" -#: src/lang.c:610 +#: src/lang.c:612 #, c-format msgid "Mail article(s) to [%.*s]> " msgstr "Envoyer article(s) à [%.*s] > " -#: src/lang.c:611 +#: src/lang.c:613 #, c-format msgid "Mailing log to %s\n" msgstr "Envoi de l'historique à %s\n" -#: src/lang.c:612 +#: src/lang.c:614 msgid "Mail bug report..." msgstr "Envoi d'un rapport de bogue..." -#: src/lang.c:613 +#: src/lang.c:615 #, c-format msgid "Mail BUG REPORT to %s?" msgstr "Signaler le BOGUE à %s ?" -#: src/lang.c:614 +#: src/lang.c:616 msgid "Mailed" msgstr "Envoyé" -#: src/lang.c:615 +#: src/lang.c:617 #, c-format msgid "Mailing to %s..." msgstr "Envoi à %s..." -#: src/lang.c:616 +#: src/lang.c:618 msgid "" "# [Mail/Save] active file. Format is like news active file:\n" "# groupname max.artnum min.artnum /dir\n" @@ -2849,61 +2879,61 @@ msgstr "" "# Le 4ème champ est le répertoire racine utilisé\n" "# (p.e. ~/Mail ou ~/News)\n" -#: src/lang.c:619 +#: src/lang.c:621 #, c-format msgid "%s marked as read" msgstr "%s marqué comme lu" -#: src/lang.c:620 +#: src/lang.c:622 #, c-format msgid "%s marked as unread" msgstr "%s marqué comme non lu" -#: src/lang.c:621 +#: src/lang.c:623 #, c-format msgid "Marked %d of %d %s as read" msgstr "%d sur %d %s marqué(s) comme lu(s)" -#: src/lang.c:622 +#: src/lang.c:624 #, c-format msgid "Marked %d of %d %s as unread" msgstr "%d sur %d %s marqué(s) comme non lu(s)" -#: src/lang.c:623 src/lang.c:1352 +#: src/lang.c:625 src/lang.c:1352 msgid "Mark" msgstr "Marque" -#: src/lang.c:624 +#: src/lang.c:626 #, c-format msgid "Mark all articles as read%s?" msgstr "Marquer tous les articles comme lus%s ?" -#: src/lang.c:625 +#: src/lang.c:627 #, c-format msgid "Mark article as read%s?" msgstr "Marquer l'article comme lu%s ?" -#: src/lang.c:626 +#: src/lang.c:628 #, c-format msgid "Mark group %s as read?" msgstr "Marquer le groupe %s comme lu ?" -#: src/lang.c:627 +#: src/lang.c:629 #, c-format msgid "Mark thread as read%s?" msgstr "Marquer le fil comme lu%s ?" -#: src/lang.c:628 +#: src/lang.c:630 #, c-format msgid "Matching %s groups..." msgstr "%s groupes correspondants..." -#: src/lang.c:629 src/lang.c:643 src/lang.c:649 +#: src/lang.c:631 src/lang.c:645 src/lang.c:651 #, c-format msgid "=set current to n; %s=line down; %s=line up; %s=help; %s=quit" msgstr "=mettre l'actuel à n; %s=descendre; %s=monter; %s=aide; %s=quitter" -#: src/lang.c:631 +#: src/lang.c:633 #, c-format msgid "" "%s=view; %s=pipe; %s=pipe raw; %s=save; %s=tag; %s=tag pattern; %s=untag all" @@ -2911,13 +2941,13 @@ msgstr "" "%s=voir; %s=passer; %s=passer la source; %s=enregistrer; %s=marquer; " "%s=marquer sélection; %s=tout démarquer" -#: src/lang.c:633 +#: src/lang.c:635 #, c-format msgid "%s=view; %s=save; %s=tag; %s=tag pattern; %s=untag all" msgstr "" "%s=voir; %s=enregistrer; %s=marquer; %s=marquer sélection; %s=tout démarquer" -#: src/lang.c:635 +#: src/lang.c:637 #, c-format msgid "" "%s=reverse tagging; %s=search forwards; %s=search backwards; %s=repeat search" @@ -2925,12 +2955,12 @@ msgstr "" "%s=(dés)activer le marquage; %s=recherche avant; %s=recherche arrière; " "%s=répéter la recherche" -#: src/lang.c:636 src/lang.c:640 +#: src/lang.c:638 src/lang.c:642 #, c-format msgid "=set current to n; %s=next unread; %s=search pattern; %s=kill/select" msgstr "=voir 'n'; %s=non lu suivant; %s=rechercher; %s=filtrer/sél." -#: src/lang.c:637 +#: src/lang.c:639 #, c-format msgid "" "%s=author search; %s=catchup; %s=line down; %s=line up; %s=mark read; " @@ -2938,39 +2968,39 @@ msgid "" msgstr "" "%s=rech. auteur; %s=tout lu; %s=bas; %s=haut; %s=marquer lu; %s=voir fil" -#: src/lang.c:638 +#: src/lang.c:640 #, c-format msgid "%s=line up; %s=line down; %s=page up; %s=page down; %s=top; %s=bottom" msgstr "%s=haut; %s=bas; %s=haut de page; %s=bas de page; %s=haut; %s=bas" -#: src/lang.c:639 +#: src/lang.c:641 #, c-format msgid "%s=search forwards; %s=search backwards; %s=quit" msgstr "%s=recherche avant; %s=recherche arrière; %s=quitter" -#: src/lang.c:641 +#: src/lang.c:643 #, c-format msgid "%s=author search; %s=body search; %s=catchup; %s=followup; %s=mark read" msgstr "" "%s=rech. auteur; %s=rech. corps; %s=tout marquer lu; %s=suivi; %s=marquer lu" -#: src/lang.c:642 +#: src/lang.c:644 #, c-format msgid "%s=add; %s=move; %s=rename; %s=delete" msgstr "%s=ajouter; %s=déplacer; %s=renommer; %s=effacer" -#: src/lang.c:644 +#: src/lang.c:646 #, c-format msgid "=set current to n; %s=next unread; %s,%s=search pattern; %s=catchup" msgstr "=voir 'n'; %s=non lu suivant; %s,%s=rechercher; %s=tout lu" -#: src/lang.c:645 +#: src/lang.c:647 #, c-format msgid "" "%s=line down; %s=line up; %s=help; %s=move; %s=quit; %s=toggle all/unread" msgstr "%s=bas; %s=haut; %s=aide; %s=déplacer; %s=quitter; %s=voir lu/non lu" -#: src/lang.c:646 +#: src/lang.c:648 #, c-format msgid "" "%s=subscribe; %s=sub pattern; %s=unsubscribe; %s=unsub pattern; %s=yank in/" @@ -2978,227 +3008,227 @@ msgid "" msgstr "" "%s=abonner; %s=sous-critère; %s=désabonner; %s=critère; %s=liste des groupes" -#: src/lang.c:647 +#: src/lang.c:649 #, c-format msgid "=set current to n; %s=next unread; %s=catchup; %s=display toggle" msgstr "=voir 'n'; %s=non lu suivant; %s=tout lu; %s=basculer l'affichage" -#: src/lang.c:648 +#: src/lang.c:650 #, c-format msgid "%s=help; %s=line down; %s=line up; %s=quit; %s=tag; %s=mark unread" msgstr "%s=aide; %s=bas; %s=haut; %s=quitter; %s=marquer; %s=marquer non lu" -#: src/lang.c:650 +#: src/lang.c:652 #, c-format msgid "%s=search forwards; %s=search backwards; %s=repeat search" msgstr "%s=recherche avant; %s=recherche arrière; %s=répéter la recherche" -#: src/lang.c:651 +#: src/lang.c:653 msgid "--More--" msgstr "-- Suite --" -#: src/lang.c:652 +#: src/lang.c:654 #, c-format msgid "Moving %s..." msgstr "Déplacement de %s..." -#: src/lang.c:653 +#: src/lang.c:655 msgid "Message-ID: & last Reference " msgstr "l'en-tête 'Message-ID:' & dernière Référence " -#: src/lang.c:654 +#: src/lang.c:656 msgid "Message-ID: line " msgstr "l'en-tête 'Message-ID:'" -#: src/lang.c:655 +#: src/lang.c:657 msgid "Message-ID: & References: line" msgstr "l'en-tête 'Message-ID:' & 'References:'" -#: src/lang.c:657 +#: src/lang.c:659 msgid ", name: " msgstr ", nom : " -#: src/lang.c:658 +#: src/lang.c:660 #, c-format msgid "Go to newsgroup [%s]> " msgstr "Aller dans le groupe [%s]> " -#: src/lang.c:659 +#: src/lang.c:661 msgid "newsgroups" msgstr "groupes" -#: src/lang.c:660 +#: src/lang.c:662 #, c-format msgid "Position %s in group list (1,2,..,$) [%d]> " msgstr "Placer %s dans la liste des groupes (1,2,..,$) [%d]> " -#: src/lang.c:661 +#: src/lang.c:663 msgid "newsgroup" msgstr "groupe" -#: src/lang.c:662 +#: src/lang.c:664 msgid "Try and save newsrc file again?" msgstr "Encore essayer et enregistrer le newsrc ?" -#: src/lang.c:663 +#: src/lang.c:665 msgid "Warning: No newsgroups were written to your newsrc file. Save aborted." msgstr "" "Attention : Aucuns groupes n'a été écrits dans le newsrc. Enregistrement " "annulé." -#: src/lang.c:664 +#: src/lang.c:666 msgid "newsrc file saved successfully.\n" msgstr "le newsrc a été enregistré avec succès.\n" -#: src/lang.c:665 +#: src/lang.c:667 msgid "-- Next response --" msgstr "-- Réponse suivante --" -#: src/lang.c:666 +#: src/lang.c:668 msgid "No " msgstr "Non " -#: src/lang.c:667 +#: src/lang.c:669 msgid "*** No articles ***" msgstr "*** Aucun article ***" -#: src/lang.c:668 +#: src/lang.c:670 msgid "No articles have been posted" msgstr "Aucun article n'a été posté" -#: src/lang.c:669 +#: src/lang.c:671 msgid "*** No attachments ***" msgstr "*** Pas de pièces-jointes ***" -#: src/lang.c:670 +#: src/lang.c:672 msgid "*** No description ***" msgstr "*** Aucune description ***" -#: src/lang.c:671 +#: src/lang.c:673 msgid "No filename" msgstr "Pas de nom de fichier" -#: src/lang.c:672 +#: src/lang.c:674 msgid "No group" msgstr "Pas de groupe" -#: src/lang.c:673 +#: src/lang.c:675 msgid "*** No groups ***" msgstr "*** Aucun groupe ***" -#: src/lang.c:674 +#: src/lang.c:676 msgid "No more groups to read" msgstr "Plus de groupes à lire" -#: src/lang.c:675 +#: src/lang.c:677 msgid "No last message" msgstr "Aucun dernier message" -#: src/lang.c:676 +#: src/lang.c:678 msgid "No mail address" msgstr "Aucune adresse email" -#: src/lang.c:677 +#: src/lang.c:679 msgid "No articles marked for saving" msgstr "Aucun article marqué à enregistrer" -#: src/lang.c:678 +#: src/lang.c:680 msgid "No match" msgstr "Aucun résultat" -#: src/lang.c:679 +#: src/lang.c:681 msgid "No more groups" msgstr "Plus de groupes" -#: src/lang.c:680 +#: src/lang.c:682 msgid "No newsgroups" msgstr "Aucun groupe" -#: src/lang.c:681 +#: src/lang.c:683 msgid "No next unread article" msgstr "Aucun article non lu suivant" -#: src/lang.c:682 +#: src/lang.c:684 msgid "No previous group" msgstr "Aucun groupe précédent" -#: src/lang.c:683 +#: src/lang.c:685 msgid "No previous search, nothing to repeat" msgstr "Aucune recherche précédente, rien à répéter" -#: src/lang.c:684 +#: src/lang.c:686 msgid "No previous unread article" msgstr "Aucun article non lu précédent" -#: src/lang.c:685 +#: src/lang.c:687 msgid "No responses" msgstr "Aucune réponse" -#: src/lang.c:686 +#: src/lang.c:688 msgid "No responses to list in current thread" msgstr "Aucune réponse à afficher dans le fil actuel" -#: src/lang.c:687 +#: src/lang.c:689 msgid "*** No scopes ***" msgstr "*** Aucune sélection ***" -#: src/lang.c:688 +#: src/lang.c:690 msgid "No search string" msgstr "Aucun terme à rechercher" -#: src/lang.c:689 +#: src/lang.c:691 msgid "No subject" msgstr "Aucun sujet" -#: src/lang.c:691 +#: src/lang.c:693 #, c-format msgid "%s: Terminal must have clear to end-of-line (ce)\n" msgstr "%s: Terminal doit avoir la fonction clear to end-of-line (ce)\n" -#: src/lang.c:692 +#: src/lang.c:694 #, c-format msgid "%s: Terminal must have clear to end-of-screen (cd)\n" msgstr "%s: Terminal doit avoir la fonction clear to end-of-screen (cd)\n" -#: src/lang.c:693 +#: src/lang.c:695 #, c-format msgid "%s: Terminal must have clearscreen (cl) capability\n" msgstr "%s: Terminal doit avoir la fonction clearscreen (cl)\n" -#: src/lang.c:694 +#: src/lang.c:696 #, c-format msgid "%s: Terminal must have cursor motion (cm)\n" msgstr "%s: Terminal doit avoir la fonction cursor motion (cm)\n" -#: src/lang.c:695 +#: src/lang.c:697 #, c-format msgid "%s: TERM variable must be set to use screen capabilities\n" msgstr "%s: la variable TERM doit être utilisée pour utiliser les fonctions\n" -#: src/lang.c:697 +#: src/lang.c:699 #, c-format msgid "No viewer found for %s/%s\n" msgstr "Visualiseur introuvable pour %s/%s\n" -#: src/lang.c:698 +#: src/lang.c:700 msgid "Newsgroup does not exist on this server" msgstr "Groupe inexistant sur ce serveur" -#: src/lang.c:699 +#: src/lang.c:701 #, c-format msgid "Group %s not found in active file" msgstr "Groupe %s introuvable dans le fichier active" -#: src/lang.c:700 +#: src/lang.c:702 msgid "c)reate it, use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "" "c)réer, utiliser a)utre nom, utiliser .newsrc par d)éfaut, q)uitter tin : " -#: src/lang.c:701 +#: src/lang.c:703 msgid "use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "utiliser a)utre nom, utiliser .newsrc par d)éfaut, q)uitter tin : " -#: src/lang.c:702 +#: src/lang.c:704 #, c-format msgid "" "# NNTP-server -> newsrc translation table and NNTP-server\n" @@ -3228,44 +3258,44 @@ msgstr "" "# news.ka.nu /tmp/nrc-nu kanu nu\n" "#\n" -#: src/lang.c:709 +#: src/lang.c:711 msgid "Only" msgstr "Actuel" -#: src/lang.c:710 +#: src/lang.c:712 #, c-format msgid "Option not enabled. Recompile with %s." msgstr "Option non activée. Recompilez avec %s." -#: src/lang.c:711 +#: src/lang.c:713 msgid "Options Menu" msgstr "Menu Options" -#: src/lang.c:712 +#: src/lang.c:714 msgid "Options Menu Commands" msgstr "Menu Options" -#: src/lang.c:715 +#: src/lang.c:717 #, c-format msgid "Error in regex: %s at pos. %d '%s'" msgstr "Erreur dans la regex : %s à %d '%s'" -#: src/lang.c:716 +#: src/lang.c:718 #, c-format msgid "Error in regex: pcre internal error %d" msgstr "Erreur dans la regex : erreur pcre interne %d" -#: src/lang.c:717 +#: src/lang.c:719 #, c-format msgid "Error in regex: study - pcre internal error %s" msgstr "Erreur dans la regex : study - erreur pcre interne %s" -#: src/lang.c:718 +#: src/lang.c:720 msgid "Post a followup..." msgstr "Postage du suivi..." #. TODO: replace hard coded key-name in txt_post_error_ask_postpone -#: src/lang.c:720 +#: src/lang.c:722 msgid "" "An error has occurred while posting the article. If you think that this\n" "error is temporary or otherwise correctable, you can postpone the article\n" @@ -3276,29 +3306,29 @@ msgstr "" "l'article comme brouillon et le réutiliser plus tard grâce à la commande " "^O.\n" -#: src/lang.c:723 +#: src/lang.c:725 msgid "Posted articles history" msgstr "Historique des articles postés" -#: src/lang.c:724 +#: src/lang.c:726 #, c-format msgid "Post to newsgroup(s) [%s]> " msgstr "Poster dans groupe(s) [%s]> " -#: src/lang.c:725 +#: src/lang.c:727 msgid "-- post processing started --" msgstr "-- post-traitement lancé --" -#: src/lang.c:726 +#: src/lang.c:728 msgid "-- post processing completed --" msgstr "-- post-traitement terminé --" -#: src/lang.c:727 +#: src/lang.c:729 #, c-format msgid "Post subject [%s]> " msgstr "Poster le sujet [%s] > " -#: src/lang.c:728 +#: src/lang.c:730 msgid "" "# Summary of mailed/posted messages viewable by 'W' command from within " "tin.\n" @@ -3306,107 +3336,107 @@ msgstr "" "# Sommaire des messages envoyés/postés visible par la commande 'W' depuis " "tin.\n" -#: src/lang.c:729 +#: src/lang.c:731 msgid "Posting article..." msgstr "Postage de l'article..." -#: src/lang.c:730 +#: src/lang.c:732 #, c-format msgid "Post postponed articles [%%s]? (%s/%s/%s/%s/%s): " msgstr "Poster les brouillons [%%s] ? (%s/%s/%s/%s/%s) : " -#: src/lang.c:731 +#: src/lang.c:733 #, c-format msgid "Hot %s" msgstr "%s sélectionné" -#: src/lang.c:732 +#: src/lang.c:734 #, c-format msgid "Tagged %s" msgstr "%s marqué" -#: src/lang.c:733 +#: src/lang.c:735 #, c-format msgid "Untagged %s" msgstr "%s non marqué" -#: src/lang.c:735 +#: src/lang.c:737 #, c-format msgid "Preparing for filtering on Path header (%d/%d)..." -msgstr "" +msgstr "Préparation pour filtrer d’après l’en-tête ‘Path’ (%d/%d)…" -#: src/lang.c:737 +#: src/lang.c:739 msgid "Processing mail messages marked for deletion." msgstr "Traitement des emails enregistrés marqués pour effacement." -#: src/lang.c:738 +#: src/lang.c:740 msgid "Processing saved articles marked for deletion." msgstr "Traitement des articles enregistrés marqués pour effacement." -#: src/lang.c:739 +#: src/lang.c:741 #, c-format msgid "Accept Followup-To? %s=post, %s=ignore, %s=quit: " msgstr "Accepter le Suivi ? %s=poster, %s=ignorer, %s=quitter : " -#: src/lang.c:740 +#: src/lang.c:742 msgid "Article unchanged, abort mailing?" msgstr "Article inchangé, annuler l'envoi ?" -#: src/lang.c:741 +#: src/lang.c:743 #, c-format msgid "Do you want to see postponed articles (%d)?" msgstr "Voulez-vous voir les brouillons (%d) ?" -#: src/lang.c:743 +#: src/lang.c:745 msgid "Add quick kill filter?" msgstr "Ajouter rapidement un filtre ?" -#: src/lang.c:744 +#: src/lang.c:746 msgid "Add quick selection filter?" msgstr "Ajouter rapidement une règle ?" -#: src/lang.c:745 +#: src/lang.c:747 msgid "Do you really want to quit?" msgstr "Voulez-vous réellement quitter ?" -#: src/lang.c:746 +#: src/lang.c:748 #, c-format msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%s]: " msgstr "" "%s=éditer message d'annulation, %s=quitter, %s=effacer (annuler) [%%s] : " -#: src/lang.c:747 +#: src/lang.c:749 msgid "You have tagged articles in this group - quit anyway?" msgstr "Vous avez des articles marqués dans ce groupe - quitter quand même ?" -#: src/lang.c:748 +#: src/lang.c:750 #, c-format msgid "%s=quit, %s=edit, %s=postpone: " msgstr "%s=quitter, %s=éditer, %s=brouillon : " -#: src/lang.c:749 +#: src/lang.c:751 #, c-format msgid "%s=quit %s=edit %s=save kill description: " msgstr "%s=quitter, %s=éditer, %s=enregistrer le filtre : " -#: src/lang.c:750 +#: src/lang.c:752 #, c-format msgid "%s=quit %s=edit %s=save select description: " msgstr "%s=quitter %s=éditer %s=enregistrer la règle : " -#: src/lang.c:751 +#: src/lang.c:753 msgid "Do you really want to quit without saving your configuration?" msgstr "Voulez-vous réellement quitter sans enregistrer votre configuration ?" -#: src/lang.c:754 +#: src/lang.c:756 msgid "Invalid range - valid are '0-9.$' eg. 1-$" msgstr "Champ invalide - '0-9.$' pe. 1-$ est valide" -#: src/lang.c:756 +#: src/lang.c:757 msgid "Do you want to abort this operation?" msgstr "Voulez-vous annuler cette opération ?" -#: src/lang.c:757 +#: src/lang.c:758 msgid "Do you want to exit tin immediately?" msgstr "Voulez-vous quitter tin immédiatement ?" @@ -3536,7 +3566,7 @@ msgstr "Créer une règle" #: src/lang.c:791 #, c-format msgid "Select Msg-ID [%s] (f/l/o/n): " -msgstr " MID : [%s] (t/d/a/n) : " +msgstr "Sélection par Msg-ID : [%s] (t/d/a/n) : " #: src/lang.c:792 msgid "Select pattern scope: " @@ -3667,11 +3697,11 @@ msgstr "Effacer la sélection ?" #: src/lang.c:823 msgid "Enter scope> " -msgstr "Entrez la sélection >" +msgstr "Entrez la sélection > " #: src/lang.c:824 msgid "Select new position> " -msgstr "Sélection de la nouvelle position >" +msgstr "Sélection de la nouvelle position > " #: src/lang.c:825 msgid "New position cannot be a global scope" @@ -3683,7 +3713,7 @@ msgstr "Opération interdite, sélection #: src/lang.c:827 msgid "Rename scope> " -msgstr "Renommer la sélection" +msgstr "Renommer la sélection " #: src/lang.c:828 msgid "Select scope> " @@ -3971,7 +4001,7 @@ msgstr "" #: src/lang.c:903 msgid "unread " -msgstr "non lu" +msgstr "non lu " #: src/lang.c:904 #, c-format @@ -4158,9 +4188,9 @@ msgid "%s only useful for batch mode ope msgstr "%s utile seulement pour opérations en tâche de fond\n" #: src/lang.c:943 -#, fuzzy, c-format +#, c-format msgid "%s only useful for batch or debug mode operations\n" -msgstr "%s utile seulement pour opérations en tâche de fond ou débogage\n" +msgstr "%s utile seulement pour opérations en tâche de fond ou de débogage\n" #: src/lang.c:944 #, c-format @@ -4775,8 +4805,8 @@ msgid " -p port use port as NNTP port msgstr " -p port utiliser port comme port NNTP [défaut=%d]" #: src/lang.c:1118 -msgid " -Q quick start. Same as -nqd" -msgstr " -Q démarrage rapide. Idem que -npd" +msgid " -Q quick start. Same as -dnq" +msgstr " -Q démarrage rapide. Idem que -dnq" #: src/lang.c:1119 msgid " -r read news remotely from default NNTP server" @@ -5379,7 +5409,7 @@ msgstr "Regrouper et effacer les derniè #: src/lang.c:1435 msgid "Compact mltpl., skip lead. & trai." -msgstr "Regrouper puis effacer les premières et dernières" +msgstr "Regrouper puis effacer les 1ères et dernières lignes" #: src/lang.c:1464 msgid "Shell archive" @@ -5528,7 +5558,7 @@ msgstr "NFD" #: src/lang.c:1581 msgid "NFKC case fold" -msgstr "" +msgstr "Transformation NFKC de la casse" #: src/lang.c:1590 msgid "Display Options" @@ -5996,7 +6026,7 @@ msgstr "" #: src/lang.c:1828 msgid "Character to show selected articles" -msgstr "Caractère pour articles sélect." +msgstr "Caractère pour articles sélectionnés" #: src/lang.c:1829 msgid "" @@ -6263,7 +6293,7 @@ msgstr "" #: src/lang.c:1937 msgid "Skip multipart/alternative parts" -msgstr "Ignorer parties multipart/alter." +msgstr "Ignorer parties multipart/alternatives" #: src/lang.c:1938 msgid "# If ON strip multipart/alternative messages automatically\n" @@ -6310,7 +6340,7 @@ msgstr "" #: src/lang.c:1958 msgid "Regex used to show twice quoted l." -msgstr "Regex pour afficher le 2nd niveau" +msgstr "Regex pour afficher le 2nd niveau." #: src/lang.c:1959 msgid "" @@ -6553,8 +6583,9 @@ msgid "" "blank\n" "# for no automatic viewing\n" msgstr "" -"# Utilisation du visualisateur MIME inclus pour les parties non textuelles\n" -"# si l'option '--internal' est utilisée.\n" +"# Si l’option '--internal’ est utilisée utiliser le visualiseur MIME inclus " +"pour\n" +"# les parties non textuelles.\n" "# Sinon, spécifiez un logiciel externe (pe. metamail) ou laissez ce champ\n" "# vide pour ne pas activer la prévisualisation automatique.\n" @@ -6607,7 +6638,6 @@ msgid "Which actions require confirmatio msgstr "Quelles actions requièrent confirmation" #: src/lang.c:2084 -#, fuzzy msgid "" "# What should we ask confirmation for.\n" "# Possible values are (the default is marked with *):\n" @@ -6620,14 +6650,16 @@ msgid "" "# 6 = quit & select\n" "# 7 = commands & quit & select\n" msgstr "" -"# Regrouper les articles par...\n" -"# Les valeurs possibles sont (celle par défaut est marquée par *) :\n" +"# Demander confirmation pour.\n" +"# Les valeurs possibles sont (valeur par défaut marquée par *):\n" "# 0 = aucun\n" -"# 1 = Sujet\n" -"# 2 = References\n" -"# * 3 = Les deux (Sujet et References)\n" -"# 4 = Sujet multipartie\n" -"# 5 = Pourcentage de concordance\n" +"# 1 = commandes\n" +"# 2 = sélection\n" +"# 3 = quitter\n" +"# * 4 = commandes & quitter\n" +"# 5 = commandes & sélection\n" +"# 6 = quitter et sélection\n" +"# 7 = commandes & quitter & sélection\n" #: src/lang.c:2098 msgid "'Mark as (un)read' ignores tags" @@ -6912,7 +6944,7 @@ msgstr "" #: src/lang.c:2256 msgid "Color of =>3 times quoted line" -msgstr "Couleur de citation de 3e niveau ou sup." +msgstr "Couleur de citation de 3e niveau ou supérieur" #: src/lang.c:2257 msgid "" @@ -7296,23 +7328,20 @@ msgid "# If ON add signature to reposted msgstr "# Si ON, rajoute la signature aux articles repostés\n" #: src/lang.c:2467 -#, fuzzy msgid "Enter quotation marks, %I for author's initials." -msgstr "Caractère de citation, %I pour les initiales de l'auteur." +msgstr "Caractère de citation, %I correspond aux initiales de l’auteur." #: src/lang.c:2468 msgid "Characters used as quote-marks" msgstr "Caractère de citation" #: src/lang.c:2469 -#, fuzzy msgid "" "# Characters used in quoting to followups and replies.\n" "# '_' is replaced by ' ', %I is replaced by author's initials.\n" msgstr "" -"# Caractères utilisés pour les citations.\n" -"# '_' est remplacé par ' ', %I est remplacé par les intiales\n" -"# de l'auteur auquel vous répondez.\n" +"# Caractères utilisés pour les citations et les réponses.\n" +"# '_' est remplacé par ' ', %I est remplacé par les intiales de l’auteur.\n" #: src/lang.c:2475 msgid "Quoting behavior" @@ -8355,21 +8384,27 @@ msgid "Insert 'X-Comment-To:' header" msgstr "Insérer l'en-tête 'X-Comment-To:'" #. TODO: lang.c -#: src/main.c:817 +#: src/main.c:819 msgid "reading from local spool" msgstr "lecture depuis le spool local" -#: src/misc.c:3877 +#. TODO: != ENOENT ? and -> lang.c +#: src/misc.c:750 +#, c-format +msgid "Error: unlink %s" +msgstr "" + +#: src/misc.c:3928 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "Version : %s %s release %s (\"%s\") %s %s\n" -#: src/misc.c:3880 +#: src/misc.c:3931 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "Version : %s %s release %s (\"%s\")\n" -#: src/newsrc.c:460 +#: src/newsrc.c:472 msgid "Unreachable?\n" msgstr "Inacessible ?\n" @@ -8408,12 +8443,12 @@ msgstr "CAPABILITIES n'a pas annoncé RE msgid "MOTD: " msgstr "MOTD: " -#: src/nrctbl.c:178 +#: src/nrctbl.c:184 #, c-format msgid "couldn't expand %s\n" msgstr "impossible de décompacter %s\n" -#: src/post.c:1344 +#: src/post.c:1357 #, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" @@ -8422,7 +8457,7 @@ msgstr "" "La ligne %d est plus longue que %d octets et devrait être réduite, mais\n" "l'encodage n'est ni %s ni %s\n" -#: src/post.c:1349 +#: src/post.c:1362 #, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" @@ -8434,7 +8469,7 @@ msgstr "" "activée ou l'article ne contient pas de caractères 8 bits donc pas\n" "besoin de réduire la ligne\n" -#: src/post.c:1351 +#: src/post.c:1364 #, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" @@ -8443,25 +8478,26 @@ msgstr "" "La ligne %d est plus longue que %d octets et devrait être réduite, mais\n" "l'encodage n'est pas %s\n" -#: src/post.c:2325 +#: src/post.c:2353 #, c-format msgid "Posting: %.*s ..." msgstr "Postage : %.*s ..." -#: src/post.c:4075 +#: src/post.c:4119 msgid "Can't supersede in mailgroups, try repost instead." msgstr "" +"Impossible de remplacer dans les groupes mail, essayez de poster à nouveau." #. Check if okay to read -#: src/read.c:207 +#: src/read.c:204 msgid "Aborting read, please wait..." msgstr "Annulation de la lecture, un moment svp..." -#: src/read.c:354 +#: src/read.c:351 msgid "Aborted read\n" msgstr "Lecture annulée\n" -#: src/read.c:409 +#: src/read.c:406 msgid "Draining\n" msgstr "Purge\n" @@ -8474,6 +8510,18 @@ msgid "[- Unavailable -]" msgstr "[- Indisponible -]" #. +#. * Add the Message-ID headers to the cache, using the last Reference +#. * as the parent +#. +#. +#. * Add the References data to the cache +#. +#: src/refs.c:1015 src/refs.c:1077 +#, c-format +msgid "Building References-trees (%d/%d)..." +msgstr "" + +#. #. * preamble #. * TODO: -> lang.c #. @@ -8491,7 +8539,7 @@ msgstr "" "ce qui suit peut paraître assez bizarre.\n" "\n" -#: src/save.c:1069 +#: src/save.c:1075 msgid "bytes" msgstr "octets" @@ -8555,3 +8603,27 @@ msgstr "Échec de Slrnface : %s." #~ msgid "# What should we ask confirmation for.\n" #~ msgstr "# Demande de confirmation pour...\n" + +#~ msgid "Active file corrupt - %s" +#~ msgstr "Fichier active corrompu - %s" + +#~ msgid "Invalid response to GROUP command, %s" +#~ msgstr "Réponse de la commande GROUP invalide, %s" + +#~ msgid "unparseable \"LIST COUNTS\" line: \"%s\"" +#~ msgstr "ligne \"LIST COUNTS\" intraitable : \"%s\"" + +#~ msgid "" +#~ "Wrong newsgroup name (\"%s\") in response of \"GROUP %s\" command: \"%s\"" +#~ msgstr "" +#~ "Nom de groupe erroné (\"%s\") dans la réponse de la commande \"GROUP%s" +#~ "\" : \"%s\"" + +#~ msgid "Enter maximum length of newsgroup names displayed. sets." +#~ msgstr "Largeur max. à afficher des noms des groupes. valide." + +#~ msgid "Max. length of group names shown" +#~ msgstr "Largeur max. des noms des groupes" + +#~ msgid "# Maximum length of the names of newsgroups displayed\n" +#~ msgstr "# Largeur maximum à afficher des noms des groupes.\n" Binary files tin-2.4.4/po/ru.gmo and tin-2.4.5/po/ru.gmo differ diff -Nurp '--exclude=.bzr*' tin-2.4.4/po/ru.po tin-2.4.5/po/ru.po --- tin-2.4.4/po/ru.po 2019-12-24 10:55:09.000000000 +0100 +++ tin-2.4.5/po/ru.po 2020-12-24 00:24:54.133896481 +0100 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: tin 1.8.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 13:24+0100\n" +"POT-Creation-Date: 2020-12-24 00:24+0100\n" "PO-Revision-Date: 2006-04-21 15:39+0200\n" "Last-Translator: Andrei Emeltchenko \n" "Language-Team: Russian \n" @@ -16,6 +16,30 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +#. -> lang.c +#: src/art.c:418 +#, fuzzy, c-format +msgid "Reading %s\n" +msgstr "ðÅÒÅÞÉÔÙ×ÁÀ %s..." + +#. TODO: -> lang.c +#: src/art.c:1205 +#, fuzzy +msgid "Threading by multipart" +msgstr "òÁÚÂÏÒ ÄÉÓËÕÓÓÉÊ..." + +#. -> lang.c +#: src/art.c:2539 +#, fuzzy, c-format +msgid "Writing %s\n" +msgstr "óÔÁÒÔÕÀ: (%s)" + +#. TODO: -> lang.c +#: src/art.c:2619 +#, fuzzy +msgid "Writing overview cache..." +msgstr "úÁÐÉÓØ ÆÁÊÌÁ ÁÔÒÉÂÕÔÏ×..." + #: src/attrib.c:986 #, fuzzy msgid "Processing attributes... " @@ -1476,8 +1500,8 @@ msgid "Error making backup of %s file. F msgstr "ïÛÉÂËÁ ÓÏÈÒÁÎÅÎÉÑ ÒÅÚÅÒ×ÎÏÊ ËÏÐÉÉ ÆÁÊÌÁ %s. îÅÔ ÍÅÓÔÁ?" #: src/lang.c:274 -#, c-format -msgid "Filtering global rules (%d/%d)..." +#, fuzzy, c-format +msgid "Filtering global rules (%d/%d) ('q' to quit)..." msgstr "æÉÌØÔÒÁÃÉÑ ÇÌÏÂÁÌØÎÙÈ ÐÒÁ×ÉÌ (%d/%d)..." #: src/lang.c:275 @@ -2199,8 +2223,9 @@ msgstr "×ÙÂÒÁÔØ ÄÉÓËÕÓÓÉÀ, ÅÓÌÉ ÈÏÔÑ ÂÙ msgid "select threads that match user specified pattern" msgstr "×ÙÂÒÁÔØ ÄÉÓËÕÓÓÉÉ, ËÏÔÏÒÙÅ ÐÏÄÐÁÄÁÀÔ ÐÏÄ ÕËÁÚÁÎÎÙÊ ÛÁÂÌÏÎ" -#: src/lang.c:465 -msgid "tag all parts of current multipart-message in order" +#: src/lang.c:465 src/lang.c:521 +#, fuzzy +msgid "tag/untag all parts of current multipart-message in order" msgstr "ÐÏÍÅÔÉÔØ ×ÓÅ ÞÁÓÔÉ ÔÅËÕÝÅÇÏ multipart-ÓÏÏÂÝÅÎÉÑ ÐÏ ÐÏÒÑÄËÕ" #: src/lang.c:466 @@ -2430,7 +2455,7 @@ msgstr "ÐÏÍÅÔÉÔØ ÄÉÓËÕÓÓÉÀ ËÁË ÎÅÐÒÏÞÉÔÁ msgid "read chosen article" msgstr "ÐÒÏÞÉÔÁÔØ ×ÙÂÒÁÎÎÕÀ ÓÔÁÔØÀ" -#: src/lang.c:521 +#: src/lang.c:522 msgid "" "Display properties\n" "------------------" @@ -2438,7 +2463,7 @@ msgstr "" "ðÏËÁÚÁÔØ Ó×ÏÊÓÔ×Á\n" "-----------------" -#: src/lang.c:522 +#: src/lang.c:523 #, fuzzy msgid "" "Miscellaneous\n" @@ -2447,7 +2472,7 @@ msgstr "" "òÁÚÎÙÅ\n" "------" -#: src/lang.c:523 +#: src/lang.c:524 msgid "" "Moving around\n" "-------------" @@ -2455,7 +2480,7 @@ msgstr "" "ä×ÉÖÅÎÉÅ\n" "--------" -#: src/lang.c:524 +#: src/lang.c:525 msgid "" "Group/thread/article operations\n" "-------------------------------" @@ -2463,7 +2488,7 @@ msgstr "" "ïÐÅÒÁÃÉÉ Ó ÇÒÕÐÐÁÍÉ/ÄÉÓËÕÓÓÉÑÍ/ÓÔÁÔØÑÍÉ\n" "---------------------------------------" -#: src/lang.c:525 +#: src/lang.c:526 #, fuzzy msgid "" "Attachment operations\n" @@ -2472,7 +2497,7 @@ msgstr "" "ðÏËÁÚÁÔØ Ó×ÏÊÓÔ×Á\n" "-----------------" -#: src/lang.c:526 +#: src/lang.c:527 #, fuzzy msgid "" "Attribute operations\n" @@ -2481,7 +2506,7 @@ msgstr "" "ðÏËÁÚÁÔØ Ó×ÏÊÓÔ×Á\n" "-----------------" -#: src/lang.c:527 +#: src/lang.c:528 #, fuzzy msgid "" "Option operations\n" @@ -2490,7 +2515,7 @@ msgstr "" "ðÏËÁÚÁÔØ Ó×ÏÊÓÔ×Á\n" "-----------------" -#: src/lang.c:528 +#: src/lang.c:529 #, fuzzy msgid "" "Scope operations\n" @@ -2499,7 +2524,7 @@ msgstr "" "ðÏËÁÚÁÔØ Ó×ÏÊÓÔ×Á\n" "-----------------" -#: src/lang.c:529 +#: src/lang.c:530 #, fuzzy msgid "" "URL operations\n" @@ -2508,96 +2533,101 @@ msgstr "" "ðÏËÁÚÁÔØ Ó×ÏÊÓÔ×Á\n" "-----------------" -#: src/lang.c:530 +#: src/lang.c:531 #, fuzzy msgid "choose first URL in list" msgstr "×ÙÂÒÁÔØ ÐÅÒ×ÕÀ ÇÒÕÐÐÕ × ÓÐÉÓËÅ" -#: src/lang.c:531 +#: src/lang.c:532 #, fuzzy msgid "0 - 9\t choose URL by number" msgstr "0 - 9\t ×ÙÂÒÁÔØ ÇÒÕÐÐÕ ÐÏ ÎÏÍÅÒÕ" -#: src/lang.c:532 +#: src/lang.c:533 #, fuzzy msgid "choose last URL in list" msgstr "×ÙÂÒÁÔØ ÐÏÓÌÅÄÎÀÀ ÇÒÕÐÐÕ × ÓÐÉÓËÅ" -#: src/lang.c:533 +#: src/lang.c:534 #, fuzzy msgid "search for URLs forwards" msgstr "ÐÏÉÓË ÓÔÁÔÅÊ ÐÏ Á×ÔÏÒÕ (×ÐÅÒ£Ä)" -#: src/lang.c:534 +#: src/lang.c:535 #, fuzzy msgid "search for URLs backwards" msgstr "ÐÏÉÓË ÓÔÁÔÅÊ ÐÏ Á×ÔÏÒÕ (ÎÁÚÁÄ)" -#: src/lang.c:535 +#: src/lang.c:536 msgid "Open URL in browser" msgstr "" -#: src/lang.c:536 +#: src/lang.c:537 #, fuzzy msgid "toggle info message in last line (URL)" msgstr "ÉÚÍÅÎÉÔØ ÉÎÆ. ÓÏÏÂÝÅÎÉÅ × ÐÏÓÌÅÄÎÅÊ ÓÔÒÏËÅ (ÔÅÍÁ/ÏÐÉÓÁÎÉÅ)" -#: src/lang.c:538 +#: src/lang.c:539 msgid "Group Level Commands" msgstr "ëÏÍÁÎÄÙ ÕÒÏ×ÎÑ ÇÒÕÐÐ" -#: src/lang.c:539 +#: src/lang.c:540 msgid "Kill filter added" msgstr "õÎÉÞÔÏÖÉÔØ ÄÏÂÁ×ÌÅÎÎÙÊ ÆÉÌØÔÒ" -#: src/lang.c:540 +#: src/lang.c:541 msgid "Auto-selection filter added" msgstr "æÉÌØÔÒ Á×ÔÏ×ÙÂÏÒÁ ÄÏÂÁ×ÌÅÎ" -#: src/lang.c:541 +#: src/lang.c:542 msgid "All parts tagged" msgstr "÷ÓÅ ÞÁÓÔÉ ÐÏÍÅÞÅÎÙ" -#: src/lang.c:542 +#: src/lang.c:543 +#, fuzzy +msgid "All parts untagged" +msgstr "÷ÓÅ ÞÁÓÔÉ ÐÏÍÅÞÅÎÙ" + +#: src/lang.c:544 msgid "Storing article for later posting" msgstr "óÏÈÒÁÎÅÎÉÅ ÓÔÁÔØÉ ÄÌÑ ÏÔÌÏÖÅÎÎÏÊ ÏÔÐÒÁ×ËÉ" -#: src/lang.c:543 +#: src/lang.c:545 msgid "Please enter a valid character" msgstr "ðÏÖÁÌÕÊÓÔÁ ××ÅÄÉÔÅ ÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ" -#: src/lang.c:544 +#: src/lang.c:546 #, c-format msgid "Missing part #%d" msgstr "ðÒÏÐÕÝÅÎÁ ÞÁÓÔØ #%d" -#: src/lang.c:545 +#: src/lang.c:547 msgid "*** No postponed articles ***" msgstr "*** îÅÔ ÏÔÌÏÖÅÎÎÙÈ ÓÔÁÔÅÊ ***" -#: src/lang.c:546 +#: src/lang.c:548 msgid "Not a multi-part message" msgstr "îÅ multi-part ÓÏÏÂÝÅÎÉÅ" -#: src/lang.c:547 +#: src/lang.c:549 msgid "You are not subscribed to this group" msgstr "÷Ù ÎÅ ÐÏÄÐÉÓÁÎÙ ÎÁ ÜÔÕ ÇÒÕÐÐÕ" -#: src/lang.c:548 +#: src/lang.c:550 msgid "No previous expression" msgstr "îÅÔ ÐÒÅÄÙÄÕÝÅÇÏ ×ÙÒÁÖÅÎÉÑ" -#: src/lang.c:549 +#: src/lang.c:551 msgid "Operation disabled in no-overwrite mode" msgstr "ïÐÅÒÁÃÉÑ ÚÁÐÒÅÝÅÎÁ × ÒÅÖÉÍÅ ÚÁÐÒÅÝÅÎÉÑ ÐÅÒÅÚÁÐÉÓÉ" #. TODO: replace hard coded key-name in txt_info_postponed -#: src/lang.c:551 +#: src/lang.c:553 #, c-format msgid "%d postponed %s, reuse with ^O...\n" msgstr "%d ÏÔÌÏÖÅÎÁ(Ù) %s, ×ÏÚÏÂÎÏ×ÉÔØ Ó ^O...\n" -#: src/lang.c:552 +#: src/lang.c:554 msgid "" "X-Conversion-Note: multipart/alternative contents have been removed.\n" " To get the whole article, turn alternative handling OFF in the Option " @@ -2607,21 +2637,21 @@ msgstr "" " äÌÑ ÐÏÌÕÞÅÎÉÑ ×ÓÅÊ ÓÔÁÔØÉ, ÉÚÍÅÎÉÔÅ ÏÂÒÁÂÏÔËÕ multipart/alternative\n" " ÓÔÁÔÅÊ ÎÁ OFF × íÅÎÀ ÏÐÃÉÊ\n" -#: src/lang.c:554 +#: src/lang.c:556 #, c-format msgid "Save filename for %s/%s is a mailbox. Attachment not saved" msgstr "æÁÊÌ ÄÌÑ ÓÏÈÒÁÎÅÎÉÑ %s/%s - mailbox. ÷ÌÏÖÅÎÉÅ ÎÅ ÓÏÈÒÁÎÅÎÏ" -#: src/lang.c:555 +#: src/lang.c:557 msgid "TeX2Iso encoded article" msgstr "TeX2Iso ËÏÄÉÒÏ×ÁÎÎÁÑ ÓÔÁÔØÑ" -#: src/lang.c:556 +#: src/lang.c:558 msgid "incomplete " msgstr "ÎÅÐÏÌÎÙÊ " #. TODO: replace hard coded key-names -#: src/lang.c:558 +#: src/lang.c:560 #, fuzzy, c-format msgid "" "\n" @@ -2687,152 +2717,152 @@ msgstr "" "TODO É FTP. óÏÏÂÝÅÎÉÑ Ï ÏÛÉÂËÁÈ É ÏÔÚÙ×Ù ÏÔÐÒÁ×ÌÑÊÔÅ %s ÐÒÉ ÐÏÍÏÝÉ ËÏÍÁÎÄÙ " "'R'.\n" -#: src/lang.c:574 +#: src/lang.c:576 #, c-format msgid "Invalid From: %s line. Read the INSTALL file again." msgstr "îÅÄÏÐÕÓÔÉÍÁÑ ÓÔÒÏËÁ From: %s. ðÒÏÞÉÔÁÊÔÅ ÆÁÊÌ INSTALL ÓÎÏ×Á." -#: src/lang.c:576 +#: src/lang.c:578 msgid "Invalid multibyte sequence found\n" msgstr "îÁÊÄÅÎÁ ÎÅÄÏÐÕÓÔÉÍÁÑ ÍÕÌØÔÉÂÁÊÔÏ×ÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ\n" -#: src/lang.c:579 +#: src/lang.c:581 #, c-format msgid "Invalid Sender:-header %s" msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÚÁÇÏÌÏ×ÏË Sender: %s" -#: src/lang.c:581 +#: src/lang.c:583 msgid "Inverse video disabled" msgstr "éÎ×ÅÒÓÎÏÅ ×ÉÄÅÏ ÚÁÐÒÅÝÅÎÏ" -#: src/lang.c:582 +#: src/lang.c:584 msgid "Inverse video enabled" msgstr "éÎ×ÅÒÓÎÏÅ ×ÉÄÅÏ ÒÁÚÒÅÛÅÎÏ" -#: src/lang.c:584 +#: src/lang.c:586 #, c-format msgid "Missing definition for %s\n" msgstr "ðÒÏÐÕÝÅÎÏ ÏÐÒÅÄÅÌÅÎÉÅ ÄÌÑ %s\n" -#: src/lang.c:585 +#: src/lang.c:587 #, c-format msgid "Invalid key definition '%s'\n" msgstr "îÅÐÒÁ×ÉÌØÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ËÌÁ×ÉÛÉ '%s'\n" -#: src/lang.c:586 +#: src/lang.c:588 #, c-format msgid "Invalid keyname '%s'\n" msgstr "îÅÐÒÁ×ÉÌØÎÏÅ ÎÁÚ×ÁÎÉÅ ËÌÁ×ÉÛÉ '%s'\n" -#: src/lang.c:587 +#: src/lang.c:589 #, c-format msgid "Keymap file was upgraded to version %s\n" msgstr "æÁÊÌ Keymap ÏÂÎÏ×ÌÅÎ ÄÏ ×ÅÒÓÉÉ %s\n" -#: src/lang.c:588 +#: src/lang.c:590 #, c-format msgid "Kill From: [%s] (y/n): " msgstr "õÎÉÞÔÏÖÉÔØ From: [%s] (y/n): " -#: src/lang.c:589 +#: src/lang.c:591 msgid "Kill Lines: (num): " msgstr "õÎÉÞÔÏÖÉÔØ ÓÔÒÏËÉ: (num): " -#: src/lang.c:590 +#: src/lang.c:592 msgid "Kill Article Menu" msgstr "õÎÉÞÔÏÖÉÔØ ÍÅÎÀ ÓÔÁÔØÉ" -#: src/lang.c:591 +#: src/lang.c:593 #, fuzzy, c-format msgid "Kill Msg-ID: [%s] (f/l/o/n): " msgstr "õÎÉÞÔÏÖÉÔØ Msg-Id: [%s] (f/l/o/n): " -#: src/lang.c:592 +#: src/lang.c:594 msgid "Kill pattern scope : " msgstr "õÎÉÞÔÏÖÉÔØ ÛÁÂÌÏÎ ÏÂÚÏÒÁ : " -#: src/lang.c:593 +#: src/lang.c:595 #, c-format msgid "Kill Subject: [%s] (y/n): " msgstr "õÎÉÞÔÏÖÉÔØ ôÅÍÕ: [%s] (y/n): " -#: src/lang.c:594 +#: src/lang.c:596 msgid "Kill text pattern : " msgstr "õÎÉÞÔÏÖÉÔØ ÛÁÂÌÏÎ : " -#: src/lang.c:595 +#: src/lang.c:597 msgid "Kill time in days : " msgstr "õÎÉÞÔÏÖÉÔØ ×ÒÅÍÑ × ÄÎÑÈ : " -#: src/lang.c:597 +#: src/lang.c:599 msgid "Last" msgstr "ðÏÓÌÅÄÎÉÊ" -#: src/lang.c:598 +#: src/lang.c:600 msgid "-- Last response --" msgstr "-- ðÏÓÌÅÄÎÉÊ ÏÔ×ÅÔ --" -#: src/lang.c:599 +#: src/lang.c:601 #, c-format msgid "Lines %s " msgstr "óÔÒÏË %s " -#: src/lang.c:602 +#: src/lang.c:604 #, fuzzy msgid "Function not available." msgstr "óÔÁÔØÑ ÎÅÄÏÓÔÕÐÎÁ" -#: src/lang.c:603 +#: src/lang.c:605 msgid "Not reading via NNTP." msgstr "" -#: src/lang.c:604 +#: src/lang.c:606 #, fuzzy, c-format msgid "Group: %s" msgstr "çÒÕÐÐÁ %.*s..." -#: src/lang.c:605 +#: src/lang.c:607 #, fuzzy, c-format msgid "Groups: %s" msgstr "çÒÕÐÐÁ %.*s..." -#: src/lang.c:608 +#: src/lang.c:610 msgid "Mail" msgstr "" -#: src/lang.c:609 +#: src/lang.c:611 msgid "mailbox " msgstr "" -#: src/lang.c:610 +#: src/lang.c:612 #, c-format msgid "Mail article(s) to [%.*s]> " msgstr "ïÔÐÒÁ×ÉÔØ ÓÔÁÔØÀ(É) ÐÏ email [%.*s]> " -#: src/lang.c:611 +#: src/lang.c:613 #, c-format msgid "Mailing log to %s\n" msgstr "ïÔÐÒÁ×ÉÔØ ÌÏÇ-ÓÏÏÂÝÅÎÉÅ %s\n" -#: src/lang.c:612 +#: src/lang.c:614 msgid "Mail bug report..." msgstr "ïÔÐÒÁ×ÌÑÅÔÓÑ ÓÏÏÂÝÅÎÉÅ Ï ÏÛÉÂËÅ..." -#: src/lang.c:613 +#: src/lang.c:615 #, c-format msgid "Mail BUG REPORT to %s?" msgstr "ïÔÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÅ Ï ÏÛÉÂËÅ %s?" -#: src/lang.c:614 +#: src/lang.c:616 msgid "Mailed" msgstr "ïÔÐÒÁ×ÌÅÎÏ ÐÏ email" -#: src/lang.c:615 +#: src/lang.c:617 #, c-format msgid "Mailing to %s..." msgstr "ïÔÐÒÁ×ÌÑÅÔÓÑ ÐÏ email %s..." -#: src/lang.c:616 +#: src/lang.c:618 msgid "" "# [Mail/Save] active file. Format is like news active file:\n" "# groupname max.artnum min.artnum /dir\n" @@ -2840,84 +2870,84 @@ msgid "" "#\n" msgstr "" -#: src/lang.c:619 +#: src/lang.c:621 #, fuzzy, c-format msgid "%s marked as read" msgstr "%s ÐÏÍÅÞÅÎÏ ËÁË ÎÅÐÒÏÞÉÔÁÎÏ" -#: src/lang.c:620 +#: src/lang.c:622 #, c-format msgid "%s marked as unread" msgstr "%s ÐÏÍÅÞÅÎÏ ËÁË ÎÅÐÒÏÞÉÔÁÎÏ" -#: src/lang.c:621 +#: src/lang.c:623 #, fuzzy, c-format msgid "Marked %d of %d %s as read" msgstr "ðÏÍÅÞÅÎÏ %d ÉÚ %d ÏÔÍÅÞÅÎÎÙÈ %s ËÁË ÐÒÏÞÉÔÁÎÎÙÅ" -#: src/lang.c:622 +#: src/lang.c:624 #, fuzzy, c-format msgid "Marked %d of %d %s as unread" msgstr "ðÏÍÅÞÅÎÏ %d ÉÚ %d ÏÔÍÅÞÅÎÎÙÈ %s ËÁË ÐÒÏÞÉÔÁÎÎÙÅ" -#: src/lang.c:623 src/lang.c:1352 +#: src/lang.c:625 src/lang.c:1352 msgid "Mark" msgstr "" -#: src/lang.c:624 +#: src/lang.c:626 #, c-format msgid "Mark all articles as read%s?" msgstr "ðÏÍÅÔÉÔØ ×ÓÅ ÓÔÁÔØÉ ËÁË ÐÒÏÞÉÔÁÎÎÙÅ%s?" -#: src/lang.c:625 +#: src/lang.c:627 #, fuzzy, c-format msgid "Mark article as read%s?" msgstr "ðÏÍÅÔÉÔØ ×ÓÅ ÓÔÁÔØÉ ËÁË ÐÒÏÞÉÔÁÎÎÙÅ%s?" -#: src/lang.c:626 +#: src/lang.c:628 #, c-format msgid "Mark group %s as read?" msgstr "ðÏÍÅÔÉÔØ ÇÒÕÐÐÕ %s ËÁË ÐÒÏÞÉÔÁÎÎÕÀ?" -#: src/lang.c:627 +#: src/lang.c:629 #, c-format msgid "Mark thread as read%s?" msgstr "ðÏÍÅÔÉÔØ ÄÉÓËÕÓÓÉÀ ËÁË ÐÒÏÞÉÔÁÎÎÕÀ %s?" -#: src/lang.c:628 +#: src/lang.c:630 #, c-format msgid "Matching %s groups..." msgstr "óÏÐÏÓÔÁ×ÌÅÎÉÅ Ó ÛÁÂÌÏÎÏÍ %s ÇÒÕÐÐ..." -#: src/lang.c:629 src/lang.c:643 src/lang.c:649 +#: src/lang.c:631 src/lang.c:645 src/lang.c:651 #, fuzzy, c-format msgid "=set current to n; %s=line down; %s=line up; %s=help; %s=quit" msgstr "=ÐÅÒÅÊÔÉ Ë n; %s=ÓÌÅÄ. ÎÅÐÒÏÞ.; %s=catchup; %s=ÉÚÍÅÎ. ×ÉÄ" -#: src/lang.c:631 +#: src/lang.c:633 #, fuzzy, c-format msgid "" "%s=view; %s=pipe; %s=pipe raw; %s=save; %s=tag; %s=tag pattern; %s=untag all" msgstr "%s=mail; %s=×ÙÈÏÄ; %s=ÏÔ×ÅÔÉÔØ; %s=ÓÏÈÒÁÎÉÔØ; %s=ÏÔÍ.; %s=ÏÔÐÒÁ×ÉÔØ" -#: src/lang.c:633 +#: src/lang.c:635 #, fuzzy, c-format msgid "%s=view; %s=save; %s=tag; %s=tag pattern; %s=untag all" msgstr "%s=mail; %s=×ÙÈÏÄ; %s=ÏÔ×ÅÔÉÔØ; %s=ÓÏÈÒÁÎÉÔØ; %s=ÏÔÍ.; %s=ÏÔÐÒÁ×ÉÔØ" -#: src/lang.c:635 +#: src/lang.c:637 #, fuzzy, c-format msgid "" "%s=reverse tagging; %s=search forwards; %s=search backwards; %s=repeat search" msgstr "%s=ÐÏÉÓË ×ÐÅÒ£Ä; %s=ÐÏÉÓË ÎÁÚÁÄ; %s=×ÙÈÏÄ" -#: src/lang.c:636 src/lang.c:640 +#: src/lang.c:638 src/lang.c:642 #, c-format msgid "=set current to n; %s=next unread; %s=search pattern; %s=kill/select" msgstr "" "=ÐÅÒÅÊÔÉ Ë n; %s=ÓÌÅÄ. ÎÅÐÒÏÞ.; %s=ÐÏÉÓË ÐÏ ÛÁÂÌÏÎÕ; %s=ÕÎÉÞÔ./×ÙÂÒÁÔØ" -#: src/lang.c:637 +#: src/lang.c:639 #, c-format msgid "" "%s=author search; %s=catchup; %s=line down; %s=line up; %s=mark read; " @@ -2926,35 +2956,35 @@ msgstr "" "%s=ÐÏÉÓË Á×Ô.; %s=catchup; %s=ÓÔÒË. ×ÎÉÚ.; %s=ÓÔÒË. ××ÅÒÈ.; %s=ÍÁÒË. ÐÒÏÞ.; " "%s=ÓÐÉÓ. ÄÉÓË." -#: src/lang.c:638 +#: src/lang.c:640 #, c-format msgid "%s=line up; %s=line down; %s=page up; %s=page down; %s=top; %s=bottom" msgstr "" "%s=ÓÔÒË. ××ÅÒÈ; %s=ÓÔÒË. ×ÎÉÚ; %s=ÓÔÒ. ××ÅÒÈ; %s=ÓÔÒ. ×ÎÉÚ; %s=ÎÁÞÁÌÏ; " "%s=ËÏÎÅÃ" -#: src/lang.c:639 +#: src/lang.c:641 #, c-format msgid "%s=search forwards; %s=search backwards; %s=quit" msgstr "%s=ÐÏÉÓË ×ÐÅÒ£Ä; %s=ÐÏÉÓË ÎÁÚÁÄ; %s=×ÙÈÏÄ" -#: src/lang.c:641 +#: src/lang.c:643 #, c-format msgid "%s=author search; %s=body search; %s=catchup; %s=followup; %s=mark read" msgstr "" "%s=ÐÏÉÓË Á×ÔÏÒÁ; %s=ÐÏÉÓË × ÓÏÏÂ.; %s=catchup; %s=followup; %s=ÍÁÒË. ÐÒÏÞ." -#: src/lang.c:642 +#: src/lang.c:644 #, c-format msgid "%s=add; %s=move; %s=rename; %s=delete" msgstr "" -#: src/lang.c:644 +#: src/lang.c:646 #, c-format msgid "=set current to n; %s=next unread; %s,%s=search pattern; %s=catchup" msgstr "=ÐÅÒÅÊÔÉ Ë n; %s=ÓÌÅÄ. ÎÅÐÒÏÞ.; %s,%s=ÐÏÉÓË ÐÏ ÛÁÂÌÏÎÕ; %s=catchup" -#: src/lang.c:645 +#: src/lang.c:647 #, c-format msgid "" "%s=line down; %s=line up; %s=help; %s=move; %s=quit; %s=toggle all/unread" @@ -2962,7 +2992,7 @@ msgstr "" "%s=ÓÔÒ. ×ÎÉÚ; %s=ÓÔÒ. ××ÅÒÈ; %s=ÐÏÍÏÝØ; %s=ÐÅÒÅÍ.; %s=×ÙÈÏÄ; %s=ÕÓÔ. ×ÓÅ|" "ÎÅÐÒÏÞ." -#: src/lang.c:646 +#: src/lang.c:648 #, c-format msgid "" "%s=subscribe; %s=sub pattern; %s=unsubscribe; %s=unsub pattern; %s=yank in/" @@ -2971,228 +3001,228 @@ msgstr "" "%s=ÐÏÄÐÉÓÁÔØÓÑ; %s=ÐÏÄÐ. ÛÁÂÌÏÎ; %s=ÏÔÐÉÓÁÔØÓÑ; %s=ÏÔÐÉÓ. ÛÁÂÌÏÎ; %s=yank in/" "out" -#: src/lang.c:647 +#: src/lang.c:649 #, c-format msgid "=set current to n; %s=next unread; %s=catchup; %s=display toggle" msgstr "=ÐÅÒÅÊÔÉ Ë n; %s=ÓÌÅÄ. ÎÅÐÒÏÞ.; %s=catchup; %s=ÉÚÍÅÎ. ×ÉÄ" -#: src/lang.c:648 +#: src/lang.c:650 #, c-format msgid "%s=help; %s=line down; %s=line up; %s=quit; %s=tag; %s=mark unread" msgstr "" "%s=ÐÏÍÏÝØ; %s=ÓÔÒ. ×ÎÉÚ; %s=ÓÔÒ. ××ÅÒÈ; %s=×ÙÈÏÄ; %s=ÏÔÍ.; %s=ÍÁÒË. ÎÅÐÒÏÞ." -#: src/lang.c:650 +#: src/lang.c:652 #, fuzzy, c-format msgid "%s=search forwards; %s=search backwards; %s=repeat search" msgstr "%s=ÐÏÉÓË ×ÐÅÒ£Ä; %s=ÐÏÉÓË ÎÁÚÁÄ; %s=×ÙÈÏÄ" -#: src/lang.c:651 +#: src/lang.c:653 msgid "--More--" msgstr "--äÁÌÅÅ--" -#: src/lang.c:652 +#: src/lang.c:654 #, c-format msgid "Moving %s..." msgstr "ðÅÒÅÍÅÝÅÎÉÅ %s..." -#: src/lang.c:653 +#: src/lang.c:655 msgid "Message-ID: & last Reference " msgstr "" -#: src/lang.c:654 +#: src/lang.c:656 msgid "Message-ID: line " msgstr "Message-ID: ÓÔÒÏËÁ " -#: src/lang.c:655 +#: src/lang.c:657 msgid "Message-ID: & References: line" msgstr "" -#: src/lang.c:657 +#: src/lang.c:659 msgid ", name: " msgstr ", ÉÍÑ: " -#: src/lang.c:658 +#: src/lang.c:660 #, fuzzy, c-format msgid "Go to newsgroup [%s]> " msgstr "ðÅÒÅÊÔÉ Ë ÇÒÕÐÐÅ [%s]> " -#: src/lang.c:659 +#: src/lang.c:661 msgid "newsgroups" msgstr "ÇÒÕÐÐÙ" -#: src/lang.c:660 +#: src/lang.c:662 #, c-format msgid "Position %s in group list (1,2,..,$) [%d]> " msgstr "ðÏÚÉÃÉÑ %s × ÓÐÉÓËÅ ÇÒÕÐÐ (1,2,..,$) [%d]> " -#: src/lang.c:661 +#: src/lang.c:663 msgid "newsgroup" msgstr "ÇÒÕÐÐÁ" -#: src/lang.c:662 +#: src/lang.c:664 msgid "Try and save newsrc file again?" msgstr "ðÏÐÒÏÂÏ×ÁÔØ É ÓÏÈÒÁÎÉÔØ newsrc ÓÎÏ×Á?" -#: src/lang.c:663 +#: src/lang.c:665 msgid "Warning: No newsgroups were written to your newsrc file. Save aborted." msgstr "÷ÎÉÍÁÎÉÅ: çÒÕÐÐÙ ÎÅ ÂÙÌÉ ÚÁÐÉÓÁÎÙ × newsrc. óÏÈÒÁÎÅÎÉÅ ÐÒÅÒ×ÁÎÏ." -#: src/lang.c:664 +#: src/lang.c:666 msgid "newsrc file saved successfully.\n" msgstr "newsrc ÆÁÊÌ ÕÓÐÅÛÎÏ ÓÏÈÒÁΣÎ.\n" -#: src/lang.c:665 +#: src/lang.c:667 msgid "-- Next response --" msgstr "-- óÌÅÄÕÀÝÉÊ ÏÔ×ÅÔ --" -#: src/lang.c:666 +#: src/lang.c:668 msgid "No " msgstr "îÅÔ " -#: src/lang.c:667 +#: src/lang.c:669 msgid "*** No articles ***" msgstr "*** îÅÔ ÓÔÁÔÅÊ ***" -#: src/lang.c:668 +#: src/lang.c:670 msgid "No articles have been posted" msgstr "îÉ ÏÄÎÁ ÓÔÁÔØÑ ÎÅ ÂÙÌÁ ÏÔÐÒÁ×ÌÅÎÁ" -#: src/lang.c:669 +#: src/lang.c:671 #, fuzzy msgid "*** No attachments ***" msgstr "*** îÅÔ ÓÔÁÔÅÊ ***" -#: src/lang.c:670 +#: src/lang.c:672 msgid "*** No description ***" msgstr "*** îÅÔ ÏÐÉÓÁÎÉÑ ***" -#: src/lang.c:671 +#: src/lang.c:673 msgid "No filename" msgstr "îÅÔ ÉÍÅÎÉ ÆÁÊÌÁ" -#: src/lang.c:672 +#: src/lang.c:674 msgid "No group" msgstr "îÅÔ ÇÒÕÐÐÙ" -#: src/lang.c:673 +#: src/lang.c:675 msgid "*** No groups ***" msgstr "*** îÅÔ ÇÒÕÐÐ ***" -#: src/lang.c:674 +#: src/lang.c:676 msgid "No more groups to read" msgstr "îÅÔ ÂÏÌØÛÅ ÇÒÕÐÐ ÄÌÑ ÞÔÅÎÉÑ" -#: src/lang.c:675 +#: src/lang.c:677 msgid "No last message" msgstr "îÅÔ ÐÏÓÌÅÄÎÅÇÏ ÓÏÏÂÝÅÎÉÑ" -#: src/lang.c:676 +#: src/lang.c:678 msgid "No mail address" msgstr "îÅÔ ÁÄÒÅÓÁ email" -#: src/lang.c:677 +#: src/lang.c:679 msgid "No articles marked for saving" msgstr "îÅÔ ÍÁÒËÉÒÏ×ÁÎÎÙÈ ÄÌÑ ÓÏÈÒÁÎÅÎÉÑ ÓÔÁÔÅÊ" -#: src/lang.c:678 +#: src/lang.c:680 msgid "No match" msgstr "îÅÔ ÓÏ×ÐÁÄÅÎÉÑ" -#: src/lang.c:679 +#: src/lang.c:681 msgid "No more groups" msgstr "âÏÌØÛÅ ÎÅÔ ÇÒÕÐÐ" -#: src/lang.c:680 +#: src/lang.c:682 msgid "No newsgroups" msgstr "îÅÔ ÇÒÕÐÐ" -#: src/lang.c:681 +#: src/lang.c:683 msgid "No next unread article" msgstr "îÅÔ ÓÌÅÄÕÀÝÅÊ ÎÅÐÒÏÞÉÔÁÎÎÏÊ ÓÔÁÔØÉ" -#: src/lang.c:682 +#: src/lang.c:684 msgid "No previous group" msgstr "îÅÔ ÐÒÅÄÙÄÕÝÅÊ ÇÒÕÐÐÙ" -#: src/lang.c:683 +#: src/lang.c:685 msgid "No previous search, nothing to repeat" msgstr "" -#: src/lang.c:684 +#: src/lang.c:686 msgid "No previous unread article" msgstr "îÅÔ ÐÒÅÄÙÄÕÝÅÊ ÎÅÐÒÏÞÉÔÁÎÎÏÊ ÓÔÁÔØÉ" -#: src/lang.c:685 +#: src/lang.c:687 msgid "No responses" msgstr "îÅÔ ÏÔ×ÅÔÏ×" -#: src/lang.c:686 +#: src/lang.c:688 msgid "No responses to list in current thread" msgstr "îÅÔ ÏÔ×ÅÔÏ× ÎÁ ÓÐÉÓÏË × ÔÅËÕÝÅÊ ÄÉÓËÕÓÓÉÉ" -#: src/lang.c:687 +#: src/lang.c:689 #, fuzzy msgid "*** No scopes ***" msgstr "*** îÅÔ ÇÒÕÐÐ ***" -#: src/lang.c:688 +#: src/lang.c:690 msgid "No search string" msgstr "îÅÔ ÓÔÒÏËÉ ÐÏÉÓËÁ" -#: src/lang.c:689 +#: src/lang.c:691 msgid "No subject" msgstr "îÅÔ ÔÅÍÙ" -#: src/lang.c:691 +#: src/lang.c:693 #, c-format msgid "%s: Terminal must have clear to end-of-line (ce)\n" msgstr "%s: ôÅÒÍÉÎÁÌ ÄÏÌÖÅÎ ÉÍÅÔØ ÆÕÎËÃÉÀ clear to end-of-line (ce)\n" -#: src/lang.c:692 +#: src/lang.c:694 #, c-format msgid "%s: Terminal must have clear to end-of-screen (cd)\n" msgstr "%s: ôÅÒÍÉÎÁÌ ÄÏÌÖÅÎ ÉÍÅÔØ ÆÕÎËÃÉÀ clear to end-of-screen (cd)\n" -#: src/lang.c:693 +#: src/lang.c:695 #, c-format msgid "%s: Terminal must have clearscreen (cl) capability\n" msgstr "%s: ôÅÒÍÉÎÁÌ ÄÏÌÖÅÎ ÉÍÅÔØ ÆÕÎËÃÉÀ clearscreen (cl)\n" -#: src/lang.c:694 +#: src/lang.c:696 #, c-format msgid "%s: Terminal must have cursor motion (cm)\n" msgstr "%s: ôÅÒÍÉÎÁÌ ÄÏÌÖÅÎ ÉÍÅÔØ cursor motion (cm)\n" -#: src/lang.c:695 +#: src/lang.c:697 #, c-format msgid "%s: TERM variable must be set to use screen capabilities\n" msgstr "%s: ÕÓÔÁÎÏ×ÉÔÅ ÐÅÒÅÍÅÎÎÕÀ ÓÒÅÄÙ TERM\n" -#: src/lang.c:697 +#: src/lang.c:699 #, c-format msgid "No viewer found for %s/%s\n" msgstr "îÅ ÎÁÊÄÅÎ ÐÒÏÓÍÏÔÏÒÝÉË ÄÌÑ %s/%s\n" -#: src/lang.c:698 +#: src/lang.c:700 msgid "Newsgroup does not exist on this server" msgstr "çÒÕÐÐÁ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ ÎÁ ÜÔÏÍ ÓÅÒ×ÅÒÅ" -#: src/lang.c:699 +#: src/lang.c:701 #, c-format msgid "Group %s not found in active file" msgstr "çÒÕÐÐÁ %s ÎÅ ÎÁÊÄÅÎÁ × ÆÁÊÌÅ active" -#: src/lang.c:700 +#: src/lang.c:702 msgid "c)reate it, use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "" "c)ÓÏÚÄÁÔØ, a)ÉÓÐ. ÁÌØÔÅÒ. ÉÍÑ, d)ÉÓÐ. ÓÔÁÎÄÁÒÔÎÙÊ .newsrc, q)×ÙÈÏÄ ÉÚ tin: " -#: src/lang.c:701 +#: src/lang.c:703 msgid "use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "a)ÉÓÐ. ÁÌØÔÅÒ. ÉÍÑ, d)ÉÓÐ. ÓÔÁÎÄÁÒÔÎÙÊ .newsrc, q)×ÙÈÏÄ ÉÚ tin: " -#: src/lang.c:702 +#: src/lang.c:704 #, c-format msgid "" "# NNTP-server -> newsrc translation table and NNTP-server\n" @@ -3209,45 +3239,45 @@ msgid "" "#\n" msgstr "" -#: src/lang.c:709 +#: src/lang.c:711 msgid "Only" msgstr "ôÏÌØËÏ" -#: src/lang.c:710 +#: src/lang.c:712 #, c-format msgid "Option not enabled. Recompile with %s." msgstr "ïÐÃÉÑ ÎÅ ×ËÌÀÞÅÎÁ. ðÅÒÅÓÏÂÅÒÉÔÅ ÐÁËÅÔ Ó %s." -#: src/lang.c:711 +#: src/lang.c:713 msgid "Options Menu" msgstr "íÅÎÀ ÏÐÃÉÊ" -#: src/lang.c:712 +#: src/lang.c:714 #, fuzzy msgid "Options Menu Commands" msgstr "íÅÎÀ ÏÐÃÉÊ" -#: src/lang.c:715 +#: src/lang.c:717 #, c-format msgid "Error in regex: %s at pos. %d '%s'" msgstr "ïÛÉÂËÁ × regex: %s × ÐÏÚ. %d '%s'" -#: src/lang.c:716 +#: src/lang.c:718 #, c-format msgid "Error in regex: pcre internal error %d" msgstr "ïÛÉÂËÁ × regex: ×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ pcre %d" -#: src/lang.c:717 +#: src/lang.c:719 #, c-format msgid "Error in regex: study - pcre internal error %s" msgstr "ïÛÉÂËÁ × regex: study - ×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ pcre %s" -#: src/lang.c:718 +#: src/lang.c:720 msgid "Post a followup..." msgstr "ïÔÐÒÁ×ÌÅÎÉÅ ÏÔ×ÅÔÁ × ÇÒÕÐÐÕ..." #. TODO: replace hard coded key-name in txt_post_error_ask_postpone -#: src/lang.c:720 +#: src/lang.c:722 msgid "" "An error has occurred while posting the article. If you think that this\n" "error is temporary or otherwise correctable, you can postpone the article\n" @@ -3257,29 +3287,29 @@ msgstr "" "É ÍÏÖÅÔ ÂÙÔØ ÉÓÐÒÁ×ÌÅÎÁÑ, ÔÏ ×Ù ÍÏÖÅÔÅ ÏÔÌÏÖÉÔØ ÓÔÁÔØÀ É ÏÔÐÒÁ×ÉÔØ Å£ Ó\n" "ÐÏÍÏÝØÀ ^O ÐÏÚÖÅ.\n" -#: src/lang.c:723 +#: src/lang.c:725 msgid "Posted articles history" msgstr "éÓÔÏÒÉÑ ÏÔÐÒÁ×ÌÅÎÎÙÈ ÓÔÁÔÅÊ" -#: src/lang.c:724 +#: src/lang.c:726 #, c-format msgid "Post to newsgroup(s) [%s]> " msgstr "ïÔÐÒÁ×ÉÔØ × ÇÒÕÐÐÕ(Ù) [%s]> " -#: src/lang.c:725 +#: src/lang.c:727 msgid "-- post processing started --" msgstr "-- ÐÏÓÔ-ÏÂÒÁÂÏÔËÁ ÎÁÞÁÔÁ --" -#: src/lang.c:726 +#: src/lang.c:728 msgid "-- post processing completed --" msgstr "-- ÐÏÓÔ-ÏÂÒÁÂÏÔËÁ ÚÁËÏÎÞÅÎÁ --" -#: src/lang.c:727 +#: src/lang.c:729 #, c-format msgid "Post subject [%s]> " msgstr "ôÅÍÁ ÓÏÏÂÝÅÎÉÑ [%s]> " -#: src/lang.c:728 +#: src/lang.c:730 msgid "" "# Summary of mailed/posted messages viewable by 'W' command from within " "tin.\n" @@ -3288,106 +3318,106 @@ msgstr "" "ËÏÍÁÎÄÏÊ\n" "# 'W' ÉÚ tin.\n" -#: src/lang.c:729 +#: src/lang.c:731 msgid "Posting article..." msgstr "ïÔÐÒÁ×ÌÅÎÉÅ ÓÔÁÔØÉ..." -#: src/lang.c:730 +#: src/lang.c:732 #, c-format msgid "Post postponed articles [%%s]? (%s/%s/%s/%s/%s): " msgstr "ïÔÐÒÁ×ÉÔØ ÏÔÌÏÖÅÎÎÙÅ ÓÔÁÔØÉ [%%s]? (%s/%s/%s/%s/%s): " -#: src/lang.c:731 +#: src/lang.c:733 #, c-format msgid "Hot %s" msgstr "" -#: src/lang.c:732 +#: src/lang.c:734 #, c-format msgid "Tagged %s" msgstr "ðÏÍÅÞÅÎÙ %s" -#: src/lang.c:733 +#: src/lang.c:735 #, c-format msgid "Untagged %s" msgstr "óÎÑÔÙ ÏÔÍÅÔËÉ %s" -#: src/lang.c:735 +#: src/lang.c:737 #, c-format msgid "Preparing for filtering on Path header (%d/%d)..." msgstr "" -#: src/lang.c:737 +#: src/lang.c:739 msgid "Processing mail messages marked for deletion." msgstr "ïÂÒÁÂÏÔËÁ ÐÏÞÔÏ×ÙÈ ÓÏÏÂÝÅÎÉÊ ÐÏÍÅÞÅÎÎÙÈ ÄÌÑ ÕÄÁÌÅÎÉÑ." -#: src/lang.c:738 +#: src/lang.c:740 msgid "Processing saved articles marked for deletion." msgstr "ïÂÒÁÂÏÔËÁ ÓÏÈÒÁΣÎÎÙÈ ÓÔÁÔÅÊ ÐÏÍÅÞÅÎÎÙÈ ÄÌÑ ÕÄÁÌÅÎÉÑ." -#: src/lang.c:739 +#: src/lang.c:741 #, c-format msgid "Accept Followup-To? %s=post, %s=ignore, %s=quit: " msgstr "ðÒÉÎÑÔØ Followup-To? %s=ÏÔÐÒÁ×ÉÔØ, %s=ÉÇÎÏÒÉÒÏ×ÁÔØ, %s=×ÙÈÏÄ: " -#: src/lang.c:740 +#: src/lang.c:742 msgid "Article unchanged, abort mailing?" msgstr "óÔÁÔØÑ ÎÅ ÉÚÍÅÎÉÌÁÓØ, ÐÒÅÒ×ÁÔØ ÏÔÐÒÁ×ËÕ?" -#: src/lang.c:741 +#: src/lang.c:743 #, c-format msgid "Do you want to see postponed articles (%d)?" msgstr "èÏÔÉÔÅ ÐÏÓÍÏÔÒÅÔØ ÏÔÌÏÖÅÎÎÙÅ ÓÔÁÔØÉ (%d)?" -#: src/lang.c:743 +#: src/lang.c:745 msgid "Add quick kill filter?" msgstr "äÏÂÁ×ÉÔØ ÆÉÌØÔÒ ÂÙÓÔÒÏÇÏ ÕÎÉÞÔÏÖÅÎÉÑ?" -#: src/lang.c:744 +#: src/lang.c:746 msgid "Add quick selection filter?" msgstr "äÏÂÁ×ÉÔØ ÆÉÌØÔÒ ÂÙÓÔÒÏÇÏ ×ÙÂÏÒÁ?" -#: src/lang.c:745 +#: src/lang.c:747 msgid "Do you really want to quit?" msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ×ÙÊÔÉ?" -#: src/lang.c:746 +#: src/lang.c:748 #, c-format msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%s]: " msgstr "%s=ÒÅÄÁËÔ. ÏÔÍÅÎ. ÓÏÏÂÝÅÎÉÑ, %s=×ÙÈÏÄ, %s=ÕÄÁÌÉÔØ (ÏÔÍÅÎÉÔØ) [%%s]: " -#: src/lang.c:747 +#: src/lang.c:749 msgid "You have tagged articles in this group - quit anyway?" msgstr "ïÓÔÁÌÉÓØ ÐÏÍÅÞÅÎÎÙÅ ÓÔÁÔØÉ × ÇÒÕÐÐÅ - ×ÙÊÔÉ ×ÓÅ ÒÁ×ÎÏ?" -#: src/lang.c:748 +#: src/lang.c:750 #, c-format msgid "%s=quit, %s=edit, %s=postpone: " msgstr "%s=×ÙÈÏÄ, %s=ÒÅÄÁËÔÉÒÏ×ÁÔØ, %s=ÏÔÌÏÖÉÔØ: " -#: src/lang.c:749 +#: src/lang.c:751 #, c-format msgid "%s=quit %s=edit %s=save kill description: " msgstr "%s=×ÙÈÏÄ %s=ÒÅÄÁËÔÉÒÏ×ÁÔØ %s=ÓÏÈÒ. ÕÎÉÞÔÏÖÅÎÎÏÅ ÏÐÉÓÁÎÉÅ: " -#: src/lang.c:750 +#: src/lang.c:752 #, c-format msgid "%s=quit %s=edit %s=save select description: " msgstr "%s=×ÙÈÏÄ %s=ÒÅÄÁËÔÉÒÏ×ÁÔØ %s=ÓÏÈÒ. ×ÙÂÒÁÎÎÏÅ ÏÐÉÓÁÎÉÅ: " -#: src/lang.c:751 +#: src/lang.c:753 msgid "Do you really want to quit without saving your configuration?" msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ×ÙÊÔÉ ÂÅÚ ÓÏÈÒÁÎÅÎÉÑ ËÏÎÆÉÇÕÒÁÃÉÉ?" -#: src/lang.c:754 +#: src/lang.c:756 msgid "Invalid range - valid are '0-9.$' eg. 1-$" msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÄÉÁÐÁÚÏÎ - ÄÏÓÔÕÐÎÙ '0-9.$', ÎÁÐÒ. 1-$" -#: src/lang.c:756 +#: src/lang.c:757 msgid "Do you want to abort this operation?" msgstr "÷Ù ÈÏÔÉÔÅ ÐÒÅÒ×ÁÔØ ÏÐÅÒÁÃÉÀ?" -#: src/lang.c:757 +#: src/lang.c:758 msgid "Do you want to exit tin immediately?" msgstr "÷Ù ÈÏÔÉÔÅ ×ÙÊÔÉ ÉÚ tin ÎÅÍÅÄÌÅÎÎÏ?" @@ -4736,7 +4766,8 @@ msgid " -p port use port as NNTP port msgstr " -p port ÉÓÐÏÌØÚÏ×ÁÔØ port ËÁË NNTP ÐÏÒÔ [ÐÏ ÕÍÏÌÞÁÎÉÀ=%d]" #: src/lang.c:1118 -msgid " -Q quick start. Same as -nqd" +#, fuzzy +msgid " -Q quick start. Same as -dnq" msgstr " -Q ÂÙÓÔÒÙÊ ÚÁÐÕÓË. ëÁË Ó ÏÐÃÉÑÍÉ -nqd" #: src/lang.c:1119 @@ -8054,21 +8085,27 @@ msgid "Insert 'X-Comment-To:' header" msgstr "äÏÂÁ×ÌÑÔØ ÚÁÇÏÌÏ×ÏË 'X-Comment-To:'" #. TODO: lang.c -#: src/main.c:817 +#: src/main.c:819 msgid "reading from local spool" msgstr "" -#: src/misc.c:3877 +#. TODO: != ENOENT ? and -> lang.c +#: src/misc.c:750 +#, c-format +msgid "Error: unlink %s" +msgstr "" + +#: src/misc.c:3928 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "÷ÅÒÓÉÑ: %s %s ÒÅÌÉÚ %s (\"%s\") %s %s\n" -#: src/misc.c:3880 +#: src/misc.c:3931 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "÷ÅÒÓÉÑ: %s %s ÒÅÌÉÚ %s (\"%s\")\n" -#: src/newsrc.c:460 +#: src/newsrc.c:472 msgid "Unreachable?\n" msgstr "îÅÄÏÓÔÉÖÉÍÏ?\n" @@ -8108,12 +8145,12 @@ msgstr "" msgid "MOTD: " msgstr "" -#: src/nrctbl.c:178 +#: src/nrctbl.c:184 #, c-format msgid "couldn't expand %s\n" msgstr "ÎÅ ÐÏÌÕÞÉÌÏÓØ ÒÁÓËÒÙÔØ %s\n" -#: src/post.c:1344 +#: src/post.c:1357 #, fuzzy, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" @@ -8122,7 +8159,7 @@ msgstr "" "óÔÒÏËÁ %d ÄÌÉÎÎÅÅ 998 ÏËÔÅÔÏ× É ÄÏÌÖÎÁ ÂÙÔØ ÒÁÚÂÉÔÁ ÎÁ ÞÁÓÔÉ,\n" "ÎÏ ËÏÄÉÒÏ×ËÁ ÎÅ ÕÓÔÁÎÏ×ÌÅÎÁ ÎÉ × %s, ÎÉ × %s\n" -#: src/post.c:1349 +#: src/post.c:1362 #, fuzzy, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" @@ -8134,7 +8171,7 @@ msgstr "" "ÉÌÉ ÓÏÏÂÝÅÎÉÅ ÎÅ ÓÏÄÅÒÖÉÔ ÎÉ ÏÄÎÏÇÏ 8-ÂÉÔÎÏÇÏ ÓÉÍ×ÏÌÁ, ÔÁËÉÍ ÏÂÒÁÚÏÍ\n" "ÒÁÚÂÉÔÉÑ ÎÁ ÞÁÓÔÉ ÎÅ ÐÒÏÉÚÏÊÄ£Ô.\n" -#: src/post.c:1351 +#: src/post.c:1364 #, fuzzy, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" @@ -8143,25 +8180,25 @@ msgstr "" "óÔÒÏËÁ %d ÄÌÉÎÎÅÅ 998 ÏËÔÅÔÏ× É ÄÏÌÖÎÁ ÂÙÔØ ÒÁÚÂÉÔÁ ÎÁ ÞÁÓÔÉ,\n" "ÎÏ ËÏÄÉÒÏ×ËÁ ÎÅ ÕÓÔÁÎÏ×ÌÅÎÁ × %s\n" -#: src/post.c:2325 +#: src/post.c:2353 #, c-format msgid "Posting: %.*s ..." msgstr "ïÔÐÒÁ×ÌÅÎÉÅ × ÇÒÕÐÐÕ %.*s ..." -#: src/post.c:4075 +#: src/post.c:4119 msgid "Can't supersede in mailgroups, try repost instead." msgstr "" #. Check if okay to read -#: src/read.c:207 +#: src/read.c:204 msgid "Aborting read, please wait..." msgstr "ðÒÅÒÙ×ÁÎÉÅ ÞÔÅÎÉÑ, ÐÏÄÏÖÄÉÔÅ..." -#: src/read.c:354 +#: src/read.c:351 msgid "Aborted read\n" msgstr "þÔÅÎÉÅ ÐÒÅÒ×ÁÎÏ\n" -#: src/read.c:409 +#: src/read.c:406 msgid "Draining\n" msgstr "ïÓÕÛÅÎÉÅ\n" @@ -8174,6 +8211,18 @@ msgid "[- Unavailable -]" msgstr "[- îÅÄÏÓÔÕÐÎÏ -]" #. +#. * Add the Message-ID headers to the cache, using the last Reference +#. * as the parent +#. +#. +#. * Add the References data to the cache +#. +#: src/refs.c:1015 src/refs.c:1077 +#, c-format +msgid "Building References-trees (%d/%d)..." +msgstr "" + +#. #. * preamble #. * TODO: -> lang.c #. @@ -8191,7 +8240,7 @@ msgstr "" "ÄÌÑ ÒÁÂÏÔÙ Ó ÎÏ×ÙÍ ÆÏÒÍÁÔÏÍ É ÓÌÅÄÕÀÝÉÅ ÄÁÎÎÙÅ ÍÏÇÕÔ ×ÙÇÌÑÄÅÔØ ÓÔÒÁÎÎÏ.\n" "\n" -#: src/save.c:1069 +#: src/save.c:1075 msgid "bytes" msgstr "ÂÁÊÔ" Binary files tin-2.4.4/po/sv.gmo and tin-2.4.5/po/sv.gmo differ diff -Nurp '--exclude=.bzr*' tin-2.4.4/po/sv.po tin-2.4.5/po/sv.po --- tin-2.4.4/po/sv.po 2019-12-24 10:55:09.000000000 +0100 +++ tin-2.4.5/po/sv.po 2020-12-24 00:24:54.253901173 +0100 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tin 1.8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 13:24+0100\n" +"POT-Creation-Date: 2020-12-24 00:24+0100\n" "PO-Revision-Date: 2006-01-11 21:22+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -16,6 +16,30 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +#. -> lang.c +#: src/art.c:418 +#, fuzzy, c-format +msgid "Reading %s\n" +msgstr "Läser om %s..." + +#. TODO: -> lang.c +#: src/art.c:1205 +#, fuzzy +msgid "Threading by multipart" +msgstr "Trådar artiklar..." + +#. -> lang.c +#: src/art.c:2539 +#, fuzzy, c-format +msgid "Writing %s\n" +msgstr "Försöker med %s" + +#. TODO: -> lang.c +#: src/art.c:2619 +#, fuzzy +msgid "Writing overview cache..." +msgstr "Skriver attributfil..." + #: src/attrib.c:986 #, fuzzy msgid "Processing attributes... " @@ -1399,7 +1423,7 @@ msgstr "" #: src/lang.c:274 #, c-format -msgid "Filtering global rules (%d/%d)..." +msgid "Filtering global rules (%d/%d) ('q' to quit)..." msgstr "" #: src/lang.c:275 @@ -2109,8 +2133,8 @@ msgstr "" msgid "select threads that match user specified pattern" msgstr "" -#: src/lang.c:465 -msgid "tag all parts of current multipart-message in order" +#: src/lang.c:465 src/lang.c:521 +msgid "tag/untag all parts of current multipart-message in order" msgstr "" #: src/lang.c:466 @@ -2332,7 +2356,7 @@ msgstr "markera tråd som oläst" msgid "read chosen article" msgstr "läs vald artikel" -#: src/lang.c:521 +#: src/lang.c:522 msgid "" "Display properties\n" "------------------" @@ -2340,7 +2364,7 @@ msgstr "" "Visa egenskaper\n" "---------------" -#: src/lang.c:522 +#: src/lang.c:523 msgid "" "Miscellaneous\n" "-------------" @@ -2348,7 +2372,7 @@ msgstr "" "Diverse\n" "-------" -#: src/lang.c:523 +#: src/lang.c:524 msgid "" "Moving around\n" "-------------" @@ -2356,7 +2380,7 @@ msgstr "" "Flytta runt\n" "-----------" -#: src/lang.c:524 +#: src/lang.c:525 msgid "" "Group/thread/article operations\n" "-------------------------------" @@ -2364,7 +2388,7 @@ msgstr "" "Operationer för grupp/tråd/artikel\n" "----------------------------------" -#: src/lang.c:525 +#: src/lang.c:526 #, fuzzy msgid "" "Attachment operations\n" @@ -2373,7 +2397,7 @@ msgstr "" "Visa egenskaper\n" "---------------" -#: src/lang.c:526 +#: src/lang.c:527 #, fuzzy msgid "" "Attribute operations\n" @@ -2382,7 +2406,7 @@ msgstr "" "Visa egenskaper\n" "---------------" -#: src/lang.c:527 +#: src/lang.c:528 #, fuzzy msgid "" "Option operations\n" @@ -2391,7 +2415,7 @@ msgstr "" "Visa egenskaper\n" "---------------" -#: src/lang.c:528 +#: src/lang.c:529 #, fuzzy msgid "" "Scope operations\n" @@ -2400,7 +2424,7 @@ msgstr "" "Visa egenskaper\n" "---------------" -#: src/lang.c:529 +#: src/lang.c:530 #, fuzzy msgid "" "URL operations\n" @@ -2409,116 +2433,120 @@ msgstr "" "Visa egenskaper\n" "---------------" -#: src/lang.c:530 +#: src/lang.c:531 #, fuzzy msgid "choose first URL in list" msgstr "välj första grupp i lista" -#: src/lang.c:531 +#: src/lang.c:532 #, fuzzy msgid "0 - 9\t choose URL by number" msgstr "0 - 9\t välj grupp efter nummer" -#: src/lang.c:532 +#: src/lang.c:533 #, fuzzy msgid "choose last URL in list" msgstr "välj sista grupp i lista" -#: src/lang.c:533 +#: src/lang.c:534 #, fuzzy msgid "search for URLs forwards" msgstr "Sök framåt [%s]> " -#: src/lang.c:534 +#: src/lang.c:535 #, fuzzy msgid "search for URLs backwards" msgstr "Sök bakåt [%s]> " -#: src/lang.c:535 +#: src/lang.c:536 msgid "Open URL in browser" msgstr "" -#: src/lang.c:536 +#: src/lang.c:537 msgid "toggle info message in last line (URL)" msgstr "" -#: src/lang.c:538 +#: src/lang.c:539 msgid "Group Level Commands" msgstr "Gruppnivåkommandon" -#: src/lang.c:539 +#: src/lang.c:540 msgid "Kill filter added" msgstr "" -#: src/lang.c:540 +#: src/lang.c:541 msgid "Auto-selection filter added" msgstr "" -#: src/lang.c:541 +#: src/lang.c:542 msgid "All parts tagged" msgstr "" -#: src/lang.c:542 +#: src/lang.c:543 +msgid "All parts untagged" +msgstr "" + +#: src/lang.c:544 msgid "Storing article for later posting" msgstr "" -#: src/lang.c:543 +#: src/lang.c:545 msgid "Please enter a valid character" msgstr "Vänligen ange ett giltigt tecken" -#: src/lang.c:544 +#: src/lang.c:546 #, c-format msgid "Missing part #%d" msgstr "" -#: src/lang.c:545 +#: src/lang.c:547 msgid "*** No postponed articles ***" msgstr "*** Inga uppskjutna artiklar ***" -#: src/lang.c:546 +#: src/lang.c:548 msgid "Not a multi-part message" msgstr "" -#: src/lang.c:547 +#: src/lang.c:549 msgid "You are not subscribed to this group" msgstr "Du är inte prenumerant av denna grupp" -#: src/lang.c:548 +#: src/lang.c:550 msgid "No previous expression" msgstr "Inget tidigare uttryck" -#: src/lang.c:549 +#: src/lang.c:551 msgid "Operation disabled in no-overwrite mode" msgstr "" #. TODO: replace hard coded key-name in txt_info_postponed -#: src/lang.c:551 +#: src/lang.c:553 #, c-format msgid "%d postponed %s, reuse with ^O...\n" msgstr "" -#: src/lang.c:552 +#: src/lang.c:554 msgid "" "X-Conversion-Note: multipart/alternative contents have been removed.\n" " To get the whole article, turn alternative handling OFF in the Option " "Menu\n" msgstr "" -#: src/lang.c:554 +#: src/lang.c:556 #, c-format msgid "Save filename for %s/%s is a mailbox. Attachment not saved" msgstr "" -#: src/lang.c:555 +#: src/lang.c:557 msgid "TeX2Iso encoded article" msgstr "" -#: src/lang.c:556 +#: src/lang.c:558 msgid "incomplete " msgstr "ej komplett " #. TODO: replace hard coded key-names -#: src/lang.c:558 +#: src/lang.c:560 #, c-format msgid "" "\n" @@ -2556,152 +2584,152 @@ msgid "" "Please send bug-reports/comments to %s with the 'R' command.\n" msgstr "" -#: src/lang.c:574 +#: src/lang.c:576 #, c-format msgid "Invalid From: %s line. Read the INSTALL file again." msgstr "" -#: src/lang.c:576 +#: src/lang.c:578 msgid "Invalid multibyte sequence found\n" msgstr "" -#: src/lang.c:579 +#: src/lang.c:581 #, c-format msgid "Invalid Sender:-header %s" msgstr "" -#: src/lang.c:581 +#: src/lang.c:583 msgid "Inverse video disabled" msgstr "" -#: src/lang.c:582 +#: src/lang.c:584 msgid "Inverse video enabled" msgstr "" -#: src/lang.c:584 +#: src/lang.c:586 #, c-format msgid "Missing definition for %s\n" msgstr "" -#: src/lang.c:585 +#: src/lang.c:587 #, c-format msgid "Invalid key definition '%s'\n" msgstr "" -#: src/lang.c:586 +#: src/lang.c:588 #, c-format msgid "Invalid keyname '%s'\n" msgstr "" -#: src/lang.c:587 +#: src/lang.c:589 #, c-format msgid "Keymap file was upgraded to version %s\n" msgstr "" -#: src/lang.c:588 +#: src/lang.c:590 #, c-format msgid "Kill From: [%s] (y/n): " msgstr "" -#: src/lang.c:589 +#: src/lang.c:591 msgid "Kill Lines: (num): " msgstr "" -#: src/lang.c:590 +#: src/lang.c:592 msgid "Kill Article Menu" msgstr "" -#: src/lang.c:591 +#: src/lang.c:593 #, c-format msgid "Kill Msg-ID: [%s] (f/l/o/n): " msgstr "" -#: src/lang.c:592 +#: src/lang.c:594 msgid "Kill pattern scope : " msgstr "" -#: src/lang.c:593 +#: src/lang.c:595 #, c-format msgid "Kill Subject: [%s] (y/n): " msgstr "" -#: src/lang.c:594 +#: src/lang.c:596 msgid "Kill text pattern : " msgstr "" -#: src/lang.c:595 +#: src/lang.c:597 msgid "Kill time in days : " msgstr "" -#: src/lang.c:597 +#: src/lang.c:599 msgid "Last" msgstr "Sista" -#: src/lang.c:598 +#: src/lang.c:600 msgid "-- Last response --" msgstr "-- Sista svaret --" -#: src/lang.c:599 +#: src/lang.c:601 #, c-format msgid "Lines %s " msgstr "Rader %s " -#: src/lang.c:602 +#: src/lang.c:604 #, fuzzy msgid "Function not available." msgstr "Artikel ej tillgänglig" -#: src/lang.c:603 +#: src/lang.c:605 msgid "Not reading via NNTP." msgstr "" -#: src/lang.c:604 +#: src/lang.c:606 #, fuzzy, c-format msgid "Group: %s" msgstr "Grupp %.*s..." -#: src/lang.c:605 +#: src/lang.c:607 #, fuzzy, c-format msgid "Groups: %s" msgstr "Grupp %.*s..." -#: src/lang.c:608 +#: src/lang.c:610 msgid "Mail" msgstr "Post" -#: src/lang.c:609 +#: src/lang.c:611 msgid "mailbox " msgstr "postlåda " -#: src/lang.c:610 +#: src/lang.c:612 #, c-format msgid "Mail article(s) to [%.*s]> " msgstr "Skicka artikel(ar) till [%.*s]> " -#: src/lang.c:611 +#: src/lang.c:613 #, c-format msgid "Mailing log to %s\n" msgstr "Skickar logg till %s\n" -#: src/lang.c:612 +#: src/lang.c:614 msgid "Mail bug report..." msgstr "" -#: src/lang.c:613 +#: src/lang.c:615 #, c-format msgid "Mail BUG REPORT to %s?" msgstr "Skicka FELRAPPORT till %s?" -#: src/lang.c:614 +#: src/lang.c:616 msgid "Mailed" msgstr "Skickad" -#: src/lang.c:615 +#: src/lang.c:617 #, c-format msgid "Mailing to %s..." msgstr "Skickar till %s..." -#: src/lang.c:616 +#: src/lang.c:618 msgid "" "# [Mail/Save] active file. Format is like news active file:\n" "# groupname max.artnum min.artnum /dir\n" @@ -2709,353 +2737,353 @@ msgid "" "#\n" msgstr "" -#: src/lang.c:619 +#: src/lang.c:621 #, fuzzy, c-format msgid "%s marked as read" msgstr "%s markerad som oläst" -#: src/lang.c:620 +#: src/lang.c:622 #, c-format msgid "%s marked as unread" msgstr "%s markerad som oläst" -#: src/lang.c:621 +#: src/lang.c:623 #, fuzzy, c-format msgid "Marked %d of %d %s as read" msgstr "Markera grupp %s som läst?" -#: src/lang.c:622 +#: src/lang.c:624 #, fuzzy, c-format msgid "Marked %d of %d %s as unread" msgstr "Markera grupp %s som läst?" -#: src/lang.c:623 src/lang.c:1352 +#: src/lang.c:625 src/lang.c:1352 msgid "Mark" msgstr "Markera" -#: src/lang.c:624 +#: src/lang.c:626 #, c-format msgid "Mark all articles as read%s?" msgstr "Markera alla artiklar som lästa%s?" -#: src/lang.c:625 +#: src/lang.c:627 #, fuzzy, c-format msgid "Mark article as read%s?" msgstr "Markera alla artiklar som lästa%s?" -#: src/lang.c:626 +#: src/lang.c:628 #, c-format msgid "Mark group %s as read?" msgstr "Markera grupp %s som läst?" -#: src/lang.c:627 +#: src/lang.c:629 #, c-format msgid "Mark thread as read%s?" msgstr "Markera tråd som läst%s?" -#: src/lang.c:628 +#: src/lang.c:630 #, c-format msgid "Matching %s groups..." msgstr "Matchar %s grupper..." -#: src/lang.c:629 src/lang.c:643 src/lang.c:649 +#: src/lang.c:631 src/lang.c:645 src/lang.c:651 #, fuzzy, c-format msgid "=set current to n; %s=line down; %s=line up; %s=help; %s=quit" msgstr "" "=sätt nuvarande till n; %s=nästa olästa; %s=sökmönster; %s=döda/välj" -#: src/lang.c:631 +#: src/lang.c:633 #, fuzzy, c-format msgid "" "%s=view; %s=pipe; %s=pipe raw; %s=save; %s=tag; %s=tag pattern; %s=untag all" msgstr "" "%s=rad ner; %s=rad upp; %s=hjälp; %s=flytta; %s=avsluta; %s=växla alla/olästa" -#: src/lang.c:633 +#: src/lang.c:635 #, fuzzy, c-format msgid "%s=view; %s=save; %s=tag; %s=tag pattern; %s=untag all" msgstr "" "%s=rad ner; %s=rad upp; %s=hjälp; %s=flytta; %s=avsluta; %s=växla alla/olästa" -#: src/lang.c:635 +#: src/lang.c:637 #, fuzzy, c-format msgid "" "%s=reverse tagging; %s=search forwards; %s=search backwards; %s=repeat search" msgstr "%s=sök framåt; %s=sök bakåt; %s=avsluta" -#: src/lang.c:636 src/lang.c:640 +#: src/lang.c:638 src/lang.c:642 #, c-format msgid "=set current to n; %s=next unread; %s=search pattern; %s=kill/select" msgstr "" "=sätt nuvarande till n; %s=nästa olästa; %s=sökmönster; %s=döda/välj" -#: src/lang.c:637 +#: src/lang.c:639 #, c-format msgid "" "%s=author search; %s=catchup; %s=line down; %s=line up; %s=mark read; " "%s=list thread" msgstr "" -#: src/lang.c:638 +#: src/lang.c:640 #, c-format msgid "%s=line up; %s=line down; %s=page up; %s=page down; %s=top; %s=bottom" msgstr "%s=rad upp; %s=rad ner; %s=sida upp; %s=sida ned; %s=topp; %s=botten" -#: src/lang.c:639 +#: src/lang.c:641 #, c-format msgid "%s=search forwards; %s=search backwards; %s=quit" msgstr "%s=sök framåt; %s=sök bakåt; %s=avsluta" -#: src/lang.c:641 +#: src/lang.c:643 #, c-format msgid "%s=author search; %s=body search; %s=catchup; %s=followup; %s=mark read" msgstr "" -#: src/lang.c:642 +#: src/lang.c:644 #, c-format msgid "%s=add; %s=move; %s=rename; %s=delete" msgstr "" -#: src/lang.c:644 +#: src/lang.c:646 #, c-format msgid "=set current to n; %s=next unread; %s,%s=search pattern; %s=catchup" msgstr "" -#: src/lang.c:645 +#: src/lang.c:647 #, c-format msgid "" "%s=line down; %s=line up; %s=help; %s=move; %s=quit; %s=toggle all/unread" msgstr "" "%s=rad ner; %s=rad upp; %s=hjälp; %s=flytta; %s=avsluta; %s=växla alla/olästa" -#: src/lang.c:646 +#: src/lang.c:648 #, c-format msgid "" "%s=subscribe; %s=sub pattern; %s=unsubscribe; %s=unsub pattern; %s=yank in/" "out" msgstr "" -#: src/lang.c:647 +#: src/lang.c:649 #, c-format msgid "=set current to n; %s=next unread; %s=catchup; %s=display toggle" msgstr "" -#: src/lang.c:648 +#: src/lang.c:650 #, c-format msgid "%s=help; %s=line down; %s=line up; %s=quit; %s=tag; %s=mark unread" msgstr "" "%s=hjälp; %s=rad ner; %s=rad upp; %s=avsluta; %s=märk; %s=markera oläst" -#: src/lang.c:650 +#: src/lang.c:652 #, fuzzy, c-format msgid "%s=search forwards; %s=search backwards; %s=repeat search" msgstr "%s=sök framåt; %s=sök bakåt; %s=avsluta" -#: src/lang.c:651 +#: src/lang.c:653 msgid "--More--" msgstr "--Mer--" -#: src/lang.c:652 +#: src/lang.c:654 #, c-format msgid "Moving %s..." msgstr "Flyttar %s..." -#: src/lang.c:653 +#: src/lang.c:655 msgid "Message-ID: & last Reference " msgstr "" -#: src/lang.c:654 +#: src/lang.c:656 msgid "Message-ID: line " msgstr "" -#: src/lang.c:655 +#: src/lang.c:657 msgid "Message-ID: & References: line" msgstr "" -#: src/lang.c:657 +#: src/lang.c:659 msgid ", name: " msgstr ", namn: " -#: src/lang.c:658 +#: src/lang.c:660 #, c-format msgid "Go to newsgroup [%s]> " msgstr "Gå till diskussionsgrupp [%s]> " -#: src/lang.c:659 +#: src/lang.c:661 msgid "newsgroups" msgstr "diskussionsgrupper" -#: src/lang.c:660 +#: src/lang.c:662 #, c-format msgid "Position %s in group list (1,2,..,$) [%d]> " msgstr "" -#: src/lang.c:661 +#: src/lang.c:663 msgid "newsgroup" msgstr "diskussionsgrupp" -#: src/lang.c:662 +#: src/lang.c:664 msgid "Try and save newsrc file again?" msgstr "Försöka att spara filen newsrc igen?" -#: src/lang.c:663 +#: src/lang.c:665 msgid "Warning: No newsgroups were written to your newsrc file. Save aborted." msgstr "" -#: src/lang.c:664 +#: src/lang.c:666 msgid "newsrc file saved successfully.\n" msgstr "" -#: src/lang.c:665 +#: src/lang.c:667 msgid "-- Next response --" msgstr "-- Nästa svar --" -#: src/lang.c:666 +#: src/lang.c:668 msgid "No " msgstr "Nej " -#: src/lang.c:667 +#: src/lang.c:669 msgid "*** No articles ***" msgstr "*** Inga artiklar ***" -#: src/lang.c:668 +#: src/lang.c:670 msgid "No articles have been posted" msgstr "Inga artiklar har postats" -#: src/lang.c:669 +#: src/lang.c:671 #, fuzzy msgid "*** No attachments ***" msgstr "*** Inga artiklar ***" -#: src/lang.c:670 +#: src/lang.c:672 msgid "*** No description ***" msgstr "*** Ingen beskrivning ***" -#: src/lang.c:671 +#: src/lang.c:673 msgid "No filename" msgstr "Inget filnamn" -#: src/lang.c:672 +#: src/lang.c:674 msgid "No group" msgstr "Ingen grupp" -#: src/lang.c:673 +#: src/lang.c:675 msgid "*** No groups ***" msgstr "*** Inga grupper ***" -#: src/lang.c:674 +#: src/lang.c:676 msgid "No more groups to read" msgstr "Inga fler grupper att läsa" -#: src/lang.c:675 +#: src/lang.c:677 msgid "No last message" msgstr "Inget sista meddelande" -#: src/lang.c:676 +#: src/lang.c:678 msgid "No mail address" msgstr "Ingen e-postadress" -#: src/lang.c:677 +#: src/lang.c:679 msgid "No articles marked for saving" msgstr "" -#: src/lang.c:678 +#: src/lang.c:680 msgid "No match" msgstr "Ingen match" -#: src/lang.c:679 +#: src/lang.c:681 msgid "No more groups" msgstr "Inga fler grupper" -#: src/lang.c:680 +#: src/lang.c:682 msgid "No newsgroups" msgstr "Inga diskussionsgrupper" -#: src/lang.c:681 +#: src/lang.c:683 msgid "No next unread article" msgstr "Slut på olästa artiklar" -#: src/lang.c:682 +#: src/lang.c:684 msgid "No previous group" msgstr "Ingen föregående grupp" -#: src/lang.c:683 +#: src/lang.c:685 msgid "No previous search, nothing to repeat" msgstr "" -#: src/lang.c:684 +#: src/lang.c:686 msgid "No previous unread article" msgstr "Ingen föregående oläst artikel" -#: src/lang.c:685 +#: src/lang.c:687 msgid "No responses" msgstr "Inga svar" -#: src/lang.c:686 +#: src/lang.c:688 msgid "No responses to list in current thread" msgstr "" -#: src/lang.c:687 +#: src/lang.c:689 #, fuzzy msgid "*** No scopes ***" msgstr "*** Inga grupper ***" -#: src/lang.c:688 +#: src/lang.c:690 msgid "No search string" msgstr "Ingen söksträng" -#: src/lang.c:689 +#: src/lang.c:691 msgid "No subject" msgstr "Inget ämne" -#: src/lang.c:691 +#: src/lang.c:693 #, c-format msgid "%s: Terminal must have clear to end-of-line (ce)\n" msgstr "" -#: src/lang.c:692 +#: src/lang.c:694 #, c-format msgid "%s: Terminal must have clear to end-of-screen (cd)\n" msgstr "" -#: src/lang.c:693 +#: src/lang.c:695 #, c-format msgid "%s: Terminal must have clearscreen (cl) capability\n" msgstr "" -#: src/lang.c:694 +#: src/lang.c:696 #, c-format msgid "%s: Terminal must have cursor motion (cm)\n" msgstr "" -#: src/lang.c:695 +#: src/lang.c:697 #, c-format msgid "%s: TERM variable must be set to use screen capabilities\n" msgstr "" -#: src/lang.c:697 +#: src/lang.c:699 #, c-format msgid "No viewer found for %s/%s\n" msgstr "" -#: src/lang.c:698 +#: src/lang.c:700 msgid "Newsgroup does not exist on this server" msgstr "" -#: src/lang.c:699 +#: src/lang.c:701 #, c-format msgid "Group %s not found in active file" msgstr "" -#: src/lang.c:700 +#: src/lang.c:702 msgid "c)reate it, use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "" -#: src/lang.c:701 +#: src/lang.c:703 msgid "use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "" -#: src/lang.c:702 +#: src/lang.c:704 #, c-format msgid "" "# NNTP-server -> newsrc translation table and NNTP-server\n" @@ -3072,179 +3100,179 @@ msgid "" "#\n" msgstr "" -#: src/lang.c:709 +#: src/lang.c:711 msgid "Only" msgstr "Endast" -#: src/lang.c:710 +#: src/lang.c:712 #, c-format msgid "Option not enabled. Recompile with %s." msgstr "Flagga inte aktiverad. Bygg om med %s." -#: src/lang.c:711 +#: src/lang.c:713 msgid "Options Menu" msgstr "Alternativmenyn" -#: src/lang.c:712 +#: src/lang.c:714 #, fuzzy msgid "Options Menu Commands" msgstr "Alternativmenyn" -#: src/lang.c:715 +#: src/lang.c:717 #, c-format msgid "Error in regex: %s at pos. %d '%s'" msgstr "" -#: src/lang.c:716 +#: src/lang.c:718 #, c-format msgid "Error in regex: pcre internal error %d" msgstr "" -#: src/lang.c:717 +#: src/lang.c:719 #, c-format msgid "Error in regex: study - pcre internal error %s" msgstr "" -#: src/lang.c:718 +#: src/lang.c:720 msgid "Post a followup..." msgstr "Posta en uppföljning..." #. TODO: replace hard coded key-name in txt_post_error_ask_postpone -#: src/lang.c:720 +#: src/lang.c:722 msgid "" "An error has occurred while posting the article. If you think that this\n" "error is temporary or otherwise correctable, you can postpone the article\n" "and pick it up again with ^O later.\n" msgstr "" -#: src/lang.c:723 +#: src/lang.c:725 msgid "Posted articles history" msgstr "" -#: src/lang.c:724 +#: src/lang.c:726 #, c-format msgid "Post to newsgroup(s) [%s]> " msgstr "Posta till diskussionsgrupp(er) [%s]> " -#: src/lang.c:725 +#: src/lang.c:727 msgid "-- post processing started --" msgstr "" -#: src/lang.c:726 +#: src/lang.c:728 msgid "-- post processing completed --" msgstr "" -#: src/lang.c:727 +#: src/lang.c:729 #, c-format msgid "Post subject [%s]> " msgstr "" -#: src/lang.c:728 +#: src/lang.c:730 msgid "" "# Summary of mailed/posted messages viewable by 'W' command from within " "tin.\n" msgstr "" -#: src/lang.c:729 +#: src/lang.c:731 msgid "Posting article..." msgstr "Postar artikel..." -#: src/lang.c:730 +#: src/lang.c:732 #, c-format msgid "Post postponed articles [%%s]? (%s/%s/%s/%s/%s): " msgstr "" -#: src/lang.c:731 +#: src/lang.c:733 #, c-format msgid "Hot %s" msgstr "Hetta %s" -#: src/lang.c:732 +#: src/lang.c:734 #, c-format msgid "Tagged %s" msgstr "Märkt %s" -#: src/lang.c:733 +#: src/lang.c:735 #, c-format msgid "Untagged %s" msgstr "" -#: src/lang.c:735 +#: src/lang.c:737 #, c-format msgid "Preparing for filtering on Path header (%d/%d)..." msgstr "" -#: src/lang.c:737 +#: src/lang.c:739 msgid "Processing mail messages marked for deletion." msgstr "" -#: src/lang.c:738 +#: src/lang.c:740 msgid "Processing saved articles marked for deletion." msgstr "" -#: src/lang.c:739 +#: src/lang.c:741 #, c-format msgid "Accept Followup-To? %s=post, %s=ignore, %s=quit: " msgstr "" -#: src/lang.c:740 +#: src/lang.c:742 msgid "Article unchanged, abort mailing?" msgstr "" -#: src/lang.c:741 +#: src/lang.c:743 #, c-format msgid "Do you want to see postponed articles (%d)?" msgstr "" -#: src/lang.c:743 +#: src/lang.c:745 msgid "Add quick kill filter?" msgstr "" -#: src/lang.c:744 +#: src/lang.c:746 msgid "Add quick selection filter?" msgstr "" -#: src/lang.c:745 +#: src/lang.c:747 msgid "Do you really want to quit?" msgstr "Vill du verkligen avsluta?" -#: src/lang.c:746 +#: src/lang.c:748 #, c-format msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%s]: " msgstr "" -#: src/lang.c:747 +#: src/lang.c:749 msgid "You have tagged articles in this group - quit anyway?" msgstr "" -#: src/lang.c:748 +#: src/lang.c:750 #, c-format msgid "%s=quit, %s=edit, %s=postpone: " msgstr "" -#: src/lang.c:749 +#: src/lang.c:751 #, c-format msgid "%s=quit %s=edit %s=save kill description: " msgstr "" -#: src/lang.c:750 +#: src/lang.c:752 #, c-format msgid "%s=quit %s=edit %s=save select description: " msgstr "" -#: src/lang.c:751 +#: src/lang.c:753 msgid "Do you really want to quit without saving your configuration?" msgstr "Vill du verkligen avsluta utan att spara din konfiguration?" -#: src/lang.c:754 +#: src/lang.c:756 msgid "Invalid range - valid are '0-9.$' eg. 1-$" msgstr "" -#: src/lang.c:756 +#: src/lang.c:757 msgid "Do you want to abort this operation?" msgstr "Vill du avbryta denna operation?" -#: src/lang.c:757 +#: src/lang.c:758 msgid "Do you want to exit tin immediately?" msgstr "Vill du avsluta tin omedelbart?" @@ -4462,8 +4490,9 @@ msgid " -p port use port as NNTP port msgstr "" #: src/lang.c:1118 -msgid " -Q quick start. Same as -nqd" -msgstr " -Q snabbstart. Samma som -nqd" +#, fuzzy +msgid " -Q quick start. Same as -dnq" +msgstr " -Q snabbstart. Samma som -dnq" #: src/lang.c:1119 msgid " -r read news remotely from default NNTP server" @@ -7430,21 +7459,27 @@ msgid "Insert 'X-Comment-To:' header" msgstr "" #. TODO: lang.c -#: src/main.c:817 +#: src/main.c:819 msgid "reading from local spool" msgstr "" -#: src/misc.c:3877 +#. TODO: != ENOENT ? and -> lang.c +#: src/misc.c:750 +#, c-format +msgid "Error: unlink %s" +msgstr "" + +#: src/misc.c:3928 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "Version: %s %s utgåva %s (\"%s\") %s %s\n" -#: src/misc.c:3880 +#: src/misc.c:3931 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "Version: %s %s utgåva %s (\"%s\")\n" -#: src/newsrc.c:460 +#: src/newsrc.c:472 msgid "Unreachable?\n" msgstr "Ej nåbar?\n" @@ -7481,19 +7516,19 @@ msgstr "" msgid "MOTD: " msgstr "" -#: src/nrctbl.c:178 +#: src/nrctbl.c:184 #, c-format msgid "couldn't expand %s\n" msgstr "" -#: src/post.c:1344 +#: src/post.c:1357 #, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" "encoding is neither set to %s nor to %s\n" msgstr "" -#: src/post.c:1349 +#: src/post.c:1362 #, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" @@ -7501,32 +7536,32 @@ msgid "" "posting doesn't contain any 8bit chars and thus folding won't happen\n" msgstr "" -#: src/post.c:1351 +#: src/post.c:1364 #, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" "encoding is not set to %s\n" msgstr "" -#: src/post.c:2325 +#: src/post.c:2353 #, c-format msgid "Posting: %.*s ..." msgstr "Postar: %.*s ..." -#: src/post.c:4075 +#: src/post.c:4119 msgid "Can't supersede in mailgroups, try repost instead." msgstr "" #. Check if okay to read -#: src/read.c:207 +#: src/read.c:204 msgid "Aborting read, please wait..." msgstr "Avbryter läsning, var god vänta..." -#: src/read.c:354 +#: src/read.c:351 msgid "Aborted read\n" msgstr "Avbröt läsning\n" -#: src/read.c:409 +#: src/read.c:406 msgid "Draining\n" msgstr "" @@ -7539,6 +7574,18 @@ msgid "[- Unavailable -]" msgstr "[- Ej tillgänglig -]" #. +#. * Add the Message-ID headers to the cache, using the last Reference +#. * as the parent +#. +#. +#. * Add the References data to the cache +#. +#: src/refs.c:1015 src/refs.c:1077 +#, c-format +msgid "Building References-trees (%d/%d)..." +msgstr "" + +#. #. * preamble #. * TODO: -> lang.c #. @@ -7552,7 +7599,7 @@ msgid "" "\n" msgstr "" -#: src/save.c:1069 +#: src/save.c:1075 msgid "bytes" msgstr "byte" diff -Nurp '--exclude=.bzr*' tin-2.4.4/po/tin.pot tin-2.4.5/po/tin.pot --- tin-2.4.4/po/tin.pot 2019-12-18 13:26:20.000000000 +0100 +++ tin-2.4.5/po/tin.pot 2020-12-24 00:25:33.095419885 +0100 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 13:24+0100\n" +"POT-Creation-Date: 2020-12-24 00:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,6 +16,28 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +#. -> lang.c +#: src/art.c:418 +#, c-format +msgid "Reading %s\n" +msgstr "" + +#. TODO: -> lang.c +#: src/art.c:1205 +msgid "Threading by multipart" +msgstr "" + +#. -> lang.c +#: src/art.c:2539 +#, c-format +msgid "Writing %s\n" +msgstr "" + +#. TODO: -> lang.c +#: src/art.c:2619 +msgid "Writing overview cache..." +msgstr "" + #: src/attrib.c:986 msgid "Processing attributes... " msgstr "" @@ -1377,7 +1399,7 @@ msgstr "" #: src/lang.c:274 #, c-format -msgid "Filtering global rules (%d/%d)..." +msgid "Filtering global rules (%d/%d) ('q' to quit)..." msgstr "" #: src/lang.c:275 @@ -2065,8 +2087,8 @@ msgstr "" msgid "select threads that match user specified pattern" msgstr "" -#: src/lang.c:465 -msgid "tag all parts of current multipart-message in order" +#: src/lang.c:465 src/lang.c:521 +msgid "tag/untag all parts of current multipart-message in order" msgstr "" #: src/lang.c:466 @@ -2281,165 +2303,169 @@ msgstr "" msgid "read chosen article" msgstr "" -#: src/lang.c:521 +#: src/lang.c:522 msgid "" "Display properties\n" "------------------" msgstr "" -#: src/lang.c:522 +#: src/lang.c:523 msgid "" "Miscellaneous\n" "-------------" msgstr "" -#: src/lang.c:523 +#: src/lang.c:524 msgid "" "Moving around\n" "-------------" msgstr "" -#: src/lang.c:524 +#: src/lang.c:525 msgid "" "Group/thread/article operations\n" "-------------------------------" msgstr "" -#: src/lang.c:525 +#: src/lang.c:526 msgid "" "Attachment operations\n" "---------------------" msgstr "" -#: src/lang.c:526 +#: src/lang.c:527 msgid "" "Attribute operations\n" "--------------------" msgstr "" -#: src/lang.c:527 +#: src/lang.c:528 msgid "" "Option operations\n" "-----------------" msgstr "" -#: src/lang.c:528 +#: src/lang.c:529 msgid "" "Scope operations\n" "----------------" msgstr "" -#: src/lang.c:529 +#: src/lang.c:530 msgid "" "URL operations\n" "--------------" msgstr "" -#: src/lang.c:530 +#: src/lang.c:531 msgid "choose first URL in list" msgstr "" -#: src/lang.c:531 +#: src/lang.c:532 msgid "0 - 9\t choose URL by number" msgstr "" -#: src/lang.c:532 +#: src/lang.c:533 msgid "choose last URL in list" msgstr "" -#: src/lang.c:533 +#: src/lang.c:534 msgid "search for URLs forwards" msgstr "" -#: src/lang.c:534 +#: src/lang.c:535 msgid "search for URLs backwards" msgstr "" -#: src/lang.c:535 +#: src/lang.c:536 msgid "Open URL in browser" msgstr "" -#: src/lang.c:536 +#: src/lang.c:537 msgid "toggle info message in last line (URL)" msgstr "" -#: src/lang.c:538 +#: src/lang.c:539 msgid "Group Level Commands" msgstr "" -#: src/lang.c:539 +#: src/lang.c:540 msgid "Kill filter added" msgstr "" -#: src/lang.c:540 +#: src/lang.c:541 msgid "Auto-selection filter added" msgstr "" -#: src/lang.c:541 +#: src/lang.c:542 msgid "All parts tagged" msgstr "" -#: src/lang.c:542 +#: src/lang.c:543 +msgid "All parts untagged" +msgstr "" + +#: src/lang.c:544 msgid "Storing article for later posting" msgstr "" -#: src/lang.c:543 +#: src/lang.c:545 msgid "Please enter a valid character" msgstr "" -#: src/lang.c:544 +#: src/lang.c:546 #, c-format msgid "Missing part #%d" msgstr "" -#: src/lang.c:545 +#: src/lang.c:547 msgid "*** No postponed articles ***" msgstr "" -#: src/lang.c:546 +#: src/lang.c:548 msgid "Not a multi-part message" msgstr "" -#: src/lang.c:547 +#: src/lang.c:549 msgid "You are not subscribed to this group" msgstr "" -#: src/lang.c:548 +#: src/lang.c:550 msgid "No previous expression" msgstr "" -#: src/lang.c:549 +#: src/lang.c:551 msgid "Operation disabled in no-overwrite mode" msgstr "" #. TODO: replace hard coded key-name in txt_info_postponed -#: src/lang.c:551 +#: src/lang.c:553 #, c-format msgid "%d postponed %s, reuse with ^O...\n" msgstr "" -#: src/lang.c:552 +#: src/lang.c:554 msgid "" "X-Conversion-Note: multipart/alternative contents have been removed.\n" " To get the whole article, turn alternative handling OFF in the Option " "Menu\n" msgstr "" -#: src/lang.c:554 +#: src/lang.c:556 #, c-format msgid "Save filename for %s/%s is a mailbox. Attachment not saved" msgstr "" -#: src/lang.c:555 +#: src/lang.c:557 msgid "TeX2Iso encoded article" msgstr "" -#: src/lang.c:556 +#: src/lang.c:558 msgid "incomplete " msgstr "" #. TODO: replace hard coded key-names -#: src/lang.c:558 +#: src/lang.c:560 #, c-format msgid "" "\n" @@ -2477,151 +2503,151 @@ msgid "" "Please send bug-reports/comments to %s with the 'R' command.\n" msgstr "" -#: src/lang.c:574 +#: src/lang.c:576 #, c-format msgid "Invalid From: %s line. Read the INSTALL file again." msgstr "" -#: src/lang.c:576 +#: src/lang.c:578 msgid "Invalid multibyte sequence found\n" msgstr "" -#: src/lang.c:579 +#: src/lang.c:581 #, c-format msgid "Invalid Sender:-header %s" msgstr "" -#: src/lang.c:581 +#: src/lang.c:583 msgid "Inverse video disabled" msgstr "" -#: src/lang.c:582 +#: src/lang.c:584 msgid "Inverse video enabled" msgstr "" -#: src/lang.c:584 +#: src/lang.c:586 #, c-format msgid "Missing definition for %s\n" msgstr "" -#: src/lang.c:585 +#: src/lang.c:587 #, c-format msgid "Invalid key definition '%s'\n" msgstr "" -#: src/lang.c:586 +#: src/lang.c:588 #, c-format msgid "Invalid keyname '%s'\n" msgstr "" -#: src/lang.c:587 +#: src/lang.c:589 #, c-format msgid "Keymap file was upgraded to version %s\n" msgstr "" -#: src/lang.c:588 +#: src/lang.c:590 #, c-format msgid "Kill From: [%s] (y/n): " msgstr "" -#: src/lang.c:589 +#: src/lang.c:591 msgid "Kill Lines: (num): " msgstr "" -#: src/lang.c:590 +#: src/lang.c:592 msgid "Kill Article Menu" msgstr "" -#: src/lang.c:591 +#: src/lang.c:593 #, c-format msgid "Kill Msg-ID: [%s] (f/l/o/n): " msgstr "" -#: src/lang.c:592 +#: src/lang.c:594 msgid "Kill pattern scope : " msgstr "" -#: src/lang.c:593 +#: src/lang.c:595 #, c-format msgid "Kill Subject: [%s] (y/n): " msgstr "" -#: src/lang.c:594 +#: src/lang.c:596 msgid "Kill text pattern : " msgstr "" -#: src/lang.c:595 +#: src/lang.c:597 msgid "Kill time in days : " msgstr "" -#: src/lang.c:597 +#: src/lang.c:599 msgid "Last" msgstr "" -#: src/lang.c:598 +#: src/lang.c:600 msgid "-- Last response --" msgstr "" -#: src/lang.c:599 +#: src/lang.c:601 #, c-format msgid "Lines %s " msgstr "" -#: src/lang.c:602 +#: src/lang.c:604 msgid "Function not available." msgstr "" -#: src/lang.c:603 +#: src/lang.c:605 msgid "Not reading via NNTP." msgstr "" -#: src/lang.c:604 +#: src/lang.c:606 #, c-format msgid "Group: %s" msgstr "" -#: src/lang.c:605 +#: src/lang.c:607 #, c-format msgid "Groups: %s" msgstr "" -#: src/lang.c:608 +#: src/lang.c:610 msgid "Mail" msgstr "" -#: src/lang.c:609 +#: src/lang.c:611 msgid "mailbox " msgstr "" -#: src/lang.c:610 +#: src/lang.c:612 #, c-format msgid "Mail article(s) to [%.*s]> " msgstr "" -#: src/lang.c:611 +#: src/lang.c:613 #, c-format msgid "Mailing log to %s\n" msgstr "" -#: src/lang.c:612 +#: src/lang.c:614 msgid "Mail bug report..." msgstr "" -#: src/lang.c:613 +#: src/lang.c:615 #, c-format msgid "Mail BUG REPORT to %s?" msgstr "" -#: src/lang.c:614 +#: src/lang.c:616 msgid "Mailed" msgstr "" -#: src/lang.c:615 +#: src/lang.c:617 #, c-format msgid "Mailing to %s..." msgstr "" -#: src/lang.c:616 +#: src/lang.c:618 msgid "" "# [Mail/Save] active file. Format is like news active file:\n" "# groupname max.artnum min.artnum /dir\n" @@ -2629,345 +2655,345 @@ msgid "" "#\n" msgstr "" -#: src/lang.c:619 +#: src/lang.c:621 #, c-format msgid "%s marked as read" msgstr "" -#: src/lang.c:620 +#: src/lang.c:622 #, c-format msgid "%s marked as unread" msgstr "" -#: src/lang.c:621 +#: src/lang.c:623 #, c-format msgid "Marked %d of %d %s as read" msgstr "" -#: src/lang.c:622 +#: src/lang.c:624 #, c-format msgid "Marked %d of %d %s as unread" msgstr "" -#: src/lang.c:623 src/lang.c:1352 +#: src/lang.c:625 src/lang.c:1352 msgid "Mark" msgstr "" -#: src/lang.c:624 +#: src/lang.c:626 #, c-format msgid "Mark all articles as read%s?" msgstr "" -#: src/lang.c:625 +#: src/lang.c:627 #, c-format msgid "Mark article as read%s?" msgstr "" -#: src/lang.c:626 +#: src/lang.c:628 #, c-format msgid "Mark group %s as read?" msgstr "" -#: src/lang.c:627 +#: src/lang.c:629 #, c-format msgid "Mark thread as read%s?" msgstr "" -#: src/lang.c:628 +#: src/lang.c:630 #, c-format msgid "Matching %s groups..." msgstr "" -#: src/lang.c:629 src/lang.c:643 src/lang.c:649 +#: src/lang.c:631 src/lang.c:645 src/lang.c:651 #, c-format msgid "=set current to n; %s=line down; %s=line up; %s=help; %s=quit" msgstr "" -#: src/lang.c:631 +#: src/lang.c:633 #, c-format msgid "" "%s=view; %s=pipe; %s=pipe raw; %s=save; %s=tag; %s=tag pattern; %s=untag all" msgstr "" -#: src/lang.c:633 +#: src/lang.c:635 #, c-format msgid "%s=view; %s=save; %s=tag; %s=tag pattern; %s=untag all" msgstr "" -#: src/lang.c:635 +#: src/lang.c:637 #, c-format msgid "" "%s=reverse tagging; %s=search forwards; %s=search backwards; %s=repeat search" msgstr "" -#: src/lang.c:636 src/lang.c:640 +#: src/lang.c:638 src/lang.c:642 #, c-format msgid "=set current to n; %s=next unread; %s=search pattern; %s=kill/select" msgstr "" -#: src/lang.c:637 +#: src/lang.c:639 #, c-format msgid "" "%s=author search; %s=catchup; %s=line down; %s=line up; %s=mark read; " "%s=list thread" msgstr "" -#: src/lang.c:638 +#: src/lang.c:640 #, c-format msgid "%s=line up; %s=line down; %s=page up; %s=page down; %s=top; %s=bottom" msgstr "" -#: src/lang.c:639 +#: src/lang.c:641 #, c-format msgid "%s=search forwards; %s=search backwards; %s=quit" msgstr "" -#: src/lang.c:641 +#: src/lang.c:643 #, c-format msgid "%s=author search; %s=body search; %s=catchup; %s=followup; %s=mark read" msgstr "" -#: src/lang.c:642 +#: src/lang.c:644 #, c-format msgid "%s=add; %s=move; %s=rename; %s=delete" msgstr "" -#: src/lang.c:644 +#: src/lang.c:646 #, c-format msgid "=set current to n; %s=next unread; %s,%s=search pattern; %s=catchup" msgstr "" -#: src/lang.c:645 +#: src/lang.c:647 #, c-format msgid "" "%s=line down; %s=line up; %s=help; %s=move; %s=quit; %s=toggle all/unread" msgstr "" -#: src/lang.c:646 +#: src/lang.c:648 #, c-format msgid "" "%s=subscribe; %s=sub pattern; %s=unsubscribe; %s=unsub pattern; %s=yank in/" "out" msgstr "" -#: src/lang.c:647 +#: src/lang.c:649 #, c-format msgid "=set current to n; %s=next unread; %s=catchup; %s=display toggle" msgstr "" -#: src/lang.c:648 +#: src/lang.c:650 #, c-format msgid "%s=help; %s=line down; %s=line up; %s=quit; %s=tag; %s=mark unread" msgstr "" -#: src/lang.c:650 +#: src/lang.c:652 #, c-format msgid "%s=search forwards; %s=search backwards; %s=repeat search" msgstr "" -#: src/lang.c:651 +#: src/lang.c:653 msgid "--More--" msgstr "" -#: src/lang.c:652 +#: src/lang.c:654 #, c-format msgid "Moving %s..." msgstr "" -#: src/lang.c:653 +#: src/lang.c:655 msgid "Message-ID: & last Reference " msgstr "" -#: src/lang.c:654 +#: src/lang.c:656 msgid "Message-ID: line " msgstr "" -#: src/lang.c:655 +#: src/lang.c:657 msgid "Message-ID: & References: line" msgstr "" -#: src/lang.c:657 +#: src/lang.c:659 msgid ", name: " msgstr "" -#: src/lang.c:658 +#: src/lang.c:660 #, c-format msgid "Go to newsgroup [%s]> " msgstr "" -#: src/lang.c:659 +#: src/lang.c:661 msgid "newsgroups" msgstr "" -#: src/lang.c:660 +#: src/lang.c:662 #, c-format msgid "Position %s in group list (1,2,..,$) [%d]> " msgstr "" -#: src/lang.c:661 +#: src/lang.c:663 msgid "newsgroup" msgstr "" -#: src/lang.c:662 +#: src/lang.c:664 msgid "Try and save newsrc file again?" msgstr "" -#: src/lang.c:663 +#: src/lang.c:665 msgid "Warning: No newsgroups were written to your newsrc file. Save aborted." msgstr "" -#: src/lang.c:664 +#: src/lang.c:666 msgid "newsrc file saved successfully.\n" msgstr "" -#: src/lang.c:665 +#: src/lang.c:667 msgid "-- Next response --" msgstr "" -#: src/lang.c:666 +#: src/lang.c:668 msgid "No " msgstr "" -#: src/lang.c:667 +#: src/lang.c:669 msgid "*** No articles ***" msgstr "" -#: src/lang.c:668 +#: src/lang.c:670 msgid "No articles have been posted" msgstr "" -#: src/lang.c:669 +#: src/lang.c:671 msgid "*** No attachments ***" msgstr "" -#: src/lang.c:670 +#: src/lang.c:672 msgid "*** No description ***" msgstr "" -#: src/lang.c:671 +#: src/lang.c:673 msgid "No filename" msgstr "" -#: src/lang.c:672 +#: src/lang.c:674 msgid "No group" msgstr "" -#: src/lang.c:673 +#: src/lang.c:675 msgid "*** No groups ***" msgstr "" -#: src/lang.c:674 +#: src/lang.c:676 msgid "No more groups to read" msgstr "" -#: src/lang.c:675 +#: src/lang.c:677 msgid "No last message" msgstr "" -#: src/lang.c:676 +#: src/lang.c:678 msgid "No mail address" msgstr "" -#: src/lang.c:677 +#: src/lang.c:679 msgid "No articles marked for saving" msgstr "" -#: src/lang.c:678 +#: src/lang.c:680 msgid "No match" msgstr "" -#: src/lang.c:679 +#: src/lang.c:681 msgid "No more groups" msgstr "" -#: src/lang.c:680 +#: src/lang.c:682 msgid "No newsgroups" msgstr "" -#: src/lang.c:681 +#: src/lang.c:683 msgid "No next unread article" msgstr "" -#: src/lang.c:682 +#: src/lang.c:684 msgid "No previous group" msgstr "" -#: src/lang.c:683 +#: src/lang.c:685 msgid "No previous search, nothing to repeat" msgstr "" -#: src/lang.c:684 +#: src/lang.c:686 msgid "No previous unread article" msgstr "" -#: src/lang.c:685 +#: src/lang.c:687 msgid "No responses" msgstr "" -#: src/lang.c:686 +#: src/lang.c:688 msgid "No responses to list in current thread" msgstr "" -#: src/lang.c:687 +#: src/lang.c:689 msgid "*** No scopes ***" msgstr "" -#: src/lang.c:688 +#: src/lang.c:690 msgid "No search string" msgstr "" -#: src/lang.c:689 +#: src/lang.c:691 msgid "No subject" msgstr "" -#: src/lang.c:691 +#: src/lang.c:693 #, c-format msgid "%s: Terminal must have clear to end-of-line (ce)\n" msgstr "" -#: src/lang.c:692 +#: src/lang.c:694 #, c-format msgid "%s: Terminal must have clear to end-of-screen (cd)\n" msgstr "" -#: src/lang.c:693 +#: src/lang.c:695 #, c-format msgid "%s: Terminal must have clearscreen (cl) capability\n" msgstr "" -#: src/lang.c:694 +#: src/lang.c:696 #, c-format msgid "%s: Terminal must have cursor motion (cm)\n" msgstr "" -#: src/lang.c:695 +#: src/lang.c:697 #, c-format msgid "%s: TERM variable must be set to use screen capabilities\n" msgstr "" -#: src/lang.c:697 +#: src/lang.c:699 #, c-format msgid "No viewer found for %s/%s\n" msgstr "" -#: src/lang.c:698 +#: src/lang.c:700 msgid "Newsgroup does not exist on this server" msgstr "" -#: src/lang.c:699 +#: src/lang.c:701 #, c-format msgid "Group %s not found in active file" msgstr "" -#: src/lang.c:700 +#: src/lang.c:702 msgid "c)reate it, use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "" -#: src/lang.c:701 +#: src/lang.c:703 msgid "use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "" -#: src/lang.c:702 +#: src/lang.c:704 #, c-format msgid "" "# NNTP-server -> newsrc translation table and NNTP-server\n" @@ -2984,178 +3010,178 @@ msgid "" "#\n" msgstr "" -#: src/lang.c:709 +#: src/lang.c:711 msgid "Only" msgstr "" -#: src/lang.c:710 +#: src/lang.c:712 #, c-format msgid "Option not enabled. Recompile with %s." msgstr "" -#: src/lang.c:711 +#: src/lang.c:713 msgid "Options Menu" msgstr "" -#: src/lang.c:712 +#: src/lang.c:714 msgid "Options Menu Commands" msgstr "" -#: src/lang.c:715 +#: src/lang.c:717 #, c-format msgid "Error in regex: %s at pos. %d '%s'" msgstr "" -#: src/lang.c:716 +#: src/lang.c:718 #, c-format msgid "Error in regex: pcre internal error %d" msgstr "" -#: src/lang.c:717 +#: src/lang.c:719 #, c-format msgid "Error in regex: study - pcre internal error %s" msgstr "" -#: src/lang.c:718 +#: src/lang.c:720 msgid "Post a followup..." msgstr "" #. TODO: replace hard coded key-name in txt_post_error_ask_postpone -#: src/lang.c:720 +#: src/lang.c:722 msgid "" "An error has occurred while posting the article. If you think that this\n" "error is temporary or otherwise correctable, you can postpone the article\n" "and pick it up again with ^O later.\n" msgstr "" -#: src/lang.c:723 +#: src/lang.c:725 msgid "Posted articles history" msgstr "" -#: src/lang.c:724 +#: src/lang.c:726 #, c-format msgid "Post to newsgroup(s) [%s]> " msgstr "" -#: src/lang.c:725 +#: src/lang.c:727 msgid "-- post processing started --" msgstr "" -#: src/lang.c:726 +#: src/lang.c:728 msgid "-- post processing completed --" msgstr "" -#: src/lang.c:727 +#: src/lang.c:729 #, c-format msgid "Post subject [%s]> " msgstr "" -#: src/lang.c:728 +#: src/lang.c:730 msgid "" "# Summary of mailed/posted messages viewable by 'W' command from within " "tin.\n" msgstr "" -#: src/lang.c:729 +#: src/lang.c:731 msgid "Posting article..." msgstr "" -#: src/lang.c:730 +#: src/lang.c:732 #, c-format msgid "Post postponed articles [%%s]? (%s/%s/%s/%s/%s): " msgstr "" -#: src/lang.c:731 +#: src/lang.c:733 #, c-format msgid "Hot %s" msgstr "" -#: src/lang.c:732 +#: src/lang.c:734 #, c-format msgid "Tagged %s" msgstr "" -#: src/lang.c:733 +#: src/lang.c:735 #, c-format msgid "Untagged %s" msgstr "" -#: src/lang.c:735 +#: src/lang.c:737 #, c-format msgid "Preparing for filtering on Path header (%d/%d)..." msgstr "" -#: src/lang.c:737 +#: src/lang.c:739 msgid "Processing mail messages marked for deletion." msgstr "" -#: src/lang.c:738 +#: src/lang.c:740 msgid "Processing saved articles marked for deletion." msgstr "" -#: src/lang.c:739 +#: src/lang.c:741 #, c-format msgid "Accept Followup-To? %s=post, %s=ignore, %s=quit: " msgstr "" -#: src/lang.c:740 +#: src/lang.c:742 msgid "Article unchanged, abort mailing?" msgstr "" -#: src/lang.c:741 +#: src/lang.c:743 #, c-format msgid "Do you want to see postponed articles (%d)?" msgstr "" -#: src/lang.c:743 +#: src/lang.c:745 msgid "Add quick kill filter?" msgstr "" -#: src/lang.c:744 +#: src/lang.c:746 msgid "Add quick selection filter?" msgstr "" -#: src/lang.c:745 +#: src/lang.c:747 msgid "Do you really want to quit?" msgstr "" -#: src/lang.c:746 +#: src/lang.c:748 #, c-format msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%s]: " msgstr "" -#: src/lang.c:747 +#: src/lang.c:749 msgid "You have tagged articles in this group - quit anyway?" msgstr "" -#: src/lang.c:748 +#: src/lang.c:750 #, c-format msgid "%s=quit, %s=edit, %s=postpone: " msgstr "" -#: src/lang.c:749 +#: src/lang.c:751 #, c-format msgid "%s=quit %s=edit %s=save kill description: " msgstr "" -#: src/lang.c:750 +#: src/lang.c:752 #, c-format msgid "%s=quit %s=edit %s=save select description: " msgstr "" -#: src/lang.c:751 +#: src/lang.c:753 msgid "Do you really want to quit without saving your configuration?" msgstr "" -#: src/lang.c:754 +#: src/lang.c:756 msgid "Invalid range - valid are '0-9.$' eg. 1-$" msgstr "" -#: src/lang.c:756 +#: src/lang.c:757 msgid "Do you want to abort this operation?" msgstr "" -#: src/lang.c:757 +#: src/lang.c:758 msgid "Do you want to exit tin immediately?" msgstr "" @@ -4354,7 +4380,7 @@ msgid " -p port use port as NNTP port msgstr "" #: src/lang.c:1118 -msgid " -Q quick start. Same as -nqd" +msgid " -Q quick start. Same as -dnq" msgstr "" #: src/lang.c:1119 @@ -7305,21 +7331,27 @@ msgid "Insert 'X-Comment-To:' header" msgstr "" #. TODO: lang.c -#: src/main.c:817 +#: src/main.c:819 msgid "reading from local spool" msgstr "" -#: src/misc.c:3877 +#. TODO: != ENOENT ? and -> lang.c +#: src/misc.c:750 +#, c-format +msgid "Error: unlink %s" +msgstr "" + +#: src/misc.c:3928 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "" -#: src/misc.c:3880 +#: src/misc.c:3931 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "" -#: src/newsrc.c:460 +#: src/newsrc.c:472 msgid "Unreachable?\n" msgstr "" @@ -7356,19 +7388,19 @@ msgstr "" msgid "MOTD: " msgstr "" -#: src/nrctbl.c:178 +#: src/nrctbl.c:184 #, c-format msgid "couldn't expand %s\n" msgstr "" -#: src/post.c:1344 +#: src/post.c:1357 #, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" "encoding is neither set to %s nor to %s\n" msgstr "" -#: src/post.c:1349 +#: src/post.c:1362 #, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" @@ -7376,32 +7408,32 @@ msgid "" "posting doesn't contain any 8bit chars and thus folding won't happen\n" msgstr "" -#: src/post.c:1351 +#: src/post.c:1364 #, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" "encoding is not set to %s\n" msgstr "" -#: src/post.c:2325 +#: src/post.c:2353 #, c-format msgid "Posting: %.*s ..." msgstr "" -#: src/post.c:4075 +#: src/post.c:4119 msgid "Can't supersede in mailgroups, try repost instead." msgstr "" #. Check if okay to read -#: src/read.c:207 +#: src/read.c:204 msgid "Aborting read, please wait..." msgstr "" -#: src/read.c:354 +#: src/read.c:351 msgid "Aborted read\n" msgstr "" -#: src/read.c:409 +#: src/read.c:406 msgid "Draining\n" msgstr "" @@ -7414,6 +7446,18 @@ msgid "[- Unavailable -]" msgstr "" #. +#. * Add the Message-ID headers to the cache, using the last Reference +#. * as the parent +#. +#. +#. * Add the References data to the cache +#. +#: src/refs.c:1015 src/refs.c:1077 +#, c-format +msgid "Building References-trees (%d/%d)..." +msgstr "" + +#. #. * preamble #. * TODO: -> lang.c #. @@ -7427,7 +7471,7 @@ msgid "" "\n" msgstr "" -#: src/save.c:1069 +#: src/save.c:1075 msgid "bytes" msgstr "" Binary files tin-2.4.4/po/tr.gmo and tin-2.4.5/po/tr.gmo differ diff -Nurp '--exclude=.bzr*' tin-2.4.4/po/tr.po tin-2.4.5/po/tr.po --- tin-2.4.4/po/tr.po 2019-12-24 10:55:10.000000000 +0100 +++ tin-2.4.5/po/tr.po 2020-12-24 00:24:54.389906491 +0100 @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: tin 2.4.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 13:24+0100\n" +"POT-Creation-Date: 2020-12-24 00:24+0100\n" "PO-Revision-Date: 2017-05-29 18:40+0000\n" "Last-Translator: Mesutcan Kurt \n" "Language-Team: Turkish \n" @@ -22,6 +22,37 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "X-POOTLE-MTIME: 1496083249.000000\n" +# #-#-#-#-# tin1.po (PACKAGE VERSION) #-#-#-#-# +# TODO: -> lang.c +# #-#-#-#-# tin2.po (PACKAGE VERSION) #-#-#-#-# +# TODO: -> lang.c +# #-#-#-#-# tin4.po (PACKAGE VERSION) #-#-#-#-# +# TODO: -> lang.c +# TODO: -> lang.c +#. -> lang.c +#: src/art.c:418 +#, fuzzy, c-format +msgid "Reading %s\n" +msgstr "%s tekrar okunuyor..." + +#. TODO: -> lang.c +#: src/art.c:1205 +#, fuzzy +msgid "Threading by multipart" +msgstr "Makaleler zincirleniyor..." + +#. -> lang.c +#: src/art.c:2539 +#, fuzzy, c-format +msgid "Writing %s\n" +msgstr "%s deneniyor" + +#. TODO: -> lang.c +#: src/art.c:2619 +#, fuzzy +msgid "Writing overview cache..." +msgstr "Öznitelikler dosylası yazılıyor..." + #: src/attrib.c:986 msgid "Processing attributes... " msgstr "Nitelikleri iÅŸliyor... " @@ -1506,8 +1537,8 @@ msgid "Error making backup of %s file. F msgstr "%s dosyasını yedeklerken hata oluÅŸtu. Dosya sistemi dolu olabilir mi?" #: src/lang.c:274 -#, c-format -msgid "Filtering global rules (%d/%d)..." +#, fuzzy, c-format +msgid "Filtering global rules (%d/%d) ('q' to quit)..." msgstr "Genel kurallar filtreleniyor (%d/%d)..." #: src/lang.c:275 @@ -2270,8 +2301,9 @@ msgstr "en az bir okunmamış makalesi o msgid "select threads that match user specified pattern" msgstr "kullanıcı tanımlı kalıba uyan eposta zincirlerini seç" -#: src/lang.c:465 -msgid "tag all parts of current multipart-message in order" +#: src/lang.c:465 src/lang.c:521 +#, fuzzy +msgid "tag/untag all parts of current multipart-message in order" msgstr "mevcut çok-bölümlü iletinin bütün bölümlerini sırayla etiketle" #: src/lang.c:466 @@ -2496,7 +2528,7 @@ msgstr "mevcut eposta zincirini okunmamÄ msgid "read chosen article" msgstr "seçilen makaleyi oku" -#: src/lang.c:521 +#: src/lang.c:522 msgid "" "Display properties\n" "------------------" @@ -2504,7 +2536,7 @@ msgstr "" "Özellikleri görüntüle\n" "------------------" -#: src/lang.c:522 +#: src/lang.c:523 msgid "" "Miscellaneous\n" "-------------" @@ -2512,7 +2544,7 @@ msgstr "" "DiÄŸer\n" "-------------" -#: src/lang.c:523 +#: src/lang.c:524 msgid "" "Moving around\n" "-------------" @@ -2520,7 +2552,7 @@ msgstr "" "Etrafına taşı\n" "-------------" -#: src/lang.c:524 +#: src/lang.c:525 msgid "" "Group/thread/article operations\n" "-------------------------------" @@ -2528,7 +2560,7 @@ msgstr "" "Grup/zincir/makale iÅŸlemleri\n" "-------------------------------" -#: src/lang.c:525 +#: src/lang.c:526 msgid "" "Attachment operations\n" "---------------------" @@ -2536,7 +2568,7 @@ msgstr "" "Ek iÅŸlemleri\n" "---------------------" -#: src/lang.c:526 +#: src/lang.c:527 msgid "" "Attribute operations\n" "--------------------" @@ -2544,7 +2576,7 @@ msgstr "" "Öznitelik iÅŸlemleri\n" "--------------------" -#: src/lang.c:527 +#: src/lang.c:528 msgid "" "Option operations\n" "-----------------" @@ -2552,7 +2584,7 @@ msgstr "" "Seçenek iÅŸlemleri\n" "-----------------" -#: src/lang.c:528 +#: src/lang.c:529 msgid "" "Scope operations\n" "----------------" @@ -2560,7 +2592,7 @@ msgstr "" "Etki alanı iÅŸlemleri\n" "----------------" -#: src/lang.c:529 +#: src/lang.c:530 msgid "" "URL operations\n" "--------------" @@ -2568,91 +2600,96 @@ msgstr "" "URL iÅŸlemleri\n" "--------------" -#: src/lang.c:530 +#: src/lang.c:531 msgid "choose first URL in list" msgstr "listedeki ilk URL'yi seç" -#: src/lang.c:531 +#: src/lang.c:532 msgid "0 - 9\t choose URL by number" msgstr "0 - 9\t URL'yi sayıyla seç" -#: src/lang.c:532 +#: src/lang.c:533 msgid "choose last URL in list" msgstr "Listedeki son URL'yi seç" -#: src/lang.c:533 +#: src/lang.c:534 msgid "search for URLs forwards" msgstr "URL'leri ileriye doÄŸru ara" -#: src/lang.c:534 +#: src/lang.c:535 msgid "search for URLs backwards" msgstr "URL'leri geriye doÄŸru ara" -#: src/lang.c:535 +#: src/lang.c:536 msgid "Open URL in browser" msgstr "URL'yi tarayıcıda aç" -#: src/lang.c:536 +#: src/lang.c:537 msgid "toggle info message in last line (URL)" msgstr "son satırdaki bilgi iletisini deÄŸiÅŸtir (URL)" -#: src/lang.c:538 +#: src/lang.c:539 msgid "Group Level Commands" msgstr "Grup Seviyesi Komutları" -#: src/lang.c:539 +#: src/lang.c:540 msgid "Kill filter added" msgstr "Öldürme filtresi eklendi" -#: src/lang.c:540 +#: src/lang.c:541 msgid "Auto-selection filter added" msgstr "Otomatik seçme filtresi eklendi" -#: src/lang.c:541 +#: src/lang.c:542 msgid "All parts tagged" msgstr "Bütün bölümler etiketlendi" -#: src/lang.c:542 +#: src/lang.c:543 +#, fuzzy +msgid "All parts untagged" +msgstr "Bütün bölümler etiketlendi" + +#: src/lang.c:544 msgid "Storing article for later posting" msgstr "Makale daha sonra göndermek için saklanıyor" -#: src/lang.c:543 +#: src/lang.c:545 msgid "Please enter a valid character" msgstr "Lütfen geçerli bir karakter girin" -#: src/lang.c:544 +#: src/lang.c:546 #, c-format msgid "Missing part #%d" msgstr "Eksik bölüm #%d" -#: src/lang.c:545 +#: src/lang.c:547 msgid "*** No postponed articles ***" msgstr "*** ErtelenmiÅŸ makale yok ***" -#: src/lang.c:546 +#: src/lang.c:548 msgid "Not a multi-part message" msgstr "Çok-bölümlü ileti deÄŸil" -#: src/lang.c:547 +#: src/lang.c:549 msgid "You are not subscribed to this group" msgstr "Bu gruba abone deÄŸilsiniz" -#: src/lang.c:548 +#: src/lang.c:550 msgid "No previous expression" msgstr "Önceki ifade yok" -#: src/lang.c:549 +#: src/lang.c:551 msgid "Operation disabled in no-overwrite mode" msgstr "Ãœstüne yazılmayan kipte iÅŸlem geçersiz" # TODO: replace hardcoded key-name in txt_info_postponed #. TODO: replace hard coded key-name in txt_info_postponed -#: src/lang.c:551 +#: src/lang.c:553 #, c-format msgid "%d postponed %s, reuse with ^O...\n" msgstr "%d ertelendi %s, ^O ile tekrar kullan...\n" -#: src/lang.c:552 +#: src/lang.c:554 msgid "" "X-Conversion-Note: multipart/alternative contents have been removed.\n" " To get the whole article, turn alternative handling OFF in the Option " @@ -2662,22 +2699,22 @@ msgstr "" " Bütün makaleyi almak için, Seçenekler Menüsündeki alternatif kotarmayı " "KAPALI durumuna getirin\n" -#: src/lang.c:554 +#: src/lang.c:556 #, c-format msgid "Save filename for %s/%s is a mailbox. Attachment not saved" msgstr "Dosya adını %s/%s için kaydetmek bir posta kutusudur. Ek kaydedilmedi" -#: src/lang.c:555 +#: src/lang.c:557 msgid "TeX2Iso encoded article" msgstr "TeX2Iso ile kodlanmış makale" -#: src/lang.c:556 +#: src/lang.c:558 msgid "incomplete " msgstr "tamamlanmadı " # TODO: replace hardcoded key-names #. TODO: replace hard coded key-names -#: src/lang.c:558 +#: src/lang.c:560 #, fuzzy, c-format msgid "" "\n" @@ -2744,151 +2781,151 @@ msgstr "" "dosyalarını okuyun.\n" "Hata-raporlarını ve önerileri 'R' komutu ile %s'e gönderin.\n" -#: src/lang.c:574 +#: src/lang.c:576 #, c-format msgid "Invalid From: %s line. Read the INSTALL file again." msgstr "Geçersiz Gönderen: %s satırı. INSTALL dosyasını yeniden okuyun." -#: src/lang.c:576 +#: src/lang.c:578 msgid "Invalid multibyte sequence found\n" msgstr "Geçersiz çoklu bayt sırası bulundu\n" -#: src/lang.c:579 +#: src/lang.c:581 #, c-format msgid "Invalid Sender:-header %s" msgstr "Geçersiz Gönderen: -baÅŸlık %s" -#: src/lang.c:581 +#: src/lang.c:583 msgid "Inverse video disabled" msgstr "Ters video devre dışı" -#: src/lang.c:582 +#: src/lang.c:584 msgid "Inverse video enabled" msgstr "Ters video geçerli" -#: src/lang.c:584 +#: src/lang.c:586 #, c-format msgid "Missing definition for %s\n" msgstr "%s için tanım eksik\n" -#: src/lang.c:585 +#: src/lang.c:587 #, c-format msgid "Invalid key definition '%s'\n" msgstr "Geçersiz tuÅŸ tanımı '%s'\n" -#: src/lang.c:586 +#: src/lang.c:588 #, c-format msgid "Invalid keyname '%s'\n" msgstr "Geçersiz anahtar isim '%s'\n" -#: src/lang.c:587 +#: src/lang.c:589 #, c-format msgid "Keymap file was upgraded to version %s\n" msgstr "TuÅŸeÅŸlem dosyası %s sürümüne yükseltildi\n" -#: src/lang.c:588 +#: src/lang.c:590 #, c-format msgid "Kill From: [%s] (y/n): " msgstr "Gönderen: yok et [%s] (e/h): " -#: src/lang.c:589 +#: src/lang.c:591 msgid "Kill Lines: (num): " msgstr "Satırlar: yok et(num): " -#: src/lang.c:590 +#: src/lang.c:592 msgid "Kill Article Menu" msgstr "Makale Menüsünü Yok Et" -#: src/lang.c:591 +#: src/lang.c:593 #, fuzzy, c-format msgid "Kill Msg-ID: [%s] (f/l/o/n): " msgstr "Ä°leti-KimliÄŸi: yok et: [%s] (f/l/o/n): " -#: src/lang.c:592 +#: src/lang.c:594 msgid "Kill pattern scope : " msgstr "Örüntü kapsamını yok et : " -#: src/lang.c:593 +#: src/lang.c:595 #, c-format msgid "Kill Subject: [%s] (y/n): " msgstr "Konuyu yok et: [%s] (e/h): " -#: src/lang.c:594 +#: src/lang.c:596 msgid "Kill text pattern : " msgstr "Metin örüntüsünü yok et : " -#: src/lang.c:595 +#: src/lang.c:597 msgid "Kill time in days : " msgstr "Åžu kadar gün içinde öldür : " -#: src/lang.c:597 +#: src/lang.c:599 msgid "Last" msgstr "Son" -#: src/lang.c:598 +#: src/lang.c:600 msgid "-- Last response --" msgstr "-- Son yanıt --" -#: src/lang.c:599 +#: src/lang.c:601 #, c-format msgid "Lines %s " msgstr "Satırlar %s " -#: src/lang.c:602 +#: src/lang.c:604 msgid "Function not available." msgstr "Fonksiyon mevcut deÄŸil." -#: src/lang.c:603 +#: src/lang.c:605 msgid "Not reading via NNTP." msgstr "NNTP üzerinden okunamıyor." -#: src/lang.c:604 +#: src/lang.c:606 #, c-format msgid "Group: %s" msgstr "Grup: %s" -#: src/lang.c:605 +#: src/lang.c:607 #, c-format msgid "Groups: %s" msgstr "Gruplar: %s" -#: src/lang.c:608 +#: src/lang.c:610 msgid "Mail" msgstr "Eposta" -#: src/lang.c:609 +#: src/lang.c:611 msgid "mailbox " msgstr "mailbox " -#: src/lang.c:610 +#: src/lang.c:612 #, c-format msgid "Mail article(s) to [%.*s]> " msgstr "Makaleleri ÅŸuraya gönder [%.*s]> " -#: src/lang.c:611 +#: src/lang.c:613 #, c-format msgid "Mailing log to %s\n" msgstr "Günlük %s'e postalanıyor\n" -#: src/lang.c:612 +#: src/lang.c:614 msgid "Mail bug report..." msgstr "Hata raporu postala..." -#: src/lang.c:613 +#: src/lang.c:615 #, c-format msgid "Mail BUG REPORT to %s?" msgstr "HATA RAPORUNU %s'e postala?" -#: src/lang.c:614 +#: src/lang.c:616 msgid "Mailed" msgstr "Postalandı" -#: src/lang.c:615 +#: src/lang.c:617 #, c-format msgid "Mailing to %s..." msgstr "%s'e postalanıyor..." -#: src/lang.c:616 +#: src/lang.c:618 msgid "" "# [Mail/Save] active file. Format is like news active file:\n" "# groupname max.artnum min.artnum /dir\n" @@ -2900,63 +2937,63 @@ msgstr "" "# 4. alan temel dizin (örn.~/Mail or ~/News)\n" "#\n" -#: src/lang.c:619 +#: src/lang.c:621 #, c-format msgid "%s marked as read" msgstr "%s okunmuÅŸ olarak iÅŸaretlendi" -#: src/lang.c:620 +#: src/lang.c:622 #, c-format msgid "%s marked as unread" msgstr "%s okunmamış olarak iÅŸaretlendi" -#: src/lang.c:621 +#: src/lang.c:623 #, c-format msgid "Marked %d of %d %s as read" msgstr "%d içerisinde %d %s okunmuÅŸ olarak iÅŸaretlendi" -#: src/lang.c:622 +#: src/lang.c:624 #, c-format msgid "Marked %d of %d %s as unread" msgstr "%d içerisinde %d %s okunmamış olarak iÅŸaretlendi " -#: src/lang.c:623 src/lang.c:1352 +#: src/lang.c:625 src/lang.c:1352 msgid "Mark" msgstr "Ä°ÅŸaretle" -#: src/lang.c:624 +#: src/lang.c:626 #, c-format msgid "Mark all articles as read%s?" msgstr "Bütün makaleleri okunmuÅŸ olarak iÅŸaretle%s?" -#: src/lang.c:625 +#: src/lang.c:627 #, c-format msgid "Mark article as read%s?" msgstr "Makaleyi okunmuÅŸ olarak iÅŸaretle%s?" -#: src/lang.c:626 +#: src/lang.c:628 #, c-format msgid "Mark group %s as read?" msgstr "%s grubunu okunmuÅŸ olarak iÅŸaretle?" -#: src/lang.c:627 +#: src/lang.c:629 #, c-format msgid "Mark thread as read%s?" msgstr "Eposta zincirini okunmuÅŸ olarak iÅŸaretle%s?" -#: src/lang.c:628 +#: src/lang.c:630 #, c-format msgid "Matching %s groups..." msgstr "%s grupları eÅŸleÅŸtiriyor..." -#: src/lang.c:629 src/lang.c:643 src/lang.c:649 +#: src/lang.c:631 src/lang.c:645 src/lang.c:651 #, c-format msgid "=set current to n; %s=line down; %s=line up; %s=help; %s=quit" msgstr "" "=mevcutu n olarak ayarla; %s=satır aÅŸağı; %s=satır yukarı; %s=yardım; " "%s=çıkış" -#: src/lang.c:631 +#: src/lang.c:633 #, c-format msgid "" "%s=view; %s=pipe; %s=pipe raw; %s=save; %s=tag; %s=tag pattern; %s=untag all" @@ -2964,14 +3001,14 @@ msgstr "" "%s=görüntüle; %s=yönlendir; %s=ham yönlendir; %s=kaydet; %s=etiketle; " "%s=örüntüyü etiketle; %s=tümünün etiketini kaldır" -#: src/lang.c:633 +#: src/lang.c:635 #, c-format msgid "%s=view; %s=save; %s=tag; %s=tag pattern; %s=untag all" msgstr "" "%s=görüntüle; %s=kaydet; %s=etiketle; %s=deseni etiketle; %s=tamamının " "etiketini kaldır" -#: src/lang.c:635 +#: src/lang.c:637 #, c-format msgid "" "%s=reverse tagging; %s=search forwards; %s=search backwards; %s=repeat search" @@ -2979,14 +3016,14 @@ msgstr "" "%s=geriye doÄŸru etiketle; %s=ileriye doÄŸru ara; %s=geriye doÄŸru ara; " "%s=aramayı tekrarla" -#: src/lang.c:636 src/lang.c:640 +#: src/lang.c:638 src/lang.c:642 #, c-format msgid "=set current to n; %s=next unread; %s=search pattern; %s=kill/select" msgstr "" "=mevcutu n olarak ayarla; %s=sonraki okunmayan; %s=arama örüntüsü; %s=yok " "et/seç" -#: src/lang.c:637 +#: src/lang.c:639 #, c-format msgid "" "%s=author search; %s=catchup; %s=line down; %s=line up; %s=mark read; " @@ -2995,37 +3032,37 @@ msgstr "" "%s=yazar araması; %s=yakala; %s=satır aÅŸağı; %s=satır yukarı; %s= okunmuÅŸ " "iÅŸaretle; %s=eposta zinciri listele" -#: src/lang.c:638 +#: src/lang.c:640 #, c-format msgid "%s=line up; %s=line down; %s=page up; %s=page down; %s=top; %s=bottom" msgstr "" "%s=satır yukarı; %s=satır aÅŸağı; %s=üst sayfa; %s=alt sayfa; %s=üst; %s=alt" -#: src/lang.c:639 +#: src/lang.c:641 #, c-format msgid "%s=search forwards; %s=search backwards; %s=quit" msgstr "%s=ileriye doÄŸru ara; %s=geriye doÄŸru ara; %s=çık" -#: src/lang.c:641 +#: src/lang.c:643 #, c-format msgid "%s=author search; %s=body search; %s=catchup; %s=followup; %s=mark read" msgstr "" "%s=yazar araması; %s=gövde araması; %s=yakala; %s=takip-et; %s=okumuÅŸ olarak " "iÅŸaretle" -#: src/lang.c:642 +#: src/lang.c:644 #, c-format msgid "%s=add; %s=move; %s=rename; %s=delete" msgstr "%s=ekle; %s=kaydır; %s=yeniden adlandır; %s=sil" -#: src/lang.c:644 +#: src/lang.c:646 #, c-format msgid "=set current to n; %s=next unread; %s,%s=search pattern; %s=catchup" msgstr "" "=mevcutu n olarak ayarla; %s=sonraki okunmayan; %s,%s=arama deseni; " "%s=yakala" -#: src/lang.c:645 +#: src/lang.c:647 #, c-format msgid "" "%s=line down; %s=line up; %s=help; %s=move; %s=quit; %s=toggle all/unread" @@ -3033,7 +3070,7 @@ msgstr "" "%s=satır aÅŸağı; %s=satır yukarı; %s=yardım; %s=taşı; %s=çık; %s=hepsi/" "okunmamışlar deÄŸiÅŸtir" -#: src/lang.c:646 +#: src/lang.c:648 #, c-format msgid "" "%s=subscribe; %s=sub pattern; %s=unsubscribe; %s=unsub pattern; %s=yank in/" @@ -3042,232 +3079,232 @@ msgstr "" "%s=abone ol; %s=örüntüdekine abone ol; %s=abonelikten çık; %s=örüntüdeki " "abonelikten çık; %s=çekme içeri/dışarı" -#: src/lang.c:647 +#: src/lang.c:649 #, c-format msgid "=set current to n; %s=next unread; %s=catchup; %s=display toggle" msgstr "" "=mevcutu n olarak ayarla; %s=sonraki okunmayan; %s=yakala; %s=görünüm " "deÄŸiÅŸtir" -#: src/lang.c:648 +#: src/lang.c:650 #, c-format msgid "%s=help; %s=line down; %s=line up; %s=quit; %s=tag; %s=mark unread" msgstr "" "%s=yardım; %s=satır aÅŸağı; %s=satır yukarı; %s=quit; %s=etiketle; " "%s=okunmamış olarak iÅŸaretle" -#: src/lang.c:650 +#: src/lang.c:652 #, c-format msgid "%s=search forwards; %s=search backwards; %s=repeat search" msgstr "%s=ileriye doÄŸru ara; %s=geriye doÄŸru ara; %s=aramayı tekrarla" -#: src/lang.c:651 +#: src/lang.c:653 msgid "--More--" msgstr "--Daha fazla--" -#: src/lang.c:652 +#: src/lang.c:654 #, c-format msgid "Moving %s..." msgstr "Taşınıyor %s..." -#: src/lang.c:653 +#: src/lang.c:655 msgid "Message-ID: & last Reference " msgstr "Ä°leti-KimliÄŸi: & son Referans " -#: src/lang.c:654 +#: src/lang.c:656 msgid "Message-ID: line " msgstr "Ä°leti-KimliÄŸi: satır " -#: src/lang.c:655 +#: src/lang.c:657 msgid "Message-ID: & References: line" msgstr "Ä°leti-KimliÄŸi & Referanslar: satırı" -#: src/lang.c:657 +#: src/lang.c:659 msgid ", name: " msgstr ", isim: " -#: src/lang.c:658 +#: src/lang.c:660 #, c-format msgid "Go to newsgroup [%s]> " msgstr "Haber grubuna git [%s]> " -#: src/lang.c:659 +#: src/lang.c:661 msgid "newsgroups" msgstr "haber grupları" -#: src/lang.c:660 +#: src/lang.c:662 #, c-format msgid "Position %s in group list (1,2,..,$) [%d]> " msgstr "Grup listesinde %s konumu (1,2,..,$) [%d]> " -#: src/lang.c:661 +#: src/lang.c:663 msgid "newsgroup" msgstr "haber grubu" -#: src/lang.c:662 +#: src/lang.c:664 msgid "Try and save newsrc file again?" msgstr "newsrc dosyasını yeniden dene ve kaydet?" -#: src/lang.c:663 +#: src/lang.c:665 msgid "Warning: No newsgroups were written to your newsrc file. Save aborted." msgstr "" "Uyarı: newsrc dosyanızda hiçbir haber grubu yazılı deÄŸil. Kaydetme " "durduruldu." -#: src/lang.c:664 +#: src/lang.c:666 msgid "newsrc file saved successfully.\n" msgstr "newsrc dosyası baÅŸarıyla kaydedildi.\n" -#: src/lang.c:665 +#: src/lang.c:667 msgid "-- Next response --" msgstr "-- Sonraki yanıt --" -#: src/lang.c:666 +#: src/lang.c:668 msgid "No " msgstr "Hayır " -#: src/lang.c:667 +#: src/lang.c:669 msgid "*** No articles ***" msgstr "*** Makale Yok ***" -#: src/lang.c:668 +#: src/lang.c:670 msgid "No articles have been posted" msgstr "Makale(ler) gönderilmedi" -#: src/lang.c:669 +#: src/lang.c:671 msgid "*** No attachments ***" msgstr "*** Ek yok ***" -#: src/lang.c:670 +#: src/lang.c:672 msgid "*** No description ***" msgstr "*** Tanım yok ***" -#: src/lang.c:671 +#: src/lang.c:673 msgid "No filename" msgstr "Dosya adı yok" -#: src/lang.c:672 +#: src/lang.c:674 msgid "No group" msgstr "Grup yok" -#: src/lang.c:673 +#: src/lang.c:675 msgid "*** No groups ***" msgstr "*** Grup(lar) yok ***" -#: src/lang.c:674 +#: src/lang.c:676 msgid "No more groups to read" msgstr "Okunacak baÅŸka grup yok" -#: src/lang.c:675 +#: src/lang.c:677 msgid "No last message" msgstr "Son ileti yok" -#: src/lang.c:676 +#: src/lang.c:678 msgid "No mail address" msgstr "Eposta adresi yok" -#: src/lang.c:677 +#: src/lang.c:679 msgid "No articles marked for saving" msgstr "Kaydetmek için iÅŸaretlenen makale yok" -#: src/lang.c:678 +#: src/lang.c:680 msgid "No match" msgstr "EÅŸleÅŸme yok" -#: src/lang.c:679 +#: src/lang.c:681 msgid "No more groups" msgstr "BaÅŸka grup yok" -#: src/lang.c:680 +#: src/lang.c:682 msgid "No newsgroups" msgstr "Haber grubu yok" -#: src/lang.c:681 +#: src/lang.c:683 msgid "No next unread article" msgstr "Sonraki okunmayan makale yok" -#: src/lang.c:682 +#: src/lang.c:684 msgid "No previous group" msgstr "Önceki grup yok" -#: src/lang.c:683 +#: src/lang.c:685 msgid "No previous search, nothing to repeat" msgstr "Önceki arama yok, tekrarlanacak bir ÅŸey yok" -#: src/lang.c:684 +#: src/lang.c:686 msgid "No previous unread article" msgstr "Önceki okunmayan makale yok" -#: src/lang.c:685 +#: src/lang.c:687 msgid "No responses" msgstr "Yanıt yok" -#: src/lang.c:686 +#: src/lang.c:688 msgid "No responses to list in current thread" msgstr "Mevcut zincirde listelenecek yanıt yok" -#: src/lang.c:687 +#: src/lang.c:689 msgid "*** No scopes ***" msgstr "*** Kapsam yok ***" -#: src/lang.c:688 +#: src/lang.c:690 msgid "No search string" msgstr "Arama dizgisi yok" -#: src/lang.c:689 +#: src/lang.c:691 msgid "No subject" msgstr "Konu yok" -#: src/lang.c:691 +#: src/lang.c:693 #, c-format msgid "%s: Terminal must have clear to end-of-line (ce)\n" msgstr "%s: Uçbirim satır sonuna (ce) kadar silmek zorunda\n" -#: src/lang.c:692 +#: src/lang.c:694 #, c-format msgid "%s: Terminal must have clear to end-of-screen (cd)\n" msgstr "%s: Uçbirim ekran sonuna (cd) kadar silmek zorunda\n" -#: src/lang.c:693 +#: src/lang.c:695 #, c-format msgid "%s: Terminal must have clearscreen (cl) capability\n" msgstr "%s: Uçbirim'in ekran temizleme yeteneÄŸini (cl) olmak zorunda\n" -#: src/lang.c:694 +#: src/lang.c:696 #, c-format msgid "%s: Terminal must have cursor motion (cm)\n" msgstr "%s: Uçbirim imleç hareketi'ne (cm) sahip olmak zorunda\n" -#: src/lang.c:695 +#: src/lang.c:697 #, c-format msgid "%s: TERM variable must be set to use screen capabilities\n" msgstr "" "%s: Ekran yeteneklerini kullanabilmek için TERM deÄŸiÅŸkeni ayarlanmalı\n" -#: src/lang.c:697 +#: src/lang.c:699 #, c-format msgid "No viewer found for %s/%s\n" msgstr "%s%s için görüntüleyici yok\n" -#: src/lang.c:698 +#: src/lang.c:700 msgid "Newsgroup does not exist on this server" msgstr "Bu sunucuda haber grubu yok" -#: src/lang.c:699 +#: src/lang.c:701 #, c-format msgid "Group %s not found in active file" msgstr "%s grubu aktif dosyada bulunamadı" -#: src/lang.c:700 +#: src/lang.c:702 msgid "c)reate it, use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "" "o)luÅŸtur, a)lternatif isim kullan, v)arsayılan .newsrc kullan, tin'den ç)ık: " -#: src/lang.c:701 +#: src/lang.c:703 msgid "use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "a)lternatif isim kullan, v)arsayılan .newsrc kullan, tin'den ç)ık: " -#: src/lang.c:702 +#: src/lang.c:704 #, c-format msgid "" "# NNTP-server -> newsrc translation table and NNTP-server\n" @@ -3297,45 +3334,45 @@ msgstr "" "# news.ka.nu /tmp/nrc-nu example ex\n" "#\n" -#: src/lang.c:709 +#: src/lang.c:711 msgid "Only" msgstr "Sadece" -#: src/lang.c:710 +#: src/lang.c:712 #, c-format msgid "Option not enabled. Recompile with %s." msgstr "Seçenek etkin deÄŸil. %s ile tekrar derle." -#: src/lang.c:711 +#: src/lang.c:713 msgid "Options Menu" msgstr "Seçenekler menüsü" -#: src/lang.c:712 +#: src/lang.c:714 msgid "Options Menu Commands" msgstr "Seçenekler Menüsü Komutları" -#: src/lang.c:715 +#: src/lang.c:717 #, c-format msgid "Error in regex: %s at pos. %d '%s'" msgstr "Regex hatası: %s ÅŸu konumda %d '%s'" -#: src/lang.c:716 +#: src/lang.c:718 #, c-format msgid "Error in regex: pcre internal error %d" msgstr "Regex hatası: pcre iç hata %d" -#: src/lang.c:717 +#: src/lang.c:719 #, c-format msgid "Error in regex: study - pcre internal error %s" msgstr "Regex hatası: incele - pcre iç hatası %s" -#: src/lang.c:718 +#: src/lang.c:720 msgid "Post a followup..." msgstr "Takip gönder..." # TODO: replace hardcoded key-name in txt_post_error_ask_postpone #. TODO: replace hard coded key-name in txt_post_error_ask_postpone -#: src/lang.c:720 +#: src/lang.c:722 msgid "" "An error has occurred while posting the article. If you think that this\n" "error is temporary or otherwise correctable, you can postpone the article\n" @@ -3345,29 +3382,29 @@ msgstr "" "düşünüyorsanız ya da geçici bir hata ise, makaleyi erteleyebilir ve\n" "tekrar ^O komutunu kulanarak ulaÅŸabilirsiniz.\n" -#: src/lang.c:723 +#: src/lang.c:725 msgid "Posted articles history" msgstr "GönderilmiÅŸ makalelerin geçmiÅŸi" -#: src/lang.c:724 +#: src/lang.c:726 #, c-format msgid "Post to newsgroup(s) [%s]> " msgstr "Habergrup(lar)a gönder [%s]> " -#: src/lang.c:725 +#: src/lang.c:727 msgid "-- post processing started --" msgstr "-- sonradan iÅŸleme baÅŸladı --" -#: src/lang.c:726 +#: src/lang.c:728 msgid "-- post processing completed --" msgstr "-- sonradan iÅŸleme tamamlandı --" -#: src/lang.c:727 +#: src/lang.c:729 #, c-format msgid "Post subject [%s]> " msgstr "Konuyu gönder [%s]> " -#: src/lang.c:728 +#: src/lang.c:730 msgid "" "# Summary of mailed/posted messages viewable by 'W' command from within " "tin.\n" @@ -3375,106 +3412,106 @@ msgstr "" "# Tin'deki 'W' komutundan görünebilir postalanmış/gönderilmiÅŸ iletilerin " "özeti.\n" -#: src/lang.c:729 +#: src/lang.c:731 msgid "Posting article..." msgstr "Makale gönderiliyor..." -#: src/lang.c:730 +#: src/lang.c:732 #, c-format msgid "Post postponed articles [%%s]? (%s/%s/%s/%s/%s): " msgstr "ErtelenmiÅŸ makaleleri gönder [%%s]? (%s/%s/%s/%s/%s): " -#: src/lang.c:731 +#: src/lang.c:733 #, c-format msgid "Hot %s" msgstr "Sıcak %s" -#: src/lang.c:732 +#: src/lang.c:734 #, c-format msgid "Tagged %s" msgstr "EtiketlenmiÅŸ %s" -#: src/lang.c:733 +#: src/lang.c:735 #, c-format msgid "Untagged %s" msgstr "EtiketlenmemiÅŸ %s" -#: src/lang.c:735 +#: src/lang.c:737 #, c-format msgid "Preparing for filtering on Path header (%d/%d)..." msgstr "" -#: src/lang.c:737 +#: src/lang.c:739 msgid "Processing mail messages marked for deletion." msgstr "Silinmek için iÅŸaretlenen iletiler iÅŸleniyor." -#: src/lang.c:738 +#: src/lang.c:740 msgid "Processing saved articles marked for deletion." msgstr "Silinmek için iÅŸaretlenen kaydedilmiÅŸ makaleler iÅŸleniyor." -#: src/lang.c:739 +#: src/lang.c:741 #, c-format msgid "Accept Followup-To? %s=post, %s=ignore, %s=quit: " msgstr "Takip etmeyi kabul et? %s=gönder, %s=yoksay, %s=çık: " -#: src/lang.c:740 +#: src/lang.c:742 msgid "Article unchanged, abort mailing?" msgstr "Makale deÄŸiÅŸtirilmedi, postalama iptal edilsin mi?" -#: src/lang.c:741 +#: src/lang.c:743 #, c-format msgid "Do you want to see postponed articles (%d)?" msgstr "ErtelenmiÅŸ makaleleri görmek ister misiniz (%d)?" -#: src/lang.c:743 +#: src/lang.c:745 msgid "Add quick kill filter?" msgstr "Hızlıca öldürme filtresi ekle?" -#: src/lang.c:744 +#: src/lang.c:746 msgid "Add quick selection filter?" msgstr "Hızlı seçme filtresi ekle?" -#: src/lang.c:745 +#: src/lang.c:747 msgid "Do you really want to quit?" msgstr "Gerçekten çıkmak istiyor musunuz?" -#: src/lang.c:746 +#: src/lang.c:748 #, c-format msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%s]: " msgstr "%s=iptal edilen iletiyi düzenle, %s=terk et, %s=sil (iptal) [%%s]: " -#: src/lang.c:747 +#: src/lang.c:749 msgid "You have tagged articles in this group - quit anyway?" msgstr "Bu grupta etiketlenmiÅŸ makaleleriniz var - yine de çıkılsın mı?" -#: src/lang.c:748 +#: src/lang.c:750 #, c-format msgid "%s=quit, %s=edit, %s=postpone: " msgstr "%s=çık, %s=düzenle, %s=ertele: " -#: src/lang.c:749 +#: src/lang.c:751 #, c-format msgid "%s=quit %s=edit %s=save kill description: " msgstr "%s=çık %s=düzenle %s=öldürme tanımı kaydet: " -#: src/lang.c:750 +#: src/lang.c:752 #, c-format msgid "%s=quit %s=edit %s=save select description: " msgstr "%s=çık %s=düzenle %s=tanım seçme kaydet: " -#: src/lang.c:751 +#: src/lang.c:753 msgid "Do you really want to quit without saving your configuration?" msgstr "Yapılandırmaları kaydetmeden çıkmak istediÄŸinizden emin misiniz?" -#: src/lang.c:754 +#: src/lang.c:756 msgid "Invalid range - valid are '0-9.$' eg. 1-$" msgstr "Geçersiz aralık- 'geçerli aralık '0-9.$' örn. 1-$" -#: src/lang.c:756 +#: src/lang.c:757 msgid "Do you want to abort this operation?" msgstr "Ä°ÅŸlem durdurulsun mu?" -#: src/lang.c:757 +#: src/lang.c:758 msgid "Do you want to exit tin immediately?" msgstr "tin'den hemen çıkmak istediÄŸinizden emin misiniz?" @@ -4835,7 +4872,8 @@ msgstr "" "kullan [varsayılan=%d]" #: src/lang.c:1118 -msgid " -Q quick start. Same as -nqd" +#, fuzzy +msgid " -Q quick start. Same as -dnq" msgstr " -Q hızlı baÅŸlat. -nqd ile aynı" #: src/lang.c:1119 @@ -8449,21 +8487,27 @@ msgid "Insert 'X-Comment-To:' header" msgstr "'X-Comment-To:' üst bilgisi ekle" #. TODO: lang.c -#: src/main.c:817 +#: src/main.c:819 msgid "reading from local spool" msgstr "yerel kuyruktan okunuyor" -#: src/misc.c:3877 +#. TODO: != ENOENT ? and -> lang.c +#: src/misc.c:750 +#, c-format +msgid "Error: unlink %s" +msgstr "" + +#: src/misc.c:3928 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "Sürüm: %s yayım %s %s (\"%s\") %s %s\n" -#: src/misc.c:3880 +#: src/misc.c:3931 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "Sürüm: %s yayım %s %s (\"%s\")\n" -#: src/newsrc.c:460 +#: src/newsrc.c:472 msgid "Unreachable?\n" msgstr "Ulaşılamaz?\n" @@ -8502,12 +8546,12 @@ msgstr "CAPABILITIES, READER duyurmadı" msgid "MOTD: " msgstr "MOTD: " -#: src/nrctbl.c:178 +#: src/nrctbl.c:184 #, c-format msgid "couldn't expand %s\n" msgstr "%s geniÅŸletilemedi\n" -#: src/post.c:1344 +#: src/post.c:1357 #, fuzzy, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" @@ -8516,7 +8560,7 @@ msgstr "" "%d satırı %d oktetten daha uzun ve kısaltılmalı, fakat\n" "kodlama %s ya da %s deÄŸerlerine ayarlanmadı\n" -#: src/post.c:1349 +#: src/post.c:1362 #, fuzzy, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" @@ -8528,7 +8572,7 @@ msgstr "" "gönderi hiçbir 8bit karakter içermiyor ve bu sebeple kısaltma " "gerçekleÅŸmeyecek\n" -#: src/post.c:1351 +#: src/post.c:1364 #, fuzzy, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" @@ -8537,27 +8581,27 @@ msgstr "" "%d satırı %d oktetten daha uzun ve kısaltılmalı, fakat\n" "kodlama %s deÄŸerine ayarlı deÄŸil\n" -#: src/post.c:2325 +#: src/post.c:2353 #, c-format msgid "Posting: %.*s ..." msgstr "Gönderiliyor: %.*s ..." -#: src/post.c:4075 +#: src/post.c:4119 msgid "Can't supersede in mailgroups, try repost instead." msgstr "" # fp # Check if okay to read #. Check if okay to read -#: src/read.c:207 +#: src/read.c:204 msgid "Aborting read, please wait..." msgstr "Okuma durduruluyor, lütfen bekleyin..." -#: src/read.c:354 +#: src/read.c:351 msgid "Aborted read\n" msgstr "Okuma durduruldu\n" -#: src/read.c:409 +#: src/read.c:406 msgid "Draining\n" msgstr "Süzdürülüyor\n" @@ -8571,6 +8615,18 @@ msgid "[- Unavailable -]" msgstr "[- Kullanılamıyor -]" #. +#. * Add the Message-ID headers to the cache, using the last Reference +#. * as the parent +#. +#. +#. * Add the References data to the cache +#. +#: src/refs.c:1015 src/refs.c:1077 +#, c-format +msgid "Building References-trees (%d/%d)..." +msgstr "" + +#. #. * preamble #. * TODO: -> lang.c #. @@ -8589,7 +8645,7 @@ msgstr "" "henüz deÄŸiÅŸikliÄŸe uÄŸramamış, ve gelecek birkaç ÅŸey garip görünebilir.\n" "\n" -#: src/save.c:1069 +#: src/save.c:1075 msgid "bytes" msgstr "bayt" Binary files tin-2.4.4/po/zh_CN.gmo and tin-2.4.5/po/zh_CN.gmo differ diff -Nurp '--exclude=.bzr*' tin-2.4.4/po/zh_CN.po tin-2.4.5/po/zh_CN.po --- tin-2.4.4/po/zh_CN.po 2019-12-24 10:55:10.000000000 +0100 +++ tin-2.4.5/po/zh_CN.po 2020-12-24 00:24:54.489910401 +0100 @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: tin 2.3.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 13:24+0100\n" +"POT-Creation-Date: 2020-12-24 00:24+0100\n" "PO-Revision-Date: 2015-08-28 12:21+0800\n" "Last-Translator: Mingye Wang \n" "Language-Team: Chinese (simplified) \n" @@ -20,6 +20,30 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 1.8.4\n" +#. -> lang.c +#: src/art.c:418 +#, fuzzy, c-format +msgid "Reading %s\n" +msgstr "é‡æ–°è¯»å– %s…" + +#. TODO: -> lang.c +#: src/art.c:1205 +#, fuzzy +msgid "Threading by multipart" +msgstr "讨论串文章…" + +#. -> lang.c +#: src/art.c:2539 +#, fuzzy, c-format +msgid "Writing %s\n" +msgstr "å°è¯• %s" + +#. TODO: -> lang.c +#: src/art.c:2619 +#, fuzzy +msgid "Writing overview cache..." +msgstr "写入属性文件…" + #: src/attrib.c:986 msgid "Processing attributes... " msgstr "处ç†å±žæ€§â€¦" @@ -1471,8 +1495,8 @@ msgid "Error making backup of %s file. F msgstr "制作文件 %s 备份时å‘生错误。文件系统已满？" #: src/lang.c:274 -#, c-format -msgid "Filtering global rules (%d/%d)..." +#, fuzzy, c-format +msgid "Filtering global rules (%d/%d) ('q' to quit)..." msgstr "筛选全局规则 (%d/%d)…" #: src/lang.c:275 @@ -2186,8 +2210,9 @@ msgstr "如果至少选å–äº†ä¸€ç¯‡æœªè¯ msgid "select threads that match user specified pattern" msgstr "选å–匹é…用户指定模å¼çš„讨论串" -#: src/lang.c:465 -msgid "tag all parts of current multipart-message in order" +#: src/lang.c:465 src/lang.c:521 +#, fuzzy +msgid "tag/untag all parts of current multipart-message in order" msgstr "ä¾åºæ ‡è®°ç›®å‰å¤šéƒ¨ä»¶æ¶ˆæ¯çš„所有部分" #: src/lang.c:466 @@ -2403,7 +2428,7 @@ msgstr "标记目å‰è®¨è®ºä¸²ä¸ºæœªè¯»" msgid "read chosen article" msgstr "读å–所选文章" -#: src/lang.c:521 +#: src/lang.c:522 msgid "" "Display properties\n" "------------------" @@ -2411,7 +2436,7 @@ msgstr "" "显示属性\n" "------------------" -#: src/lang.c:522 +#: src/lang.c:523 msgid "" "Miscellaneous\n" "-------------" @@ -2419,7 +2444,7 @@ msgstr "" "æ‚项\n" "-------------" -#: src/lang.c:523 +#: src/lang.c:524 msgid "" "Moving around\n" "-------------" @@ -2427,7 +2452,7 @@ msgstr "" "四处移动\n" "-------------" -#: src/lang.c:524 +#: src/lang.c:525 msgid "" "Group/thread/article operations\n" "-------------------------------" @@ -2435,7 +2460,7 @@ msgstr "" "群组/讨论串/文章æ“作\n" "-------------------------------" -#: src/lang.c:525 +#: src/lang.c:526 msgid "" "Attachment operations\n" "---------------------" @@ -2443,7 +2468,7 @@ msgstr "" "附件æ“作\n" "---------------------" -#: src/lang.c:526 +#: src/lang.c:527 msgid "" "Attribute operations\n" "--------------------" @@ -2451,7 +2476,7 @@ msgstr "" "属性æ“作\n" "--------------------" -#: src/lang.c:527 +#: src/lang.c:528 msgid "" "Option operations\n" "-----------------" @@ -2459,7 +2484,7 @@ msgstr "" "选项æ“作\n" "-----------------" -#: src/lang.c:528 +#: src/lang.c:529 msgid "" "Scope operations\n" "----------------" @@ -2467,7 +2492,7 @@ msgstr "" "范围æ“作\n" "----------------" -#: src/lang.c:529 +#: src/lang.c:530 msgid "" "URL operations\n" "--------------" @@ -2475,90 +2500,95 @@ msgstr "" "网å€æ“作\n" "--------------" -#: src/lang.c:530 +#: src/lang.c:531 msgid "choose first URL in list" msgstr "选择清å•ä¸­çš„第一笔网å€" -#: src/lang.c:531 +#: src/lang.c:532 msgid "0 - 9\t choose URL by number" msgstr "0 - 9\t ä¾ç¼–å·é€‰æ‹©ç½‘å€" -#: src/lang.c:532 +#: src/lang.c:533 msgid "choose last URL in list" msgstr "选择清å•ä¸­çš„最åŽä¸€ç¬”网å€" -#: src/lang.c:533 +#: src/lang.c:534 msgid "search for URLs forwards" msgstr "å‘å‰æœç´¢ç½‘å€" -#: src/lang.c:534 +#: src/lang.c:535 msgid "search for URLs backwards" msgstr "å‘åŽæœç´¢ç½‘å€" -#: src/lang.c:535 +#: src/lang.c:536 msgid "Open URL in browser" msgstr "在æµè§ˆå™¨ä¸­æ‰“开网å€" -#: src/lang.c:536 +#: src/lang.c:537 msgid "toggle info message in last line (URL)" msgstr "切æ¢æœ€åŽä¸€è¡Œçš„ä¿¡æ¯æ¶ˆæ¯ (网å€)" -#: src/lang.c:538 +#: src/lang.c:539 msgid "Group Level Commands" msgstr "群组层级命令" -#: src/lang.c:539 +#: src/lang.c:540 msgid "Kill filter added" msgstr "ç é™¤å·²åŠ å…¥çš„筛选器" -#: src/lang.c:540 +#: src/lang.c:541 msgid "Auto-selection filter added" msgstr "自动选å–已加入的筛选器" -#: src/lang.c:541 +#: src/lang.c:542 msgid "All parts tagged" msgstr "已标记所有部分" -#: src/lang.c:542 +#: src/lang.c:543 +#, fuzzy +msgid "All parts untagged" +msgstr "已标记所有部分" + +#: src/lang.c:544 msgid "Storing article for later posting" msgstr "存入文章以用于ç¨åŽå¼ è´´" -#: src/lang.c:543 +#: src/lang.c:545 msgid "Please enter a valid character" msgstr "请输入有效字符" -#: src/lang.c:544 +#: src/lang.c:546 #, c-format msgid "Missing part #%d" msgstr "缺少部分的 #%d" -#: src/lang.c:545 +#: src/lang.c:547 msgid "*** No postponed articles ***" msgstr "*** 未被æ置的文章 ***" -#: src/lang.c:546 +#: src/lang.c:548 msgid "Not a multi-part message" msgstr "ä¸æ˜¯ä¸€ç¯‡å¤šéƒ¨ä»¶æ¶ˆæ¯" -#: src/lang.c:547 +#: src/lang.c:549 msgid "You are not subscribed to this group" msgstr "您未订阅这个群组" -#: src/lang.c:548 +#: src/lang.c:550 msgid "No previous expression" msgstr "没有上一个表达å¼" -#: src/lang.c:549 +#: src/lang.c:551 msgid "Operation disabled in no-overwrite mode" msgstr "在无覆写模å¼ä¸­çš„æ“作已åœç”¨" #. TODO: replace hard coded key-name in txt_info_postponed -#: src/lang.c:551 +#: src/lang.c:553 #, c-format msgid "%d postponed %s, reuse with ^O...\n" msgstr "%d å·²æç½® %s，按下 ^O 以é‡æ–°ä½¿ç”¨â€¦\n" -#: src/lang.c:552 +#: src/lang.c:554 msgid "" "X-Conversion-Note: multipart/alternative contents have been removed.\n" " To get the whole article, turn alternative handling OFF in the Option " @@ -2567,21 +2597,21 @@ msgstr "" "X-Conversion-Note: 多部件/替代内容已被移除。\n" " è¦æå–整篇文章，请在选项功能表中关闭替代处ç†\n" -#: src/lang.c:554 +#: src/lang.c:556 #, c-format msgid "Save filename for %s/%s is a mailbox. Attachment not saved" msgstr "ä¿å­˜ %s/%s 的文件å是一个信箱。附件未被ä¿å­˜" -#: src/lang.c:555 +#: src/lang.c:557 msgid "TeX2Iso encoded article" msgstr "TeX2Iso ç¼–ç æ–‡ç« " -#: src/lang.c:556 +#: src/lang.c:558 msgid "incomplete " msgstr "ä¸å®Œæ•´çš„ " #. TODO: replace hard coded key-names -#: src/lang.c:558 +#: src/lang.c:560 #, fuzzy, c-format msgid "" "\n" @@ -2640,152 +2670,152 @@ msgstr "" "è¦èŽ·å¾—更多信æ¯ï¼Œè¯·é˜…读在线手册ã€READMEã€INSTALLã€TODO å’Œ FTP 等文件。\n" "请利用‘R’命令å‘é€é”™è¯¯æŠ¥å‘Š/æ„è§ç»™ %s。\n" -#: src/lang.c:574 +#: src/lang.c:576 #, c-format msgid "Invalid From: %s line. Read the INSTALL file again." msgstr "无效的 From: %s 行。请å†é˜…读 INSTALL 文件。" -#: src/lang.c:576 +#: src/lang.c:578 msgid "Invalid multibyte sequence found\n" msgstr "出现无效的多字节åºåˆ—\n" -#: src/lang.c:579 +#: src/lang.c:581 #, c-format msgid "Invalid Sender:-header %s" msgstr "无效的 Sender: -header %s" -#: src/lang.c:581 +#: src/lang.c:583 msgid "Inverse video disabled" msgstr "å白显示已åœç”¨" -#: src/lang.c:582 +#: src/lang.c:584 msgid "Inverse video enabled" msgstr "å白显示已å¯ç”¨" -#: src/lang.c:584 +#: src/lang.c:586 #, c-format msgid "Missing definition for %s\n" msgstr "缺少 %s 的定义\n" -#: src/lang.c:585 +#: src/lang.c:587 #, c-format msgid "Invalid key definition '%s'\n" msgstr "无效的按键定义‘%s’\n" -#: src/lang.c:586 +#: src/lang.c:588 #, c-format msgid "Invalid keyname '%s'\n" msgstr "无效的按键å称‘%s’\n" -#: src/lang.c:587 +#: src/lang.c:589 #, c-format msgid "Keymap file was upgraded to version %s\n" msgstr "Keymap 文件已å‡çº§åˆ°ç‰ˆæœ¬ %s\n" -#: src/lang.c:588 +#: src/lang.c:590 #, c-format msgid "Kill From: [%s] (y/n): " msgstr "ç é™¤ From: [%s] (y/n)：" -#: src/lang.c:589 +#: src/lang.c:591 msgid "Kill Lines: (num): " msgstr "ç é™¤ Lines: (num)：" -#: src/lang.c:590 +#: src/lang.c:592 msgid "Kill Article Menu" msgstr "ç é™¤æ–‡ç« èœå•" -#: src/lang.c:591 +#: src/lang.c:593 #, fuzzy, c-format msgid "Kill Msg-ID: [%s] (f/l/o/n): " msgstr "ç é™¤ Msg-Id： [%s] (f/l/o/n)：" -#: src/lang.c:592 +#: src/lang.c:594 msgid "Kill pattern scope : " msgstr "ç é™¤æ¨¡å¼èŒƒå›´ ：" -#: src/lang.c:593 +#: src/lang.c:595 #, c-format msgid "Kill Subject: [%s] (y/n): " msgstr "ç é™¤ Subject: [%s] (y/n)：" -#: src/lang.c:594 +#: src/lang.c:596 msgid "Kill text pattern : " msgstr "ç é™¤æ–‡æœ¬æ¨¡å¼ ：" -#: src/lang.c:595 +#: src/lang.c:597 msgid "Kill time in days : " msgstr "ç é™¤æ—¶é—´äºŽæ¯æ—¥ ：" -#: src/lang.c:597 +#: src/lang.c:599 msgid "Last" msgstr "最åŽä¸€ç¬”" -#: src/lang.c:598 +#: src/lang.c:600 msgid "-- Last response --" msgstr "-- 最åŽä¸€ç¬”回应 --" -#: src/lang.c:599 +#: src/lang.c:601 #, c-format msgid "Lines %s " msgstr "è¡Œ %s " -#: src/lang.c:602 +#: src/lang.c:604 #, fuzzy msgid "Function not available." msgstr "无法使用文章" -#: src/lang.c:603 +#: src/lang.c:605 msgid "Not reading via NNTP." msgstr "" -#: src/lang.c:604 +#: src/lang.c:606 #, fuzzy, c-format msgid "Group: %s" msgstr "群组 %.*s…" -#: src/lang.c:605 +#: src/lang.c:607 #, fuzzy, c-format msgid "Groups: %s" msgstr "群组 %.*s…" -#: src/lang.c:608 +#: src/lang.c:610 msgid "Mail" msgstr "邮寄" -#: src/lang.c:609 +#: src/lang.c:611 msgid "mailbox " msgstr "ä¿¡ç®± " -#: src/lang.c:610 +#: src/lang.c:612 #, c-format msgid "Mail article(s) to [%.*s]> " msgstr "邮寄文章到 [%.*s]>" -#: src/lang.c:611 +#: src/lang.c:613 #, c-format msgid "Mailing log to %s\n" msgstr "邮寄记录档到 %s\n" -#: src/lang.c:612 +#: src/lang.c:614 msgid "Mail bug report..." msgstr "邮寄错误报告…" -#: src/lang.c:613 +#: src/lang.c:615 #, c-format msgid "Mail BUG REPORT to %s?" msgstr "邮寄错误报告到 %s？" -#: src/lang.c:614 +#: src/lang.c:616 msgid "Mailed" msgstr "已寄出" -#: src/lang.c:615 +#: src/lang.c:617 #, c-format msgid "Mailing to %s..." msgstr "邮寄到 %s…" -#: src/lang.c:616 +#: src/lang.c:618 msgid "" "# [Mail/Save] active file. Format is like news active file:\n" "# groupname max.artnum min.artnum /dir\n" @@ -2797,84 +2827,84 @@ msgstr "" "# 第四个字段是基底目录 (äº¦å³ ~/Mail 或 ~/News)\n" "#\n" -#: src/lang.c:619 +#: src/lang.c:621 #, c-format msgid "%s marked as read" msgstr "%s 标记为已读" -#: src/lang.c:620 +#: src/lang.c:622 #, c-format msgid "%s marked as unread" msgstr "%s 标记为未读" -#: src/lang.c:621 +#: src/lang.c:623 #, c-format msgid "Marked %d of %d %s as read" msgstr "标记 %2$d 中的 %1$d %3$s 为已读" -#: src/lang.c:622 +#: src/lang.c:624 #, c-format msgid "Marked %d of %d %s as unread" msgstr "标记 %2$d 中的 %1$d %3$s 为未读" -#: src/lang.c:623 src/lang.c:1352 +#: src/lang.c:625 src/lang.c:1352 msgid "Mark" msgstr "标记" -#: src/lang.c:624 +#: src/lang.c:626 #, c-format msgid "Mark all articles as read%s?" msgstr "标记所有文章为 %s 读？" -#: src/lang.c:625 +#: src/lang.c:627 #, c-format msgid "Mark article as read%s?" msgstr "标记文章为 %s 读？" -#: src/lang.c:626 +#: src/lang.c:628 #, c-format msgid "Mark group %s as read?" msgstr "标记群组 %s 为已读？" -#: src/lang.c:627 +#: src/lang.c:629 #, c-format msgid "Mark thread as read%s?" msgstr "标记讨论串为 %s 读？" -#: src/lang.c:628 +#: src/lang.c:630 #, c-format msgid "Matching %s groups..." msgstr "æ­£åœ¨åŒ¹é… %s 群组…" -#: src/lang.c:629 src/lang.c:643 src/lang.c:649 +#: src/lang.c:631 src/lang.c:645 src/lang.c:651 #, c-format msgid "=set current to n; %s=line down; %s=line up; %s=help; %s=quit" msgstr "=设置目å‰ä¸º n; %s=下移一行；%s=上移一行；%s=求助；%s=离开" -#: src/lang.c:631 +#: src/lang.c:633 #, c-format msgid "" "%s=view; %s=pipe; %s=pipe raw; %s=save; %s=tag; %s=tag pattern; %s=untag all" msgstr "" "%s=查看；%s=管é“ï¼›%s=管é“原始；%s=ä¿å­˜ï¼›%s=标记；%s=标记模å¼ï¼›%s=å–消所有标记" -#: src/lang.c:633 +#: src/lang.c:635 #, c-format msgid "%s=view; %s=save; %s=tag; %s=tag pattern; %s=untag all" msgstr "%s=查看；%s=ä¿å­˜ï¼›%s=标记；%s=标记模å¼ï¼›%s=å–消所有标记" -#: src/lang.c:635 +#: src/lang.c:637 #, c-format msgid "" "%s=reverse tagging; %s=search forwards; %s=search backwards; %s=repeat search" msgstr "%s=åå‘标记；%s=å‘å‰æœç´¢ï¼›%s=å‘åŽæœç´¢ï¼›%s=é‡å¤æœç´¢" -#: src/lang.c:636 src/lang.c:640 +#: src/lang.c:638 src/lang.c:642 #, c-format msgid "=set current to n; %s=next unread; %s=search pattern; %s=kill/select" msgstr "=设置目å‰ä¸º n; %s=下一个未读；%s=æœç´¢æ¨¡å¼ï¼›%s=ç é™¤/选å–" -#: src/lang.c:637 +#: src/lang.c:639 #, c-format msgid "" "%s=author search; %s=catchup; %s=line down; %s=line up; %s=mark read; " @@ -2883,262 +2913,262 @@ msgstr "" "%s=作者æœç´¢ï¼›%s=设回未读；%s=下移一行；%s=上移一行；%s=设为已读；%s=列出讨论" "串" -#: src/lang.c:638 +#: src/lang.c:640 #, c-format msgid "%s=line up; %s=line down; %s=page up; %s=page down; %s=top; %s=bottom" msgstr "%s=上移一行；%s=下移一行；%s=å‘上一页；%s=å‘下一页；%s=顶端；%s=底部" -#: src/lang.c:639 +#: src/lang.c:641 #, c-format msgid "%s=search forwards; %s=search backwards; %s=quit" msgstr "%s=å‘å‰æœç´¢ï¼›%s=å‘åŽæœç´¢ï¼›%s=离开" -#: src/lang.c:641 +#: src/lang.c:643 #, c-format msgid "%s=author search; %s=body search; %s=catchup; %s=followup; %s=mark read" msgstr "%s=作者æœç´¢ï¼›%s=内文æœç´¢ï¼›%s=设回未读；%s=è·Ÿè´´ï¼›%s=设为已读" -#: src/lang.c:642 +#: src/lang.c:644 #, c-format msgid "%s=add; %s=move; %s=rename; %s=delete" msgstr "%s=加入；%s=移动；%s=é‡å‘½åï¼›%s=删除" -#: src/lang.c:644 +#: src/lang.c:646 #, c-format msgid "=set current to n; %s=next unread; %s,%s=search pattern; %s=catchup" msgstr "=设置目å‰ä¸º n; %s=下一个未读；%s,%s=æœç´¢æ¨¡å¼ï¼›%s=设回未读" -#: src/lang.c:645 +#: src/lang.c:647 #, c-format msgid "" "%s=line down; %s=line up; %s=help; %s=move; %s=quit; %s=toggle all/unread" msgstr "%s=下移一行；%s=上移一行；%s=求助；%s=移动；%s=离开；%s=切æ¢å…¨éƒ¨/未读" -#: src/lang.c:646 +#: src/lang.c:648 #, c-format msgid "" "%s=subscribe; %s=sub pattern; %s=unsubscribe; %s=unsub pattern; %s=yank in/" "out" msgstr "%s=订阅；%s=订阅模å¼ï¼›%s=å–消订阅；%s=å–消订阅模å¼ï¼›%s=拔入/出" -#: src/lang.c:647 +#: src/lang.c:649 #, c-format msgid "=set current to n; %s=next unread; %s=catchup; %s=display toggle" msgstr "=设置目å‰ä¸º n; %s=下一个未读；%s=设回未读；%s=显示切æ¢" -#: src/lang.c:648 +#: src/lang.c:650 #, c-format msgid "%s=help; %s=line down; %s=line up; %s=quit; %s=tag; %s=mark unread" msgstr "%s=求助；%s=下移一行；%s=上移一行；%s=离开；%s=标记；%s=标记未读" -#: src/lang.c:650 +#: src/lang.c:652 #, c-format msgid "%s=search forwards; %s=search backwards; %s=repeat search" msgstr "%s=å‘å‰æœç´¢ï¼›%s=å‘åŽæœç´¢ï¼›%s=é‡å¤æœç´¢" -#: src/lang.c:651 +#: src/lang.c:653 msgid "--More--" msgstr "--更多--" -#: src/lang.c:652 +#: src/lang.c:654 #, c-format msgid "Moving %s..." msgstr "正在移动 %s…" -#: src/lang.c:653 +#: src/lang.c:655 msgid "Message-ID: & last Reference " msgstr "Message-ID: & 最近å‚考 " -#: src/lang.c:654 +#: src/lang.c:656 msgid "Message-ID: line " msgstr "Message-ID: è¡Œ " -#: src/lang.c:655 +#: src/lang.c:657 msgid "Message-ID: & References: line" msgstr "Message-ID: & References: è¡Œ" -#: src/lang.c:657 +#: src/lang.c:659 msgid ", name: " msgstr "，å称：" -#: src/lang.c:658 +#: src/lang.c:660 #, c-format msgid "Go to newsgroup [%s]> " msgstr "å‰å¾€æ–°é—»ç¾¤ç»„ [%s]>" -#: src/lang.c:659 +#: src/lang.c:661 msgid "newsgroups" msgstr "新闻群组" -#: src/lang.c:660 +#: src/lang.c:662 #, c-format msgid "Position %s in group list (1,2,..,$) [%d]> " msgstr "å®šä½ %s äºŽç¾¤ç»„æ¸…å• (1,2,..,$) [%d]>" -#: src/lang.c:661 +#: src/lang.c:663 msgid "newsgroup" msgstr "新闻群组" -#: src/lang.c:662 +#: src/lang.c:664 msgid "Try and save newsrc file again?" msgstr "å†æ¬¡å°è¯•å¹¶ä¿å­˜ newsrc 文件？" -#: src/lang.c:663 +#: src/lang.c:665 msgid "Warning: No newsgroups were written to your newsrc file. Save aborted." msgstr "警告：没有任何新闻群组被写入您的 newsrc 文件。已放弃ä¿å­˜ã€‚" -#: src/lang.c:664 +#: src/lang.c:666 msgid "newsrc file saved successfully.\n" msgstr "newsrc 文件已æˆåŠŸä¿å­˜ã€‚\n" -#: src/lang.c:665 +#: src/lang.c:667 msgid "-- Next response --" msgstr "-- 下一个回应 --" -#: src/lang.c:666 +#: src/lang.c:668 msgid "No " msgstr "å¦ " -#: src/lang.c:667 +#: src/lang.c:669 msgid "*** No articles ***" msgstr "*** 没有文章 ***" -#: src/lang.c:668 +#: src/lang.c:670 msgid "No articles have been posted" msgstr "没有任何文章已被张贴" -#: src/lang.c:669 +#: src/lang.c:671 msgid "*** No attachments ***" msgstr "*** 没有附件 ***" -#: src/lang.c:670 +#: src/lang.c:672 msgid "*** No description ***" msgstr "*** 没有æè¿° ***" -#: src/lang.c:671 +#: src/lang.c:673 msgid "No filename" msgstr "没有文件å" -#: src/lang.c:672 +#: src/lang.c:674 msgid "No group" msgstr "没有群组" -#: src/lang.c:673 +#: src/lang.c:675 msgid "*** No groups ***" msgstr "*** 没有群组 ***" -#: src/lang.c:674 +#: src/lang.c:676 msgid "No more groups to read" msgstr "已无å¯è¯»å–群组" -#: src/lang.c:675 +#: src/lang.c:677 msgid "No last message" msgstr "没有最近一笔消æ¯" -#: src/lang.c:676 +#: src/lang.c:678 msgid "No mail address" msgstr "没有邮件地å€" -#: src/lang.c:677 +#: src/lang.c:679 msgid "No articles marked for saving" msgstr "没有标记è¦ä¿å­˜çš„文章" -#: src/lang.c:678 +#: src/lang.c:680 msgid "No match" msgstr "没有匹é…" -#: src/lang.c:679 +#: src/lang.c:681 msgid "No more groups" msgstr "已无群组" -#: src/lang.c:680 +#: src/lang.c:682 msgid "No newsgroups" msgstr "没有新闻群组" -#: src/lang.c:681 +#: src/lang.c:683 msgid "No next unread article" msgstr "没有下一篇未读文章" -#: src/lang.c:682 +#: src/lang.c:684 msgid "No previous group" msgstr "没有上一个群组" -#: src/lang.c:683 +#: src/lang.c:685 msgid "No previous search, nothing to repeat" msgstr "没有上一个æœç´¢ï¼Œæ²¡æœ‰ä»»ä½•ä¸œè¥¿å¯é‡å¤" -#: src/lang.c:684 +#: src/lang.c:686 msgid "No previous unread article" msgstr "没有上一篇未读文章" -#: src/lang.c:685 +#: src/lang.c:687 msgid "No responses" msgstr "没有回应" -#: src/lang.c:686 +#: src/lang.c:688 msgid "No responses to list in current thread" msgstr "在目å‰çš„讨论串中没有回应å¯åˆ—出" -#: src/lang.c:687 +#: src/lang.c:689 msgid "*** No scopes ***" msgstr "*** 没有范围 ***" -#: src/lang.c:688 +#: src/lang.c:690 msgid "No search string" msgstr "没有æœç´¢å­—串" -#: src/lang.c:689 +#: src/lang.c:691 msgid "No subject" msgstr "没有主旨" -#: src/lang.c:691 +#: src/lang.c:693 #, c-format msgid "%s: Terminal must have clear to end-of-line (ce)\n" msgstr "%s：终端机必须能够清空到行尾 (ce)\n" -#: src/lang.c:692 +#: src/lang.c:694 #, c-format msgid "%s: Terminal must have clear to end-of-screen (cd)\n" msgstr "%s：终端机必须能够清空到å±å¹•æœ«ç«¯ (cd)\n" -#: src/lang.c:693 +#: src/lang.c:695 #, c-format msgid "%s: Terminal must have clearscreen (cl) capability\n" msgstr "%s：终端机必须具备清空å±å¹• (cl) 的能力\n" -#: src/lang.c:694 +#: src/lang.c:696 #, c-format msgid "%s: Terminal must have cursor motion (cm)\n" msgstr "%s：终端机必须能够移动光标 (cm)\n" -#: src/lang.c:695 +#: src/lang.c:697 #, c-format msgid "%s: TERM variable must be set to use screen capabilities\n" msgstr "%s：TERM å˜é‡å¿…须被设置以使用å±å¹•èƒ½åŠ›\n" -#: src/lang.c:697 +#: src/lang.c:699 #, c-format msgid "No viewer found for %s/%s\n" msgstr "找ä¸åˆ°ä»»ä½•æŸ¥çœ‹å™¨ç”¨äºŽ %s/%s\n" -#: src/lang.c:698 +#: src/lang.c:700 msgid "Newsgroup does not exist on this server" msgstr "新闻群组ä¸å­˜åœ¨äºŽè¿™ä¸ªæœåŠ¡å™¨" -#: src/lang.c:699 +#: src/lang.c:701 #, c-format msgid "Group %s not found in active file" msgstr "在现用文件中找ä¸åˆ°ç¾¤ç»„ %s" -#: src/lang.c:700 +#: src/lang.c:702 msgid "c)reate it, use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "c)创建它ã€ä½¿ç”¨ a)替代å称ã€ä½¿ç”¨ d)ç¼ºçœ .newsrcã€q)离开 tin：" -#: src/lang.c:701 +#: src/lang.c:703 msgid "use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "使用 a)替代å称ã€ä½¿ç”¨ d)ç¼ºçœ .newsrcã€q)离开 tin：" -#: src/lang.c:702 +#: src/lang.c:704 #, c-format msgid "" "# NNTP-server -> newsrc translation table and NNTP-server\n" @@ -3167,44 +3197,44 @@ msgstr "" "# news.example.org /tmp/nrc-ex example ex\n" "#\n" -#: src/lang.c:709 +#: src/lang.c:711 msgid "Only" msgstr "åªæœ‰" -#: src/lang.c:710 +#: src/lang.c:712 #, c-format msgid "Option not enabled. Recompile with %s." msgstr "选项未å¯ç”¨ã€‚é‡æ–°ä»¥ %s 编译。" -#: src/lang.c:711 +#: src/lang.c:713 msgid "Options Menu" msgstr "选项功能表" -#: src/lang.c:712 +#: src/lang.c:714 msgid "Options Menu Commands" msgstr "选项功能表命令" -#: src/lang.c:715 +#: src/lang.c:717 #, c-format msgid "Error in regex: %s at pos. %d '%s'" msgstr "åœ¨æ­£åˆ™è¡¨è¾¾å¼ %s çš„ä½ç½® %d å‘生错误：‘%s’" -#: src/lang.c:716 +#: src/lang.c:718 #, c-format msgid "Error in regex: pcre internal error %d" msgstr "在正则表达å¼ä¸­å‘生错误：pcre 内部错误 %d" -#: src/lang.c:717 +#: src/lang.c:719 #, c-format msgid "Error in regex: study - pcre internal error %s" msgstr "在正则表达å¼ä¸­å‘生错误：study - pcre 内部错误 %s" -#: src/lang.c:718 +#: src/lang.c:720 msgid "Post a followup..." msgstr "跟贴…" #. TODO: replace hard coded key-name in txt_post_error_ask_postpone -#: src/lang.c:720 +#: src/lang.c:722 msgid "" "An error has occurred while posting the article. If you think that this\n" "error is temporary or otherwise correctable, you can postpone the article\n" @@ -3214,134 +3244,134 @@ msgstr "" "错误是暂时或是å¯æ”¹æ­£çš„，您å¯ä»¥æ置文章\n" "并于ç¨åŽä»¥ ^O å†æ¬¡å–出它。\n" -#: src/lang.c:723 +#: src/lang.c:725 msgid "Posted articles history" msgstr "张贴文章历å²è®°å½•" -#: src/lang.c:724 +#: src/lang.c:726 #, c-format msgid "Post to newsgroup(s) [%s]> " msgstr "张贴到新闻群组 [%s]>" -#: src/lang.c:725 +#: src/lang.c:727 msgid "-- post processing started --" msgstr "-- 张贴处ç†å¼€å§‹ --" -#: src/lang.c:726 +#: src/lang.c:728 msgid "-- post processing completed --" msgstr "-- 张贴处ç†å®Œæˆ --" -#: src/lang.c:727 +#: src/lang.c:729 #, c-format msgid "Post subject [%s]> " msgstr "张贴主旨 [%s]>" -#: src/lang.c:728 +#: src/lang.c:730 msgid "" "# Summary of mailed/posted messages viewable by 'W' command from within " "tin.\n" msgstr "# 邮寄/张贴的消æ¯æ¦‚è¦å¯ä»¥åœ¨ tin 之中ç»ç”±â€˜W’命令æ¥æŸ¥çœ‹ã€‚\n" -#: src/lang.c:729 +#: src/lang.c:731 msgid "Posting article..." msgstr "张贴文章…" -#: src/lang.c:730 +#: src/lang.c:732 #, c-format msgid "Post postponed articles [%%s]? (%s/%s/%s/%s/%s): " msgstr "张贴被æ置的文章 [%%s]？(%s/%s/%s/%s/%s)：" -#: src/lang.c:731 +#: src/lang.c:733 #, c-format msgid "Hot %s" msgstr "热门 %s" -#: src/lang.c:732 +#: src/lang.c:734 #, c-format msgid "Tagged %s" msgstr "已标记 %s" -#: src/lang.c:733 +#: src/lang.c:735 #, c-format msgid "Untagged %s" msgstr "å·²å–消标记 %s" -#: src/lang.c:735 +#: src/lang.c:737 #, c-format msgid "Preparing for filtering on Path header (%d/%d)..." msgstr "" -#: src/lang.c:737 +#: src/lang.c:739 msgid "Processing mail messages marked for deletion." msgstr "处ç†æ ‡è®°ä¸ºåˆ é™¤çš„邮件消æ¯ã€‚" -#: src/lang.c:738 +#: src/lang.c:740 msgid "Processing saved articles marked for deletion." msgstr "处ç†æ ‡è®°ä¸ºåˆ é™¤çš„å·²ä¿å­˜æ–‡ç« ã€‚" -#: src/lang.c:739 +#: src/lang.c:741 #, c-format msgid "Accept Followup-To? %s=post, %s=ignore, %s=quit: " msgstr "接å—跟贴？%s=张贴，%s=忽略，%s=离开：" -#: src/lang.c:740 +#: src/lang.c:742 msgid "Article unchanged, abort mailing?" msgstr "文章未å˜æ›´ï¼Œæ”¾å¼ƒé‚®å¯„？" -#: src/lang.c:741 +#: src/lang.c:743 #, c-format msgid "Do you want to see postponed articles (%d)?" msgstr "您è¦çœ‹åˆ°æ置的文章 (%d) å—？" -#: src/lang.c:743 +#: src/lang.c:745 msgid "Add quick kill filter?" msgstr "加入快速ç é™¤ç­›é€‰å™¨ï¼Ÿ" -#: src/lang.c:744 +#: src/lang.c:746 msgid "Add quick selection filter?" msgstr "加入快速选择筛选器？" -#: src/lang.c:745 +#: src/lang.c:747 msgid "Do you really want to quit?" msgstr "您真的è¦ç¦»å¼€å—？" -#: src/lang.c:746 +#: src/lang.c:748 #, c-format msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%s]: " msgstr "%s=编辑å–消消æ¯ï¼Œ%s=离开，%s=删除 (å–消) [%%s]：" -#: src/lang.c:747 +#: src/lang.c:749 msgid "You have tagged articles in this group - quit anyway?" msgstr "您已在这个群组中标记文章 - 无论如何都è¦ç¦»å¼€ï¼Ÿ" -#: src/lang.c:748 +#: src/lang.c:750 #, c-format msgid "%s=quit, %s=edit, %s=postpone: " msgstr "%s=离开，%s=编辑，%s=æ置：" -#: src/lang.c:749 +#: src/lang.c:751 #, c-format msgid "%s=quit %s=edit %s=save kill description: " msgstr "%s=离开 %s=编辑 %s=ä¿å­˜ç é™¤æ述：" -#: src/lang.c:750 +#: src/lang.c:752 #, c-format msgid "%s=quit %s=edit %s=save select description: " msgstr "%s=离开 %s=编辑 %s=ä¿å­˜é€‰å–æ述：" -#: src/lang.c:751 +#: src/lang.c:753 msgid "Do you really want to quit without saving your configuration?" msgstr "您真的è¦ç¦»å¼€å´ä¸ä¿å­˜æ‚¨çš„组æ€å—？" -#: src/lang.c:754 +#: src/lang.c:756 msgid "Invalid range - valid are '0-9.$' eg. 1-$" msgstr "无效的范围 - 有效是‘0-9.$’例如：1-$" -#: src/lang.c:756 +#: src/lang.c:757 msgid "Do you want to abort this operation?" msgstr "您è¦æ”¾å¼ƒè¿™ä¸ªæ“作å—？" -#: src/lang.c:757 +#: src/lang.c:758 msgid "Do you want to exit tin immediately?" msgstr "您è¦é©¬ä¸Šç¦»å¼€ tin å—？" @@ -4677,7 +4707,8 @@ msgid " -p port use port as NNTP port msgstr " -p port 使用 port 作为 NNTP é€šä¿¡ç«¯å£ [缺çœ=%d]" #: src/lang.c:1118 -msgid " -Q quick start. Same as -nqd" +#, fuzzy +msgid " -Q quick start. Same as -dnq" msgstr " -Q å¿«é€Ÿå¼€å§‹ã€‚å¦‚åŒ -nqd" #: src/lang.c:1119 @@ -8066,21 +8097,27 @@ msgid "Insert 'X-Comment-To:' header" msgstr "æ’入‘X-Comment-To:’标头" #. TODO: lang.c -#: src/main.c:817 +#: src/main.c:819 msgid "reading from local spool" msgstr "" -#: src/misc.c:3877 +#. TODO: != ENOENT ? and -> lang.c +#: src/misc.c:750 +#, c-format +msgid "Error: unlink %s" +msgstr "" + +#: src/misc.c:3928 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "版本：%s %s å‘布 %s (“%sâ€) %s %s\n" -#: src/misc.c:3880 +#: src/misc.c:3931 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "版本：%s %s å‘布 %s (“%sâ€)\n" -#: src/newsrc.c:460 +#: src/newsrc.c:472 msgid "Unreachable?\n" msgstr "无法连接？\n" @@ -8120,12 +8157,12 @@ msgstr "能力中并未宣告包å«é˜…è¯ msgid "MOTD: " msgstr "MOTD: " -#: src/nrctbl.c:178 +#: src/nrctbl.c:184 #, c-format msgid "couldn't expand %s\n" msgstr "无法展开 %s\n" -#: src/post.c:1344 +#: src/post.c:1357 #, fuzzy, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" @@ -8134,7 +8171,7 @@ msgstr "" "第 %d 行长度超过 998 字节而应该被折å ï¼Œä½†æ˜¯\n" "ç¼–ç æœªè¢«è®¾ç½®ä¸º %s äº¦éž %s\n" -#: src/post.c:1349 +#: src/post.c:1362 #, fuzzy, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" @@ -8145,7 +8182,7 @@ msgstr "" "ç¼–ç è¢«è®¾ç½®ä¸º %s 而未å¯ç”¨ MIME_BREAK_LONG_LINES 或是\n" "è´´æ–‡ä¸åŒ…å«ä»»ä½• 8 比特字符，因而无法å‘生折å \n" -#: src/post.c:1351 +#: src/post.c:1364 #, fuzzy, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" @@ -8154,25 +8191,25 @@ msgstr "" "第 %d 行长度超过 998 字节而，但是\n" "ç¼–ç æœªè¢«è®¾ç½®ä¸º %s\n" -#: src/post.c:2325 +#: src/post.c:2353 #, c-format msgid "Posting: %.*s ..." msgstr "张贴：%.*s…" -#: src/post.c:4075 +#: src/post.c:4119 msgid "Can't supersede in mailgroups, try repost instead." msgstr "" #. Check if okay to read -#: src/read.c:207 +#: src/read.c:204 msgid "Aborting read, please wait..." msgstr "放弃读å–，请ç¨å¾……" -#: src/read.c:354 +#: src/read.c:351 msgid "Aborted read\n" msgstr "已放弃读å–\n" -#: src/read.c:409 +#: src/read.c:406 msgid "Draining\n" msgstr "排放\n" @@ -8185,6 +8222,18 @@ msgid "[- Unavailable -]" msgstr "[- ä¸å¯ç”¨ -]" #. +#. * Add the Message-ID headers to the cache, using the last Reference +#. * as the parent +#. +#. +#. * Add the References data to the cache +#. +#: src/refs.c:1015 src/refs.c:1077 +#, c-format +msgid "Building References-trees (%d/%d)..." +msgstr "" + +#. #. * preamble #. * TODO: -> lang.c #. @@ -8202,7 +8251,7 @@ msgstr "" "以了解新的格å¼ï¼Œè€ŒéšåŽè€Œæ¥çš„东西也许看起æ¥ä¼šå¾ˆæ€ªå¼‚。\n" "\n" -#: src/save.c:1069 +#: src/save.c:1075 msgid "bytes" msgstr "字节" Binary files tin-2.4.4/po/zh_TW.gmo and tin-2.4.5/po/zh_TW.gmo differ diff -Nurp '--exclude=.bzr*' tin-2.4.4/po/zh_TW.po tin-2.4.5/po/zh_TW.po --- tin-2.4.4/po/zh_TW.po 2019-12-24 10:55:10.000000000 +0100 +++ tin-2.4.5/po/zh_TW.po 2020-12-24 00:24:54.589914311 +0100 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: tin 2.3.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-18 13:24+0100\n" +"POT-Creation-Date: 2020-12-24 00:24+0100\n" "PO-Revision-Date: 2015-10-08 12:13+0800\n" "Last-Translator: Wei-Lun Chao \n" "Language-Team: Chinese (traditional) \n" @@ -18,6 +18,30 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" +#. -> lang.c +#: src/art.c:418 +#, fuzzy, c-format +msgid "Reading %s\n" +msgstr "é‡æ–°è®€å– %s…" + +#. TODO: -> lang.c +#: src/art.c:1205 +#, fuzzy +msgid "Threading by multipart" +msgstr "討論串文章…" + +#. -> lang.c +#: src/art.c:2539 +#, fuzzy, c-format +msgid "Writing %s\n" +msgstr "嘗試 %s" + +#. TODO: -> lang.c +#: src/art.c:2619 +#, fuzzy +msgid "Writing overview cache..." +msgstr "寫入屬性檔案…" + #: src/attrib.c:986 msgid "Processing attributes... " msgstr "處ç†å±¬æ€§â€¦" @@ -1469,8 +1493,8 @@ msgid "Error making backup of %s file. F msgstr "製作檔案 %s 備份時發生錯誤。檔案系統已滿？" #: src/lang.c:274 -#, c-format -msgid "Filtering global rules (%d/%d)..." +#, fuzzy, c-format +msgid "Filtering global rules (%d/%d) ('q' to quit)..." msgstr "篩é¸å…¨åŸŸè¦å‰‡ (%d/%d)…" #: src/lang.c:275 @@ -2184,8 +2208,9 @@ msgstr "如果至少é¸å–äº†ä¸€ç¯‡æœªè® msgid "select threads that match user specified pattern" msgstr "é¸å–匹é…使用者指定胚騰的討論串" -#: src/lang.c:465 -msgid "tag all parts of current multipart-message in order" +#: src/lang.c:465 src/lang.c:521 +#, fuzzy +msgid "tag/untag all parts of current multipart-message in order" msgstr "ä¾åºæ¨™å®šç›®å‰å¤šéƒ¨ä»¶è¨Šæ¯çš„所有部分" #: src/lang.c:466 @@ -2401,7 +2426,7 @@ msgstr "標記目å‰è¨Žè«–串為未讀" msgid "read chosen article" msgstr "讀å–所é¸æ–‡ç« " -#: src/lang.c:521 +#: src/lang.c:522 msgid "" "Display properties\n" "------------------" @@ -2409,7 +2434,7 @@ msgstr "" "顯示屬性\n" "------------------" -#: src/lang.c:522 +#: src/lang.c:523 msgid "" "Miscellaneous\n" "-------------" @@ -2417,7 +2442,7 @@ msgstr "" "雜項\n" "-------------" -#: src/lang.c:523 +#: src/lang.c:524 msgid "" "Moving around\n" "-------------" @@ -2425,7 +2450,7 @@ msgstr "" "四處移動\n" "-------------" -#: src/lang.c:524 +#: src/lang.c:525 msgid "" "Group/thread/article operations\n" "-------------------------------" @@ -2433,7 +2458,7 @@ msgstr "" "群組/討論串/文章æ“作\n" "-------------------------------" -#: src/lang.c:525 +#: src/lang.c:526 msgid "" "Attachment operations\n" "---------------------" @@ -2441,7 +2466,7 @@ msgstr "" "附件æ“作\n" "---------------------" -#: src/lang.c:526 +#: src/lang.c:527 msgid "" "Attribute operations\n" "--------------------" @@ -2449,7 +2474,7 @@ msgstr "" "屬性æ“作\n" "--------------------" -#: src/lang.c:527 +#: src/lang.c:528 msgid "" "Option operations\n" "-----------------" @@ -2457,7 +2482,7 @@ msgstr "" "é¸é …æ“作\n" "-----------------" -#: src/lang.c:528 +#: src/lang.c:529 msgid "" "Scope operations\n" "----------------" @@ -2465,7 +2490,7 @@ msgstr "" "範åœæ“作\n" "----------------" -#: src/lang.c:529 +#: src/lang.c:530 msgid "" "URL operations\n" "--------------" @@ -2473,90 +2498,95 @@ msgstr "" "網å€æ“作\n" "--------------" -#: src/lang.c:530 +#: src/lang.c:531 msgid "choose first URL in list" msgstr "é¸æ“‡æ¸…單中的第一筆網å€" -#: src/lang.c:531 +#: src/lang.c:532 msgid "0 - 9\t choose URL by number" msgstr "0 - 9\t ä¾ç·¨è™Ÿé¸æ“‡ç¶²å€" -#: src/lang.c:532 +#: src/lang.c:533 msgid "choose last URL in list" msgstr "é¸æ“‡æ¸…單中的最後一筆網å€" -#: src/lang.c:533 +#: src/lang.c:534 msgid "search for URLs forwards" msgstr "å‘å‰æœå°‹ç¶²å€" -#: src/lang.c:534 +#: src/lang.c:535 msgid "search for URLs backwards" msgstr "å‘後æœå°‹ç¶²å€" -#: src/lang.c:535 +#: src/lang.c:536 msgid "Open URL in browser" msgstr "在ç€è¦½å™¨ä¸­é–‹å•Ÿç¶²å€" -#: src/lang.c:536 +#: src/lang.c:537 msgid "toggle info message in last line (URL)" msgstr "切æ›æœ€å¾Œä¸€åˆ—çš„è³‡è¨Šè¨Šæ¯ (網å€)" -#: src/lang.c:538 +#: src/lang.c:539 msgid "Group Level Commands" msgstr "群組層級命令" -#: src/lang.c:539 +#: src/lang.c:540 msgid "Kill filter added" msgstr "ç é™¤å·²åŠ å…¥çš„篩é¸å™¨" -#: src/lang.c:540 +#: src/lang.c:541 msgid "Auto-selection filter added" msgstr "自動é¸å–已加入的篩é¸å™¨" -#: src/lang.c:541 +#: src/lang.c:542 msgid "All parts tagged" msgstr "已標定所有部分" -#: src/lang.c:542 +#: src/lang.c:543 +#, fuzzy +msgid "All parts untagged" +msgstr "已標定所有部分" + +#: src/lang.c:544 msgid "Storing article for later posting" msgstr "存入文章以用於ç¨å¾Œå¼µè²¼" -#: src/lang.c:543 +#: src/lang.c:545 msgid "Please enter a valid character" msgstr "請輸入有效字元" -#: src/lang.c:544 +#: src/lang.c:546 #, c-format msgid "Missing part #%d" msgstr "缺少部分的 #%d" -#: src/lang.c:545 +#: src/lang.c:547 msgid "*** No postponed articles ***" msgstr "*** 沒有被擱置的文章 ***" -#: src/lang.c:546 +#: src/lang.c:548 msgid "Not a multi-part message" msgstr "ä¸æ˜¯ä¸€ç¯‡å¤šéƒ¨ä»¶è¨Šæ¯" -#: src/lang.c:547 +#: src/lang.c:549 msgid "You are not subscribed to this group" msgstr "您未訂閱這個群組" -#: src/lang.c:548 +#: src/lang.c:550 msgid "No previous expression" msgstr "沒有上一個表示å¼" -#: src/lang.c:549 +#: src/lang.c:551 msgid "Operation disabled in no-overwrite mode" msgstr "在無覆寫模å¼ä¸­çš„æ“作已åœç”¨" #. TODO: replace hard coded key-name in txt_info_postponed -#: src/lang.c:551 +#: src/lang.c:553 #, c-format msgid "%d postponed %s, reuse with ^O...\n" msgstr "%d 已擱置 %s，按下 ^O 以é‡æ–°ä½¿ç”¨â€¦\n" -#: src/lang.c:552 +#: src/lang.c:554 msgid "" "X-Conversion-Note: multipart/alternative contents have been removed.\n" " To get the whole article, turn alternative handling OFF in the Option " @@ -2565,21 +2595,21 @@ msgstr "" "X-Conversion-Note: 多部件/替代內容已被移除。\n" " è¦æå–整篇文章，請在é¸é …功能表中關閉替代處ç†\n" -#: src/lang.c:554 +#: src/lang.c:556 #, c-format msgid "Save filename for %s/%s is a mailbox. Attachment not saved" msgstr "儲存 %s/%s 的檔å是一個信箱。附件未被儲存" -#: src/lang.c:555 +#: src/lang.c:557 msgid "TeX2Iso encoded article" msgstr "TeX2Iso 編碼文章" -#: src/lang.c:556 +#: src/lang.c:558 msgid "incomplete " msgstr "ä¸å®Œæ•´çš„ " #. TODO: replace hard coded key-names -#: src/lang.c:558 +#: src/lang.c:560 #, fuzzy, c-format msgid "" "\n" @@ -2638,152 +2668,152 @@ msgstr "" "è¦ç²å¾—更多資訊，請閱讀線上手冊ã€READMEã€INSTALLã€TODO å’Œ FTP 等檔案。\n" "請利用『Rã€å‘½ä»¤ç™¼é€éŒ¯èª¤å ±å‘Š/æ„見給 %s。\n" -#: src/lang.c:574 +#: src/lang.c:576 #, c-format msgid "Invalid From: %s line. Read the INSTALL file again." msgstr "無效的 From: %s 列。請å†é–±è®€ INSTALL 檔案。" -#: src/lang.c:576 +#: src/lang.c:578 msgid "Invalid multibyte sequence found\n" msgstr "出ç¾ç„¡æ•ˆçš„多ä½å…ƒçµ„åºåˆ—\n" -#: src/lang.c:579 +#: src/lang.c:581 #, c-format msgid "Invalid Sender:-header %s" msgstr "無效的 Sender: -header %s" -#: src/lang.c:581 +#: src/lang.c:583 msgid "Inverse video disabled" msgstr "å白顯示已åœç”¨" -#: src/lang.c:582 +#: src/lang.c:584 msgid "Inverse video enabled" msgstr "å白顯示已啟用" -#: src/lang.c:584 +#: src/lang.c:586 #, c-format msgid "Missing definition for %s\n" msgstr "缺少 %s 的定義\n" -#: src/lang.c:585 +#: src/lang.c:587 #, c-format msgid "Invalid key definition '%s'\n" msgstr "無效的按éµå®šç¾©ã€Ž%sã€\n" -#: src/lang.c:586 +#: src/lang.c:588 #, c-format msgid "Invalid keyname '%s'\n" msgstr "無效的按éµå稱『%sã€\n" -#: src/lang.c:587 +#: src/lang.c:589 #, c-format msgid "Keymap file was upgraded to version %s\n" msgstr "Keymap 檔案已å‡ç´šåˆ°ç‰ˆæœ¬ %s\n" -#: src/lang.c:588 +#: src/lang.c:590 #, c-format msgid "Kill From: [%s] (y/n): " msgstr "ç é™¤ From: [%s] (y/n)：" -#: src/lang.c:589 +#: src/lang.c:591 msgid "Kill Lines: (num): " msgstr "ç é™¤ Lines: (num)：" -#: src/lang.c:590 +#: src/lang.c:592 msgid "Kill Article Menu" msgstr "ç é™¤æ–‡ç« é¸å–®" -#: src/lang.c:591 +#: src/lang.c:593 #, fuzzy, c-format msgid "Kill Msg-ID: [%s] (f/l/o/n): " msgstr "ç é™¤ Msg-Id： [%s] (f/l/o/n)：" -#: src/lang.c:592 +#: src/lang.c:594 msgid "Kill pattern scope : " msgstr "ç é™¤èƒšé¨°ç¯„åœ ï¼š" -#: src/lang.c:593 +#: src/lang.c:595 #, c-format msgid "Kill Subject: [%s] (y/n): " msgstr "ç é™¤ Subject: [%s] (y/n)：" -#: src/lang.c:594 +#: src/lang.c:596 msgid "Kill text pattern : " msgstr "ç é™¤æ–‡å­—胚騰 ：" -#: src/lang.c:595 +#: src/lang.c:597 msgid "Kill time in days : " msgstr "ç é™¤æ™‚é–“æ–¼æ¯æ—¥ ：" -#: src/lang.c:597 +#: src/lang.c:599 msgid "Last" msgstr "最後一筆" -#: src/lang.c:598 +#: src/lang.c:600 msgid "-- Last response --" msgstr "-- 最後一筆回應 --" -#: src/lang.c:599 +#: src/lang.c:601 #, c-format msgid "Lines %s " msgstr "列 %s " -#: src/lang.c:602 +#: src/lang.c:604 #, fuzzy msgid "Function not available." msgstr "無法使用文章" -#: src/lang.c:603 +#: src/lang.c:605 msgid "Not reading via NNTP." msgstr "" -#: src/lang.c:604 +#: src/lang.c:606 #, fuzzy, c-format msgid "Group: %s" msgstr "群組 %.*s…" -#: src/lang.c:605 +#: src/lang.c:607 #, fuzzy, c-format msgid "Groups: %s" msgstr "群組 %.*s…" -#: src/lang.c:608 +#: src/lang.c:610 msgid "Mail" msgstr "郵寄" -#: src/lang.c:609 +#: src/lang.c:611 msgid "mailbox " msgstr "ä¿¡ç®± " -#: src/lang.c:610 +#: src/lang.c:612 #, c-format msgid "Mail article(s) to [%.*s]> " msgstr "郵寄文章到 [%.*s]>" -#: src/lang.c:611 +#: src/lang.c:613 #, c-format msgid "Mailing log to %s\n" msgstr "郵寄記錄檔到 %s\n" -#: src/lang.c:612 +#: src/lang.c:614 msgid "Mail bug report..." msgstr "郵寄錯誤報告…" -#: src/lang.c:613 +#: src/lang.c:615 #, c-format msgid "Mail BUG REPORT to %s?" msgstr "郵寄錯誤報告到 %s？" -#: src/lang.c:614 +#: src/lang.c:616 msgid "Mailed" msgstr "已寄出" -#: src/lang.c:615 +#: src/lang.c:617 #, c-format msgid "Mailing to %s..." msgstr "郵寄到 %s…" -#: src/lang.c:616 +#: src/lang.c:618 msgid "" "# [Mail/Save] active file. Format is like news active file:\n" "# groupname max.artnum min.artnum /dir\n" @@ -2795,84 +2825,84 @@ msgstr "" "# 第四個欄ä½æ˜¯åŸºåº•ç›®éŒ„ (äº¦å³ ~/Mail 或 ~/News)\n" "#\n" -#: src/lang.c:619 +#: src/lang.c:621 #, c-format msgid "%s marked as read" msgstr "%s 標記為已讀" -#: src/lang.c:620 +#: src/lang.c:622 #, c-format msgid "%s marked as unread" msgstr "%s 標記為未讀" -#: src/lang.c:621 +#: src/lang.c:623 #, c-format msgid "Marked %d of %d %s as read" msgstr "標記 %2$d 中的 %1$d %3$s 為已讀" -#: src/lang.c:622 +#: src/lang.c:624 #, c-format msgid "Marked %d of %d %s as unread" msgstr "標記 %2$d 中的 %1$d %3$s 為未讀" -#: src/lang.c:623 src/lang.c:1352 +#: src/lang.c:625 src/lang.c:1352 msgid "Mark" msgstr "標記" -#: src/lang.c:624 +#: src/lang.c:626 #, c-format msgid "Mark all articles as read%s?" msgstr "標記所有文章為 %s 讀？" -#: src/lang.c:625 +#: src/lang.c:627 #, c-format msgid "Mark article as read%s?" msgstr "標記文章為 %s 讀？" -#: src/lang.c:626 +#: src/lang.c:628 #, c-format msgid "Mark group %s as read?" msgstr "標記群組 %s 為已讀？" -#: src/lang.c:627 +#: src/lang.c:629 #, c-format msgid "Mark thread as read%s?" msgstr "標記討論串為 %s 讀？" -#: src/lang.c:628 +#: src/lang.c:630 #, c-format msgid "Matching %s groups..." msgstr "æ­£åœ¨åŒ¹é… %s 群組…" -#: src/lang.c:629 src/lang.c:643 src/lang.c:649 +#: src/lang.c:631 src/lang.c:645 src/lang.c:651 #, c-format msgid "=set current to n; %s=line down; %s=line up; %s=help; %s=quit" msgstr "=設定目å‰ç‚º n; %s=下移一列；%s=貼齊；%s=求助；%s=離開" -#: src/lang.c:631 +#: src/lang.c:633 #, c-format msgid "" "%s=view; %s=pipe; %s=pipe raw; %s=save; %s=tag; %s=tag pattern; %s=untag all" msgstr "" "%s=檢視；%s=管線；%s=管線原始；%s=儲存；%s=標定；%s=標定胚騰；%s=å–消所有標定" -#: src/lang.c:633 +#: src/lang.c:635 #, c-format msgid "%s=view; %s=save; %s=tag; %s=tag pattern; %s=untag all" msgstr "%s=檢視；%s=儲存；%s=標定；%s=標定胚騰；%s=å–消所有標定" -#: src/lang.c:635 +#: src/lang.c:637 #, c-format msgid "" "%s=reverse tagging; %s=search forwards; %s=search backwards; %s=repeat search" msgstr "%s=åå‘標定；%s=å‘å‰æœå°‹ï¼›%s=å‘後æœå°‹ï¼›%s=é‡è¤‡æœå°‹" -#: src/lang.c:636 src/lang.c:640 +#: src/lang.c:638 src/lang.c:642 #, c-format msgid "=set current to n; %s=next unread; %s=search pattern; %s=kill/select" msgstr "=設定目å‰ç‚º n; %s=下一個未讀；%s=æœå°‹èƒšé¨°ï¼›%s=ç é™¤/é¸å–" -#: src/lang.c:637 +#: src/lang.c:639 #, c-format msgid "" "%s=author search; %s=catchup; %s=line down; %s=line up; %s=mark read; " @@ -2880,262 +2910,262 @@ msgid "" msgstr "" "%s=作者æœå°‹ï¼›%s=設回未讀；%s=下移一列；%s=貼齊；%s=標記讀å–ï¼›%s=列出討論串" -#: src/lang.c:638 +#: src/lang.c:640 #, c-format msgid "%s=line up; %s=line down; %s=page up; %s=page down; %s=top; %s=bottom" msgstr "%s=貼齊；%s=下移一列；%s=å‘上一é ï¼›%s=å‘下一é ï¼›%s=頂端；%s=底部" -#: src/lang.c:639 +#: src/lang.c:641 #, c-format msgid "%s=search forwards; %s=search backwards; %s=quit" msgstr "%s=å‘å‰æœå°‹ï¼›%s=å‘後æœå°‹ï¼›%s=離開" -#: src/lang.c:641 +#: src/lang.c:643 #, c-format msgid "%s=author search; %s=body search; %s=catchup; %s=followup; %s=mark read" msgstr "%s=作者æœå°‹ï¼›%s=內文æœå°‹ï¼›%s=設回未讀；%s=跟貼；%s=標記讀å–" -#: src/lang.c:642 +#: src/lang.c:644 #, c-format msgid "%s=add; %s=move; %s=rename; %s=delete" msgstr "%s=加入；%s=移動；%s=é‡æ–°å‘½åï¼›%s=刪除" -#: src/lang.c:644 +#: src/lang.c:646 #, c-format msgid "=set current to n; %s=next unread; %s,%s=search pattern; %s=catchup" msgstr "=設定目å‰ç‚º n; %s=下一個未讀；%s,%s=æœå°‹èƒšé¨°ï¼›%s=設回未讀" -#: src/lang.c:645 +#: src/lang.c:647 #, c-format msgid "" "%s=line down; %s=line up; %s=help; %s=move; %s=quit; %s=toggle all/unread" msgstr "%s=下移一列；%s=貼齊；%s=求助；%s=移動；%s=離開；%s=切æ›å…¨éƒ¨/未讀" -#: src/lang.c:646 +#: src/lang.c:648 #, c-format msgid "" "%s=subscribe; %s=sub pattern; %s=unsubscribe; %s=unsub pattern; %s=yank in/" "out" msgstr "%s=訂閱；%s=訂閱胚騰；%s=å–消訂閱；%s=å–消訂閱胚騰；%s=拔入/出" -#: src/lang.c:647 +#: src/lang.c:649 #, c-format msgid "=set current to n; %s=next unread; %s=catchup; %s=display toggle" msgstr "=設定目å‰ç‚º n; %s=下一個未讀；%s=設回未讀；%s=顯示切æ›" -#: src/lang.c:648 +#: src/lang.c:650 #, c-format msgid "%s=help; %s=line down; %s=line up; %s=quit; %s=tag; %s=mark unread" msgstr "%s=求助；%s=下移一列；%s=貼齊；%s=離開；%s=標定；%s=標記未讀" -#: src/lang.c:650 +#: src/lang.c:652 #, c-format msgid "%s=search forwards; %s=search backwards; %s=repeat search" msgstr "%s=å‘å‰æœå°‹ï¼›%s=å‘後æœå°‹ï¼›%s=é‡è¤‡æœå°‹" -#: src/lang.c:651 +#: src/lang.c:653 msgid "--More--" msgstr "--更多--" -#: src/lang.c:652 +#: src/lang.c:654 #, c-format msgid "Moving %s..." msgstr "正在移動 %s…" -#: src/lang.c:653 +#: src/lang.c:655 msgid "Message-ID: & last Reference " msgstr "Message-ID: & 最近一筆åƒè€ƒ " -#: src/lang.c:654 +#: src/lang.c:656 msgid "Message-ID: line " msgstr "Message-ID: 列 " -#: src/lang.c:655 +#: src/lang.c:657 msgid "Message-ID: & References: line" msgstr "Message-ID: & References: 列" -#: src/lang.c:657 +#: src/lang.c:659 msgid ", name: " msgstr "，å稱：" -#: src/lang.c:658 +#: src/lang.c:660 #, c-format msgid "Go to newsgroup [%s]> " msgstr "å‰å¾€æ–°èžç¾¤çµ„ [%s]>" -#: src/lang.c:659 +#: src/lang.c:661 msgid "newsgroups" msgstr "æ–°èžç¾¤çµ„" -#: src/lang.c:660 +#: src/lang.c:662 #, c-format msgid "Position %s in group list (1,2,..,$) [%d]> " msgstr "å®šä½ %s 於群組清單 (1,2,..,$) [%d]>" -#: src/lang.c:661 +#: src/lang.c:663 msgid "newsgroup" msgstr "æ–°èžç¾¤çµ„" -#: src/lang.c:662 +#: src/lang.c:664 msgid "Try and save newsrc file again?" msgstr "å†æ¬¡å˜—試並儲存 newsrc 檔案？" -#: src/lang.c:663 +#: src/lang.c:665 msgid "Warning: No newsgroups were written to your newsrc file. Save aborted." msgstr "警告：沒有任何新èžç¾¤çµ„被寫入您的 newsrc 檔案。已放棄儲存。" -#: src/lang.c:664 +#: src/lang.c:666 msgid "newsrc file saved successfully.\n" msgstr "newsrc 檔案已æˆåŠŸå„²å­˜ã€‚\n" -#: src/lang.c:665 +#: src/lang.c:667 msgid "-- Next response --" msgstr "-- 下一個回應 --" -#: src/lang.c:666 +#: src/lang.c:668 msgid "No " msgstr "å¦ " -#: src/lang.c:667 +#: src/lang.c:669 msgid "*** No articles ***" msgstr "*** 沒有文章 ***" -#: src/lang.c:668 +#: src/lang.c:670 msgid "No articles have been posted" msgstr "沒有任何文章已被張貼" -#: src/lang.c:669 +#: src/lang.c:671 msgid "*** No attachments ***" msgstr "*** 沒有附件 ***" -#: src/lang.c:670 +#: src/lang.c:672 msgid "*** No description ***" msgstr "*** 沒有æè¿° ***" -#: src/lang.c:671 +#: src/lang.c:673 msgid "No filename" msgstr "沒有檔å" -#: src/lang.c:672 +#: src/lang.c:674 msgid "No group" msgstr "沒有群組" -#: src/lang.c:673 +#: src/lang.c:675 msgid "*** No groups ***" msgstr "*** 沒有群組 ***" -#: src/lang.c:674 +#: src/lang.c:676 msgid "No more groups to read" msgstr "已無å¯è®€å–群組" -#: src/lang.c:675 +#: src/lang.c:677 msgid "No last message" msgstr "沒有最近一筆訊æ¯" -#: src/lang.c:676 +#: src/lang.c:678 msgid "No mail address" msgstr "沒有郵件地å€" -#: src/lang.c:677 +#: src/lang.c:679 msgid "No articles marked for saving" msgstr "沒有標記è¦å„²å­˜çš„文章" -#: src/lang.c:678 +#: src/lang.c:680 msgid "No match" msgstr "沒有匹é…" -#: src/lang.c:679 +#: src/lang.c:681 msgid "No more groups" msgstr "已無群組" -#: src/lang.c:680 +#: src/lang.c:682 msgid "No newsgroups" msgstr "沒有新èžç¾¤çµ„" -#: src/lang.c:681 +#: src/lang.c:683 msgid "No next unread article" msgstr "沒有下一篇未讀文章" -#: src/lang.c:682 +#: src/lang.c:684 msgid "No previous group" msgstr "沒有上一個群組" -#: src/lang.c:683 +#: src/lang.c:685 msgid "No previous search, nothing to repeat" msgstr "沒有上一個æœå°‹ï¼Œæ²’有任何æ±è¥¿å¯é‡è¤‡" -#: src/lang.c:684 +#: src/lang.c:686 msgid "No previous unread article" msgstr "沒有上一篇未讀文章" -#: src/lang.c:685 +#: src/lang.c:687 msgid "No responses" msgstr "沒有回應" -#: src/lang.c:686 +#: src/lang.c:688 msgid "No responses to list in current thread" msgstr "在目å‰çš„討論串中沒有回應å¯åˆ—出" -#: src/lang.c:687 +#: src/lang.c:689 msgid "*** No scopes ***" msgstr "*** æ²’æœ‰ç¯„åœ ***" -#: src/lang.c:688 +#: src/lang.c:690 msgid "No search string" msgstr "沒有æœå°‹å­—串" -#: src/lang.c:689 +#: src/lang.c:691 msgid "No subject" msgstr "沒有主旨" -#: src/lang.c:691 +#: src/lang.c:693 #, c-format msgid "%s: Terminal must have clear to end-of-line (ce)\n" msgstr "%s：終端機必須能夠清空到列尾 (ce)\n" -#: src/lang.c:692 +#: src/lang.c:694 #, c-format msgid "%s: Terminal must have clear to end-of-screen (cd)\n" msgstr "%s：終端機必須能夠清空到螢幕末端 (cd)\n" -#: src/lang.c:693 +#: src/lang.c:695 #, c-format msgid "%s: Terminal must have clearscreen (cl) capability\n" msgstr "%s：終端機必須具備清空螢幕 (cl) 的能力\n" -#: src/lang.c:694 +#: src/lang.c:696 #, c-format msgid "%s: Terminal must have cursor motion (cm)\n" msgstr "%s：終端機必須能夠移動游標 (cm)\n" -#: src/lang.c:695 +#: src/lang.c:697 #, c-format msgid "%s: TERM variable must be set to use screen capabilities\n" msgstr "%s：TERM 變數必須被設定以使用螢幕能力\n" -#: src/lang.c:697 +#: src/lang.c:699 #, c-format msgid "No viewer found for %s/%s\n" msgstr "找ä¸åˆ°ä»»ä½•æª¢è¦–器用於 %s/%s\n" -#: src/lang.c:698 +#: src/lang.c:700 msgid "Newsgroup does not exist on this server" msgstr "æ–°èžç¾¤çµ„ä¸å­˜åœ¨æ–¼é€™å€‹ä¼ºæœå™¨" -#: src/lang.c:699 +#: src/lang.c:701 #, c-format msgid "Group %s not found in active file" msgstr "在ç¾ç”¨æª”案中找ä¸åˆ°ç¾¤çµ„ %s" -#: src/lang.c:700 +#: src/lang.c:702 msgid "c)reate it, use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "c)建立它ã€ä½¿ç”¨ a)替代å稱ã€ä½¿ç”¨ d)é è¨­ .newsrcã€q)離開 tin：" -#: src/lang.c:701 +#: src/lang.c:703 msgid "use a)lternative name, use d)efault .newsrc, q)uit tin: " msgstr "使用 a)替代å稱ã€ä½¿ç”¨ d)é è¨­ .newsrcã€q)離開 tin：" -#: src/lang.c:702 +#: src/lang.c:704 #, c-format msgid "" "# NNTP-server -> newsrc translation table and NNTP-server\n" @@ -3164,44 +3194,44 @@ msgstr "" "# news.example.org /tmp/nrc-ex example ex\n" "#\n" -#: src/lang.c:709 +#: src/lang.c:711 msgid "Only" msgstr "åªæœ‰" -#: src/lang.c:710 +#: src/lang.c:712 #, c-format msgid "Option not enabled. Recompile with %s." msgstr "é¸é …未啟用。é‡æ–°ä»¥ %s 編譯。" -#: src/lang.c:711 +#: src/lang.c:713 msgid "Options Menu" msgstr "é¸é …功能表" -#: src/lang.c:712 +#: src/lang.c:714 msgid "Options Menu Commands" msgstr "é¸é …功能表命令" -#: src/lang.c:715 +#: src/lang.c:717 #, c-format msgid "Error in regex: %s at pos. %d '%s'" msgstr "在正è¦è¡¨ç¤ºå¼ %s çš„ä½ç½® %d 發生錯誤：『%sã€" -#: src/lang.c:716 +#: src/lang.c:718 #, c-format msgid "Error in regex: pcre internal error %d" msgstr "在正è¦è¡¨ç¤ºå¼ä¸­ç™¼ç”ŸéŒ¯èª¤ï¼špcre 內部錯誤 %d" -#: src/lang.c:717 +#: src/lang.c:719 #, c-format msgid "Error in regex: study - pcre internal error %s" msgstr "在正è¦è¡¨ç¤ºå¼ä¸­ç™¼ç”ŸéŒ¯èª¤ï¼šstudy - pcre 內部錯誤 %s" -#: src/lang.c:718 +#: src/lang.c:720 msgid "Post a followup..." msgstr "跟貼…" #. TODO: replace hard coded key-name in txt_post_error_ask_postpone -#: src/lang.c:720 +#: src/lang.c:722 msgid "" "An error has occurred while posting the article. If you think that this\n" "error is temporary or otherwise correctable, you can postpone the article\n" @@ -3211,134 +3241,134 @@ msgstr "" "錯誤是暫時或是å¯æ”¹æ­£çš„，您å¯ä»¥æ“±ç½®æ–‡ç« \n" "並於ç¨å¾Œä»¥ ^O å†æ¬¡å–出它。\n" -#: src/lang.c:723 +#: src/lang.c:725 msgid "Posted articles history" msgstr "張貼文章歷å²è¨˜éŒ„" -#: src/lang.c:724 +#: src/lang.c:726 #, c-format msgid "Post to newsgroup(s) [%s]> " msgstr "張貼到新èžç¾¤çµ„ [%s]>" -#: src/lang.c:725 +#: src/lang.c:727 msgid "-- post processing started --" msgstr "-- 張貼處ç†é–‹å§‹ --" -#: src/lang.c:726 +#: src/lang.c:728 msgid "-- post processing completed --" msgstr "-- 張貼處ç†å®Œæˆ --" -#: src/lang.c:727 +#: src/lang.c:729 #, c-format msgid "Post subject [%s]> " msgstr "張貼主旨 [%s]>" -#: src/lang.c:728 +#: src/lang.c:730 msgid "" "# Summary of mailed/posted messages viewable by 'W' command from within " "tin.\n" msgstr "# 郵寄/張貼的訊æ¯æ¦‚è¦å¯ä»¥åœ¨ tin 之中經由『Wã€å‘½ä»¤ä¾†æª¢è¦–。\n" -#: src/lang.c:729 +#: src/lang.c:731 msgid "Posting article..." msgstr "張貼文章…" -#: src/lang.c:730 +#: src/lang.c:732 #, c-format msgid "Post postponed articles [%%s]? (%s/%s/%s/%s/%s): " msgstr "張貼被擱置的文章 [%%s]？(%s/%s/%s/%s/%s)：" -#: src/lang.c:731 +#: src/lang.c:733 #, c-format msgid "Hot %s" msgstr "熱門 %s" -#: src/lang.c:732 +#: src/lang.c:734 #, c-format msgid "Tagged %s" msgstr "已標定 %s" -#: src/lang.c:733 +#: src/lang.c:735 #, c-format msgid "Untagged %s" msgstr "å·²å–消標定 %s" -#: src/lang.c:735 +#: src/lang.c:737 #, c-format msgid "Preparing for filtering on Path header (%d/%d)..." msgstr "" -#: src/lang.c:737 +#: src/lang.c:739 msgid "Processing mail messages marked for deletion." msgstr "處ç†æ¨™è¨˜ç‚ºåˆªé™¤çš„郵件訊æ¯ã€‚" -#: src/lang.c:738 +#: src/lang.c:740 msgid "Processing saved articles marked for deletion." msgstr "處ç†æ¨™è¨˜ç‚ºåˆªé™¤çš„已儲存文章。" -#: src/lang.c:739 +#: src/lang.c:741 #, c-format msgid "Accept Followup-To? %s=post, %s=ignore, %s=quit: " msgstr "接å—跟貼？%s=張貼，%s=忽略，%s=離開：" -#: src/lang.c:740 +#: src/lang.c:742 msgid "Article unchanged, abort mailing?" msgstr "文章未變更，放棄郵寄？" -#: src/lang.c:741 +#: src/lang.c:743 #, c-format msgid "Do you want to see postponed articles (%d)?" msgstr "您è¦çœ‹åˆ°æ“±ç½®çš„文章 (%d) 嗎？" -#: src/lang.c:743 +#: src/lang.c:745 msgid "Add quick kill filter?" msgstr "加入快速ç é™¤ç¯©é¸å™¨ï¼Ÿ" -#: src/lang.c:744 +#: src/lang.c:746 msgid "Add quick selection filter?" msgstr "加入快速é¸æ“‡ç¯©é¸å™¨ï¼Ÿ" -#: src/lang.c:745 +#: src/lang.c:747 msgid "Do you really want to quit?" msgstr "您真的è¦é›¢é–‹å—Žï¼Ÿ" -#: src/lang.c:746 +#: src/lang.c:748 #, c-format msgid "%s=edit cancel message, %s=quit, %s=delete (cancel) [%%s]: " msgstr "%s=編輯å–消訊æ¯ï¼Œ%s=離開，%s=刪除 (å–消) [%%s]：" -#: src/lang.c:747 +#: src/lang.c:749 msgid "You have tagged articles in this group - quit anyway?" msgstr "您已在這個群組中標定文章 - 無論如何都è¦é›¢é–‹ï¼Ÿ" -#: src/lang.c:748 +#: src/lang.c:750 #, c-format msgid "%s=quit, %s=edit, %s=postpone: " msgstr "%s=離開，%s=編輯，%s=擱置：" -#: src/lang.c:749 +#: src/lang.c:751 #, c-format msgid "%s=quit %s=edit %s=save kill description: " msgstr "%s=離開 %s=編輯 %s=儲存ç é™¤æ述：" -#: src/lang.c:750 +#: src/lang.c:752 #, c-format msgid "%s=quit %s=edit %s=save select description: " msgstr "%s=離開 %s=編輯 %s=儲存é¸å–æ述：" -#: src/lang.c:751 +#: src/lang.c:753 msgid "Do you really want to quit without saving your configuration?" msgstr "您真的è¦é›¢é–‹å»ä¸å„²å­˜æ‚¨çš„組態嗎？" -#: src/lang.c:754 +#: src/lang.c:756 msgid "Invalid range - valid are '0-9.$' eg. 1-$" msgstr "ç„¡æ•ˆçš„ç¯„åœ - 有效是『0-9.$ã€ä¾‹å¦‚：1-$" -#: src/lang.c:756 +#: src/lang.c:757 msgid "Do you want to abort this operation?" msgstr "您è¦æ”¾æ£„這個æ“作嗎？" -#: src/lang.c:757 +#: src/lang.c:758 msgid "Do you want to exit tin immediately?" msgstr "您è¦é¦¬ä¸Šé›¢é–‹ tin 嗎？" @@ -4674,7 +4704,8 @@ msgid " -p port use port as NNTP port msgstr " -p port 使用 port åšç‚º NNTP 通訊埠 [é è¨­=%d]" #: src/lang.c:1118 -msgid " -Q quick start. Same as -nqd" +#, fuzzy +msgid " -Q quick start. Same as -dnq" msgstr " -Q å¿«é€Ÿé–‹å§‹ã€‚å¦‚åŒ -nqd" #: src/lang.c:1119 @@ -8061,21 +8092,27 @@ msgid "Insert 'X-Comment-To:' header" msgstr "æ’入『X-Comment-To:ã€æ¨™é ­" #. TODO: lang.c -#: src/main.c:817 +#: src/main.c:819 msgid "reading from local spool" msgstr "" -#: src/misc.c:3877 +#. TODO: != ENOENT ? and -> lang.c +#: src/misc.c:750 +#, c-format +msgid "Error: unlink %s" +msgstr "" + +#: src/misc.c:3928 #, c-format msgid "Version: %s %s release %s (\"%s\") %s %s\n" msgstr "版本：%s %s 釋出 %s (「%sã€) %s %s\n" -#: src/misc.c:3880 +#: src/misc.c:3931 #, c-format msgid "Version: %s %s release %s (\"%s\")\n" msgstr "版本：%s %s 釋出 %s (「%sã€)\n" -#: src/newsrc.c:460 +#: src/newsrc.c:472 msgid "Unreachable?\n" msgstr "無法連線？\n" @@ -8115,12 +8152,12 @@ msgstr "能力中並未宣告包å«é–±è® msgid "MOTD: " msgstr "MOTD: " -#: src/nrctbl.c:178 +#: src/nrctbl.c:184 #, c-format msgid "couldn't expand %s\n" msgstr "無法展開 %s\n" -#: src/post.c:1344 +#: src/post.c:1357 #, fuzzy, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" @@ -8129,7 +8166,7 @@ msgstr "" "第 %d åˆ—é•·åº¦è¶…éŽ 998 ä½å…ƒçµ„而應該被折疊，但是\n" "編碼未被設定為 %s äº¦éž %s\n" -#: src/post.c:1349 +#: src/post.c:1362 #, fuzzy, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" @@ -8140,7 +8177,7 @@ msgstr "" "編碼被設定為 %s 而未啟用 MIME_BREAK_LONG_LINES 或是\n" "貼文ä¸åŒ…å«ä»»ä½• 8 ä½å…ƒå­—元，因而無法發生折疊\n" -#: src/post.c:1351 +#: src/post.c:1364 #, fuzzy, c-format msgid "" "Line %d is longer than %d octets and should be folded, but\n" @@ -8149,25 +8186,25 @@ msgstr "" "第 %d åˆ—é•·åº¦è¶…éŽ 998 ä½å…ƒçµ„而，但是\n" "編碼未被設定為 %s\n" -#: src/post.c:2325 +#: src/post.c:2353 #, c-format msgid "Posting: %.*s ..." msgstr "張貼：%.*s…" -#: src/post.c:4075 +#: src/post.c:4119 msgid "Can't supersede in mailgroups, try repost instead." msgstr "" #. Check if okay to read -#: src/read.c:207 +#: src/read.c:204 msgid "Aborting read, please wait..." msgstr "放棄讀å–，請ç¨å¾……" -#: src/read.c:354 +#: src/read.c:351 msgid "Aborted read\n" msgstr "已放棄讀å–\n" -#: src/read.c:409 +#: src/read.c:406 msgid "Draining\n" msgstr "排放\n" @@ -8180,6 +8217,18 @@ msgid "[- Unavailable -]" msgstr "[- 無法使用 -]" #. +#. * Add the Message-ID headers to the cache, using the last Reference +#. * as the parent +#. +#. +#. * Add the References data to the cache +#. +#: src/refs.c:1015 src/refs.c:1077 +#, c-format +msgid "Building References-trees (%d/%d)..." +msgstr "" + +#. #. * preamble #. * TODO: -> lang.c #. @@ -8197,7 +8246,7 @@ msgstr "" "以了解新的格å¼ï¼Œè€Œéš¨å¾Œè€Œä¾†çš„æ±è¥¿ä¹Ÿè¨±çœ‹èµ·ä¾†æœƒå¾ˆæ€ªç•°ã€‚\n" "\n" -#: src/save.c:1069 +#: src/save.c:1075 msgid "bytes" msgstr "ä½å…ƒçµ„" diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/Makefile.in tin-2.4.5/src/Makefile.in --- tin-2.4.4/src/Makefile.in 2019-11-20 14:41:45.000000000 +0100 +++ tin-2.4.5/src/Makefile.in 2020-12-01 11:52:35.472481025 +0100 @@ -1,9 +1,9 @@ # Source Makefile for tin # - for configuration options read the ../doc/INSTALL file. # -# Updated: 2019-03-12 +# Updated: 2020-01-08 # -# Copyright (c) 1995-2020 Thomas E. Dickey +# Copyright (c) 1995-2021 Thomas E. Dickey # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -59,7 +59,9 @@ FEATURES = # -DALLOW_FWS_IN_NEWSGROUPLIS INTL_CPPFLAGS = -DLOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" PCRE_CPPFLAGS = @PCREDIR_CPPFLAGS@ @PCREDIR_MAKE@ -I$(top_builddir)/pcre -I$(top_srcdir)/pcre -CPPFLAGS = @DEFS@ -I. -I../include $(PCRE_CPPFLAGS) $(INTL_CPPFLAGS) -I$(INCDIR) $(DEBUG) $(FEATURES) @CPPFLAGS@ +CAN_CPPFLAGS = @CANDIR_MAKE@ @CAN_CPPFLAGS@ + +CPPFLAGS = @DEFS@ -I. -I../include $(PCRE_CPPFLAGS) $(CAN_CPPFLAGS) $(INTL_CPPFLAGS) -I$(INCDIR) $(DEBUG) $(FEATURES) @CPPFLAGS@ CFLAGS = @CFLAGS@ LDFLAGS = @LDFLAGS@ diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/active.c tin-2.4.5/src/active.c --- tin-2.4.4/src/active.c 2019-11-20 14:40:25.000000000 +0100 +++ tin-2.4.5/src/active.c 2020-12-01 11:51:00.799877331 +0100 @@ -6,7 +6,7 @@ * Updated : 2019-01-28 * Notes : * - * Copyright (c) 1992-2020 Iain Lea + * Copyright (c) 1992-2021 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -688,7 +688,7 @@ read_active_counts( if (cmd_line && !batch_mode) my_fputc('\n', stderr); - tin_done(EXIT_FAILURE,_(txt_cannot_retrieve), ACTIVE_FILE); + tin_done(EXIT_FAILURE, _(txt_cannot_retrieve), ACTIVE_FILE); } while ((ptr = tin_fgets(fp, FALSE)) != NULL) { diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/art.c tin-2.4.5/src/art.c --- tin-2.4.4/src/art.c 2019-11-20 14:40:25.000000000 +0100 +++ tin-2.4.5/src/art.c 2020-12-01 11:51:00.831878887 +0100 @@ -3,10 +3,10 @@ * Module : art.c * Author : I.Lea & R.Skrenta * Created : 1991-04-01 - * Updated : 2019-06-12 + * Updated : 2020-07-08 * Notes : * - * Copyright (c) 1991-2020 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2021 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -73,7 +73,6 @@ static int date_comp_asc(t_comptype p1, static int date_comp_desc(t_comptype p1, t_comptype p2); static int from_comp_asc(t_comptype p1, t_comptype p2); static int from_comp_desc(t_comptype p1, t_comptype p2); -static int global_get_multiparts(int aindex, MultiPartInfo **malloc_and_setme_info); static int global_look_for_multipart_info(int aindex, MultiPartInfo *setme, char start, char stop, int *offset); static int last_date_comp_base_asc(t_comptype p1, t_comptype p2); static int last_date_comp_base_desc(t_comptype p1, t_comptype p2); @@ -94,7 +93,7 @@ static t_compfunc eval_sort_arts_func(un static time_t get_last_posting_date(long n); static void sort_base(unsigned int sort_threads_type); static void thread_by_multipart(void); -static void thread_by_percentage(struct t_group *group); +static void thread_by_percentage(unsigned int percentage); static void thread_by_subject(void); static void write_overview(struct t_group *group); #ifdef NNTP_ABLE @@ -129,7 +128,8 @@ find_base( grpmenu.max = 0; #ifdef DEBUG - debug_print_arts(); + if (debug & DEBUG_FILTER) + debug_print_arts(); #endif /* DEBUG */ for_each_art(i) { @@ -413,6 +413,10 @@ index_group( if (!batch_mode) show_art_msg(group->name); + else { + if (verbose) /* -> lang.c */ + wait_message(0, _("Reading %s\n"), group->name); + } signal_context = cArt; /* Set this only once curr_group is valid */ @@ -817,7 +821,7 @@ read_art_headers( top = arts[top_art].artnum; /* used if arts are killed */ top_art++; - if (++modified % MODULO_COUNT_NUM == 0) + if (++modified % (MODULO_COUNT_NUM * 20) == 0) show_progress(group_msg, modified, total); } @@ -904,12 +908,11 @@ thread_by_subject( */ static void thread_by_percentage( - struct t_group *group) + unsigned int percentage) { int i, j, k; int root_num = 0; /* The index number of the root we are currently working on. */ unsigned int unmatched; /* This is the number of characters that don't match between the two strings */ - unsigned int percentage = 100 - group->attribute->thread_perc; size_t slen; /* First we need to sort art[] to simplify and speed up the matching. */ @@ -969,9 +972,6 @@ thread_by_percentage( /* - * This was brought over from tags.c, however this version doesn't - * operate on base_index - * * Parses a subject header of the type "multipart message subject (01/42)" * into a MultiPartInfo struct, or fails if the message subject isn't in the * right form. @@ -1001,10 +1001,6 @@ global_get_multipart_info( } -/* - * Again this was taken from tags.c, but works on global indices into arts - * rather than on base_index. - */ static int global_look_for_multipart_info( int aindex, @@ -1029,7 +1025,7 @@ global_look_for_multipart_info( if (!pch || !isdigit((int) pch[1])) return 0; - tmp.base_index = aindex; /* This could be confusing because we are actually storing the index into arts, not the base_index. */ + tmp.arts_index = aindex; tmp.subject_compare_len = pch - subj; tmp.part_number = (int) strtol(pch + 1, &pch, 10); if (*pch != '/' && *pch != '|') @@ -1042,6 +1038,12 @@ global_look_for_multipart_info( if (*pch != stop) return 0; + /* + * skip "blah (00/102)" or "blah (103/102)" subjects + */ + if (tmp.part_number < 1 || tmp.part_number > tmp.total) + return 0; + tmp.subject = subj; *setme = tmp; *offset = pch - subj; @@ -1049,28 +1051,53 @@ global_look_for_multipart_info( } +t_bool +global_look_for_multipart( + int aindex, + char start, + char stop) +{ + char *pch; + + pch = strrchr(arts[aindex].subject, start); + if (!pch || !isdigit((int) pch[1])) + return FALSE; + + strtol(pch + 1, &pch, 10); + if (*pch != '/' && *pch != '|') + return FALSE; + + if (!isdigit((int) pch[1])) + return FALSE; + + strtol(pch + 1, &pch, 10); + if (*pch != stop) + return FALSE; + + arts[aindex].multipart_subj = TRUE; + return TRUE; +} + + /* - * Taken from tags.c but changed to use indices into arts[] instead of - * base_index. Changed so that even when we don't have all the parts we - * return a valid array. - * * Tries to find all the parts to the multipart message pointed to by - * base_index. + * aindex. * - * @return on success, the number of parts found. On failure, zero if not a - * multipart or the negative value of the first missing part. - * @param base_index index pointing to one of the messages in a multipart + * @return on success, the number of parts found. On failure, zero if not + * a multipart or the negative value of the first missing part in case of + * tagging. + * @param aindex index pointing to one of the messages in a multipart * message. * @param malloc_and_setme_info on success, set to a malloced array the * parts found. */ -static int +int global_get_multiparts( int aindex, - MultiPartInfo **malloc_and_setme_info) + MultiPartInfo **malloc_and_setme_info, + t_bool tagging) { - int i; - int part_index; + int i, part_index, part_cnt = 0; MultiPartInfo tmp, tmp2; MultiPartInfo *info = NULL; @@ -1092,8 +1119,8 @@ global_get_multiparts( } /* try to find all the multiparts... */ - for_each_art(i) { - if (strncmp(arts[i].subject, tmp.subject, tmp.subject_compare_len)) + for (i = (tagging ? 0 : aindex); i < top_art; i++) { + if (!arts[i].multipart_subj || strncmp(arts[i].subject, tmp.subject, tmp.subject_compare_len)) continue; if (!global_get_multipart_info(i, &tmp2)) @@ -1105,12 +1132,6 @@ global_get_multiparts( part_index = tmp2.part_number - 1; - /* - * skip "blah (00/102)" or "blah (103/102)" subjects - */ - if (part_index < 0 || part_index >= tmp.total) - continue; - /* repost check: do we already have this part? */ if (info[part_index].part_number != -1) { assert(info[part_index].part_number == tmp2.part_number && "bookkeeping error"); @@ -1119,13 +1140,21 @@ global_get_multiparts( /* we have a match, hooray! */ info[part_index] = tmp2; + + arts[i].multipart_subj = FALSE; + + /* all parts found? */ + if (++part_cnt == tmp.total) + break; } /* see if we got them all. */ - for (i = 0; i < tmp.total; ++i) { - if (info[i].part_number != i + 1) { - *malloc_and_setme_info = info; - return -(i + 1); /* missing part #(i+1) */ + if (tagging) { + for (i = 0; i < tmp.total; ++i) { + if (info[i].part_number != i + 1) { + free(info); + return -(i + 1); /* missing part #(i+1) */ + } } } @@ -1146,8 +1175,17 @@ thread_by_multipart( MultiPartInfo *minfo = NULL; for_each_art(i) { - if (IGNORE_ART_THREAD(i) || arts[i].prev >= 0 || !global_get_multiparts(i, &minfo)) { + if (!global_look_for_multipart(i, '[', ']')) + global_look_for_multipart(i, '(', ')'); + } + + for_each_art(i) { + if (!arts[i].multipart_subj) + continue; + + if (IGNORE_ART_THREAD(i) || arts[i].prev >= 0 || !global_get_multiparts(i, &minfo, FALSE)) { FreeAndNull(minfo); + arts[i].multipart_subj = FALSE; continue; } @@ -1155,13 +1193,16 @@ thread_by_multipart( for (j = minfo[0].total - 1; j >= 0; j--) { if (minfo[j].part_number != -1) { if (threadNum != -1) { - arts[minfo[j].base_index].thread = threadNum; - arts[threadNum].prev = minfo[j].base_index; + arts[minfo[j].arts_index].thread = threadNum; + arts[threadNum].prev = minfo[j].arts_index; } - threadNum = minfo[j].base_index; + threadNum = minfo[j].arts_index; } } FreeAndNull(minfo); + arts[i].multipart_subj = FALSE; + if (i % MODULO_COUNT_NUM == 0) /* TODO: -> lang.c */ + show_progress(_("Threading by multipart"), i, top_art); } } @@ -1195,13 +1236,15 @@ make_threads( struct t_group *group, t_bool rethread) { - if (!cmd_line && !batch_mode) + if (!cmd_line && !batch_mode) { info_message((group->attribute->thread_articles == THREAD_NONE ? _(txt_unthreading_arts) : _(txt_threading_arts))); + my_flush(); + } #ifdef DEBUG if (debug & DEBUG_MISC) error_message(2, "rethread=[%d] thread_articles=[%d] attr_thread_articles=[%d]", - rethread, tinrc.thread_articles, group->attribute->thread_articles); + rethread, tinrc.thread_articles, group->attribute->thread_articles); #endif /* DEBUG */ /* @@ -1272,7 +1315,7 @@ make_threads( break; case THREAD_PERC: - thread_by_percentage(group); + thread_by_percentage(100 - group->attribute->thread_perc); break; default: /* not reached */ @@ -1539,7 +1582,8 @@ parse_headers( h->subject = hash_str(""); #ifdef DEBUG - debug_print_header(h); + if (debug & DEBUG_FILTER) + debug_print_header(h); #endif /* DEBUG */ return TRUE; } @@ -1688,9 +1732,8 @@ build_range_list( res->cnt = res->end - res->start + 1; gap_cnt = 1; # ifdef DEBUG - if ((debug & DEBUG_NNTP) && verbose > 1) { + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "more then %d ranges after optimization, fetch all at once instead: start: %"T_ARTNUM_PFMT" end: %"T_ARTNUM_PFMT" cnt: %"T_ARTNUM_PFMT"", MAX_CNT, res->start, res->end, res->cnt); - } # endif /* DEBUG */ } *range_cnt = gap_cnt; @@ -1773,6 +1816,8 @@ get_path_header( } if (fp) { + int j = 0; + prep_msg = fmt_string(_(txt_prep_for_filter_on_path), cur, cnt); while ((buf = tin_fgets(fp, FALSE)) != NULL && buf[0] != '.') { # ifdef DEBUG @@ -1784,10 +1829,12 @@ get_path_header( artnum = atoartnum(ptr); if ((ptr = tin_strtok(NULL, " ")) == NULL) continue; - for_each_art(i) { + for (i = j; i < top_art; i++) { if (arts[i].artnum == artnum) { FreeIfNeeded(arts[i].path); arts[i].path = my_strdup(ptr); + j = i; + break; } } if (++artnum % MODULO_COUNT_NUM == 0) @@ -1801,7 +1848,7 @@ get_path_header( supported = FALSE; if (nntp_caps.xpat) nntp_caps.xpat = FALSE; - /* as nntp_caps.hdr may work with other headers we don't disable it*/ + /* as nntp_caps.hdr may work with other headers we don't disable it */ # ifdef DEBUG if ((debug & DEBUG_NNTP) && verbose > 1) @@ -2132,8 +2179,7 @@ read_overview( art->subject = hash_str(q); free(q); - } - else { + } else { art->subject = hash_str(""); #ifdef DEBUG if ((debug & DEBUG_NNTP) && verbose > 1) @@ -2270,7 +2316,7 @@ read_overview( continue; /* we might lose accuracy here, but that shouldn't hurt */ - if (artnum % MODULO_COUNT_NUM == 0) + if (artnum % (MODULO_COUNT_NUM * 20) == 0) show_progress(group_msg, artnum - min, max - min); top_art++; /* Basically this statement commits the article */ @@ -2357,7 +2403,7 @@ read_overview( art->xref = my_strdup(ptr); } /* we might lose accuracy here, but that shouldn't hurt */ - if (artnum % MODULO_COUNT_NUM == 0) + if (artnum % (MODULO_COUNT_NUM * 20) == 0) show_progress(group_msg, artnum - min, max - min); } } @@ -2489,6 +2535,9 @@ write_overview( } #endif /* CHARSET_CONVERSION */ + if (verbose && batch_mode) /* -> lang.c */ + wait_message(0, _("Writing %s\n"), group->name); + for_each_art(i) { char *p; char *q, *ref; @@ -2566,8 +2615,16 @@ write_overview( q = NULL; } } + if (i % (MODULO_COUNT_NUM * 20) == 0) /* TODO: -> lang.c */ + show_progress(_("Writing overview cache..."), i, top_art); } +#ifdef HAVE_FCHMOD fchmod(fileno(fp), (mode_t) (S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH)); + /* + * TODO: + * add code for !HAVE_FCHMOD && HAVE_CHMOD + */ +#endif /* HAVE_FCHMOD */ fclose(fp); } @@ -3143,6 +3200,7 @@ set_article( art->inrange = FALSE; art->matched = FALSE; art->keep_in_base = FALSE; + art->multipart_subj = FALSE; } @@ -3221,10 +3279,10 @@ print_date( if ((tm = gmtime(&secs)) != NULL) snprintf(date, sizeof(date), "%02d %.3s %04d %02d:%02d:%02d GMT", - tm->tm_mday, - months_a[tm->tm_mon], - tm->tm_year + 1900, - tm->tm_hour, tm->tm_min, tm->tm_sec); + tm->tm_mday, + months_a[tm->tm_mon], + tm->tm_year + 1900, + tm->tm_hour, tm->tm_min, tm->tm_sec); else snprintf(date, sizeof(date), "01 Jan 1970 00:00:00 UTC"); @@ -3246,9 +3304,8 @@ print_from( if (article->name != NULL) { q = my_strdup(article->name); #ifdef CHARSET_CONVERSION - if (charset != -1) { + if (charset != -1) buffer_to_network(q, charset); - } #endif /* CHARSET_CONVERSION */ p = rfc1522_encode(article->name, tinrc.mm_local_charset, FALSE); unfold_header(p); @@ -3260,7 +3317,7 @@ print_from( free(p); free(q); } else - STRCPY(from, article->from); + snprintf(from, sizeof(from), "<%s>", article->from); return from; } diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/attrib.c tin-2.4.5/src/attrib.c --- tin-2.4.4/src/attrib.c 2019-11-20 14:40:25.000000000 +0100 +++ tin-2.4.5/src/attrib.c 2020-12-01 11:51:00.859880249 +0100 @@ -3,10 +3,10 @@ * Module : attrib.c * Author : I. Lea * Created : 1993-12-01 - * Updated : 2019-07-03 + * Updated : 2020-04-23 * Notes : Group attribute routines * - * Copyright (c) 1993-2020 Iain Lea + * Copyright (c) 1993-2021 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -524,7 +524,7 @@ read_attributes_file( switch (my_tolower((unsigned char) line[0])) { case 'a': if (match_boolean(line, "auto_bcc=", &auto_bcc)) { - if (scopes[num_scope -1].attribute->auto_cc_bcc & AUTO_CC) + if (scopes[num_scope - 1].attribute->auto_cc_bcc & AUTO_CC) auto_cc_bcc = (auto_bcc ? AUTO_CC_BCC : AUTO_CC); else auto_cc_bcc = (auto_bcc ? AUTO_BCC : 0); @@ -533,7 +533,7 @@ read_attributes_file( break; } if (match_boolean(line, "auto_cc=", &auto_cc)) { - if (scopes[num_scope -1].attribute->auto_cc_bcc & AUTO_BCC) + if (scopes[num_scope - 1].attribute->auto_cc_bcc & AUTO_BCC) auto_cc_bcc = (auto_cc ? AUTO_CC_BCC : AUTO_BCC); else auto_cc_bcc = (auto_cc ? AUTO_CC : 0); @@ -1557,7 +1557,13 @@ write_attributes_file( } /* rename_file() preserves mode, so this is safe */ +#ifdef HAVE_FCHMOD fchmod(fileno(fp), (mode_t) (S_IRUSR|S_IWUSR)); +#else +# ifdef HAVE_CHMOD + chmod(new_file, (mode_t) (S_IRUSR|S_IWUSR)); +# endif /* HAVE_CHMOD */ +#endif /* HAVE_FCHMOD */ if ((i = ferror(fp)) || fclose(fp)) { error_message(2, _(txt_filesystem_full), ATTRIBUTES_FILE); diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/auth.c tin-2.4.5/src/auth.c --- tin-2.4.4/src/auth.c 2019-11-20 14:40:25.000000000 +0100 +++ tin-2.4.5/src/auth.c 2020-12-15 20:09:23.479341865 +0100 @@ -7,7 +7,7 @@ * Notes : Routines to authenticate to a news server via NNTP. * DON'T USE get_respcode() THROUGHOUT THIS CODE. * - * Copyright (c) 1997-2020 Dirk Nimmich + * Copyright (c) 1997-2021 Dirk Nimmich * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -101,7 +101,13 @@ read_newsauth_file( error_message(4, _(txt_error_insecure_permissions), filename, statbuf.st_mode); /* * TODO: fix permissions? - * fchmod(fd, S_IRUSR|S_IWUSR); + * #ifdef HAVE_FCHMOD + * fchmod(fd, S_IRUSR|S_IWUSR); + * #else + * # ifdef HAVE_CHMOD + * chmod(filename, S_IRUSR|S_IWUSR); + * # endif + * #endif */ } # endif /* !FILE_MODE_BROKEN */ @@ -188,7 +194,7 @@ do_authinfo_user( if ((authpass == NULL) || (*authpass == '\0')) { # ifdef DEBUG - if ((debug & DEBUG_NNTP) && verbose >1) + if ((debug & DEBUG_NNTP) && verbose > 1) debug_print_file("NNTP", "authorization failed: no password"); # endif /* DEBUG */ error_message(2, _(txt_auth_failed_nopass), server); @@ -303,7 +309,7 @@ authinfo_plain( # ifdef DEBUG else { if ((debug & DEBUG_NNTP) && verbose > 1) - debug_print_file("NNTP", "read_newsauth_file(\"%s\", \"%s\", \"%s\") failed", server, authuser, authpass); + debug_print_file("NNTP", "read_newsauth_file(\"%s\", \"%s\", \"%s\") failed", server, authuser, authpass); } # endif /* DEBUG */ } @@ -550,8 +556,9 @@ sasl_auth_plain( gsasl_done(ctx); return p; } - gsasl_property_set(session, GSASL_AUTHID, user); - gsasl_property_set(session, GSASL_PASSWORD, pass); + /* GSASL_AUTHZID (authorization identity) is (usually) unused with NNTP */ + gsasl_property_set(session, GSASL_AUTHID, user); /* authentication identity */ + gsasl_property_set(session, GSASL_PASSWORD, pass); /* password of the authentication identity */ if (gsasl_step64(session, NULL, &p) != GSASL_OK) FreeAndNull(p); gsasl_finish(session); diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/charset.c tin-2.4.5/src/charset.c --- tin-2.4.4/src/charset.c 2019-11-20 14:40:25.000000000 +0100 +++ tin-2.4.5/src/charset.c 2020-12-01 11:51:00.879881221 +0100 @@ -3,10 +3,10 @@ * Module : charset.c * Author : M. Kuhn, T. Burmester * Created : 1993-12-10 - * Updated : 2019-07-05 + * Updated : 2020-02-26 * Notes : ISO to ascii charset conversion routines * - * Copyright (c) 1993-2020 Markus Kuhn + * Copyright (c) 1993-2021 Markus Kuhn * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -147,12 +147,12 @@ static constext *const iso2asc[NUM_ISO_T * german tex style to latin1 conversion (by root@aspic, 12/04/93) */ -#define TEX_SUBST 15 +#define TEX_SUBST 16 #define SPACES " " static const char *const tex_from[TEX_SUBST] = { - "\"a","\\\"a","\"o","\\\"o","\"u","\\\"u","\"A","\\\"A","\"O","\\\"O","\"U","\\\"U","\"s","\\\"s","\\3" + "\"a","\\\"a","\"o","\\\"o","\"u","\\\"u","\"A","\\\"A","\"O","\\\"O","\"U","\\\"U","\"s","\\\"s","\\3",'\0' }; /* @@ -272,6 +272,8 @@ convert_tex2iso( t_bool ex; /* initialize tex_to */ + memset(tex_to, '\0', sizeof(tex_to)); + /* * Charsets which have german umlauts incl. sharp s at the same * code position as ISO-8859-1 @@ -300,7 +302,7 @@ convert_tex2iso( tex_to[3] = tex_to[2] = "\303\266"; /* ouml */ tex_to[5] = tex_to[4] = "\303\274"; /* uuml */ tex_to[7] = tex_to[6] = "\303\204"; /* Auml */ - tex_to[9] = tex_to[8] = "\303\266"; /* Ouml */ + tex_to[9] = tex_to[8] = "\303\226"; /* Ouml */ tex_to[11] = tex_to[10] = "\303\234"; /* Uuml */ tex_to[14] = tex_to[13] = tex_to[12] = "\303\237"; /* szlig */ } else { @@ -314,7 +316,7 @@ convert_tex2iso( while (col < len) { i = 0; ex = FALSE; - while ((i < TEX_SUBST) && !ex) { + while ((i < TEX_SUBST - 1) && !ex) { subst_len = strlen(tex_from[i]); if (!strncmp(from + col, tex_from[i], subst_len)) { strcat(to, tex_to[i]); diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/color.c tin-2.4.5/src/color.c --- tin-2.4.4/src/color.c 2019-11-20 14:40:25.000000000 +0100 +++ tin-2.4.5/src/color.c 2020-12-01 11:51:00.891881804 +0100 @@ -11,7 +11,7 @@ * Notes : This are the basic function for ansi-color * and word highlighting * - * Copyright (c) 1995-2020 Roland Rosenfeld + * Copyright (c) 1995-2021 Roland Rosenfeld * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/config.c tin-2.4.5/src/config.c --- tin-2.4.4/src/config.c 2019-11-20 14:40:25.000000000 +0100 +++ tin-2.4.5/src/config.c 2020-12-01 11:51:00.903882388 +0100 @@ -3,10 +3,10 @@ * Module : config.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2019-07-03 + * Updated : 2020-04-23 * Notes : Configuration file routines * - * Copyright (c) 1991-2020 Iain Lea + * Copyright (c) 1991-2021 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -1486,7 +1486,13 @@ write_config_file( } } +#ifdef HAVE_FCHMOD fchmod(fileno(fp), (mode_t) (S_IRUSR|S_IWUSR)); /* rename_file() preserves mode */ +#else +# ifdef HAVE_CHMOD + chmod(file_tmp, (mode_t) (S_IRUSR|S_IWUSR)); /* rename_file() preserves mode */ +# endif /* HAVE_CHMOD */ +#endif /* HAVE_FCHMOD */ if ((i = ferror(fp)) || fclose(fp)) { error_message(2, _(txt_filesystem_full), CONFIG_FILE); @@ -2073,7 +2079,7 @@ rc_post_update( if (match_string(buf, "sigfile=", tinrc.sigfile, sizeof(tinrc.sigfile))) { size_t l = strlen(tinrc.sigfile); - if (tinrc.sigfile[0] == '!'&& (tinrc.sigfile[l - 2] != '%' || tinrc.sigfile[l - 1] != 'G')) { + if (tinrc.sigfile[0] == '!' && (tinrc.sigfile[l - 2] != '%' || tinrc.sigfile[l - 1] != 'G')) { char *newbuf = my_malloc(sizeof(tinrc.sigfile) + 4); sprintf(newbuf, "%s %s", tinrc.sigfile, "%G"); @@ -2225,7 +2231,13 @@ write_server_config( fprintf(fp, "last_newnews=%lu (%s)\n", (unsigned long int) newnews[i].time, timestring); } +#ifdef HAVE_FCHMOD fchmod(fileno(fp), (mode_t) (S_IRUSR|S_IWUSR)); /* rename_file() preserves mode */ +#else +# ifdef HAVE_CHMOD + chmod(file_tmp, (mode_t) (S_IRUSR|S_IWUSR)); /* rename_file() preserves mode */ +# endif /* HAVE_CHMOD */ +#endif /* HAVE_FCHMOD */ if ((i = ferror(fp)) || fclose(fp)) { error_message(2, _(txt_filesystem_full), SERVERCONFIG_FILE); diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/cook.c tin-2.4.5/src/cook.c --- tin-2.4.4/src/cook.c 2019-11-20 14:40:25.000000000 +0100 +++ tin-2.4.5/src/cook.c 2020-12-01 11:51:00.931883749 +0100 @@ -6,7 +6,7 @@ * Updated : 2019-02-03 * Notes : Split from page.c * - * Copyright (c) 2000-2020 Jason Faultless + * Copyright (c) 2000-2021 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/curses.c tin-2.4.5/src/curses.c --- tin-2.4.4/src/curses.c 2019-11-20 14:40:25.000000000 +0100 +++ tin-2.4.5/src/curses.c 2020-12-01 11:51:00.963885305 +0100 @@ -27,7 +27,7 @@ /* local prototype */ #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) static wint_t convert_c2wc (const char *input); -#endif /* MULTIBYTE_ABLE && !NO_LOCALE*/ +#endif /* MULTIBYTE_ABLE && !NO_LOCALE */ #ifdef USE_CURSES @@ -616,7 +616,7 @@ RawState( # ifndef CBREAK # define CBREAK 0x00000002 /* half-cooked mode */ # endif /* !CBREAK */ -#endif /* sun || __sun && (!__SVR4 ||! __svr4__) && BSD && BSD < 199306 */ +#endif /* sun || __sun && (!__SVR4 || !__svr4__) && BSD && BSD < 199306 */ /* * state is either TRUE or FALSE, as indicated by call */ diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/debug.c tin-2.4.5/src/debug.c --- tin-2.4.4/src/debug.c 2019-11-20 14:40:25.000000000 +0100 +++ tin-2.4.5/src/debug.c 2020-12-01 11:51:00.983886277 +0100 @@ -3,10 +3,10 @@ * Module : debug.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2019-07-23 + * Updated : 2020-05-19 * Notes : debug routines * - * Copyright (c) 1991-2020 Iain Lea + * Copyright (c) 1991-2021 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -109,6 +109,8 @@ debug_delete_files( if (debug & (DEBUG_MISC | DEBUG_REMOVE)) { joinpath(file, sizeof(file), TMPDIR, "ACTIVE"); unlink(file); + joinpath(file, sizeof(file), TMPDIR, "GNKSA"); + unlink(file); } } @@ -122,10 +124,7 @@ debug_print_arts( { int i; - if (!(debug & DEBUG_FILTER)) - return; - - for_each_art(i) + for_each_art(i) /* fopen/close() horror */ debug_print_header(&arts[i]); } @@ -134,28 +133,29 @@ void debug_print_header( struct t_article *s) { + static char file[PATH_LEN] = { '\0' }; FILE *fp; - char file[PATH_LEN]; if (!(debug & DEBUG_FILTER)) return; - joinpath(file, sizeof(file), TMPDIR, "ARTS"); + if (!*file) + joinpath(file, sizeof(file), TMPDIR, "ARTS"); if ((fp = fopen(file, "a")) != NULL) { - fprintf(fp,"art=[%5"T_ARTNUM_PFMT"] tag=[%s] kill=[%s] selected=[%s]\n", s->artnum, + fprintf(fp, "art=[%5"T_ARTNUM_PFMT"] tag=[%s] kill=[%s] selected=[%s]\n", s->artnum, bool_unparse(s->tagged), bool_unparse(s->killed), bool_unparse(s->selected)); - fprintf(fp,"subj=[%-38s]\n", s->subject); - fprintf(fp,"date=[%ld] from=[%s] name=[%s]\n", (long) s->date, s->from, + fprintf(fp, "subj=[%-38s]\n", s->subject); + fprintf(fp, "date=[%ld] from=[%s] name=[%s]\n", (long) s->date, s->from, BlankIfNull(s->name)); - fprintf(fp,"msgid=[%s] refs=[%s]\n", + fprintf(fp, "msgid=[%s] refs=[%s]\n", BlankIfNull(s->msgid), BlankIfNull(s->refs)); if (s->killed) - fprintf(fp,"score=[%d] gnksa=[%d] lines=[%d]\n", s->score, s->gnksa_code, s->line_count); + fprintf(fp, "score=[%d] gnksa=[%d] lines=[%d]\n", s->score, s->gnksa_code, s->line_count); if (s->archive) { fprintf(fp, "archive.name=[%-38s] ", s->archive->name); @@ -164,9 +164,15 @@ debug_print_header( if (s->archive->ispart) fprintf(fp, "archive.ispart=[%s]\n", bool_unparse(s->archive->ispart)); } - fprintf(fp,"thread=[%d] prev=[%d] status=[%u]\n\n", s->thread, s->prev, s->status); + fprintf(fp, "thread=[%d] prev=[%d] status=[%u]\n\n", s->thread, s->prev, s->status); fflush(fp); +#ifdef HAVE_FCHMOD fchmod(fileno(fp), (S_IRUGO|S_IWUGO)); +#else +# ifdef HAVE_CHMOD + chmod(file, (S_IRUGO|S_IWUGO)); +# endif /* HAVE_CHMOD */ +#endif /* HAVE_FCHMOD */ fclose(fp); } } @@ -176,13 +182,14 @@ void debug_print_active( void) { + static char file[PATH_LEN] = { '\0' }; FILE *fp; - char file[PATH_LEN]; if (!(debug & DEBUG_MISC)) return; - joinpath(file, sizeof(file), TMPDIR, "ACTIVE"); + if (!*file) + joinpath(file, sizeof(file), TMPDIR, "ACTIVE"); if ((fp = fopen(file, "w")) != NULL) { int i; @@ -203,7 +210,13 @@ debug_print_active( if (debug & DEBUG_ATTRIB) debug_print_attributes(group->attribute, fp); } +#ifdef HAVE_FCHMOD fchmod(fileno(fp), (S_IRUGO|S_IWUGO)); +#else +# ifdef HAVE_CHMOD + chmod(file, (S_IRUGO|S_IWUGO)); +# endif /* HAVE_CHMOD */ +#endif /* HAVE_FCHMOD */ fclose(fp); } } @@ -248,24 +261,30 @@ debug_print_attributes( void debug_print_malloc( - int is_malloc, + t_bool is_malloc, const char *xfile, int line, size_t size) { - FILE *fp; - char file[PATH_LEN]; + static char file[PATH_LEN] = { '\0' }; static size_t total = 0; + FILE *fp; - if (debug & DEBUG_MEM) { + if (!*file) joinpath(file, sizeof(file), TMPDIR, "MALLOC"); - if ((fp = fopen(file, "a")) != NULL) { - total += size; - /* sometimes size_t is long */ - fprintf(fp, "%12s:%-4d %s(%6lu). Total %lu\n", xfile, line, is_malloc ? " malloc" : "realloc", (unsigned long) size, (unsigned long) total); - fchmod(fileno(fp), (S_IRUGO|S_IWUGO)); - fclose(fp); - } + + if ((fp = fopen(file, "a")) != NULL) { + total += size; + /* sometimes size_t is long */ + fprintf(fp, "%12s:%-4d %s(%6lu). Total %lu\n", xfile, line, is_malloc ? " malloc" : "realloc", (unsigned long) size, (unsigned long) total); +#ifdef HAVE_FCHMOD + fchmod(fileno(fp), (S_IRUGO|S_IWUGO)); +#else +# ifdef HAVE_CHMOD + chmod(file, (S_IRUGO|S_IWUGO)); +# endif /* HAVE_CHMOD */ +#endif /* HAVE_FCHMOD */ + fclose(fp); } } @@ -308,15 +327,13 @@ void debug_print_filters( void) { - FILE *fp; - char file[PATH_LEN]; int i, num; + static char file[PATH_LEN] = { '\0' }; struct t_filter *the_filter; + FILE *fp; - if (!(debug & DEBUG_FILTER)) - return; - - joinpath(file, sizeof(file), TMPDIR, "FILTER"); + if (!*file) + joinpath(file, sizeof(file), TMPDIR, "FILTER"); if ((fp = fopen(file, "w")) != NULL) { /* @@ -331,7 +348,13 @@ debug_print_filters( } fprintf(fp, "*** END GLOBAL FILTER ***\n"); +#ifdef HAVE_FCHMOD fchmod(fileno(fp), (S_IRUGO|S_IWUGO)); +#else +# ifdef HAVE_CHMOD + chmod(file, (S_IRUGO|S_IWUGO)); +# endif /* HAVE_CHMOD */ +#endif /* HAVE_FCHMOD */ fclose(fp); } } @@ -358,8 +381,14 @@ debug_print_file( joinpath(file, sizeof(file), TMPDIR, fname); if ((fp = fopen(file, "a")) != NULL) { - fprintf(fp,"%s\n", buf); + fprintf(fp, "%s\n", buf); +#ifdef HAVE_FCHMOD fchmod(fileno(fp), (S_IRUGO|S_IWUGO)); +#else +# ifdef HAVE_CHMOD + chmod(file, (S_IRUGO|S_IWUGO)); +# endif /* HAVE_CHMOD */ +#endif /* HAVE_FCHMOD */ fclose(fp); } free(buf); @@ -407,7 +436,13 @@ debug_print_bitmap( (art->status == ART_READ ? "READ" : "UNREAD")); } debug_print_newsrc(&group->newsrc, fp); +#ifdef HAVE_FCHMOD fchmod(fileno(fp), (S_IRUGO|S_IWUGO)); +#else +# ifdef HAVE_CHMOD + chmod(file, (S_IRUGO|S_IWUGO)); +# endif /* HAVE_CHMOD */ +#endif /* HAVE_FCHMOD */ fclose(fp); } } diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/envarg.c tin-2.4.5/src/envarg.c --- tin-2.4.4/src/envarg.c 2019-11-20 14:40:25.000000000 +0100 +++ tin-2.4.5/src/envarg.c 2020-12-01 11:51:00.991886666 +0100 @@ -6,7 +6,7 @@ * Updated : 1993-03-10 * Notes : Adds default options from environment to command line * - * Copyright (c) 1991-2020 Bill Davidson + * Copyright (c) 1991-2021 Bill Davidson * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/feed.c tin-2.4.5/src/feed.c --- tin-2.4.4/src/feed.c 2019-11-20 14:40:25.000000000 +0100 +++ tin-2.4.5/src/feed.c 2020-12-01 11:51:01.003887249 +0100 @@ -6,7 +6,7 @@ * Updated : 2019-02-15 * Notes : provides same interface to mail,pipe,print,save & repost commands * - * Copyright (c) 1991-2020 Iain Lea + * Copyright (c) 1991-2021 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/filter.c tin-2.4.5/src/filter.c --- tin-2.4.4/src/filter.c 2019-11-20 14:40:25.000000000 +0100 +++ tin-2.4.5/src/filter.c 2020-12-01 11:51:01.015887833 +0100 @@ -3,10 +3,10 @@ * Module : filter.c * Author : I. Lea * Created : 1992-12-28 - * Updated : 2019-07-05 + * Updated : 2020-05-28 * Notes : Filter articles. Kill & auto selection are supported. * - * Copyright (c) 1991-2020 Iain Lea + * Copyright (c) 1991-2021 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -1896,10 +1896,13 @@ filter_articles( /* * loop through all arts applying global & local filtering rules - * - * TODO: allow iKeyAbort to stop filtering */ for (i = 0; (i < top_art) && !error; i++) { +#ifdef HAVE_SELECT + if (wait_for_input()) /* allow abort */ + break; /* to free the mem */ +#endif /* HAVE_SELECT */ + arts[i].score = 0; if (tinrc.kill_level == KILL_UNREAD && IS_READ(i)) /* skip only when the article is read */ @@ -2119,25 +2122,23 @@ filter_articles( } else { #ifdef DEBUG if (debug & DEBUG_FILTER) /* TODO: lang.c, _()? */ - debug_print_file("FILTER", "Skipping xref filter"); + debug_print_file("FILTER", "Skipping Xref filter"); #endif /* DEBUG */ error = TRUE; break; } - if (ptr[j].xref != NULL) { - switch (test_regex(k, ptr[j].xref, ptr[j].icase, ®ex_cache_xref[j])) { - case 1: - SET_FILTER(group, i, j); - break; - - case -1: - error = TRUE; - break; + switch (test_regex(k, ptr[j].xref, ptr[j].icase, ®ex_cache_xref[j])) { + case 1: + SET_FILTER(group, i, j); + break; - default: - break; - } + case -1: + error = TRUE; + break; + + default: + break; } free(k); } @@ -2164,6 +2165,10 @@ filter_articles( } } } + /* + * if (i % (MODULO_COUNT_NUM * 20) == 0) + * show_progress("Filter", i, top_art); + */ } /* @@ -2209,6 +2214,7 @@ filter_articles( } } } + if (!cmd_line && !batch_mode) clear_message(); diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/getline.c tin-2.4.5/src/getline.c --- tin-2.4.4/src/getline.c 2019-11-20 14:40:25.000000000 +0100 +++ tin-2.4.5/src/getline.c 2020-12-01 11:51:01.039889000 +0100 @@ -3,7 +3,7 @@ * Module : getline.c * Author : Chris Thewalt & Iain Lea * Created : 1991-11-09 - * Updated : 2019-01-15 + * Updated : 2020-06-01 * Notes : emacs style line editing input package. * Copyright : (c) Copyright 1991-99 by Chris Thewalt & Iain Lea * Permission to use, copy, modify, and distribute this @@ -116,7 +116,7 @@ tin_getline( if (max_chars == 0) { if (number_only) - gl_max = 6; + gl_max = 10; else gl_max = BUF_SIZE; } else diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/global.c tin-2.4.5/src/global.c --- tin-2.4.4/src/global.c 2019-11-20 14:40:25.000000000 +0100 +++ tin-2.4.5/src/global.c 2020-12-01 11:51:01.055889777 +0100 @@ -6,7 +6,7 @@ * Updated : 2005-10-19 * Notes : Generic navigation and key handling routines * - * Copyright (c) 1999-2020 Jason Faultless + * Copyright (c) 1999-2021 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/group.c tin-2.4.5/src/group.c --- tin-2.4.4/src/group.c 2019-11-20 14:40:25.000000000 +0100 +++ tin-2.4.5/src/group.c 2020-12-01 11:51:01.067890361 +0100 @@ -3,10 +3,10 @@ * Module : group.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2017-10-24 + * Updated : 2020-06-10 * Notes : * - * Copyright (c) 1991-2020 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2021 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -593,7 +593,9 @@ group_page( case GROUP_TAG_PARTS: /* tag all in order */ if (0 <= grpmenu.curr) { - if (tag_multipart(grpmenu.curr) != 0) { + int old_num = num_of_tagged_arts; + + if (tag_multipart(base[grpmenu.curr]) != 0) { /* * on success, move the pointer to the next * untagged article just for ease of use's sake @@ -608,7 +610,10 @@ group_page( break; } } while (n != grpmenu.curr); - info_message(_(txt_info_all_parts_tagged)); + if (old_num < num_of_tagged_arts) + info_message(_(txt_info_all_parts_tagged)); + else + info_message(_(txt_info_all_parts_untagged)); } } break; diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/hashstr.c tin-2.4.5/src/hashstr.c --- tin-2.4.4/src/hashstr.c 2019-11-20 14:40:25.000000000 +0100 +++ tin-2.4.5/src/hashstr.c 2020-12-01 11:51:01.099891916 +0100 @@ -3,10 +3,10 @@ * Module : hashstr.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2003-09-19 + * Updated : 2020-05-13 * Notes : * - * Copyright (c) 1991-2020 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2021 Iain Lea , Rich Skrenta * All rights reserved. * @@ -53,11 +53,6 @@ * Spillovers are chained on the end */ -/* - * Arbitrary table size, but make sure it's prime! - */ -#define HASHNODE_TABLE_SIZE 2411 - static struct t_hashnode *table[HASHNODE_TABLE_SIZE]; static struct t_hashnode *add_string(const char *s); diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/header.c tin-2.4.5/src/header.c --- tin-2.4.4/src/header.c 2019-11-20 14:40:25.000000000 +0100 +++ tin-2.4.5/src/header.c 2020-12-01 11:51:01.123893083 +0100 @@ -5,7 +5,7 @@ * Created : 1997-03-10 * Updated : 2019-07-07 * - * Copyright (c) 1997-2020 Urs Janssen + * Copyright (c) 1997-2021 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/help.c tin-2.4.5/src/help.c --- tin-2.4.4/src/help.c 2019-11-20 14:40:25.000000000 +0100 +++ tin-2.4.5/src/help.c 2020-12-01 11:51:01.139893861 +0100 @@ -3,10 +3,10 @@ * Module : help.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2018-02-02 + * Updated : 2020-06-10 * Notes : * - * Copyright (c) 1991-2020 Iain Lea + * Copyright (c) 1991-2021 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -447,6 +447,7 @@ static t_help_page thread_help_page[] = #endif /* !DISABLE_PRINTING */ { txt_help_empty_line, NOT_ASSIGNED }, { txt_help_global_tag, THREAD_TAG }, + { txt_help_thread_tag_parts, THREAD_TAG_PARTS }, { txt_help_group_untag_thread, THREAD_UNTAG }, { txt_help_empty_line, NOT_ASSIGNED }, { txt_help_thread_mark_article_read, THREAD_MARK_ARTICLE_READ }, diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/inews.c tin-2.4.5/src/inews.c --- tin-2.4.4/src/inews.c 2019-11-20 14:40:25.000000000 +0100 +++ tin-2.4.5/src/inews.c 2020-12-01 11:51:01.151894445 +0100 @@ -3,10 +3,10 @@ * Module : inews.c * Author : I. Lea * Created : 1992-03-17 - * Updated : 2019-02-18 + * Updated : 2020-06-27 * Notes : NNTP built in version of inews * - * Copyright (c) 1991-2020 Iain Lea + * Copyright (c) 1991-2021 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -153,8 +153,9 @@ submit_inews( * * check for valid From: line */ - if (!(group ? group->attribute->post_8bit_header : tinrc.post_8bit_header) && GNKSA_OK != gnksa_check_from(from_name + 6)) { /* error in address */ - error_message(2, _(txt_invalid_from), from_name + 6); + respcode = gnksa_check_from(from_name + 6); + if (!(group ? group->attribute->post_8bit_header : tinrc.post_8bit_header) && respcode > GNKSA_OK && respcode < GNKSA_MISSING_REALNAME) { /* error in address */ + error_message(2, "inews158%s", _(txt_invalid_from), from_name + 6); fclose(fp); return ret_code; } @@ -457,6 +458,7 @@ sender_needed( char sender_addr[HEADER_LEN]; char sender_line[HEADER_LEN]; char sender_name[HEADER_LEN]; + int r; # ifdef DEBUG if (debug & DEBUG_MISC) { @@ -471,7 +473,8 @@ sender_needed( snprintf(sender_line, sizeof(sender_line), "Sender: %s", sender); p = rfc1522_encode(sender_line, charset, FALSE); - if (GNKSA_OK != gnksa_do_check_from(p + 8, sender_addr, sender_name)) { + r = gnksa_do_check_from(p + 8, sender_addr, sender_name); + if (r > GNKSA_OK && r < GNKSA_MISSING_REALNAME) { free(p); return -2; } diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/init.c tin-2.4.5/src/init.c --- tin-2.4.4/src/init.c 2019-11-20 14:40:25.000000000 +0100 +++ tin-2.4.5/src/init.c 2020-12-01 11:51:01.175895611 +0100 @@ -3,10 +3,10 @@ * Module : init.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2019-08-20 + * Updated : 2020-09-28 * Notes : * - * Copyright (c) 1991-2020 Iain Lea + * Copyright (c) 1991-2021 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -803,10 +803,10 @@ init_selfinfo( if (!*overviewfmt_file) joinpath(overviewfmt_file, sizeof(overviewfmt_file), libdir, OVERVIEW_FMT); if (!*default_organization) { - char buf[LEN]; - joinpath(tmp, sizeof(tmp), libdir, "organization"); if ((fp = fopen(tmp, "r")) != NULL) { + char buf[LEN]; + if (fgets(buf, (int) sizeof(buf), fp) != NULL) { ptr = strrchr(buf, '\n'); if (ptr != NULL) @@ -912,7 +912,13 @@ init_selfinfo( if (!fstat(fileno(fp), &sb)) { if (sb.st_size == 0) { fprintf(fp, "%s", _(txt_posted_info_file)); +#ifdef HAVE_FCHMOD fchmod(fileno(fp), (mode_t) (S_IRUSR|S_IWUSR)); +#else +# ifdef HAVE_CHMOD + chmod(posted_info_file, (mode_t) (S_IRUSR|S_IWUSR)); +# endif /* HAVE_CHMOD */ +#endif /* HAVE_FCHMOD */ } } fclose(fp); diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/joinpath.c tin-2.4.5/src/joinpath.c --- tin-2.4.4/src/joinpath.c 2019-11-20 14:40:25.000000000 +0100 +++ tin-2.4.5/src/joinpath.c 2020-12-01 11:51:01.203896973 +0100 @@ -6,7 +6,7 @@ * Updated : 2008-12-04 * Notes : * - * Copyright (c) 1997-2020 Thomas Dickey + * Copyright (c) 1997-2021 Thomas Dickey * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/keymap.c tin-2.4.5/src/keymap.c --- tin-2.4.4/src/keymap.c 2019-11-20 14:40:25.000000000 +0100 +++ tin-2.4.5/src/keymap.c 2020-12-01 11:51:01.215897556 +0100 @@ -3,10 +3,10 @@ * Module : keymap.c * Author : D. Nimmich, J. Faultless * Created : 2000-05-25 - * Updated : 2019-06-05 + * Updated : 2020-06-10 * Notes : This file contains key mapping routines and variables. * - * Copyright (c) 2000-2020 Dirk Nimmich + * Copyright (c) 2000-2021 Dirk Nimmich * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -1773,6 +1773,11 @@ process_mapping( return TRUE; } + if (strcmp(keyname, "ThreadTagParts") == 0) { + process_keys(THREAD_TAG_PARTS, keys, &thread_keys); + + return TRUE; + } if (strcmp(keyname, "ThreadToggleArtSel") == 0) { process_keys(THREAD_TOGGLE_ARTICLE_SELECTION, keys, &thread_keys); @@ -2675,6 +2680,7 @@ setup_default_keys( add_default_key(&thread_keys, "K", THREAD_MARK_ARTICLE_READ); add_default_key(&thread_keys, "L", GLOBAL_LOOKUP_MESSAGEID); add_default_key(&thread_keys, "S", THREAD_AUTOSAVE); + add_default_key(&thread_keys, "T", THREAD_TAG_PARTS); add_default_key(&thread_keys, "U", THREAD_UNTAG); add_default_key(&thread_keys, "Z", MARK_THREAD_UNREAD); add_default_key(&thread_keys, "\t", THREAD_READ_NEXT_ARTICLE_OR_THREAD); diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/lang.c tin-2.4.5/src/lang.c --- tin-2.4.4/src/lang.c 2019-11-20 14:40:25.000000000 +0100 +++ tin-2.4.5/src/lang.c 2020-12-02 11:31:31.237704429 +0100 @@ -3,10 +3,10 @@ * Module : lang.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2019-07-03 + * Updated : 2020-12-02 * Notes : * - * Copyright (c) 1991-2020 Iain Lea + * Copyright (c) 1991-2021 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -148,7 +148,7 @@ constext txt_choose_post_process_type[] constext txt_color_on[] = N_("ANSI color enabled"); #endif /* HAVE_COLOR */ constext txt_command_failed[] = N_("Command failed: %s"); -constext txt_copyright_notice[] = "%s (c) Copyright 1991-2020 Iain Lea."; +constext txt_copyright_notice[] = "%s (c) Copyright 1991-2021 Iain Lea."; constext txt_confirm_select_on_exit[] = N_("Mark not selected articles read?"); #ifdef NNTP_ABLE constext txt_connecting[] = N_("Connecting to %s..."); @@ -271,7 +271,7 @@ constext txt_extracting_shar[] = N_("Ext constext txt_filesystem_full[] = N_("Error writing %s file. Filesystem full? File reset to previous state."); constext txt_filesystem_full_backup[] = N_("Error making backup of %s file. Filesystem full?"); -constext txt_filter_global_rules[] = N_("Filtering global rules (%d/%d)..."); +constext txt_filter_global_rules[] = N_("Filtering global rules (%d/%d) ('q' to quit)..."); constext txt_filter_rule_created[] = N_("Rule created by: "); constext txt_feed_pattern[] = N_("Enter pattern [%s]> "); constext txt_followup_newsgroups[] = N_("\nYou requested followups to your article to go to the following %s:\n"); @@ -462,7 +462,7 @@ constext txt_help_group_select_all[] = N constext txt_help_group_select_thread[] = N_("select thread"); constext txt_help_group_select_thread_if_unread_selected[] = N_("select threads if at least one unread article is selected"); constext txt_help_group_select_thread_pattern[] = N_("select threads that match user specified pattern"); -constext txt_help_group_tag_parts[] = N_("tag all parts of current multipart-message in order"); +constext txt_help_group_tag_parts[] = N_("tag/untag all parts of current multipart-message in order"); constext txt_help_group_thread_by_num[] = N_("0 - 9\t choose thread by number"); constext txt_help_group_toggle_getart_limit[] = N_("toggle limit number of articles to get, and reload"); constext txt_help_group_toggle_read_articles[] = N_("toggle display of all/unread articles"); @@ -518,6 +518,7 @@ constext txt_help_thread_mark_article_re constext txt_help_thread_mark_article_unread[] = N_("mark article, range or tagged articles as unread"); constext txt_help_thread_mark_thread_unread[] = N_("mark current thread as unread"); constext txt_help_thread_read_article[] = N_("read chosen article"); +constext txt_help_thread_tag_parts[] = N_("tag/untag all parts of current multipart-message in order"); constext txt_help_title_disp[] = N_("Display properties\n------------------"); constext txt_help_title_misc[] = N_("Miscellaneous\n-------------"); constext txt_help_title_navi[] = N_("Moving around\n-------------"); @@ -539,6 +540,7 @@ constext txt_index_page_com[] = N_("Grou constext txt_info_add_kill[] = N_("Kill filter added"); constext txt_info_add_select[] = N_("Auto-selection filter added"); constext txt_info_all_parts_tagged[] = N_("All parts tagged"); +constext txt_info_all_parts_untagged[] = N_("All parts untagged"); constext txt_info_do_postpone[] = N_("Storing article for later posting"); constext txt_info_enter_valid_character[] = N_("Please enter a valid character"); constext txt_info_missing_part[] = N_("Missing part #%d"); @@ -752,10 +754,8 @@ constext txt_quit_no_write[] = N_("Do yo constext txt_quoted_printable[] = "quoted-printable"; constext txt_range_invalid[] = N_("Invalid range - valid are '0-9.$' eg. 1-$"); -#ifdef NNTP_ABLE - constext txt_read_abort[] = N_("Do you want to abort this operation?"); - constext txt_read_exit[] = N_("Do you want to exit tin immediately?"); -#endif /* NNTP_ABLE */ +constext txt_read_abort[] = N_("Do you want to abort this operation?"); +constext txt_read_exit[] = N_("Do you want to exit tin immediately?"); constext txt_reading_article[] = N_("Reading ('q' to quit)..."); constext txt_reading_arts[] = N_("Reading %sarticles..."); constext txt_reading_attributes_file[] = N_("Reading %sattributes file...\n"); @@ -1115,7 +1115,7 @@ Warning: Posting is in %s and contains c constext txt_usage_force_authentication[] = N_(" -A force authentication on connect"); constext txt_usage_newsserver[] = N_(" -g serv read news from NNTP server serv [default=%s]"); constext txt_usage_port[] = N_(" -p port use port as NNTP port [default=%d]"); - constext txt_usage_quickstart[] = N_(" -Q quick start. Same as -nqd"); + constext txt_usage_quickstart[] = N_(" -Q quick start. Same as -dnq"); constext txt_usage_read_news_remotely[] = N_(" -r read news remotely from default NNTP server"); constext txt_usage_read_only_active[] = N_(" -l use only LIST instead of GROUP (-n) command"); constext txt_usage_read_only_subscribed[] = N_(" -n only read subscribed .newsrc groups from NNTP server"); diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/list.c tin-2.4.5/src/list.c --- tin-2.4.4/src/list.c 2019-11-20 14:40:25.000000000 +0100 +++ tin-2.4.5/src/list.c 2020-12-01 11:51:01.267900084 +0100 @@ -6,7 +6,7 @@ * Updated : 2019-01-18 * Notes : Low level functions handling the active[] list and its group_hash index * - * Copyright (c) 1993-2020 Iain Lea + * Copyright (c) 1993-2021 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/lock.c tin-2.4.5/src/lock.c --- tin-2.4.4/src/lock.c 2019-11-20 14:40:25.000000000 +0100 +++ tin-2.4.5/src/lock.c 2020-12-01 11:51:01.275900473 +0100 @@ -6,7 +6,7 @@ * Updated : 2013-11-17 * Notes : * - * Copyright (c) 1998-2020 Urs Janssen + * Copyright (c) 1998-2021 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/mail.c tin-2.4.5/src/mail.c --- tin-2.4.4/src/mail.c 2019-11-20 14:40:25.000000000 +0100 +++ tin-2.4.5/src/mail.c 2020-12-01 11:51:01.287901056 +0100 @@ -6,7 +6,7 @@ * Updated : 2018-02-15 * Notes : Mail handling routines for creating pseudo newsgroups * - * Copyright (c) 1992-2020 Iain Lea + * Copyright (c) 1992-2021 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/main.c tin-2.4.5/src/main.c --- tin-2.4.4/src/main.c 2019-11-20 14:40:25.000000000 +0100 +++ tin-2.4.5/src/main.c 2020-12-01 11:51:01.295901446 +0100 @@ -3,10 +3,10 @@ * Module : main.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2019-07-16 + * Updated : 2020-05-22 * Notes : * - * Copyright (c) 1991-2020 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2021 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -289,7 +289,8 @@ main( read_attributes_file(FALSE); start_groupnum = read_news_active_file(); #ifdef DEBUG - debug_print_active(); + if (debug & DEBUG_MISC) + debug_print_active(); #endif /* DEBUG */ /* @@ -300,7 +301,8 @@ main( no_write = TRUE; #ifdef DEBUG - debug_print_filters(); + if (debug & DEBUG_FILTER) + debug_print_filters(); #endif /* DEBUG */ /* @@ -575,7 +577,7 @@ read_cmd_line_options( /* FALLTHROUGH */ case 'I': - my_strncpy(index_newsdir, optarg, sizeof(index_newsdir) - 1); + joinpath(index_newsdir, sizeof(index_newsdir), optarg, INDEX_NEWSDIR); break; case 'l': @@ -946,6 +948,8 @@ update_index_files( cCOLS = 132; /* set because curses has not started */ create_index_lock_file(lock_file); tinrc.thread_articles = THREAD_NONE; /* stop threading to run faster */ + tinrc.sort_article_type = SORT_ARTICLES_BY_NOTHING; + tinrc.sort_threads_type = SORT_THREADS_BY_NOTHING; do_update(catchup); tin_done(EXIT_SUCCESS, NULL); } diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/makecfg.c tin-2.4.5/src/makecfg.c --- tin-2.4.4/src/makecfg.c 2019-11-20 14:40:26.000000000 +0100 +++ tin-2.4.5/src/makecfg.c 2020-12-01 11:51:01.331903196 +0100 @@ -3,10 +3,10 @@ * Module : makecfg.c * Author : Thomas E. Dickey * Created : 1997-08-23 - * Updated : 2019-02-04 + * Updated : 2020-08-15 * Notes : #defines and structs for options_menu.c * - * Copyright (c) 1997-2020 Thomas E. Dickey + * Copyright (c) 1997-2021 Thomas E. Dickey * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -123,8 +123,13 @@ parse_tbl( char *t = s + strlen(s); /* strip leading/trailing blanks */ - while ((t-- != s) && isspace ((int)*t)) - *t = '\0'; + do { + t--; + if (isspace ((int)*t)) + *t = '\0'; + else + break; + } while (t > s); while (isspace ((int)*s)) s++; buffer = s; diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/memory.c tin-2.4.5/src/memory.c --- tin-2.4.4/src/memory.c 2019-11-20 14:40:26.000000000 +0100 +++ tin-2.4.5/src/memory.c 2020-12-01 11:51:01.359904557 +0100 @@ -3,10 +3,10 @@ * Module : memory.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2018-07-02 + * Updated : 2020-05-19 * Notes : * - * Copyright (c) 1991-2020 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2021 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -139,7 +139,11 @@ expand_art( max_art += max_art >> 1; /* increase by 50% */ arts = my_realloc(arts, sizeof(*arts) * max_art); - for (; i < max_art; i++) /* use memset() instead? */ + /* + * memset(&arts[i].artnum, 0, (max_art - i - 1) * sizeof(*arts)); + * seems to be not faster at all + */ + for (; i < max_art; i++) arts[i].subject = arts[i].from = arts[i].xref = arts[i].path = arts[i].refs = arts[i].msgid = NULL; } @@ -529,7 +533,8 @@ my_malloc1( void *p; #ifdef DEBUG - debug_print_malloc(TRUE, file, line, size); + if (debug & DEBUG_MEM) + debug_print_malloc(TRUE, file, line, size); #endif /* DEBUG */ if ((p = malloc(size)) == NULL) { @@ -553,7 +558,8 @@ my_calloc1( void *p; #ifdef DEBUG - debug_print_malloc(TRUE, file, line, nmemb * size); + if (debug & DEBUG_MEM) + debug_print_malloc(TRUE, file, line, nmemb * size); #endif /* DEBUG */ if ((p = calloc(nmemb, size)) == NULL) { @@ -572,7 +578,8 @@ my_realloc1( size_t size) { #ifdef DEBUG - debug_print_malloc(FALSE, file, line, size); + if (debug & DEBUG_MEM) + debug_print_malloc(FALSE, file, line, size); #endif /* DEBUG */ if (!size) { diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/mimetypes.c tin-2.4.5/src/mimetypes.c --- tin-2.4.4/src/mimetypes.c 2019-11-20 14:40:26.000000000 +0100 +++ tin-2.4.5/src/mimetypes.c 2020-12-01 11:51:01.387905918 +0100 @@ -6,7 +6,7 @@ * Updated : 2019-02-18 * Notes : mime.types handling * - * Copyright (c) 2000-2020 Jason Faultless + * Copyright (c) 2000-2021 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/misc.c tin-2.4.5/src/misc.c --- tin-2.4.4/src/misc.c 2019-11-20 14:40:26.000000000 +0100 +++ tin-2.4.5/src/misc.c 2020-12-01 11:51:01.399906502 +0100 @@ -3,10 +3,10 @@ * Module : misc.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2019-09-19 + * Updated : 2020-07-08 * Notes : * - * Copyright (c) 1991-2020 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2021 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -238,7 +238,13 @@ backup_file( ret = copy_fp(fp_in, fp_out); if ((fd = fileno(fp_out)) != -1) +#ifdef HAVE_FCHMOD fchmod(fd, mode); +#else +# ifdef HAVE_CHMOD + chmod(backupname, mode); +# endif /* HAVE_CHMOD */ +#endif /* HAVE_FCHMOD */ fclose(fp_out); fclose(fp_in); @@ -280,7 +286,7 @@ copy_body( return; } - while(maxlen > 0 && *q) { + while (maxlen > 0 && *q) { if (*q == '%' && *(q + 1) == 'I') { if (maxlen < ilen) /* not enough space left for %I expansion */ break; @@ -739,7 +745,12 @@ rename_file( mode_t mode = (mode_t) (S_IRUSR|S_IWUSR); struct stat statbuf; - unlink(new_filename); + if (unlink(new_filename) == -1) { + if (errno == EPERM) { /* TODO: != ENOENT ? and -> lang.c */ + perror_message(_("Error: unlink %s"), new_filename); + return; + } + } #ifdef HAVE_LINK if (link(old_filename, new_filename) == -1) @@ -766,7 +777,13 @@ rename_file( copy_fp(fp_old, fp_new); if ((fd = fileno(fp_new)) != -1) +#ifdef HAVE_FCHMOD fchmod(fd, mode); +#else +# ifdef HAVE_CHMOD + chmod(new_filename, mode); +# endif /* HAVE_CHMOD */ +#endif /* HAVE_FCHMOD */ fclose(fp_new); fclose(fp_old); @@ -1140,7 +1157,13 @@ create_index_lock_file( giveup(); } if ((fp = fopen(the_lock_file, "w")) != NULL) { +#ifdef HAVE_FCHMOD fchmod(fileno(fp), (mode_t) (S_IRUSR|S_IWUSR)); +#else +# ifdef HAVE_CHMOD + chmod(the_lock_file, (mode_t) (S_IRUSR|S_IWUSR)); +# endif /* HAVE_CHMOD */ +#endif /* HAVE_FCHMOD */ (void) time(&epoch); fprintf(fp, "%6d %s\n", (int) process_id, ctime(&epoch)); if ((err = ferror(fp)) || fclose(fp)) { @@ -2276,8 +2299,13 @@ write_input_history_file( } } } - +#ifdef HAVE_FCHMOD fchmod(fileno(fp), (mode_t) (S_IRUSR|S_IWUSR)); /* rename_file() preserves mode */ +#else +# ifdef HAVE_CHMOD + chmod(file_tmp, (mode_t) (S_IRUSR|S_IWUSR)); /* rename_file() preserves mode */ +# endif /* HAVE_CHMOD */ +#endif /* HAVE_FCHMOD */ if ((his_w = ferror(fp)) || fclose(fp)) { error_message(2, _(txt_filesystem_full), local_input_history_file); @@ -2945,6 +2973,9 @@ gnksa_dequote_plainphrase( int initialstate; /* initial state */ int state; /* current state */ + if (!*realname) + return GNKSA_MISSING_REALNAME; + /* initialize state machine */ switch (addrtype) { case GNKSA_ADDRTYPE_ROUTE: @@ -3369,22 +3400,17 @@ gnksa_split_from( *address = *realname = '\0'; /* copy raw address into work area */ - strncpy(work, from, HEADER_LEN - 2); - work[HEADER_LEN - 2] = '\0'; - work[HEADER_LEN - 1] = '\0'; - - /* skip trailing whitespace */ - addr_end = work + strlen(work) - 1; - while (addr_end >= work && (*addr_end == ' ' || *addr_end == '\t')) - addr_end--; + STRCPY(work, from); + strip_line(work); + strcpy(address, work); - if (addr_end < work) { + if (!*work) { *addrtype = GNKSA_ADDRTYPE_OLDSTYLE; - return GNKSA_LPAREN_MISSING; + return GNKSA_ATSIGN_MISSING; /* GNKSA_LPAREN_MISSING */ } - *(addr_end + 1) = '\0'; - *(addr_end + 2) = '\0'; + /* skip trailing whitespace */ + addr_end = work + strlen(work) - 1; if (*addr_end == '>') { /* route-address used */ @@ -3398,25 +3424,33 @@ gnksa_split_from( if (*addr_begin != '<') /* syntax error in mail address */ return GNKSA_LANGLE_MISSING; - /* copy route address */ *addr_end = *addr_begin = '\0'; + /* copy route address */ strcpy(address, addr_begin + 1); + /* missing realname */ + if (addr_begin == work) + return GNKSA_MISSING_REALNAME; + /* get realname part */ addr_end = addr_begin - 1; addr_begin = work; /* strip surrounding whitespace */ - while (addr_end >= work && (*addr_end == ' '|| *addr_end == '\t')) - addr_end--; - + strip_line(addr_end); while ((*addr_begin == ' ') || (*addr_begin == '\t')) addr_begin++; - *++addr_end = '\0'; +#if 0 /* whitespace only realname */ + strip_line(addr_begin); + if (!strlen(addr_begin)) + return GNKSA_WHITESPACE_REALNAME; + else +#endif /* 0 */ /* copy realname */ strcpy(realname, addr_begin); } else { + size_t l; /* old-style address used */ *addrtype = GNKSA_ADDRTYPE_OLDSTYLE; @@ -3426,22 +3460,32 @@ gnksa_split_from( while ((*addr_begin == ' ') || (*addr_begin == '\t')) addr_begin++; + if (*addr_begin == '<') { + *addrtype = GNKSA_ADDRTYPE_ROUTE; + return GNKSA_RANGLE_MISSING; + } + /* scan forward to next whitespace or null */ + l = strlen(addr_begin); addr_end = addr_begin; + while ((*addr_end != ' ') && (*addr_end != '\t') && (*addr_end)) addr_end++; *addr_end = '\0'; + + if (l == strlen(addr_begin)) + return GNKSA_MISSING_REALNAME; + /* copy route address */ strcpy(address, addr_begin); /* get realname part */ addr_begin = addr_end + 1; - addr_end = addr_begin + strlen(addr_begin) -1; - /* strip surrounding whitespace */ - while ((*addr_end == ' ') || (*addr_end == '\t')) - addr_end--; + addr_end = addr_begin + strlen(addr_begin) - 1; + /* strip surrounding whitespace */ + strip_line(addr_end); while ((*addr_begin == ' ') || (*addr_begin == '\t')) addr_begin++; @@ -3599,12 +3643,19 @@ char * strip_line( char *line) { - char *ptr = line + strlen(line) - 1; + char *ptr; - while ((ptr >= line) && (*ptr == ' ' || *ptr == '\t' || *ptr == '\r' || *ptr == '\n')) - ptr--; + if (!*line) + return line; - *++ptr = '\0'; + ptr = line + strlen(line); + do { + ptr--; + if (*ptr == ' ' || *ptr == '\t' || *ptr == '\r' || *ptr == '\n') + *ptr = '\0'; + else + break; + } while (ptr > line); return line; } @@ -3765,7 +3816,7 @@ idna_decode( return out; #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) -/* IDNA 2008 */ + /* IDNA 2008 */ # if defined(HAVE_LIBIDNKIT) && defined(HAVE_IDN_DECODENAME) { idn_result_t res; @@ -3792,7 +3843,7 @@ idna_decode( } # endif /* HAVE_LIBIDNKIT && HAVE_IDN_DECODENAME */ -/* IDNA 2003 */ + /* IDNA 2003 */ # ifdef HAVE_LIBICUUC { UChar *src; diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/my_tmpfile.c tin-2.4.5/src/my_tmpfile.c --- tin-2.4.4/src/my_tmpfile.c 2019-11-20 14:40:26.000000000 +0100 +++ tin-2.4.5/src/my_tmpfile.c 2020-12-01 11:51:01.427907863 +0100 @@ -6,7 +6,7 @@ * Updated : 2014-05-13 * Notes : * - * Copyright (c) 2001-2020 Urs Janssen + * Copyright (c) 2001-2021 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/newsrc.c tin-2.4.5/src/newsrc.c --- tin-2.4.4/src/newsrc.c 2019-11-20 14:40:26.000000000 +0100 +++ tin-2.4.5/src/newsrc.c 2020-12-01 11:51:01.439908446 +0100 @@ -3,10 +3,10 @@ * Module : newsrc.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2018-11-23 + * Updated : 2020-05-09 * Notes : ArtCount = (ArtMax - ArtMin) + 1 [could have holes] * - * Copyright (c) 1991-2020 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2021 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -224,7 +224,13 @@ write_newsrc( if ((fp_op = fopen(newnewsrc, "w")) != NULL) { if (newsrc_mode) +#ifdef HAVE_FCHMOD fchmod(fileno(fp_op), newsrc_mode); +#else +# ifdef HAVE_CHMOD + chmod(newnewsrc, newsrc_mode); +# endif /* HAVE_CHMOD */ +#endif /* HAVE_FCHMOD */ while ((line = tin_fgets(fp_ip, FALSE)) != NULL) tot += write_newsrc_line(fp_op, line); @@ -341,7 +347,13 @@ auto_subscribe_groups( } if (newsrc_mode) +#ifdef HAVE_FCHMOD fchmod(fileno(fp_newsrc), newsrc_mode); +#else +# ifdef HAVE_CHMOD + chmod(newsrc_file, newsrc_mode); +# endif /* HAVE_CHMOD */ +#endif /* HAVE_FCHMOD */ /* TODO: test me! */ while ((ptr = tin_fgets(fp_subs, FALSE)) != NULL) { @@ -553,7 +565,13 @@ subscribe( return; if (newsrc_mode) +#ifdef HAVE_FCHMOD fchmod(fileno(newfp), newsrc_mode); +#else +# ifdef HAVE_CHMOD + chmod(newnewsrc, newsrc_mode); +# endif /* HAVE_CHMOD */ +#endif /* HAVE_FCHMOD */ if ((fp = fopen(newsrc, "r")) != NULL) { while ((line = tin_fgets(fp, FALSE)) != NULL) { @@ -612,7 +630,13 @@ reset_newsrc( if (!no_write && (newfp = fopen(newnewsrc, "w")) != NULL) { if (newsrc_mode) +#ifdef HAVE_FCHMOD fchmod(fileno(newfp), newsrc_mode); +#else +# ifdef HAVE_CHMOD + chmod(newnewsrc, newsrc_mode); +# endif /* HAVE_CHMOD */ +#endif /* HAVE_FCHMOD */ if ((fp = fopen(newsrc, "r")) != NULL) { while ((line = tin_fgets(fp, FALSE)) != NULL) { @@ -655,7 +679,13 @@ delete_group( if ((newfp = fopen(newnewsrc, "w")) != NULL) { if (newsrc_mode) +#ifdef HAVE_FCHMOD fchmod(fileno(newfp), newsrc_mode); +#else +# ifdef HAVE_CHMOD + chmod(newnewsrc, newsrc_mode); +# endif /* HAVE_CHMOD */ +#endif /* HAVE_FCHMOD */ if ((fp = fopen(newsrc, "r")) != NULL) { while ((line = tin_fgets(fp, FALSE)) != NULL) { @@ -1213,7 +1243,13 @@ pos_group_in_newsrc( newnewsrc_created = TRUE; if (newsrc_mode) +#ifdef HAVE_FCHMOD fchmod(fileno(fp_out), newsrc_mode); +#else +# ifdef HAVE_CHMOD + chmod(newnewsrc, newsrc_mode); +# endif /* HAVE_CHMOD */ +#endif /* HAVE_FCHMOD */ joinpath(filename, sizeof(filename), TMPDIR, ".subrc"); snprintf(sub, sizeof(sub), "%s.%ld", filename, (long) process_id); diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/nntplib.c tin-2.4.5/src/nntplib.c --- tin-2.4.4/src/nntplib.c 2019-11-20 14:40:26.000000000 +0100 +++ tin-2.4.5/src/nntplib.c 2020-12-01 11:51:01.463909613 +0100 @@ -1469,7 +1469,7 @@ nntp_open( # endif /* DEBUG */ put_server("MODE READER"); switch (get_only_respcode(buf, sizeof(buf))) { - /* just honor ciritical errors */ + /* just honor critical errors */ case ERR_GOODBYE: case ERR_ACCESS: error_message(2, "%s", buf); diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/nrctbl.c tin-2.4.5/src/nrctbl.c --- tin-2.4.4/src/nrctbl.c 2019-11-20 14:40:26.000000000 +0100 +++ tin-2.4.5/src/nrctbl.c 2020-12-01 11:51:01.471910002 +0100 @@ -3,13 +3,13 @@ * Module : nrctbl.c * Author : Sven Paulus * Created : 1996-10-06 - * Updated : 2019-07-08 + * Updated : 2020-04-23 * Notes : This module does the NNTP server name lookup in * ~/.tin/newsrctable and returns the real hostname * and the name of the newsrc file for a given * alias of the server. * - * Copyright (c) 1996-2020 Sven Paulus + * Copyright (c) 1996-2021 Sven Paulus * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -72,7 +72,13 @@ write_newsrctable_file( return; fprintf(fp, _(txt_nrctbl_info), PRODUCT, VERSION); +#ifdef HAVE_FCHMOD fchmod(fileno(fp), (mode_t) (S_IRUSR|S_IWUSR)); +#else +# ifdef HAVE_CHMOD + chmod(local_newsrctable_file, (mode_t) (S_IRUSR|S_IWUSR)); +# endif /* HAVE_CHMOD */ +#endif /* HAVE_FCHMOD */ fclose(fp); } diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/options_menu.c tin-2.4.5/src/options_menu.c --- tin-2.4.4/src/options_menu.c 2019-11-20 14:40:26.000000000 +0100 +++ tin-2.4.5/src/options_menu.c 2020-12-01 11:51:01.491910975 +0100 @@ -3,10 +3,10 @@ * Module : options_menu.c * Author : Michael Bienia * Created : 2004-09-05 - * Updated : 2019-06-05 + * Updated : 2020-06-10 * Notes : Split from config.c * - * Copyright (c) 2004-2020 Michael Bienia + * Copyright (c) 2004-2021 Michael Bienia * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -2167,13 +2167,8 @@ config_page( break; case OPT_POSTED_ARTICLES_FILE: - if (prompt_option_string(option)) { - char buf[PATH_LEN]; - - strfpath(tinrc.posted_articles_file, buf, sizeof(buf), &CURR_GROUP, TRUE); - STRCPY(tinrc.posted_articles_file, buf); + if (prompt_option_string(option)) /* no expansion here, will be done in post_loop() */ changed |= MISC_OPTS; - } break; #ifdef HAVE_COLOR diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/page.c tin-2.4.5/src/page.c --- tin-2.4.4/src/page.c 2019-11-20 14:40:26.000000000 +0100 +++ tin-2.4.5/src/page.c 2020-12-17 16:54:05.168007429 +0100 @@ -6,7 +6,7 @@ * Updated : 2019-07-10 * Notes : * - * Copyright (c) 1991-2020 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2021 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -1295,7 +1295,7 @@ invoke_metamail( fseek(fp, offset, SEEK_SET); /* goto old position */ #ifdef DONT_HAVE_PIPING - snprintf(buf, sizeof(buf) -1, "%s %s", tinrc.metamail_prog, mimefile); + snprintf(buf, sizeof(buf) - 1, "%s %s", tinrc.metamail_prog, mimefile); invoke_cmd(buf); fclose(mime_fp); unlink(mimefile); @@ -1373,15 +1373,15 @@ draw_page_header( if (right_len > cCOLS / 3 + 1) right_len = cCOLS / 3 + 1; +# ifdef HAVE_COLOR + fcol(tinrc.col_head); +# endif /* HAVE_COLOR */ + /* * first line */ cur_pos = 0; -# ifdef HAVE_COLOR - fcol(tinrc.col_head); -# endif /* HAVE_COLOR */ - /* date */ if ((wtmp = char2wchar_t(buf)) != NULL) { my_fputws(wtmp, stdout); @@ -1441,10 +1441,6 @@ draw_page_header( */ cur_pos = 0; -# ifdef HAVE_COLOR - fcol(tinrc.col_head); -# endif /* HAVE_COLOR */ - /* line count */ if (arts[this_resp].line_count < 0) strcpy(buf, "?"); @@ -1487,6 +1483,8 @@ draw_page_header( * TODO: why do we fall back to arts[this_resp].subject if !note_h->subj? * if !note_h->subj then the article just has no subject, no matter * what the overview says. + * + * add BiDi handling */ strncpy(buf, (note_h->subj ? note_h->subj : arts[this_resp].subject), line_len); buf[line_len - 1] = '\0'; @@ -1549,6 +1547,8 @@ draw_page_header( * TODO: don't use arts[this_resp].name/arts[this_resp].from * split up note_h->from and use that instead as it might * be different _if_ the overviews are broken + * + * add BiDi handling */ { char *p = idna_decode(arts[this_resp].from); @@ -1575,6 +1575,7 @@ draw_page_header( * * TODO: IDNA decoding, see also comment in * cook.c:cook_article() + * add BiDi handling */ if (note_h->org) { snprintf(buf, line_len, _(txt_at_s), note_h->org); @@ -1605,15 +1606,15 @@ draw_page_header( */ right_len = MAX((strlen(_(txt_thread_x_of_n)) - 6 + 8), (strlen(_(txt_art_x_of_n)) - 6 + 8)); +# ifdef HAVE_COLOR + fcol(tinrc.col_head); +# endif /* HAVE_COLOR */ + /* * first line */ cur_pos = 0; -# ifdef HAVE_COLOR - fcol(tinrc.col_head); -# endif /* HAVE_COLOR */ - /* date */ my_fputs(buf, stdout); cur_pos += strlen(buf); @@ -1664,10 +1665,6 @@ draw_page_header( */ cur_pos = 0; -# ifdef HAVE_COLOR - fcol(tinrc.col_head); -# endif /* HAVE_COLOR */ - /* line count */ /* an accurate line count will appear in the footer anymay */ if (arts[this_resp].line_count < 0) diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/pgp.c tin-2.4.5/src/pgp.c --- tin-2.4.4/src/pgp.c 2019-11-20 14:40:26.000000000 +0100 +++ tin-2.4.5/src/pgp.c 2020-12-01 11:51:01.535913114 +0100 @@ -6,7 +6,7 @@ * Updated : 2017-03-28 * Notes : PGP support * - * Copyright (c) 1995-2020 Steven J. Madsen + * Copyright (c) 1995-2021 Steven J. Madsen * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/post.c tin-2.4.5/src/post.c --- tin-2.4.4/src/post.c 2019-11-20 14:40:26.000000000 +0100 +++ tin-2.4.5/src/post.c 2020-12-01 11:51:01.559914281 +0100 @@ -3,10 +3,10 @@ * Module : post.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2019-07-09 + * Updated : 2020-09-23 * Notes : mail/post/replyto/followup/repost & cancel articles * - * Copyright (c) 1991-2020 Iain Lea + * Copyright (c) 1991-2021 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -138,6 +138,7 @@ static FILE *create_mail_headers(char *f static char **build_nglist(char *ngs_list, int *ngcnt); static char **split_address_list(const char *addresses, unsigned int *cnt); static int add_mail_quote(FILE *fp, int respnum); +static int append_mail(const char *the_article, const char *addr, const char *the_mailbox); static int check_article_to_be_posted(const char *the_article, int art_type, struct t_group **group, t_bool art_unchanged, t_bool use_cache); static int mail_loop(const char *filename, t_function func, char *subject, const char *groupname, const char *prompt, FILE *articlefp); static int msg_add_x_body(FILE *fp_out, const char *body); @@ -147,7 +148,6 @@ static unsigned int get_recipients(struc static size_t skip_id(const char *id); static struct t_group *check_moderated(const char *groups, int *art_type, const char *failmsg); static t_bool address_in_list(const char *addresses, const char *address); -static t_bool append_mail(const char *the_article, const char *addr, const char *the_mailbox); static t_bool backup_article(const char *the_article); static t_bool check_for_spamtrap(const char *addr); static t_bool create_normal_article_headers(struct t_group *group, const char *newsgroups, int art_type); @@ -622,7 +622,7 @@ update_posted_info_file( * appends the content of the_article to the_mailbox, with a From_ line of * addr, does mboxo/mboxrd From_ line quoting if needed (!MMDF-style mbox) */ -static t_bool +static int append_mail( const char *the_article, const char *addr, @@ -633,7 +633,7 @@ append_mail( char buf[LEN]; time_t epoch; t_bool mmdf = FALSE; - t_bool rval = FALSE; + int rval; #ifndef NO_LOCKING int fd; unsigned int retrys = 11; /* maximum lock retrys + 1 */ @@ -643,14 +643,15 @@ append_mail( mmdf = TRUE; if ((fp_in = fopen(the_article, "r")) == NULL) - return rval; + return errno; if ((fp_out = fopen(the_mailbox, "a+")) != NULL) { #ifndef NO_LOCKING fd = fileno(fp_out); - /* TODO: move the retry/error stuff into a function? */ - while (--retrys && fd_lock(fd, FALSE)) + + while ((rval = fd_lock(fd, FALSE)) && --retrys) wait_message(1, _(txt_trying_lock), retrys, the_mailbox); + if (!retrys) { wait_message(5, _(txt_error_couldnt_lock), the_mailbox); fclose(fp_out); @@ -658,14 +659,16 @@ append_mail( return rval; } retrys++; + while (--retrys && !dot_lock(the_mailbox)) wait_message(1, _(txt_trying_dotlock), retrys, the_mailbox); + if (!retrys) { wait_message(5, _(txt_error_couldnt_dotlock), the_mailbox); fd_unlock(fd); fclose(fp_out); fclose(fp_in); - return rval; + return ENOENT; /* FIXME! dot_lock() doesn't return more info yet */ } #endif /* !NO_LOCKING */ @@ -699,13 +702,14 @@ append_mail( fflush(fp_out); #ifndef NO_LOCKING - if (fd_unlock(fd) || !dot_unlock(the_mailbox)) + if ((rval = fd_unlock(fd)) || !dot_unlock(the_mailbox)) wait_message(4, _(txt_error_cant_unlock), the_mailbox); #endif /* !NO_LOCKING */ fclose(fp_out); - rval = TRUE; - } + } else + rval = errno; + fclose(fp_in); return rval; } @@ -959,9 +963,11 @@ check_article_to_be_posted( #else cp2 = rfc1522_encode(line, tinrc.mm_charset, FALSE); #endif /* CHARSET_CONVERSION */ - if ((i = gnksa_check_from(cp2 + (cp - line) + 1)) != GNKSA_OK) { + i = gnksa_check_from(cp2 + (cp - line) + 1); + if (i > GNKSA_OK && i < GNKSA_MISSING_REALNAME) { StartInverse(); my_fprintf(stderr, "%s", _(txt_error_bad_approved)); + my_fprintf(stderr, "%s\n", cp2); my_fprintf(stderr, gnksa_strerror(i), i); EndInverse(); my_fflush(stderr); @@ -979,9 +985,11 @@ check_article_to_be_posted( #else cp2 = rfc1522_encode(line, tinrc.mm_charset, FALSE); #endif /* CHARSET_CONVERSION */ - if ((i = gnksa_check_from(cp2 + (cp - line) + 1)) != GNKSA_OK) { + i = gnksa_check_from(cp2 + (cp - line) + 1); + if (i > GNKSA_OK && i < GNKSA_MISSING_REALNAME) { StartInverse(); my_fprintf(stderr, "%s", _(txt_error_bad_from)); + my_fprintf(stderr, "%s\n", cp2); my_fprintf(stderr, gnksa_strerror(i), i); EndInverse(); my_fflush(stderr); @@ -998,9 +1006,11 @@ check_article_to_be_posted( #else cp2 = rfc1522_encode(line, tinrc.mm_charset, FALSE); #endif /* CHARSET_CONVERSION */ - if ((i = gnksa_check_from(cp2 + (cp - line) + 1)) != GNKSA_OK) { + i = gnksa_check_from(cp2 + (cp - line) + 1); + if (i > GNKSA_OK && i < GNKSA_MISSING_REALNAME) { StartInverse(); my_fprintf(stderr, "%s", _(txt_error_bad_replyto)); + my_fprintf(stderr, "%s\n", cp2); my_fprintf(stderr, gnksa_strerror(i), i); EndInverse(); my_fflush(stderr); @@ -1017,9 +1027,11 @@ check_article_to_be_posted( #else cp2 = rfc1522_encode(line, tinrc.mm_charset, FALSE); #endif /* CHARSET_CONVERSION */ - if ((i = gnksa_check_from(cp2 + (cp - line) + 1)) != GNKSA_OK) { + i = gnksa_check_from(cp2 + (cp - line) + 1); + if (i > GNKSA_OK && i < GNKSA_MISSING_REALNAME) { StartInverse(); my_fprintf(stderr, "%s", _(txt_error_bad_to)); + my_fprintf(stderr, "%s\n", cp2); my_fprintf(stderr, gnksa_strerror(i), i); EndInverse(); my_fflush(stderr); @@ -1046,6 +1058,7 @@ check_article_to_be_posted( { StartInverse(); my_fprintf(stderr, "%s", _(txt_error_bad_msgidfqdn)); + my_fprintf(stderr, "%s\n", line); my_fprintf(stderr, gnksa_strerror(i), i); EndInverse(); my_fflush(stderr); @@ -2054,20 +2067,29 @@ post_article_done: my_strncpy(tinrc.default_post_subject, header.subj, sizeof(tinrc.default_post_subject) - 1); } - if (*tinrc.posted_articles_file && type != POST_REPOST) { - char a_mailbox[LEN]; + if (*tinrc.posted_articles_file && type != POST_REPOST) { /* TODO: either document the !POST_REPOST logic or remove it */ + char a_mailbox[PATH_LEN]; char posted_msgs_file[PATH_LEN]; - joinpath(posted_msgs_file, sizeof(posted_msgs_file), (cmdline.args & CMDLINE_MAILDIR) ? cmdline.maildir : (group ? group->attribute->maildir : tinrc.maildir), tinrc.posted_articles_file); + if (!strfpath(tinrc.posted_articles_file, posted_msgs_file, sizeof(posted_msgs_file), group, TRUE)) + STRCPY(posted_msgs_file, tinrc.posted_articles_file); + else { + if (!strcmp(tinrc.posted_articles_file, posted_msgs_file)) /* only prefix tinrc.posted_articles_file if it was a plain file without path */ + joinpath(posted_msgs_file, sizeof(posted_msgs_file), (cmdline.args & CMDLINE_MAILDIR) ? cmdline.maildir : (group ? group->attribute->maildir : tinrc.maildir), tinrc.posted_articles_file); + } + + /* re-strfpath as maildir may also need expansion */ + if (!strfpath(posted_msgs_file, a_mailbox, sizeof(a_mailbox), group, TRUE)) + STRCPY(a_mailbox, posted_msgs_file); + /* * log Message-ID if given in a_message_id, - * add Date:, remove empty headers + * add Date: if required, remove empty headers */ add_headers(article_name, a_message_id); - if (!strfpath(posted_msgs_file, a_mailbox, sizeof(a_mailbox), group, TRUE)) - STRCPY(a_mailbox, posted_msgs_file); - if (!append_mail(article_name, userid, a_mailbox)) { - /* TODO: error handling */ + + if ((errno = append_mail(article_name, userid, a_mailbox))) { + perror_message(_(txt_cannot_open_for_saving), a_mailbox); } } free_and_init_header(&header); @@ -2196,7 +2218,13 @@ create_normal_article_headers( return FALSE; } +#ifdef HAVE_FCHMOD fchmod(fileno(fp), (mode_t) (S_IRUSR|S_IWUSR)); +#else +# ifdef HAVE_CHMOD + chmod(article_name, (mode_t) (S_IRUSR|S_IWUSR)); +# endif /* HAVE_CHMOD */ +#endif /* HAVE_FCHMOD */ get_from_name(from_name, group); #ifdef FORGERY @@ -2520,9 +2548,8 @@ pickup_postponed_articles( case PROMPT_NO: case GLOBAL_QUIT: case GLOBAL_ABORT: - if (!append_mail(article_name, userid, postponed_articles_file)) { - /* TODO: error handling */ - } + if ((errno = append_mail(article_name, userid, postponed_articles_file))) + perror_message(_(txt_cannot_open_for_saving), postponed_articles_file); unlink(article_name); if (func != PROMPT_NO) return TRUE; @@ -2541,9 +2568,8 @@ postpone_article( const char *the_article) { wait_message(3, _(txt_info_do_postpone)); - if (!append_mail(the_article, userid, postponed_articles_file)) { - /* TODO: error handling */ - } + if ((errno = append_mail(the_article, userid, postponed_articles_file))) + perror_message(_(txt_cannot_open_for_saving), postponed_articles_file); } @@ -2968,7 +2994,13 @@ post_response( return ret_code; } +#ifdef HAVE_FCHMOD fchmod(fileno(fp), (mode_t) (S_IRUSR|S_IWUSR)); +#else +# ifdef HAVE_CHMOD + chmod(article_name, (mode_t) (S_IRUSR|S_IWUSR)); +# endif /* HAVE_CHMOD */ +#endif /* HAVE_FCHMOD */ group = group_find(groupname, FALSE); get_from_name(from_name, group); @@ -3140,7 +3172,13 @@ create_mail_headers( return NULL; } +#ifdef HAVE_FCHMOD fchmod(fileno(fp), (mode_t) (S_IRUSR|S_IWUSR)); +#else +# ifdef HAVE_CHMOD + chmod(filename, (mode_t) (S_IRUSR|S_IWUSR)); +# endif /* HAVE_CHMOD */ +#endif /* HAVE_FCHMOD */ if ((INTERACTIVE_NONE == tinrc.interactive_mailer) || (INTERACTIVE_WITH_HEADERS == tinrc.interactive_mailer)) { /* tin should include headers for editing */ char from_buf[HEADER_LEN]; @@ -3854,7 +3892,13 @@ cancel_article( return redraw_screen; } +#ifdef HAVE_FCHMOD fchmod(fileno(fp), (mode_t) (S_IRUSR|S_IWUSR)); +#else +# ifdef HAVE_CHMOD + chmod(cancel, (mode_t) (S_IRUSR|S_IWUSR)); +# endif /* HAVE_CHMOD */ +#endif /* HAVE_FCHMOD */ #ifdef FORGERY if (!author) { @@ -4080,7 +4124,13 @@ repost_article( perror_message(_(txt_cannot_open), article_name); return ret_code; } +#ifdef HAVE_FCHMOD fchmod(fileno(fp), (mode_t) (S_IRUSR|S_IWUSR)); +#else +# ifdef HAVE_CHMOD + chmod(article_name, (mode_t) (S_IRUSR|S_IWUSR)); +# endif /* HAVE_CHMOD */ +#endif /* HAVE_FCHMOD */ get_from_name(from_name, group); get_user_info(user_name, full_name); @@ -4472,14 +4522,14 @@ checknadd_headers( #if defined(HAVE_SYS_UTSNAME_H) && defined(HAVE_UNAME) if (*system_info.release) { # ifdef _AIX - snprintf(suffix, sizeof(suffix), " (%s/%s.%s)", + snprintf(suffix, sizeof(suffix), "(%s/%s.%s)", system_info.sysname, system_info.version, system_info.release); # else # if defined(SEIUX) || defined(__riscos) - snprintf(suffix, sizeof(suffix), " (%s/%s)", + snprintf(suffix, sizeof(suffix), "(%s/%s)", system_info.version, system_info.release); # else - snprintf(suffix, sizeof(suffix), " (%s/%s (%s))", + snprintf(suffix, sizeof(suffix), "(%s/%s (%s))", system_info.sysname, system_info.release, system_info.machine); # endif /* SEIUX || __riscos */ # endif /* _AIX */ @@ -4487,7 +4537,7 @@ checknadd_headers( #endif /* HAVE_SYS_UTSNAME_H && HAVE_UNAME */ #ifdef SYSTEM_NAME if (!*suffix && strlen(SYSTEM_NAME)) - snprintf(suffix, sizeof(suffix), " (%s)", SYSTEM_NAME); + snprintf(suffix, sizeof(suffix), "(%s)", SYSTEM_NAME); #endif /* SYSTEM_NAME */ fprintf(fp_out, "User-Agent: %s/%s-%s (\"%s\") %s\n", @@ -4515,6 +4565,7 @@ insert_from_header( char *p; char from_name[HEADER_LEN]; char outfile[PATH_LEN]; + int r; t_bool from_found = FALSE; t_bool in_header = TRUE; @@ -4551,7 +4602,8 @@ insert_from_header( # else p = rfc1522_encode(from_buff, tinrc.mm_charset, TRUE); # endif /* CHARSET_CONVERSION */ - if (gnksa_check_from(p) != GNKSA_OK) { /* error in address */ + r = gnksa_check_from(p); + if (r > GNKSA_OK && r < GNKSA_MISSING_REALNAME) { /* error in address */ error_message(2, _(txt_invalid_from), from_buff); free(p); unlink(outfile); @@ -4569,7 +4621,8 @@ insert_from_header( # else p = rfc1522_encode(from_name, tinrc.mm_charset, FALSE); # endif /* CHARSET_CONVERSION */ - if (gnksa_check_from(p + 6) != GNKSA_OK) { /* error in address */ + r = gnksa_check_from(p + 6); + if (r > GNKSA_OK && r < GNKSA_MISSING_REALNAME) { /* error in address */ error_message(2, _(txt_invalid_from), from_name + 6); free(p); unlink(outfile); @@ -4777,9 +4830,8 @@ submit_mail_file( if (!strfpath(fcc, a_mailbox, sizeof(a_mailbox), group, TRUE)) STRCPY(a_mailbox, fcc); - if (!append_mail(file, userid, a_mailbox)) { - /* TODO: error handling */ - } + if ((errno = append_mail(file, userid, a_mailbox))) + perror_message(_(txt_cannot_open_for_saving), a_mailbox); } FreeIfNeeded(fcc); } @@ -5238,7 +5290,13 @@ get_secret( # ifdef DEBUG error_message(4, _(txt_error_insecure_permissions), path_secret, statbuf.st_mode); # else +# ifdef HAVE_FCHMOD fchmod(fd, S_IRUSR|S_IWUSR); +# else +# ifdef HAVE_CHMOD + chmod(path_secret, S_IRUSR|S_IWUSR); +# endif /* HAVE_CHMOD */ +# endif /* HAVE_FCHMOD */ # endif /* DEBUG */ } # endif /* !FILE_MODE_BROKEN */ @@ -5257,7 +5315,7 @@ get_secret( /* - * adds Message-ID- and Date-Header to infile, removes empty headers + * adds Message-ID- and Date-header to infile, removes empty headers */ static void add_headers( diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/prompt.c tin-2.4.5/src/prompt.c --- tin-2.4.4/src/prompt.c 2019-11-20 14:40:26.000000000 +0100 +++ tin-2.4.5/src/prompt.c 2020-12-01 11:51:01.579915253 +0100 @@ -6,7 +6,7 @@ * Updated : 2017-10-18 * Notes : * - * Copyright (c) 1991-2020 Iain Lea + * Copyright (c) 1991-2021 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/read.c tin-2.4.5/src/read.c --- tin-2.4.4/src/read.c 2019-11-20 14:40:26.000000000 +0100 +++ tin-2.4.5/src/read.c 2020-12-01 11:51:01.587915642 +0100 @@ -3,9 +3,9 @@ * Module : read.c * Author : Jason Faultless * Created : 1997-04-10 - * Updated : 2019-03-12 + * Updated : 2020-05-27 * - * Copyright (c) 1997-2020 Jason Faultless + * Copyright (c) 1997-2021 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -65,12 +65,9 @@ static int offset = 0; * local prototypes */ static char *tin_read(char *buffer, size_t len, FILE *fp, t_bool header); -#if defined(NNTP_ABLE) && defined(HAVE_SELECT) - static t_bool wait_for_input(void); -#endif /* NNTP_ABLE && HAVE_SELECT */ -#if defined(NNTP_ABLE) && defined(HAVE_SELECT) +#ifdef HAVE_SELECT /* * Used by the I/O read routine to look for keyboard input * Returns TRUE if user aborted with 'q' or 'z' (lynx-style) @@ -78,7 +75,7 @@ static char *tin_read(char *buffer, size * TODO: document 'z' (, and allow it's remapping?) and 'Q' * add a !HAVE_SELECT code path */ -static t_bool +t_bool wait_for_input( void) { @@ -169,7 +166,7 @@ wait_for_input( } } -#endif /* NNTP_ABLE && HAVE_SELECT */ +#endif /* HAVE_SELECT */ /* diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/refs.c tin-2.4.5/src/refs.c --- tin-2.4.4/src/refs.c 2019-11-20 14:40:26.000000000 +0100 +++ tin-2.4.5/src/refs.c 2020-12-01 11:51:01.619917197 +0100 @@ -3,12 +3,12 @@ * Module : refs.c * Author : Jason Faultless * Created : 1996-05-09 - * Updated : 2017-03-28 + * Updated : 2020-05-13 * Notes : Caching of message ids / References based threading * Credits : Richard Hodson * hash_msgid, free_msgid * - * Copyright (c) 1996-2020 Jason Faultless + * Copyright (c) 1996-2021 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -592,7 +592,7 @@ dump_thread( /* * Dump the current article */ - sprintf(ptr, "%3d %*s", msgid->article, 2*level, " "); + sprintf(ptr, "%3d %*s", msgid->article, 2 * level, " "); len = strlen(ptr); i = cCOLS - len - 20; @@ -982,6 +982,7 @@ void build_references( struct t_group *group) { + static char msg[LEN]; char *s; int i; struct t_article *art; @@ -1011,6 +1012,7 @@ build_references( * Add the Message-ID headers to the cache, using the last Reference * as the parent */ + snprintf(msg, sizeof(msg), _("Building References-trees (%d/%d)..."), 1, 2); /* TODO: -> lang.c */ for_each_art(i) { art = &arts[i]; @@ -1060,6 +1062,9 @@ build_references( art->refptr->article = i; FreeAndNull(art->msgid); /* Now cached - discard this */ + + if (i % (MODULO_COUNT_NUM * 20) == 0) + show_progress(msg, i, top_art); } #ifdef DEBUG @@ -1069,6 +1074,7 @@ build_references( /* * Add the References data to the cache */ + snprintf(msg, sizeof(msg), _("Building References-trees (%d/%d)..."), 2, 2); /* TODO: -> lang.c */ for_each_art(i) { if (!arts[i].refs) /* No refs - skip */ continue; @@ -1086,6 +1092,9 @@ build_references( add_msgid(REF_REF, art->refptr->parent->txt, refs); FreeAndNull(art->refs); + + if (i % (MODULO_COUNT_NUM * 20) == 0) + show_progress(msg, i, top_art); } #ifdef DEBUG diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/regex.c tin-2.4.5/src/regex.c --- tin-2.4.4/src/regex.c 2019-11-20 14:40:26.000000000 +0100 +++ tin-2.4.5/src/regex.c 2020-12-01 11:51:01.631917781 +0100 @@ -7,7 +7,7 @@ * Notes : Regular expression subroutines * Credits : * - * Copyright (c) 1997-2020 Jason Faultless + * Copyright (c) 1997-2021 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/rfc1524.c tin-2.4.5/src/rfc1524.c --- tin-2.4.4/src/rfc1524.c 2019-11-20 14:40:26.000000000 +0100 +++ tin-2.4.5/src/rfc1524.c 2020-12-01 11:51:01.639918170 +0100 @@ -6,7 +6,7 @@ * Updated : 2018-11-25 * Notes : mailcap parsing as defined in RFC 1524 * - * Copyright (c) 2000-2020 Urs Janssen , Jason Faultless + * Copyright (c) 2000-2021 Urs Janssen , Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/rfc2045.c tin-2.4.5/src/rfc2045.c --- tin-2.4.4/src/rfc2045.c 2019-11-20 14:40:26.000000000 +0100 +++ tin-2.4.5/src/rfc2045.c 2020-12-01 11:51:01.651918753 +0100 @@ -6,7 +6,7 @@ * Updated : 2018-11-22 * Notes : RFC 2045/2047 encoding * - * Copyright (c) 1995-2020 Chris Blum + * Copyright (c) 1995-2021 Chris Blum * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -286,7 +286,7 @@ put_rest( } if (c == '\n') { /* Look for CRLF spread over two lines. */ - if (put_chars && (*line)[put_chars -1] == '\r') + if (put_chars && (*line)[put_chars - 1] == '\r') --put_chars; /* * FIXME: Adding a newline may be not correct. At least it may diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/rfc2046.c tin-2.4.5/src/rfc2046.c --- tin-2.4.4/src/rfc2046.c 2019-11-20 14:40:26.000000000 +0100 +++ tin-2.4.5/src/rfc2046.c 2020-12-17 17:10:53.739278483 +0100 @@ -3,10 +3,10 @@ * Module : rfc2046.c * Author : Jason Faultless * Created : 2000-02-18 - * Updated : 2019-10-25 + * Updated : 2020-12-17 * Notes : RFC 2046 MIME article parsing * - * Copyright (c) 2000-2020 Jason Faultless + * Copyright (c) 2000-2021 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -153,7 +153,7 @@ boundary_cmp( /* remove trailing whites as per RFC 2046 5.1.1 */ l = my_strdup(line); e = l + len - 1; - while(e > l + blen + 1 && isspace(*e)) + while (e > l + blen + 1 && isspace(*e)) *e-- = '\0'; len = strlen(l); @@ -1250,8 +1250,11 @@ parse_multipart_article( case M_HDR: switch (bnd) { - case BOUND_START: /* TODO: skip error message if not -DDEBUG? */ - error_message(2, _(txt_error_mime_start)); + case BOUND_START: +#ifdef DEBUG + if (debug & DEBUG_MISC) + error_message(2, _(txt_error_mime_start)); +#endif /* DEBUG */ continue; case BOUND_NONE: @@ -1456,6 +1459,12 @@ parse_rfc2045_article( if ((ret = parse_rfc822_headers(&artinfo->hdr, infile, artinfo->raw)) != 0) goto error; + /* no article data returned, just a '.' after 220er response */ + if (ret == 0 && artinfo->hdr.ext->offset == 0) { + ret = ART_UNAVAILABLE; + goto error; + } + /* * Is this a MIME article ? * We don't bother to parse all plain text articles @@ -1465,8 +1474,10 @@ parse_rfc2045_article( /* Strip off EOF condition if present */ if (ret & TIN_EOF) { ret ^= TIN_EOF; - /* TODO: skip error message if not -DDEBUG? */ - error_message(2, _(txt_error_mime_end), content_types[artinfo->hdr.ext->type], artinfo->hdr.ext->subtype); +#ifdef DEBUG + if (debug & DEBUG_MISC) + error_message(2, _(txt_error_mime_end), content_types[artinfo->hdr.ext->type], artinfo->hdr.ext->subtype); +#endif /* DEBUG */ if (ret != 0) goto error; } else @@ -1566,7 +1577,7 @@ art_open( progress_mesg = pmesg; if (parse_rfc2045_article(fp, art->line_count, artinfo, show_progress_meter) != 0) { progress_mesg = NULL; - return ART_ABORT; + return ((tin_errno == 0) ? ART_UNAVAILABLE : ART_ABORT); } progress_mesg = NULL; diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/rfc2047.c tin-2.4.5/src/rfc2047.c --- tin-2.4.4/src/rfc2047.c 2019-11-20 14:40:26.000000000 +0100 +++ tin-2.4.5/src/rfc2047.c 2020-12-01 11:51:01.671919726 +0100 @@ -6,7 +6,7 @@ * Updated : 2019-07-08 * Notes : MIME header encoding/decoding stuff * - * Copyright (c) 1995-2020 Chris Blum + * Copyright (c) 1995-2021 Chris Blum * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/save.c tin-2.4.5/src/save.c --- tin-2.4.4/src/save.c 2019-11-20 14:40:26.000000000 +0100 +++ tin-2.4.5/src/save.c 2020-12-01 11:51:01.683920309 +0100 @@ -3,10 +3,10 @@ * Module : save.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2019-06-05 + * Updated : 2020-04-23 * Notes : * - * Copyright (c) 1991-2020 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2021 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -1002,7 +1002,13 @@ post_process_uud( if (!(mode &= ~(S_ISUID|S_ISGID|S_ISVTX))) mode = (S_IRUSR|S_IWUSR); +#ifdef HAVE_FCHMOD fchmod(fileno(fp_out), mode); +#else +# ifdef HAVE_CHMOD + chmod(path, mode); +# endif /* HAVE_CHMOD */ +#endif /* HAVE_FCHMOD */ fclose(fp_out); fp_out = NULL; @@ -1340,8 +1346,8 @@ decode_save_one( * View the attachment */ if ((postproc && curr_group->attribute->post_process_view) || !curr_group->attribute->ask_for_metamail) { - start_viewer(part, savepath); - my_printf(cCRLF); + start_viewer(part, savepath); + my_printf(cCRLF); } else { snprintf(buf, sizeof(buf), _(txt_view_attachment), savepath, content_types[part->type], part->subtype); if ((i = prompt_yn(buf, TRUE)) == 1) @@ -1522,7 +1528,7 @@ decode_save_mime( * the role of a multipart part. Check to see if we want to * save text and if not, skip this part. */ - /* check_save_mime_type() is done in decode_save_one() and the check for ptr->uue must be done unconditionally */ + /* check_save_mime_type() is done in decode_save_one() and the check for ptr->uue must be done unconditionally */ if (ptr->type == TYPE_MULTIPART || (NULL != ptr->uue /* && !check_save_mime_type(ptr, curr_group->attribute->mime_types_to_save) */ )) continue; diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/screen.c tin-2.4.5/src/screen.c --- tin-2.4.4/src/screen.c 2019-11-20 14:40:26.000000000 +0100 +++ tin-2.4.5/src/screen.c 2020-12-01 11:51:01.695920892 +0100 @@ -3,10 +3,10 @@ * Module : screen.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2019-01-17 + * Updated : 2020-06-23 * Notes : * - * Copyright (c) 1991-2020 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2021 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -260,11 +260,22 @@ center_line( t_bool inverse, const char *str) { + char *ln; int pos; int len; len = strwidth(str); +#if defined(HAVE_LIBICUUC) && defined(MULTIBYTE_ABLE) && defined(HAVE_UNICODE_UBIDI_H) && !defined(NO_LOCALE) + if (tinrc.render_bidi && IS_LOCAL_CHARSET("UTF-8") && len > 1) { + t_bool is_rtl; + + if ((ln = render_bidi(str, &is_rtl)) == NULL) + ln = my_strdup(str); + } else +#endif /* HAVE_LIBICUUC && MULTIBYTE_ABLE && HAVE_UNICODE_UBIDI_H && !NO_LOCALE */ + ln = my_strdup(str); + if (!cmd_line) { if (cCOLS >= len) pos = (cCOLS - len) / 2; @@ -281,11 +292,11 @@ center_line( if (len >= cCOLS) { char *buffer; - buffer = strunc(str, cCOLS - 2); + buffer = strunc(ln, cCOLS - 2); my_fputs(buffer, stdout); free(buffer); } else - my_fputs(str, stdout); + my_fputs(ln, stdout); if (cmd_line) my_flush(); @@ -293,6 +304,7 @@ center_line( if (inverse) EndInverse(); } + free(ln); } @@ -484,10 +496,10 @@ show_progress( time_t curr_time; static char last_display[LEN]; static int last_ratio; + static t_artnum last_count; static t_artnum last_total; static time_t last_update; #if defined(HAVE_CLOCK_GETTIME) || defined(HAVE_GETTIMEOFDAY) - static t_artnum last_count; static int average; static int samples; static int last_secs_left; @@ -504,7 +516,7 @@ show_progress( return; /* If this is a new progress meter, start recalculating */ - if ((last_total != total) || (count == 1)) { + if ((last_total != total) || (count <= last_count)) { last_ratio = -1; last_display[0] = '\0'; last_update = time(NULL) - 2; @@ -586,7 +598,6 @@ show_progress( } free(display_format); - last_count = count; tin_gettime(&last_time); #else snprintf(display, sizeof(display), DISPLAY_FMT, txt, ratio); @@ -632,6 +643,7 @@ show_progress( STRCPY(last_display, display); } + last_count = count; last_total = total; last_ratio = ratio; } diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/search.c tin-2.4.5/src/search.c --- tin-2.4.4/src/search.c 2019-11-20 14:40:26.000000000 +0100 +++ tin-2.4.5/src/search.c 2020-12-01 11:51:01.719922059 +0100 @@ -3,10 +3,10 @@ * Module : search.c * Author : I. Lea & R. Skrenta * Created : 1991-04-01 - * Updated : 2018-01-29 + * Updated : 2020-11-18 * Notes : * - * Copyright (c) 1991-2020 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2021 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -391,7 +391,7 @@ body_search( return 1; } } else { - if (wildmatpos(line, searchbuf, TRUE, srch_offsets, srch_offsets_size)) { + if (wildmatpos(line, searchbuf, TRUE, srch_offsets, srch_offsets_size) == 1) { srch_lineno = i; art_close(&pgart); /* Switch the pager over to matched art */ pgart = artinfo; @@ -490,7 +490,7 @@ search_group( char *searchbuff, int (*search_func) (int i, char *searchbuff)) { - int i, ret; + int i, ret, loop_cnt; if (grpmenu.curr < 0) { info_message(_(txt_no_arts)); @@ -504,6 +504,7 @@ search_group( return -1; i = current_art; + loop_cnt = 1; do { if (forward) { @@ -532,7 +533,13 @@ search_group( case -1: /* User abort */ return -1; } - } while (i != current_art); +#ifdef HAVE_SELECT + if (wait_for_input()) /* allow abort */ + return -1; +#endif /* HAVE_SELECT */ + if (loop_cnt % (MODULO_COUNT_NUM * 20) == 0) + show_progress(txt_searching, loop_cnt, top_art); + } while (i != current_art && loop_cnt++ <= top_art); if (tinrc.wildcard) { FreeAndNull(search_regex.re); diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/select.c tin-2.4.5/src/select.c --- tin-2.4.4/src/select.c 2019-11-20 14:40:26.000000000 +0100 +++ tin-2.4.5/src/select.c 2020-12-01 11:51:01.747923421 +0100 @@ -6,7 +6,7 @@ * Updated : 2019-09-16 * Notes : * - * Copyright (c) 1991-2020 Iain Lea , Rich Skrenta + * Copyright (c) 1991-2021 Iain Lea , Rich Skrenta * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -896,7 +896,7 @@ yank_active_file( selmenu.curr = save_restore_curr_group(FALSE); /* Restore previous group position */ yanked_out = bool_not(yanked_out); show_selection_page(); - info_message(_(txt_yanked_groups), selmenu.max-prevmax, PLURAL(selmenu.max-prevmax, txt_group)); + info_message(_(txt_yanked_groups), selmenu.max - prevmax, PLURAL(selmenu.max-prevmax, txt_group)); } else { /* Yank out */ toggle_my_groups(NULL); HpGlitch(erase_arrow()); diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/sigfile.c tin-2.4.5/src/sigfile.c --- tin-2.4.4/src/sigfile.c 2019-11-20 14:40:26.000000000 +0100 +++ tin-2.4.5/src/sigfile.c 2020-12-01 11:51:01.755923810 +0100 @@ -6,7 +6,7 @@ * Updated : 2019-07-17 * Notes : Generate random signature for posting/mailing etc. * - * Copyright (c) 1992-2020 Mike Gleason + * Copyright (c) 1992-2021 Mike Gleason * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/signal.c tin-2.4.5/src/signal.c --- tin-2.4.4/src/signal.c 2019-11-20 14:40:26.000000000 +0100 +++ tin-2.4.5/src/signal.c 2020-12-01 11:51:01.767924393 +0100 @@ -6,7 +6,7 @@ * Updated : 2019-07-17 * Notes : signal handlers for different modes and window resizing * - * Copyright (c) 1991-2020 Iain Lea + * Copyright (c) 1991-2021 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/strftime.c tin-2.4.5/src/strftime.c --- tin-2.4.4/src/strftime.c 2019-11-20 14:40:26.000000000 +0100 +++ tin-2.4.5/src/strftime.c 2020-12-01 11:51:01.775924782 +0100 @@ -12,7 +12,7 @@ * tm = localtime(&secs); * num = strftime(buf, sizeof(buf), "%a %d-%m-%y %H:%M:%S", tm); * - * Copyright (c) 1991-2020 Arnold Robbins + * Copyright (c) 1991-2021 Arnold Robbins * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/string.c tin-2.4.5/src/string.c --- tin-2.4.4/src/string.c 2019-11-20 14:40:26.000000000 +0100 +++ tin-2.4.5/src/string.c 2020-12-01 11:51:01.787925365 +0100 @@ -3,10 +3,10 @@ * Module : string.c * Author : Urs Janssen * Created : 1997-01-20 - * Updated : 2019-01-08 + * Updated : 2020-05-31 * Notes : * - * Copyright (c) 1997-2020 Urs Janssen + * Copyright (c) 1997-2021 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -94,9 +94,15 @@ tin_ltoa( snprintf(buffer, sizeof(buffer), "%"T_ARTNUM_PFMT, value); len = (int) strlen(buffer); - while (len > digits) { - len -= 3; - i++; + /* + * only shorten if necessary, + * then ensure that the metric prefix fits into the buffer + */ + if (len > digits) { + while (len >= digits) { + len -= 3; + i++; + } } if (i >= strlen(power)) { /* buffer is to small */ diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/tags.c tin-2.4.5/src/tags.c --- tin-2.4.4/src/tags.c 2019-11-20 14:40:26.000000000 +0100 +++ tin-2.4.5/src/tags.c 2020-12-01 11:51:01.807926338 +0100 @@ -3,10 +3,10 @@ * Module : tags.c * Author : Jason Faultless * Created : 1999-12-06 - * Updated : 2010-04-02 + * Updated : 2020-08-04 * Notes : Split out from other modules * - * Copyright (c) 1999-2020 Jason Faultless + * Copyright (c) 1999-2021 Jason Faultless * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -42,164 +42,11 @@ #endif /* !TIN_H */ /* Local prototypes */ -static int get_multipart_info(int base_index, MultiPartInfo *setme); -static int get_multiparts(int base_index, MultiPartInfo **malloc_and_setme_info); -static int look_for_multipart_info(int base_index, MultiPartInfo *setme, char start, char stop, int *offset); static t_bool parse_range(char *range, int min, int max, int curr, int *range_start, int *range_end); int num_of_tagged_arts = 0; /* - * Parses a subject header of the type "multipart message subject (01/42)" - * into a MultiPartInfo struct, or fails if the message subject isn't in the - * right form. - * - * @return nonzero on success - */ -static int -get_multipart_info( - int base_index, - MultiPartInfo *setme) -{ - int i, j, offi, offj; - MultiPartInfo setmei, setmej; - - i = look_for_multipart_info(base_index, &setmei, '[', ']', &offi); - j = look_for_multipart_info(base_index, &setmej, '(', ')', &offj); - - /* Ok i hits first */ - if (offi > offj) { - *setme = setmei; - return i; - } - - /* Its j or they are both the same (which must be zero!) so we don't care */ - *setme = setmej; - return j; -} - - -static int -look_for_multipart_info( - int base_index, - MultiPartInfo* setme, - char start, - char stop, - int *offset) -{ - MultiPartInfo tmp; - char *subj; - char *pch; - - *offset = 0; - - /* entry assertions */ - assert(0 <= base_index && base_index < grpmenu.max && "invalid base_index"); - assert(setme != NULL && "setme must not be NULL"); - - /* parse the message */ - subj = arts[base[base_index]].subject; - if (!(pch = strrchr(subj, start))) - return 0; - if (!isdigit((int) pch[1])) - return 0; - tmp.base_index = base_index; - tmp.subject_compare_len = pch - subj; - tmp.part_number = (int) strtol(pch + 1, &pch, 10); - if (*pch != '/' && *pch != '|') - return 0; - if (!isdigit((int) pch[1])) - return 0; - tmp.total = (int) strtol(pch + 1, &pch, 10); - if (*pch != stop) - return 0; - tmp.subject = subj; - *setme = tmp; - *offset = pch - subj; - return 1; -} - - -/* - * Tries to find all the parts to the multipart message pointed to by - * base_index. - * - * Weakness(?): only walks through the base messages. - * - * @return on success, the number of parts found. On failure, zero if not a - * multipart or the negative value of the first missing part. - * @param base_index index pointing to one of the messages in a multipart - * message. - * @param malloc_and_setme_info on success, set to a malloced array the - * parts found. Untouched on failure. - */ -static int -get_multiparts( - int base_index, - MultiPartInfo **malloc_and_setme_info) -{ - MultiPartInfo tmp, tmp2; - MultiPartInfo *info = NULL; - int i; - int part_index; - - /* entry assertions */ - assert(0 <= base_index && base_index < grpmenu.max && "Invalid base index"); - assert(malloc_and_setme_info != NULL && "malloc_and_setme_info must not be NULL"); - - /* make sure this is a multipart message... */ - if (!get_multipart_info(base_index, &tmp) || tmp.total < 1) - return 0; - - /* make a temporary buffer to hold the multipart info... */ - info = my_malloc(sizeof(MultiPartInfo) * tmp.total); - - /* zero out part-number for the repost check below */ - for (i = 0; i < tmp.total; ++i) - info[i].part_number = -1; - - /* try to find all the multiparts... */ - for (i = 0; i < grpmenu.max; ++i) { - if (strncmp(arts[base[i]].subject, tmp.subject, tmp.subject_compare_len)) - continue; - if (!get_multipart_info(i, &tmp2)) - continue; - - part_index = tmp2.part_number - 1; - - /* skip the "blah (00/102)" info messages... */ - if (part_index < 0) - continue; - - /* skip insane "blah (103/102) subjects... */ - if (part_index >= tmp.total) - continue; - - /* repost check: do we already have this part? */ - if (info[part_index].part_number != -1) { - assert(info[part_index].part_number == tmp2.part_number && "bookkeeping error"); - continue; - } - - /* we have a match, hooray! */ - info[part_index] = tmp2; - } - - /* see if we got them all. */ - for (i = 0; i < tmp.total; ++i) { - if (info[i].part_number != i + 1) { - free(info); - return -(i + 1); /* missing part #(i+1) */ - } - } - - /* looks like a success .. */ - *malloc_and_setme_info = info; - return tmp.total; -} - - -/* * Tags all parts of a multipart index if base_index points * to a multipart message and all its parts can be found. * @@ -208,11 +55,19 @@ get_multiparts( */ int tag_multipart( - int base_index) + int arts_index) { MultiPartInfo *info = NULL; int i; - const int qty = get_multiparts(base_index, &info); + int qty; + t_bool untagging = FALSE; + + for_each_art(i) { + if (!global_look_for_multipart(i, '[', ']')) + global_look_for_multipart(i, '(', ')'); + } + + qty = global_get_multiparts(arts_index, &info, TRUE); /* check for failure... */ if (qty == 0) { @@ -225,20 +80,26 @@ tag_multipart( } /* - * if any are already tagged, untag 'em first - * so num_of_tagged_arts doesn't get corrupted + * if any are already tagged, untag 'em */ for (i = 0; i < qty; ++i) { - if (arts[base[info[i].base_index]].tagged != 0) - untag_article(base[info[i].base_index]); + if (arts[info[i].arts_index].tagged != 0) { + untagging = TRUE; + while (i < qty) + untag_article(info[i++].arts_index); + } } /* * get_multiparts() sorts info by part number, * so a simple for loop tags in the right order + * + * only tag if we are not untagging */ - for (i = 0; i < qty; ++i) - arts[base[info[i].base_index]].tagged = ++num_of_tagged_arts; + if (!untagging) { + for (i = 0; i < qty; ++i) + arts[info[i].arts_index].tagged = ++num_of_tagged_arts; + } free(info); @@ -360,7 +221,6 @@ set_range( char *prompt; int artnum; int i; - int depth; int range_min; int range_max; @@ -431,13 +291,13 @@ set_range( arts[artnum].inrange = FALSE; } - depth = 1; + i = 1; for_each_art_in_thread(artnum, thread_basenote) { - if (depth > range_max) + if (i > range_max) break; - if (depth >= range_min) + if (i >= range_min) arts[artnum].inrange = TRUE; - depth++; + i++; } break; diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/tcurses.c tin-2.4.5/src/tcurses.c --- tin-2.4.4/src/tcurses.c 2019-11-20 14:40:26.000000000 +0100 +++ tin-2.4.5/src/tcurses.c 2020-12-01 11:51:01.831927505 +0100 @@ -7,7 +7,7 @@ * Notes : This is a set of wrapper functions adapting the termcap * interface of tin to use SVr4 curses (e.g., ncurses). * - * Copyright (c) 1997-2020 Thomas Dickey + * Copyright (c) 1997-2021 Thomas Dickey * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/thread.c tin-2.4.5/src/thread.c --- tin-2.4.4/src/thread.c 2019-11-20 14:40:26.000000000 +0100 +++ tin-2.4.5/src/thread.c 2020-12-01 11:51:01.843928088 +0100 @@ -3,10 +3,10 @@ * Module : thread.c * Author : I. Lea * Created : 1991-04-01 - * Updated : 2017-03-28 + * Updated : 2020-06-10 * Notes : * - * Copyright (c) 1991-2020 Iain Lea + * Copyright (c) 1991-2021 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -765,6 +765,24 @@ thread_page( ret_code = GRP_QUIT; break; + case THREAD_TAG_PARTS: /* tag/untag article */ + /* Find index of current article */ + if ((n = find_response(thread_basenote, thdmenu.curr)) < 0) + break; + else { + int old_num = num_of_tagged_arts; + + if (tag_multipart(n) != 0) { + update_thread_page(); + + if (old_num < num_of_tagged_arts) + info_message(_(txt_info_all_parts_tagged)); + else + info_message(_(txt_info_all_parts_untagged)); + } + } + break; + case THREAD_TAG: /* tag/untag article */ /* Find index of current article */ if ((n = find_response(thread_basenote, thdmenu.curr)) < 0) @@ -1055,15 +1073,19 @@ num_of_responses( int n) { int i; - int oldi = -3; int sum = 0; +#ifndef NDEBUG + int oldi = -3; assert(n < grpmenu.max && n >= 0); +#endif /* !NDEBUG */ for_each_art_in_thread(i, n) { +#ifndef NDEBUG assert(i != ART_EXPIRED); assert(i != oldi); oldi = i; +#endif /* !NDEBUG */ sum++; } diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/tincfg.tbl tin-2.4.5/src/tincfg.tbl --- tin-2.4.4/src/tincfg.tbl 2019-11-20 14:41:17.000000000 +0100 +++ tin-2.4.5/src/tincfg.tbl 2020-12-01 11:52:32.144319146 +0100 @@ -5,7 +5,7 @@ ; Updated : 2017-08-13 ; Notes : #defines and structs for config.c ; -; Copyright (c) 1996-2020 Thomas E. Dickey +; Copyright (c) 1996-2021 Thomas E. Dickey ; All rights reserved. ; ; Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/tmpfile.c tin-2.4.5/src/tmpfile.c --- tin-2.4.4/src/tmpfile.c 2019-11-20 14:40:26.000000000 +0100 +++ tin-2.4.5/src/tmpfile.c 2020-12-01 11:51:01.871929449 +0100 @@ -57,6 +57,9 @@ tmpfile( char buf[sizeof(_PATH_TMP) + sizeof(TRAILER)]; int sverrno, fd = -1; sigset_t set, oset; +# if !defined(HAVE_MKSTEMP) && defined(HAVE_MKTEMP) + char *p; +# endif /* !HAVE_MKSTEMP && HAVE_MKTEMP */ (void) memcpy(buf, _PATH_TMP, sizeof(_PATH_TMP) - 1); (void) memcpy(buf + sizeof(_PATH_TMP) - 1, TRAILER, sizeof(TRAILER)); @@ -69,7 +72,8 @@ tmpfile( fd = mkstemp(buf); # else # ifdef HAVE_MKTEMP - fd = open(mktemp(buf), (O_WRONLY|O_CREAT|O_EXCL), (mode_t) (S_IRUSR|S_IWUSR)); + p = mktemp(buf); + fd = open(p, (O_WRONLY|O_CREAT|O_EXCL), (mode_t) (S_IRUSR|S_IWUSR)); # endif /* HAVE_MKTEMP */ # endif /* HAVE_MKSTEMP */ @@ -79,7 +83,13 @@ tmpfile( (void) unlink(buf); u = umask(0); (void) umask(u); +# ifdef HAVE_FCHMOD (void) fchmod(fd, (S_IRUGO|S_IWUGO) & ~u); +# else +# if defined(HAVE_CHMOD) && !defined(HAVE_MKSTEMP) && defined(HAVE_MKTEMP) + fchmod(p, (S_IRUGO|S_IWUGO) & ~u); +# endif /* HAVE_CHMOD && !HAVE_MKSTEMP && HAVE_MKTEMP */ +#endif /* HAVE_FCHMOD */ } (void) sigprocmask(SIG_SETMASK, &oset, NULL); diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/trace.c tin-2.4.5/src/trace.c --- tin-2.4.4/src/trace.c 2019-11-20 14:40:27.000000000 +0100 +++ tin-2.4.5/src/trace.c 2020-12-01 11:51:01.891930421 +0100 @@ -6,7 +6,7 @@ * Updated : 2001-07-22 * Notes : debugging support via TRACE macro. * - * Copyright (c) 1997-2020 Thomas Dickey + * Copyright (c) 1997-2021 Thomas Dickey * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/version.c tin-2.4.5/src/version.c --- tin-2.4.4/src/version.c 2019-11-20 14:40:27.000000000 +0100 +++ tin-2.4.5/src/version.c 2020-12-01 11:51:01.903931005 +0100 @@ -6,7 +6,7 @@ * Updated : 2019-02-04 * Notes : * - * Copyright (c) 2003-2020 Urs Janssen + * Copyright (c) 2003-2021 Urs Janssen * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/wildmat.c tin-2.4.5/src/wildmat.c --- tin-2.4.4/src/wildmat.c 2019-11-20 14:40:27.000000000 +0100 +++ tin-2.4.5/src/wildmat.c 2020-12-01 11:51:01.911931394 +0100 @@ -200,12 +200,12 @@ wildmatpos( px = my_strdup(p + 1); for (t = txt + prev_offset; *t; t++) - if ((ret = (DoMatch(t, px))) == TRUE) { + if ((ret = (DoMatch(t, px))) == 1) { /* remove the trailing '*' */ px[strlen(px) - 1] = '\0'; for (i = strlen(t); i > 0; i--) { t[i] = '\0'; - if ((ret = (DoMatch(t, px))) == TRUE) { + if ((ret = (DoMatch(t, px))) == 1) { if (srch_offsets_size >= 2) { srch_offsets[0] = t - txt; srch_offsets[1] = srch_offsets[0] + i; diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/xface.c tin-2.4.5/src/xface.c --- tin-2.4.4/src/xface.c 2019-11-20 14:40:27.000000000 +0100 +++ tin-2.4.5/src/xface.c 2020-12-01 11:51:01.935932561 +0100 @@ -6,7 +6,7 @@ * Updated : 2013-11-06 * Notes : * - * Copyright (c) 2003-2020 Joshua Crawford & Drazen Kacar + * Copyright (c) 2003-2021 Joshua Crawford & Drazen Kacar * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/src/xref.c tin-2.4.5/src/xref.c --- tin-2.4.4/src/xref.c 2019-11-20 14:40:27.000000000 +0100 +++ tin-2.4.5/src/xref.c 2020-12-01 11:51:01.947933144 +0100 @@ -6,7 +6,7 @@ * Updated : 2019-09-11 * Notes : * - * Copyright (c) 1993-2020 Iain Lea + * Copyright (c) 1993-2021 Iain Lea * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nurp '--exclude=.bzr*' tin-2.4.4/tools/tinews.pl tin-2.4.5/tools/tinews.pl --- tin-2.4.4/tools/tinews.pl 2019-11-20 14:42:16.000000000 +0100 +++ tin-2.4.5/tools/tinews.pl 2020-12-24 01:20:04.851347514 +0100 @@ -4,7 +4,7 @@ # signs the article and posts it. # # -# Copyright (c) 2002-2020 Urs Janssen , +# Copyright (c) 2002-2021 Urs Janssen , # Marc Brockschmidt # # Redistribution and use in source and binary forms, with or without @@ -40,43 +40,54 @@ # - check for /etc/nntpserver (and /etc/news/server) # - add $PGPOPTS, $PGPPATH and $GNUPGHOME support # - cleanup and remove duplicated code -# - option to convert CRLF to LF in input -# - use STARTTLS (if Net::NNTP is recent enough and server supports it)? # - quote inpupt properly before passing to shell +# - $ENV{'NEWSHOST'} / $ENV{'NNTPSERVER'} and $ENV{'NNTPPORT'} +# do have higher precedence than settings in the script and +# config-file, but config-settig SSL may override $ENV{'NNTPPORT'} # - if (!defined $ENV{'GPG_TTY'}) {if (open(my $T,'-|','tty')) { # chomp(my $tty=<$T>); close($T); # $ENV{'GPG_TTY'}=$tty if($tty =~ m/^\//)}} # for gpg? -# +# - option to break long header lines? +# use Text::Wrap; $Text::Wrap::columns=998; wrap("","\t",$_); +# - option to trim References +# ... use strict; use warnings; # version Number -my $version = "1.1.51"; +my $version = "1.1.57"; my %config; # configuration, may be overwritten via ~/.tinewsrc -$config{'NNTPServer'} = 'news'; # your NNTP servers name, may be set via $NNTPSERVER -$config{'NNTPPort'} = 119; # NNTP-port, may be set via $NNTPPORT -$config{'NNTPUser'} = ''; # username for nntp-auth, may be set via ~/.newsauth or ~/.nntpauth -$config{'NNTPPass'} = ''; # password for nntp-auth, may be set via ~/.newsauth or ~/.nntpauth - -$config{'PGPSigner'} = ''; # sign as who? -$config{'PGPPass'} = ''; # pgp2 only -$config{'PathtoPGPPass'}= ''; # pgp2, pgp5, pgp6 and gpg -$config{'PGPPassFD'} = 9; # file descriptor used for input redirection of PathtoPGPPass; GPG1, GPG2, PGP5 and PGP6 only +$config{'nntp-server'} = 'news'; # your NNTP servers name, may be set via $NNTPSERVER +$config{'nntp-port'} = 119; # NNTP-port, may be set via $NNTPPORT +$config{'nntp-user'} = ''; # username for nntp-auth, may be set via ~/.newsauth or ~/.nntpauth +$config{'nntp-pass'} = ''; # password for nntp-auth, may be set via ~/.newsauth or ~/.nntpauth + +$config{'ssl'} = 0; # set to 1 to use NNTPS if possible + +$config{'pgp-signer'} = ''; # sign as who? +$config{'pgp-pass'} = ''; # pgp2 only +$config{'path-to-pgp-pass'}= ''; # pgp2, pgp5, pgp6 and gpg +$config{'pgp-pass-fd'} = 9; # file descriptor used for input redirection of path-to-pgp-pass; GPG1, GPG2, PGP5 and PGP6 only $config{'pgp'} = '/usr/bin/pgp'; # path to pgp -$config{'PGPVersion'} = '2'; # Use 2 for 2.X, 5 for PGP5, 6 for PGP6, GPG or GPG1 for GPG1 and GPG2 for GPG2 +$config{'pgp-version'} = '2'; # Use 2 for 2.X, 5 for PGP5, 6 for PGP6, GPG or GPG1 for GPG1 and GPG2 for GPG2 $config{'digest-algo'} = 'MD5';# Digest Algorithm for GPG. Must be supported by your installation -$config{'Interactive'} = 'yes';# allow interactive usage +$config{'interactive'} = 'yes';# allow interactive usage + +$config{'verbose'} = 0; # set to 1 to get warning messages +$config{'debug'} = 0; # set to 1 to get some debug output + +$config{'sig-path'} = glob('~/.signature'); # path to signature +$config{'add-signature'}= 'yes';# Add $config{'sig-path'} to posting if there is no sig +$config{'sig-max-lines'}= 4; # max number of signatures lines -$config{'sig_path'} = glob('~/.signature'); # path to signature -$config{'add_signature'}= 'yes';# Add $config{'sig_path'} to posting if there is no sig -$config{'sig_max_lines'}= 4; # max number of signatures lines +$config{'max-header-length'} = 998; # RFC 5536 $config{'sendmail'} = '/usr/sbin/sendmail -i -t'; # set to '' to disable mail-actions @@ -86,16 +97,16 @@ $config{'pgpheader'} = 'X-PGP-Sig'; $config{'pgpbegin'} = '-----BEGIN PGP SIGNATURE-----'; # Begin of PGP-Signature $config{'pgpend'} = '-----END PGP SIGNATURE-----'; # End of PGP-Signature -$config{'canlock_algorithm'} = 'sha1'; # Digest algorithm used for cancel-lock and cancel-key; sha1, sha256 and sha512 are supported -# $config{'canlock_secret'} = '~/.cancelsecret'; # Path to canlock secret file +$config{'canlock-algorithm'} = 'sha1'; # Digest algorithm used for cancel-lock and cancel-key; sha1, sha256 and sha512 are supported +# $config{'canlock-secret'} = '~/.cancelsecret'; # Path to canlock secret file -# $config{'ignore_headers'} = ''; # headers to be ignored during signing +# $config{'ignore-headers'} = ''; # headers to be ignored during signing -$config{'PGPSignHeaders'} = ['From', 'Newsgroups', 'Subject', 'Control', +$config{'pgp-sign-headers'} = ['From', 'Newsgroups', 'Subject', 'Control', 'Supersedes', 'Followup-To', 'Date', 'Injection-Date', 'Sender', 'Approved', 'Message-ID', 'Reply-To', 'Cancel-Key', 'Also-Control', 'Distribution']; -$config{'PGPorderheaders'} = ['from', 'newsgroups', 'subject', 'control', +$config{'pgp-order-headers'} = ['from', 'newsgroups', 'subject', 'control', 'supersedes', 'followup-To', 'date', 'injection-date', 'organization', 'lines', 'sender', 'approved', 'distribution', 'message-id', 'references', 'reply-to', 'mime-version', 'content-type', @@ -121,17 +132,31 @@ if ($ENV{'XDG_CONFIG_HOME'}) { } push(@try, (glob('~/.config/tinewsrc'))[0], (glob('~/.tinewsrc'))[0]); -foreach (grep { ! $seen{$_}++ } @try) { +foreach (@try) { last if (open($TINEWSRC, '<', $_)); $TINEWSRC = undef; } if (defined($TINEWSRC)) { + my $changes = 0; while (defined($_ = <$TINEWSRC>)) { if (m/^([^#\s=]+)\s*=\s*(\S[^#]+)/io) { - chomp($config{$1} = $2); + # rename pre 1.1.56 tinewsrc-var names + my $key = $1; + my $val = $2; + $key =~ s#^followupto#follow-to# && $changes++; + $key =~ s#^replyto#reply-to# && $changes++; + $key =~ s#^NNTP(?!\-).#NNTP-# && $changes++; + $key =~ s#^PathtoPGPPass#path-to-pgp-pass# && $changes++; + $key =~ s#^PGPorderheaders#pgp-order-headers# && $changes++; + $key =~ s#^PGPPassFD#pgp-pass-fd# && $changes++; + $key =~ s#^PGPSignHeaders#pgp-sign-headers# && $changes++; + $key =~ s#^PGP(?!\-).#PGP-# && $changes++; + $key =~ s#_#-# && $changes++; + chomp($config{lc($key)} = $val); } } close($TINEWSRC); + print "Old style tinewsrc option names found, you should adjust them.\n" if ($changes && ($config{'verbose'} || $config{'debug'})); } # as of tinews 1.1.51 we use 3 args open() to pipe to sendmail @@ -143,39 +168,43 @@ $config{'sendmail'} =~ s/^\s*\|\s*//io; $config{'digest-algo'} = uc($config{'digest-algo'}); # these env-vars have higher priority (order is important) -$config{'NNTPServer'} = $ENV{'NEWSHOST'} if ($ENV{'NEWSHOST'}); -$config{'NNTPServer'} = $ENV{'NNTPSERVER'} if ($ENV{'NNTPSERVER'}); -$config{'NNTPPort'} = $ENV{'NNTPPORT'} if ($ENV{'NNTPPORT'}); +$config{'nntp-server'} = $ENV{'NEWSHOST'} if ($ENV{'NEWSHOST'}); +$config{'nntp-server'} = $ENV{'NNTPSERVER'} if ($ENV{'NNTPSERVER'}); +$config{'nntp-port'} = $ENV{'NNTPPORT'} if ($ENV{'NNTPPORT'}); # Get options: $Getopt::Long::ignorecase=0; $Getopt::Long::bundling=1; -GetOptions('A|V|W|O|no-organization|h|headers' => [], # do nothing +GetOptions('A|V|W|h|headers' => [], # do nothing 'debug|D|N' => \$config{'debug'}, - 'port|p=i' => \$config{'NNTPPort'}, - 'no-sign|X' => \$config{'no_sign'}, - 'no-control|R' => \$config{'no_control'}, - 'no-signature|S' => \$config{'no_signature'}, - 'no-canlock|L' => \$config{'no_canlock'}, + 'port|p=i' => \$config{'nntp-port'}, + 'no-sign|X' => \$config{'no-sign'}, + 'no-control|R' => \$config{'no-control'}, + 'no-signature|S' => \$config{'no-signature'}, + 'no-canlock|L' => \$config{'no-canlock'}, 'no-injection-date|I' => \$config{'no-injection-date'}, - 'force-auth|Y' => \$config{'force_auth'}, + 'no-organization|O' => \$config{'no-organization'}, + 'force-auth|Y' => \$config{'force-auth'}, 'approved|a=s' => \$config{'approved'}, 'control|c=s' => \$config{'control'}, - 'canlock-algorithm=s' => \$config{'canlock_algorithm'}, + 'canlock-algorithm=s' => \$config{'canlock-algorithm'}, 'distribution|d=s' => \$config{'distribution'}, 'expires|e=s' => \$config{'expires'}, 'from|f=s' => \$config{'from'}, - 'ignore-headers|i=s' => \$config{'ignore_headers'}, - 'followupto|w=s' => \$config{'followup-to'}, + 'ignore-headers|i=s' => \$config{'ignore-headers'}, + 'followup-to|w=s' => \$config{'followup-to'}, 'newsgroups|n=s' => \$config{'newsgroups'}, - 'replyto|r=s' => \$config{'reply-to'}, + 'reply-to|r=s' => \$config{'reply-to'}, 'savedir|s=s' => \$config{'savedir'}, + 'ssl|nntps' => \$config{'ssl'}, 'subject|t=s' => \$config{'subject'}, 'references|F=s' => \$config{'references'}, 'organization|o=s' => \$config{'organization'}, 'path|x=s' => \$config{'path'}, 'help|H' => \$config{'help'}, - 'version|v' => \$config{'version'} + 'transform' => \$config{'transform'}, + 'verbose|v' => \$config{'verbose'}, + 'version' => \$config{'version'} ); foreach (@ARGV) { @@ -190,16 +219,32 @@ if ($config{'version'}) { usage() if ($config{'help'}); -my $sha_mod=undef; +# check if SSL support is available +if ($config{'ssl'}) { + eval "Net::NNTP->can_ssl"; + if ($@) { + warn "Your Net::NNTP doesn't support SSL.\n" if ($config{'debug'} || $config{'verbose'}); + $config{'ssl'} = 0; + } +} +# and now adjust default port depending on SSL requested and +# available or not +if ($config{'ssl'}) { + $config{'nntp-port'} = 563 if ($config{'nntp-port'} == 119); +} else { + $config{'nntp-port'} = 119 if ($config{'nntp-port'} == 563); +} + +my $sha_mod = undef; # Cancel-Locks require some more modules -if ($config{'canlock_secret'} && !$config{'no_canlock'}) { - $config{'canlock_algorithm'} = lc($config{'canlock_algorithm'}); +if ($config{'canlock-secret'} && !$config{'no-canlock'}) { + $config{'canlock-algorithm'} = lc($config{'canlock-algorithm'}); # we support sha1, sha256 and sha512, fallback to sha1 if something else is given - if (!($config{'canlock_algorithm'} =~ /^sha(1|256|512)$/)) { - warn "Digest algorithm " . $config{'canlock_algorithm'} . " not supported. Falling back to sha1.\n" if $config{'debug'}; - $config{'canlock_algorithm'} = 'sha1'; + if (!($config{'canlock-algorithm'} =~ /^sha(1|256|512)$/)) { + warn "Digest algorithm " . $config{'canlock-algorithm'} . " not supported. Falling back to sha1.\n" if ($config{'debug'} || $config{'verbose'}); + $config{'canlock-algorithm'} = 'sha1'; } - if ($config{'canlock_algorithm'} eq 'sha1') { + if ($config{'canlock-algorithm'} eq 'sha1') { foreach ('Digest::SHA qw(sha1)', 'Digest::SHA1()') { eval "use $_"; if (!$@) { @@ -210,17 +255,17 @@ if ($config{'canlock_secret'} && !$confi foreach ('MIME::Base64()', 'Digest::HMAC_SHA1()') { eval "use $_"; if ($@ || !defined($sha_mod)) { - $config{'no_canlock'} = 1; - warn "Cancel-Locks disabled: Can't locate ".$_."\n" if $config{'debug'}; + $config{'no-canlock'} = 1; + warn "Cancel-Locks disabled: Can't locate ".$_."\n" if ($config{'debug'} || $config{'verbose'}); last; } } - } elsif ($config{'canlock_algorithm'} eq 'sha256') { + } elsif ($config{'canlock-algorithm'} eq 'sha256') { foreach ('MIME::Base64()', 'Digest::SHA qw(sha256 hmac_sha256)') { eval "use $_"; if ($@) { - $config{'no_canlock'} = 1; - warn "Cancel-Locks disabled: Can't locate ".$_."\n" if $config{'debug'}; + $config{'no-canlock'} = 1; + warn "Cancel-Locks disabled: Can't locate ".$_."\n" if ($config{'debug'} || $config{'verbose'}); last; } } @@ -228,8 +273,8 @@ if ($config{'canlock_secret'} && !$confi foreach ('MIME::Base64()', 'Digest::SHA qw(sha512 hmac_sha512)') { eval "use $_"; if ($@) { - $config{'no_canlock'} = 1; - warn "Cancel-Locks disabled: Can't locate ".$_."\n" if $config{'debug'}; + $config{'no-canlock'} = 1; + warn "Cancel-Locks disabled: Can't locate ".$_."\n" if ($config{'debug'} || $config{'verbose'}); last; } } @@ -241,46 +286,44 @@ my $attribs = $term->Attribs; my $in_header = 1; my (%Header, @Body, $PGPCommand); -if (! $config{'no_sign'}) { - $config{'PGPSigner'} = $ENV{'SIGNER'} if ($ENV{'SIGNER'}); - $config{'PathtoPGPPass'} = $ENV{'PGPPASSFILE'} if ($ENV{'PGPPASSFILE'}); - if ($config{'PathtoPGPPass'}) { - open(my $PGPPass, '<', (glob($config{'PathtoPGPPass'}))[0]) or - $config{'Interactive'} && die("$0: Can't open ".$config{'PathtoPGPPass'}.": $!"); - chomp($config{'PGPPass'} = <$PGPPass>); - close($PGPPass); - } - if ($config{'PGPVersion'} eq '2' && $ENV{'PGPPASS'}) { - $config{'PGPPass'} = $ENV{'PGPPASS'}; +if (! $config{'no-sign'}) { + $config{'pgp-signer'} = $ENV{'SIGNER'} if ($ENV{'SIGNER'}); + $config{'path-to-pgp-pass'} = $ENV{'PGPPASSFILE'} if ($ENV{'PGPPASSFILE'}); + if ($config{'path-to-pgp-pass'}) { + open(my $pgppass, '<', (glob($config{'path-to-pgp-pass'}))[0]) or + $config{'interactive'} && die("$0: Can't open ".$config{'path-to-pgp-pass'}.": $!"); + chomp($config{'pgp-pass'} = <$pgppass>); + close($pgppass); + } + if ($config{'pgp-version'} eq '2' && $ENV{'PGPPASS'}) { + $config{'pgp-pass'} = $ENV{'PGPPASS'}; } } -# Remove unwanted headers from PGPSignHeaders -if (${config{'ignore_headers'}}) { - my @hdr_to_ignore = split(/,/, ${config{'ignore_headers'}}); +# Remove unwanted headers from pgp-sign-headers +if (${config{'ignore-headers'}}) { + my @hdr_to_ignore = split(/,/, ${config{'ignore-headers'}}); foreach my $hdr (@hdr_to_ignore) { - @{$config{'PGPSignHeaders'}} = map {lc($_) eq lc($hdr) ? () : $_} @{$config{'PGPSignHeaders'}}; + @{$config{'pgp-sign-headers'}} = map {lc($_) eq lc($hdr) ? () : $_} @{$config{'pgp-sign-headers'}}; } } # Read the message and split the header readarticle(\%Header, \@Body); # Add signature if there is none -if (!$config{'no_signature'}) { - if ($config{'add_signature'} && !grep {/^-- /} @Body) { - if (-r glob($config{'sig_path'})) { +if (!$config{'no-signature'}) { + if ($config{'add-signature'} && !grep {/^-- /} @Body) { + if (-r glob($config{'sig-path'})) { my $l = 0; push @Body, "-- \n"; - open(my $SIGNATURE, '<', glob($config{'sig_path'})) or die("Can't open " . $config{'sig_path'} . ": $!"); + open(my $SIGNATURE, '<', glob($config{'sig-path'})) or die("Can't open " . $config{'sig-path'} . ": $!"); while (<$SIGNATURE>) { - die $config{'sig_path'} . " longer than " . $config{'sig_max_lines'}. " lines!" if (++$l > $config{'sig_max_lines'}); + die $config{'sig-path'} . " longer than " . $config{'sig-max-lines'}. " lines!" if (++$l > $config{'sig-max-lines'}); push @Body, $_; } close($SIGNATURE); } else { - if ($config{'debug'}) { - warn "Tried to add " . $config{'sig_path'} . ", but it is unreadable"; - } + warn "Tried to add " . $config{'sig-path'} . ", but it is unreadable.\n" if ($config{'debug'} || $config{'verbose'}); } } } @@ -321,27 +364,28 @@ if (defined($Header{'user-agent'})) { $Header{'user-agent'} = $Header{'user-agent'}." ".$pname."/".$version."\n"; } -delete $Header{'x-pgp-key'} if (!$config{'no_sign'} && defined($Header{'x-pgp-key'})); +delete $Header{'x-pgp-key'} if (!$config{'no-sign'} && defined($Header{'x-pgp-key'})); +delete $Header{'organization'} if ($config{'no-organization'} && defined($Header{'organization'})); -# No control messages allowed when using -R|--no-control -if ($config{'no_control'} and $Header{control}) { +# No control. No control. You have no control. +if ($config{'no-control'} and $Header{control}) { print STDERR "No control messages allowed.\n"; exit 1; } # various checks -if ($config{'debug'}) { +if ($config{'debug'} || $config{'verbose'}) { foreach (keys %Header) { - warn "Raw 8-bit data in the following header:\n$Header{$_}" if ($Header{$_} =~ m/[\x80-\xff]/o); + warn "Raw 8-bit data in the following header:\n$Header{$_}\n" if ($Header{$_} =~ m/[\x80-\xff]/o); } if (!defined($Header{'mime-version'}) || !defined($Header{'content-type'}) || !defined($Header{'content-transfer-encoding'})) { warn "8bit body without MIME-headers\n" if (grep {/[\x80-\xff]/} @Body); } } -# try ~/.newsauth if no $config{'NNTPPass'} was set -if (!$config{'NNTPPass'}) { +# try ~/.newsauth if no $config{'nntp-pass'} was set +if (!$config{'nntp-pass'}) { my ($l, $server, $pass, $user); if (-r (glob("~/.newsauth"))[0]) { open (my $NEWSAUTH, '<', (glob("~/.newsauth"))[0]) or die("Can't open ~/.newsauth: $!"); @@ -349,12 +393,12 @@ if (!$config{'NNTPPass'}) { chomp $l; next if ($l =~ m/^[#\s]/); ($server, $pass, $user) = split(/\s+\b/, $l); - last if ($server =~ m/\Q$config{'NNTPServer'}\E/); + last if ($server =~ m/\Q$config{'nntp-server'}\E/); } close($NEWSAUTH); - if ($pass && $server =~ m/\Q$config{'NNTPServer'}\E/) { - $config{'NNTPPass'} = $pass; - $config{'NNTPUser'} = $user || getlogin || getpwuid($<) || $ENV{USER}; + if ($pass && $server =~ m/\Q$config{'nntp-server'}\E/) { + $config{'nntp-pass'} = $pass; + $config{'nntp-user'} = $user || getlogin || getpwuid($<) || $ENV{USER}; } else { $pass = $user = ""; } @@ -367,43 +411,47 @@ if (!$config{'NNTPPass'}) { chomp $l; next if ($l =~ m/^[#\s]/); ($server, $user, $pass) = split(/\s+\b/, $l); - last if ($server =~ m/\Q$config{'NNTPServer'}\E/); + last if ($server =~ m/\Q$config{'nntp-server'}\E/); } close($NNTPAUTH); - if ($pass && $server =~ m/\Q$config{'NNTPServer'}\E/) { - $config{'NNTPPass'} = $pass; - $config{'NNTPUser'} = $user || getlogin || getpwuid($<) || $ENV{USER}; + if ($pass && $server =~ m/\Q$config{'nntp-server'}\E/) { + $config{'nntp-pass'} = $pass; + $config{'nntp-user'} = $user || getlogin || getpwuid($<) || $ENV{USER}; } } } } -if (! $config{'savedir'} && defined($Header{'newsgroups'}) && !defined($Header{'message-id'})) { - my $Server = AuthonNNTP(); - my $ServerMsg = $Server->message(); - $Server->datasend('.'); - $Server->dataend(); - $Server->quit(); - $Header{'message-id'} = "Message-ID: $1\n" if ($ServerMsg =~ m/(<\S+\@\S+>)/o); -} - -if (!defined($Header{'message-id'})) { - my $hname; - eval "use Sys::Hostname"; - if ($@) { - chomp($hname = `hostname`); - } else { - $hname = hostname(); +# instead of abort posting just to prefetch a Messsage-ID we should (try +# to keep) the the session open instead +if (!($config{'no-sign'} && $config{'no-canlock'})) { + if (! $config{'savedir'} && defined($Header{'newsgroups'}) && !defined($Header{'message-id'})) { + my $Server = AuthonNNTP(); + my $ServerMsg = $Server->message(); + $Header{'message-id'} = "Message-ID: $1\n" if ($ServerMsg =~ m/(<\S+\@\S+>)/o); + #$Server->datasend('.'); # dataend() already sends "." + $Server->dataend(); + $Server->quit(); } - my ($hostname,) = gethostbyname($hname); - if (defined($hostname) && $hostname =~ m/\./io) { - $Header{'message-id'} = "Message-ID: " . sprintf("\n", $>, timelocal(localtime), $$, $hostname); + + if (!defined($Header{'message-id'})) { + my $hname; + eval "use Sys::Hostname"; + if ($@) { + chomp($hname = `hostname`); + } else { + $hname = hostname(); + } + my ($hostname,) = gethostbyname($hname); + if (defined($hostname) && $hostname =~ m/\./io) { + $Header{'message-id'} = "Message-ID: " . sprintf("\n", $>, timelocal(localtime), $$, $hostname); + } } } # add Cancel-Lock (and Cancel-Key) header(s) if requested -if ($config{'canlock_secret'} && !$config{'no_canlock'} && defined($Header{'message-id'})) { - open(my $CANLock, '<', (glob($config{'canlock_secret'}))[0]) or die("$0: Can't open " . $config{'canlock_secret'} . ": $!"); +if ($config{'canlock-secret'} && !$config{'no-canlock'} && defined($Header{'message-id'})) { + open(my $CANLock, '<', (glob($config{'canlock-secret'}))[0]) or die("$0: Can't open " . $config{'canlock-secret'} . ": $!"); chomp(my $key = <$CANLock>); close($CANLock); (my $data = $Header{'message-id'}) =~ s#^Message-ID: ##i; @@ -412,9 +460,9 @@ if ($config{'canlock_secret'} && !$confi my $cancel_lock = buildcancellock($cancel_key, $sha_mod); if (defined($Header{'cancel-lock'})) { chomp $Header{'cancel-lock'}; - $Header{'cancel-lock'} .= " " . $config{'canlock_algorithm'} . ":" . $cancel_lock . "\n"; + $Header{'cancel-lock'} .= " " . $config{'canlock-algorithm'} . ":" . $cancel_lock . "\n"; } else { - $Header{'cancel-lock'} = "Cancel-Lock: " . $config{'canlock_algorithm'} . ":" . $cancel_lock . "\n"; + $Header{'cancel-lock'} = "Cancel-Lock: " . $config{'canlock-algorithm'} . ":" . $cancel_lock . "\n"; } if ((defined($Header{'supersedes'}) && $Header{'supersedes'} =~ m/^Supersedes:\s+<\S+>\s*$/i) || (defined($Header{'control'}) && $Header{'control'} =~ m/^Control:\s+cancel\s+<\S+>\s*$/i) ||(defined($Header{'also-control'}) && $Header{'also-control'} =~ m/^Also-Control:\s+cancel\s+<\S+>\s*$/i)) { @@ -437,9 +485,9 @@ if ($config{'canlock_secret'} && !$confi } if (defined($Header{'cancel-key'})) { chomp $Header{'cancel-key'}; - $Header{'cancel-key'} .= " " . $config{'canlock_algorithm'} . ":" . $cancel_key . "\n"; + $Header{'cancel-key'} .= " " . $config{'canlock-algorithm'} . ":" . $cancel_key . "\n"; } else { - $Header{'cancel-key'} = "Cancel-Key: " . $config{'canlock_algorithm'} . ":" . $cancel_key . "\n"; + $Header{'cancel-key'} = "Cancel-Key: " . $config{'canlock-algorithm'} . ":" . $cancel_key . "\n"; } } } @@ -454,12 +502,12 @@ if ($config{'sendmail'} && defined($Head } } -if (! $config{'no_sign'}) { - if (!$config{'PGPSigner'}) { - chomp($config{'PGPSigner'} = $Header{'from'}); - $config{'PGPSigner'} =~ s/^[^\s:]+: (.*)/$1/; +if (! $config{'no-sign'}) { + if (!$config{'pgp-signer'}) { + chomp($config{'pgp-signer'} = $Header{'from'}); + $config{'pgp-signer'} =~ s/^[^\s:]+: (.*)/$1/; } - $PGPCommand = getpgpcommand($config{'PGPVersion'}); + $PGPCommand = getpgpcommand($config{'pgp-version'}); } # (re)move mail-headers @@ -472,7 +520,7 @@ $Newsgroups = $Header{'newsgroups'} if ( my $MessageR = []; -if ($config{'no_sign'}) { +if ($config{'no-sign'}) { # don't sign article push @$MessageR, $Header{$_} for (keys %Header); push @$MessageR, "\n", @Body; @@ -495,9 +543,18 @@ if (($To || $Cc || $Bcc) && $config{'sen unshift @$MessageR, "$Cc" if ($Cc); unshift @$MessageR, "$Bcc" if ($Bcc); print($MAIL @$MessageR); + close($MAIL); } +# exit with error if neither $Newsgroups nor any of $To, $Cc or $Bcc set +my $required = 0; +foreach ('Newsgroups', 'To,', 'Cc', 'Bcc') { + $required++ if (defined($Header{lc($_)})); + last if $required; +} +die("$0: neither Newsgroups: nor any of To:, Cc:, Bcc or present.\n") if (!$required); + # Game over. Insert new coin. exit; @@ -507,15 +564,22 @@ exit; sub readarticle { my ($HeaderR, $BodyR) = @_; my $currentheader; + my $l = 0; while (defined($_ = <>)) { + s#\r\n$#\n# if ($config{'transform'}); if ($in_header) { + use bytes; if (m/^$/o) { #end of header $in_header = 0; } elsif (m/^([^\s:]+): (.*)$/s) { $currentheader = lc($1); $$HeaderR{$currentheader} = "$1: $2"; + $l = length($_); + print $1 . ":-header exceeds line length limit " . $l . " > " . $config{'max-header-length'} . " octets.\n" if (($config{'verbose'} || $config{'debug'}) && length($_) > $config{'max-header-length'}); } elsif (m/^[ \t]/o) { $$HeaderR{$currentheader} .= $_; + $l = length($_); + print "Part of continued " . ucfirst($currentheader) . ":-header exceeds line length limit " . $l . " > " . $config{'max-header-length'} . " octets.\n" if (($config{'verbose'} || $config{'debug'}) && $l > $config{'max-header-length'}); # } elsif (m/^([^\s:]+):$/) { # skip over empty headers # next; } else { @@ -562,34 +626,41 @@ sub getdate { # User, Password and Server are defined before as elements # of the global hash %config. If no values for user or password # are defined, the sub will try to ask the user (only if -# $config{'Interactive'} is != 0). +# $config{'interactive'} is != 0). sub AuthonNNTP { - my $Server = Net::NNTP->new($config{'NNTPServer'}, Reader => 1, Debug => $config{'debug'}, Port => $config{'NNTPPort'}) - or die("$0: Can't connect to ".$config{'NNTPServer'}.":".$config{'NNTPPort'}."!\n"); - my $ServerMsg = ""; + my $Server = Net::NNTP->new( + Host => $config{'nntp-server'}, + Reader => 1, + Debug => $config{'debug'}, + Port => $config{'nntp-port'}, + SSL => $config{'ssl'}, + SSL_verify_mode => 0 + ) or die("$0: Can't connect to ".$config{'nntp-server'}.":".$config{'nntp-port'}."!\n"); + if ($config{'ssl'} && $config{'debug'}) { + printf("SSL_fingerprint: %s %s\n", split(/\$/, $Server->get_fingerprint)); + } + my $ServerMsg = $Server->message(); my $ServerCod = $Server->code(); # no read and/or write access - give up if ($ServerCod < 200 || $ServerCod > 201) { - $ServerMsg = $Server->message(); $Server->quit(); die($0.": ".$ServerCod." ".$ServerMsg."\n"); } # read access - try auth - if ($ServerCod == 201 || $config{'force_auth'}) { - if ($config{'NNTPPass'} eq "") { - if ($config{'Interactive'}) { - $config{'NNTPUser'} = $term->readline("Your Username at ".$config{'NNTPServer'}.": "); + if ($ServerCod == 201 || $config{'force-auth'}) { + if ($config{'nntp-pass'} eq "") { + if ($config{'interactive'}) { + $config{'nntp-user'} = $term->readline("Your Username at ".$config{'nntp-server'}.": "); $attribs->{redisplay_function} = $attribs->{shadow_redisplay}; - $config{'NNTPPass'} = $term->readline("Password for ".$config{'NNTPUser'}." at ".$config{'NNTPServer'}.": "); + $config{'nntp-pass'} = $term->readline("Password for ".$config{'nntp-user'}." at ".$config{'nntp-server'}.": "); } else { - $ServerMsg = $Server->message(); $Server->quit(); die($0.": ".$ServerCod." ".$ServerMsg."\n"); } } - $Server->authinfo($config{'NNTPUser'}, $config{'NNTPPass'}); + $Server->authinfo($config{'nntp-user'}, $config{'nntp-pass'}); $ServerCod = $Server->code(); $ServerMsg = $Server->message(); if ($ServerCod != 281) { # auth failed @@ -601,18 +672,18 @@ sub AuthonNNTP { $Server->post(); $ServerCod = $Server->code(); if ($ServerCod == 480) { - if ($config{'NNTPPass'} eq "") { - if ($config{'Interactive'}) { - $config{'NNTPUser'} = $term->readline("Your Username at ".$config{'NNTPServer'}.": "); + if ($config{'nntp-pass'} eq "") { + if ($config{'interactive'}) { + $config{'nntp-user'} = $term->readline("Your Username at ".$config{'nntp-server'}.": "); $attribs->{redisplay_function} = $attribs->{shadow_redisplay}; - $config{'NNTPPass'} = $term->readline("Password for ".$config{'NNTPUser'}." at ".$config{'NNTPServer'}.": "); + $config{'nntp-pass'} = $term->readline("Password for ".$config{'nntp-user'}." at ".$config{'nntp-server'}.": "); } else { $ServerMsg = $Server->message(); $Server->quit(); die($0.": ".$ServerCod." ".$ServerMsg."\n"); } } - $Server->authinfo($config{'NNTPUser'}, $config{'NNTPPass'}); + $Server->authinfo($config{'nntp-user'}, $config{'nntp-pass'}); $Server->post(); } return $Server; @@ -623,9 +694,9 @@ sub AuthonNNTP { # getpgpcommand generates the command to sign the message and returns it. # # Receives: -# - $PGPVersion: A scalar holding the PGPVersion +# - $pgpversion: A scalar holding the pgp-version sub getpgpcommand { - my ($PGPVersion) = @_; + my ($pgpversion) = @_; my $found = 0; if ($config{'pgp'} !~ /^\//) { @@ -637,52 +708,52 @@ sub getpgpcommand { } } if (!-x $config{'pgp'} && ! $found) { - warn "PGP signing disabled: Can't locate executable ".$config{'pgp'}."\n" if $config{'debug'}; - $config{'no_sign'} = 1; + warn "PGP signing disabled: Can't locate executable ".$config{'pgp'}."\n" if ($config{'debug'} || $config{'verbose'}); + $config{'no-sign'} = 1; } - if ($PGPVersion eq '2') { - if ($config{'PGPPass'}) { - $PGPCommand = "PGPPASS=\"".$config{'PGPPass'}."\" ".$config{'pgp'}." -z -u \"".$config{'PGPSigner'}."\" +verbose=0 language='en' -saft <".$config{'pgptmpf'}.".txt >".$config{'pgptmpf'}.".txt.asc"; - } elsif ($config{'Interactive'}) { - $PGPCommand = $config{'pgp'}." -z -u \"".$config{'PGPSigner'}."\" +verbose=0 language='en' -saft <".$config{'pgptmpf'}.".txt >".$config{'pgptmpf'}.".txt.asc"; + if ($pgpversion eq '2') { + if ($config{'pgp-pass'}) { + $PGPCommand = "PGPPASS=\"".$config{'pgp-pass'}."\" ".$config{'pgp'}." -z -u \"".$config{'pgp-signer'}."\" +verbose=0 language='en' -saft <".$config{'pgptmpf'}.".txt >".$config{'pgptmpf'}.".txt.asc"; + } elsif ($config{'interactive'}) { + $PGPCommand = $config{'pgp'}." -z -u \"".$config{'pgp-signer'}."\" +verbose=0 language='en' -saft <".$config{'pgptmpf'}.".txt >".$config{'pgptmpf'}.".txt.asc"; } else { die("$0: Passphrase is unknown!\n"); } - } elsif ($PGPVersion eq '5') { - if ($config{'PathtoPGPPass'}) { - $PGPCommand = "PGPPASSFD=".$config{'PGPPassFD'}." ".$config{'pgp'}."s -u \"".$config{'PGPSigner'}."\" -t --armor -o ".$config{'pgptmpf'}.".txt.asc -z -f < ".$config{'pgptmpf'}.".txt ".$config{'PGPPassFD'}."<".$config{'PathtoPGPPass'}; - } elsif ($config{'Interactive'}) { - $PGPCommand = $config{'pgp'}."s -u \"".$config{'PGPSigner'}."\" -t --armor -o ".$config{'pgptmpf'}.".txt.asc -z -f < ".$config{'pgptmpf'}.".txt"; + } elsif ($pgpversion eq '5') { + if ($config{'path-to-pgp-pass'}) { + $PGPCommand = "PGPPASSFD=".$config{'pgp-pass-fd'}." ".$config{'pgp'}."s -u \"".$config{'pgp-signer'}."\" -t --armor -o ".$config{'pgptmpf'}.".txt.asc -z -f < ".$config{'pgptmpf'}.".txt ".$config{'pgp-pass-fd'}."<".$config{'path-to-pgp-pass'}; + } elsif ($config{'interactive'}) { + $PGPCommand = $config{'pgp'}."s -u \"".$config{'pgp-signer'}."\" -t --armor -o ".$config{'pgptmpf'}.".txt.asc -z -f < ".$config{'pgptmpf'}.".txt"; } else { die("$0: Passphrase is unknown!\n"); } - } elsif ($PGPVersion eq '6') { # this is untested - if ($config{'PathtoPGPPass'}) { - $PGPCommand = "PGPPASSFD=".$config{'PGPPassFD'}." ".$config{'pgp'}." -u \"".$config{'PGPSigner'}."\" -saft -o ".$config{'pgptmpf'}.".txt.asc < ".$config{'pgptmpf'}.".txt ".$config{'PGPPassFD'}."<".$config{'PathtoPGPPass'}; - } elsif ($config{'Interactive'}) { - $PGPCommand = $config{'pgp'}." -u \"".$config{'PGPSigner'}."\" -saft -o ".$config{'pgptmpf'}.".txt.asc < ".$config{'pgptmpf'}.".txt"; + } elsif ($pgpversion eq '6') { # this is untested + if ($config{'path-to-pgp-pass'}) { + $PGPCommand = "PGPPASSFD=".$config{'pgp-pass-fd'}." ".$config{'pgp'}." -u \"".$config{'pgp-signer'}."\" -saft -o ".$config{'pgptmpf'}.".txt.asc < ".$config{'pgptmpf'}.".txt ".$config{'pgp-pass-fd'}."<".$config{'path-to-pgp-pass'}; + } elsif ($config{'interactive'}) { + $PGPCommand = $config{'pgp'}." -u \"".$config{'pgp-signer'}."\" -saft -o ".$config{'pgptmpf'}.".txt.asc < ".$config{'pgptmpf'}.".txt"; } else { die("$0: Passphrase is unknown!\n"); } - } elsif ($PGPVersion =~ m/GPG1?$/io) { - if ($config{'PathtoPGPPass'}) { - $PGPCommand = $config{'pgp'}." --emit-version --digest-algo $config{'digest-algo'} -a -u \"".$config{'PGPSigner'}."\" -o ".$config{'pgptmpf'}.".txt.asc --no-tty --batch --passphrase-fd ".$config{'PGPPassFD'}." ".$config{'PGPPassFD'}."<".$config{'PathtoPGPPass'}." --clearsign ".$config{'pgptmpf'}.".txt"; - } elsif ($config{'Interactive'}) { - $PGPCommand = $config{'pgp'}." --emit-version --digest-algo $config{'digest-algo'} -a -u \"".$config{'PGPSigner'}."\" -o ".$config{'pgptmpf'}.".txt.asc --no-secmem-warning --no-batch --clearsign ".$config{'pgptmpf'}.".txt"; + } elsif ($pgpversion =~ m/GPG1?$/io) { + if ($config{'path-to-pgp-pass'}) { + $PGPCommand = $config{'pgp'}." --emit-version --digest-algo $config{'digest-algo'} -a -u \"".$config{'pgp-signer'}."\" -o ".$config{'pgptmpf'}.".txt.asc --no-tty --batch --passphrase-fd ".$config{'pgp-pass-fd'}." ".$config{'pgp-pass-fd'}."<".$config{'path-to-pgp-pass'}." --clearsign ".$config{'pgptmpf'}.".txt"; + } elsif ($config{'interactive'}) { + $PGPCommand = $config{'pgp'}." --emit-version --digest-algo $config{'digest-algo'} -a -u \"".$config{'pgp-signer'}."\" -o ".$config{'pgptmpf'}.".txt.asc --no-secmem-warning --no-batch --clearsign ".$config{'pgptmpf'}.".txt"; } else { die("$0: Passphrase is unknown!\n"); } - } elsif ($PGPVersion =~ m/GPG2$/io) { - if ($config{'PathtoPGPPass'}) { - $PGPCommand = $config{'pgp'}." --pinentry-mode loopback --emit-version --digest-algo $config{'digest-algo'} -a -u \"".$config{'PGPSigner'}."\" -o ".$config{'pgptmpf'}.".txt.asc --no-tty --batch --passphrase-fd ".$config{'PGPPassFD'}." ".$config{'PGPPassFD'}."<".$config{'PathtoPGPPass'}." --clearsign ".$config{'pgptmpf'}.".txt"; - } elsif ($config{'Interactive'}) { - $PGPCommand = $config{'pgp'}." --emit-version --digest-algo $config{'digest-algo'} -a -u \"".$config{'PGPSigner'}."\" -o ".$config{'pgptmpf'}.".txt.asc --no-secmem-warning --no-batch --clearsign ".$config{'pgptmpf'}.".txt"; + } elsif ($pgpversion =~ m/GPG2$/io) { + if ($config{'path-to-pgp-pass'}) { + $PGPCommand = $config{'pgp'}." --pinentry-mode loopback --emit-version --digest-algo $config{'digest-algo'} -a -u \"".$config{'pgp-signer'}."\" -o ".$config{'pgptmpf'}.".txt.asc --no-tty --batch --passphrase-fd ".$config{'pgp-pass-fd'}." ".$config{'pgp-pass-fd'}."<".$config{'path-to-pgp-pass'}." --clearsign ".$config{'pgptmpf'}.".txt"; + } elsif ($config{'interactive'}) { + $PGPCommand = $config{'pgp'}." --emit-version --digest-algo $config{'digest-algo'} -a -u \"".$config{'pgp-signer'}."\" -o ".$config{'pgptmpf'}.".txt.asc --no-secmem-warning --no-batch --clearsign ".$config{'pgptmpf'}.".txt"; } else { die("$0: Passphrase is unknown!\n"); } } else { - die("$0: Unknown PGP-Version $PGPVersion!"); + die("$0: Unknown PGP-Version $pgpversion!"); } return $PGPCommand; } @@ -698,17 +769,21 @@ sub postarticle { my $Server = AuthonNNTP(); my $ServerCod = $Server->code(); + my $ServerMsg = $Server->message(); if ($ServerCod == 340) { $Server->datasend(@$ArticleR); + ## buggy Net::Cmd < 2.31 + $Server->set_status(200, ""); $Server->dataend(); - if (!$Server->ok()) { - my $ServerMsg = $Server->message(); + $ServerCod = $Server->code(); + $ServerMsg = $Server->message(); + if (! $Server->ok()) { $Server->quit(); - die("\n$0: Posting failed! Response from news server:\n", $Server->code(), ' ', $ServerMsg); + die("\n$0: Posting failed! Response from news server:\n", $ServerCod, ' ', $ServerMsg); } $Server->quit(); } else { - die("\n".$0.": Posting failed!\n"); + die("\n$0: Posting failed! Response from news server:\n", $ServerCod, ' ', $ServerMsg); } return; } @@ -746,7 +821,7 @@ sub signarticle { my ($HeaderR, $BodyR) = @_; my (@pgphead, @pgpbody, $pgphead, $pgpbody, $signheaders, @signheaders); - foreach (@{$config{'PGPSignHeaders'}}) { + foreach (@{$config{'pgp-sign-headers'}}) { if (defined($$HeaderR{lc($_)}) && $$HeaderR{lc($_)} =~ m/^[^\s:]+: .+/o) { push @signheaders, $_; } @@ -769,7 +844,7 @@ sub signarticle { unless (substr($pgpbody,-1,1)=~ /\n/ ) {$pgpbody.="\n"}; open(my $FH, '>', $config{'pgptmpf'} . ".txt") or die("$0: can't open ".$config{'pgptmpf'}.": $!\n"); print $FH $pgphead, "\n", $pgpbody; - print $FH "\n" if ($config{'PGPVersion'} =~ m/GPG/io); # workaround a pgp/gpg incompatibility - should IMHO be fixed in pgpverify + print $FH "\n" if ($config{'pgp-version'} =~ m/GPG/io); # workaround a pgp/gpg incompatibility - should IMHO be fixed in pgpverify close($FH) or warn "$0: Couldn't close TMP: $!\n"; # Start PGP, then read the signature; @@ -822,7 +897,7 @@ sub signarticle { delete $$HeaderR{$config{'pgpheader'}}; @pgphead = (); - foreach my $header (@{$config{PGPorderheaders}}) { + foreach my $header (@{$config{'pgp-order-headers'}}) { if ($$HeaderR{$header} && $$HeaderR{$header} ne "\n") { push(@pgphead, "$$HeaderR{$header}"); delete $$HeaderR{$header}; @@ -837,7 +912,7 @@ sub signarticle { } push @pgphead, ("X-PGP-Hash: " . $config{'digest-algo'} . "\n") if (defined($config{'digest-algo'})); - push @pgphead, ("X-PGP-Key: " . $config{'PGPSigner'} . "\n"), $tmppgpheader; + push @pgphead, ("X-PGP-Key: " . $config{'pgp-signer'} . "\n"), $tmppgpheader; undef $tmppgpheader; @pgpbody = split(/$/m, $pgpbody); @@ -857,9 +932,9 @@ sub signarticle { sub buildcancelkey { my ($data, $key) = @_; my $cancel_key; - if ($config{'canlock_algorithm'} eq 'sha1') { + if ($config{'canlock-algorithm'} eq 'sha1') { $cancel_key = MIME::Base64::encode(Digest::HMAC_SHA1::hmac_sha1($data, $key), ''); - } elsif ($config{'canlock_algorithm'} eq 'sha256') { + } elsif ($config{'canlock-algorithm'} eq 'sha256') { $cancel_key = MIME::Base64::encode(Digest::SHA::hmac_sha256($data, $key), ''); } else { $cancel_key = MIME::Base64::encode(Digest::SHA::hmac_sha512($data, $key), ''); @@ -880,13 +955,13 @@ sub buildcancelkey { sub buildcancellock { my ($cancel_key, $sha_mod) = @_; my $cancel_lock; - if ($config{'canlock_algorithm'} eq 'sha1') { + if ($config{'canlock-algorithm'} eq 'sha1') { if ($sha_mod =~ m/SHA1/) { $cancel_lock = MIME::Base64::encode(Digest::SHA1::sha1($cancel_key, ''), ''); } else { $cancel_lock = MIME::Base64::encode(Digest::SHA::sha1($cancel_key, ''), ''); } - } elsif ($config{'canlock_algorithm'} eq 'sha256') { + } elsif ($config{'canlock-algorithm'} eq 'sha256') { $cancel_lock = MIME::Base64::encode(Digest::SHA::sha256($cancel_key, ''), ''); } else { $cancel_lock = MIME::Base64::encode(Digest::SHA::sha512($cancel_key, ''), ''); @@ -910,11 +985,11 @@ sub usage { print " -i string list of headers to be ignored for signing\n"; print " -n string set Newsgroups:-header to string\n"; print " -o string set Organization:-header to string\n"; - print " -p port use port as NNTP port [default=".$config{'NNTPPort'}."]\n"; + print " -p port use port as NNTP port [default=".$config{'nntp-port'}."]\n"; print " -r string set Reply-To:-header to string\n"; print " -s string save signed article to directory string instead of posting\n"; print " -t string set Subject:-header to string\n"; - print " -v show version\n"; + print " -v show warnings about missing/disabled features\n"; print " -w string set Followup-To:-header to string\n"; print " -x string set Path:-header to string\n"; print " -D enable debugging\n"; @@ -922,10 +997,17 @@ sub usage { print " -H show help\n"; print " -I do not add Injection-Date: header\n"; print " -L do not add Cancel-Lock: / Cancel-Key: headers\n"; + print " -O do not add Organization:-header\n"; print " -R disallow control messages\n"; - print " -S do not append " . $config{'sig_path'} . "\n"; + print " -S do not append " . $config{'sig-path'} . "\n"; print " -X do not sign article\n"; print " -Y force authentication on connect\n"; + print " --canlock-algorithm string\n"; + print " digest algorithm for Cancel-Lock (sha1, sha256 or sha512)\n"; + print " --ssl use NNTPS (via port 563) if available\n"; + print " --transform convert to \n"; + print " --version show version\n"; + printf ("\nAvailable tinewsrc-vars: %s\n", join(", ",sort keys %config)) if ($config{'verbose'} || $config{'debug'}); exit 0; } @@ -955,7 +1037,8 @@ to the article and send out the mail-cop If a Cancel-Lock secret file is defined it will automatically add a Cancel-Lock: (and Cancel-Key: if required) header. -The input should have unix line endings (, '\n'). +The input should have unix line endings (, '\n'). Use --B +to convert from to just . =head1 OPTIONS X @@ -1016,8 +1099,8 @@ X<-p> X<--port> use C as NNTP-port -=item -B C | --B C -X<-r> X<--replyto> +=item -B C | --B C +X<-r> X<--reply-to> Set the article header field Reply-To: to the given value. @@ -1031,13 +1114,14 @@ X<-t> X<--subject> Set the article header field Subject: to the given value. -=item -B | --B -X<-v> X<--version> +=item -B | --B +X<-v> X<--verbose> -Show version. +Warn about disabled options due to lacking perl-modules or executables and +unreadable files and enable warnings about raw 8-bit data. -=item -B C | --B C -X<-w> X<--followupto> +=item -B C | --B C +X<-w> X<--followup-to> Set the article header field Followup-To: to the given value. @@ -1046,6 +1130,13 @@ X<-x> X<--path> Set the article header field Path: to the given value. +=item -B | -B | --B +X<-D> X<-N> X<--debug> + +Set L to debug mode, enable warnings about raw 8-bit data, +warn about disabled options due to lacking perl-modules or executables and +unreadable files. + =item -B | --B X<-H> X<--help> @@ -1061,11 +1152,10 @@ X<-L> X<--no-canlock> Do not add Cancel-Lock: / Cancel-Key: headers. -=item --B C -X<--canlock-algorithm> +=item -B | --B +X<-O> X<--no-organization> -Digest algorithm used for Cancel-Lock: / Cancel-Key: headers. -Supported algorithms are sha1, sha256 and sha512. Default is sha1. +Do not add Organization: header. =item -B | --B X<-R> X<--no-control> @@ -1087,6 +1177,29 @@ X<-Y> X<--force-auth> Force authentication on connect even if not required by the server. +=item --B C +X<--canlock-algorithm> + +Digest algorithm used for Cancel-Lock: / Cancel-Key: headers. +Supported algorithms are sha1, sha256 and sha512. Default is sha1. + +=item --B | --B +X<--ssl> X<--nntps> + +Use NNTPS (via port 563) if available. This requires a recent version +of L and L. Be aware that no SSL +verification will be done. + +=item --B +X<--transform> + +Convert network line endings () to unix line endings (). + +=item --B +X<--version> + +Show version. + =item -B -B -B X<-A> X<-V> X<-W> @@ -1097,18 +1210,6 @@ X<-h> X<--headers> These options are accepted for compatibility reasons but ignored. -=item -B | --B -X<-O> X<--no-organization> - -These options are accepted for compatibility reasons but ignored. - -=item -B | -B | --B -X<-D> X<-N> X<--debug> - -Enable warnings about raw 8-bit data and set L in debug -mode, enable warnings about raw 8-bit data, warn about disabled options -due to lacking perl-modules or executables and unreadable files. - =back =head1 EXIT STATUS @@ -1181,7 +1282,8 @@ X<$ORGANIZATION> X Set the article header field Organization: to the contents of the variable if there isn't already an Organization: header in the article. The '-B' -command-line option overrides B<$ORGANIZATION>. +command-line option overrides B<$ORGANIZATION>, The '-B' command-line +option disables it. =item B<$DISTRIBUTION> X<$DISTRIBUTION> X @@ -1236,7 +1338,7 @@ F<$HOME/.newsauth> is checked first. =item F<$XDG_CONFIG_HOME/tinewsrc> F<$HOME/.config/tinewsrc> F<$HOME/.tinewsrc> "option=value" configuration pairs. Lines that start with "#" are ignored. -If the file contains unencrypted passwords (e.g. NNTPPass or PGPPass), it +If the file contains unencrypted passwords (e.g. nntp-pass or pgp-pass), it should be readable for the user only. =back @@ -1248,6 +1350,8 @@ contained that password has been erased, find that password, in plaintext, in a core dump. In short, if serious security is an issue, don't use this script. +Be aware that even if NNTPS is used still no SSL verification will be done. + =head1 NOTES B is designed to be used with L-2.6.3, @@ -1257,6 +1361,10 @@ B requires the following stan L, L, and L. +NNTPS (NNTP with implicit TLS; RFC 4642 and RFC 8143) may be unavailable +if L is too old or L is missing on +the system. B will fallback to unencrypted NNTP in that case. + If the Cancel-Lock feature (RFC 8315) is enabled the following additional modules must be installed: L, L or L and L. sha256 and sha512 as @@ -1281,7 +1389,7 @@ Marc Brockschmidt Emarc@marcbrocksch L, L, L, L, L, L, L, L, -L, L, L, -L +L, L, L, +L, L =cut diff -Nurp '--exclude=.bzr*' tin-2.4.4/tools/url_handler.pl tin-2.4.5/tools/url_handler.pl --- tin-2.4.4/tools/url_handler.pl 2017-12-08 00:50:27.000000000 +0100 +++ tin-2.4.5/tools/url_handler.pl 2020-12-01 11:53:17.746537421 +0100 @@ -11,7 +11,7 @@ use warnings; die "Usage: $pname URL" if $#ARGV != 0; # version Number -my $version = "0.1.2"; +my $version = "0.1.3"; my ($method, $url, $match, @try); $method = $url = $ARGV[0]; @@ -127,7 +127,7 @@ B was designed to work t issues shell escaped absolute URLs thus B does not try hard to shell escape its input nor does it convert relative URLs into absolute ones! If you use B from other applications be sure to at -least shell escaped its input! +least shell escape its input! =head1 AUTHOR diff -Nurp '--exclude=.bzr*' tin-2.4.4/tools/w2r.pl tin-2.4.5/tools/w2r.pl --- tin-2.4.4/tools/w2r.pl 2018-06-04 10:46:42.000000000 +0200 +++ tin-2.4.5/tools/w2r.pl 2020-12-24 01:23:07.094473333 +0100 @@ -3,7 +3,7 @@ # reads a tin filter file with wildmat filters on STDIN, converts it to # regexp filters and returns it on STDOUT # -# 2000-04-27 +# 2020-11-10 # # NOTE: don't use w2r.pl on regexp filters # @@ -18,7 +18,7 @@ require 5.004; # version Number -# $VERSION = "0.2.7"; +# $VERSION = "0.2.8"; while (defined($line = <>)) { chomp $line; @@ -33,7 +33,7 @@ while (defined($line = <>)) { next if ($line =~ m/^[^=]+=$/o); # lines which needs to be translated - if ($line =~ m/^(subj|from|msgid(?:|_last|_only)|refs_only|xref)=(.*)$/o) { + if ($line =~ m/^(subj|from|msgid(?:|_last|_only)|refs_only|xref|path)=(.*)$/o) { printf ("$1=%s\n", w2p($2)); next; }