----------------------------------------------------------------------------- MANIFEST | 207 - Makefile | 18 README.MAC | 11 aclocal.m4 | 1120 ++++-- config.guess | 54 config.sub | 95 configure | 7402 ++++++++++++++++++++++++++--------------- configure.in | 45 doc/CHANGES | 79 doc/CHANGES.old | 4 doc/INSTALL | 10 doc/TODO | 79 doc/WHATSNEW | 7 doc/config-anomalies | 4 doc/keymap.sample | 5 doc/l10n/de.po | 3808 ++++++++++----------- doc/l10n/de/tin.1 | 94 doc/l10n/de/tin.5 | 74 doc/l10n/en_GB.po | 3807 ++++++++++----------- doc/l10n/en_GB/tin.1 | 72 doc/l10n/en_GB/tin.5 | 44 doc/l10n/tin-man.pot | 3678 ++++++++++---------- doc/pgp.txt | 2 doc/tin.1 | 62 doc/tin.5 | 42 doc/tinews.1 | 2 doc/url_handler.1 | 72 include/autoconf.hin | 12 include/bool.h | 2 include/bugrep.h | 2 include/debug.h | 2 include/extern.h | 34 include/keymap.h | 5 include/newsrc.h | 2 include/nntplib.h | 2 include/policy.h | 53 include/proto.h | 16 include/rfc2046.h | 2 include/stpwatch.h | 2 include/tcurses.h | 11 include/tin.h | 47 include/tinrc.h | 7 include/tnntp.h | 2 include/trace.h | 2 include/version.h | 10 install-sh | 294 + install.sh | 294 - intl/Makefile.in | 7 intl/plural.y | 2 libcanlock/Makefile.in | 2 libcanlock/include/sha1.h | 12 libcanlock/src/base64.c | 4 mkdirs.sh | 51 po/Makefile.inn | 84 po/da.gmo |binary po/da.po | 2586 +++++++------- po/de.gmo |binary po/de.po | 2742 +++++++-------- po/en_GB.gmo |binary po/en_GB.po | 2576 +++++++------- po/et.gmo |binary po/et.po | 2597 +++++++------- po/fr.gmo |binary po/fr.po | 2854 ++++++++------- po/ru.gmo |binary po/ru.po | 2612 +++++++------- po/rw.gmo |binary po/rw.po | 7911 -------------------------------------------- po/sv.gmo |binary po/sv.po | 2612 +++++++------- po/tin.pot | 2583 +++++++------- po/tr.gmo |binary po/tr.po | 2616 +++++++------- src/Makefile.in | 14 src/active.c | 6 src/art.c | 50 src/attrib.c | 270 - src/auth.c | 2 src/charset.c | 20 src/color.c | 66 src/config.c | 354 + src/cook.c | 14 src/curses.c | 14 src/debug.c | 8 src/envarg.c | 2 src/feed.c | 10 src/filter.c | 16 src/getline.c | 2 src/global.c | 2 src/group.c | 6 src/hashstr.c | 2 src/header.c | 2 src/help.c | 93 src/inews.c | 2 src/init.c | 20 src/joinpath.c | 2 src/keymap.c | 16 src/lang.c | 65 src/list.c | 2 src/lock.c | 2 src/mail.c | 8 src/main.c | 67 src/makecfg.c | 2 src/memory.c | 4 src/mimetypes.c | 2 src/misc.c | 61 src/my_tmpfile.c | 2 src/newsrc.c | 16 src/nntplib.c | 15 src/nrctbl.c | 2 src/options_menu.c | 147 src/page.c | 96 src/pgp.c | 19 src/post.c | 221 - src/prompt.c | 14 src/read.c | 30 src/refs.c | 18 src/regex.c | 2 src/rfc1524.c | 2 src/rfc2045.c | 2 src/rfc2046.c | 71 src/rfc2047.c | 10 src/save.c | 80 src/screen.c | 16 src/search.c | 6 src/select.c | 14 src/sigfile.c | 2 src/signal.c | 2 src/strftime.c | 2 src/string.c | 86 src/tags.c | 2 src/tcurses.c | 11 src/thread.c | 39 src/tincfg.tbl | 23 src/trace.c | 2 src/version.c | 2 src/xface.c | 2 src/xref.c | 2 tin.spec | 9 tools/tinews.pl | 171 tools/url_handler.pl | 13 141 files changed, 26291 insertions(+), 29615 deletions(-) ----------------------------------------------------------------------------- diff -Nurp --exclude='.bzr*' tin-1.9.6/MANIFEST tin-2.0.0/MANIFEST --- tin-1.9.6/MANIFEST 2010-11-26 16:08:00.000000000 +0100 +++ tin-2.0.0/MANIFEST 2011-08-23 00:03:57.317656484 +0200 @@ -1,36 +1,35 @@ -MANIFEST for tin-1.9.6 (Fri Nov 26 16:07:59 CET 2010) +MANIFEST for tin-2.0.0 (Tue Aug 23 00:03:55 CEST 2011) ---------------------------------------------------- - 14149 ./Makefile - 8121 ./MANIFEST + 14066 ./Makefile + 8060 ./MANIFEST 1441 ./README - 564 ./README.MAC + 745 ./README.MAC 976 ./README.WIN - 168397 ./aclocal.m4 + 178280 ./aclocal.m4 882 ./conf-tin - 44832 ./config.guess - 34912 ./config.sub - 595798 ./configure - 32299 ./configure.in - 7123 ./install.sh - 1320 ./mkdirs.sh - 1505 ./tin.spec + 45029 ./config.guess + 35291 ./config.sub + 636696 ./configure + 31970 ./configure.in + 7123 ./install-sh + 1488 ./tin.spec 18847 ./doc/ABOUT-NLS - 22476 ./doc/CHANGES - 252173 ./doc/CHANGES.old + 25927 ./doc/CHANGES + 252176 ./doc/CHANGES.old 5041 ./doc/CREDITS 1305 ./doc/DEBUG_REFS - 30361 ./doc/INSTALL - 39182 ./doc/TODO - 1702 ./doc/WHATSNEW + 30405 ./doc/INSTALL + 40816 ./doc/TODO + 1915 ./doc/WHATSNEW 2618 ./doc/art_handling.txt 1701 ./doc/article.txt 4373 ./doc/auth.txt - 4046 ./doc/config-anomalies + 3859 ./doc/config-anomalies 11269 ./doc/filtering 35305 ./doc/good-netkeeping-seal 3803 ./doc/internals.txt 23621 ./doc/iso2asc.txt - 3883 ./doc/keymap.sample + 3904 ./doc/keymap.sample 633 ./doc/mailcap.sample 5870 ./doc/mbox.5 3365 ./doc/mime.types @@ -39,16 +38,16 @@ MANIFEST for tin-1.9.6 (Fri Nov 26 16:07 1541 ./doc/nov_tests 5155 ./doc/opt-case.1 6964 ./doc/plp_snprintf.3 - 3984 ./doc/pgp.txt + 3964 ./doc/pgp.txt 2817 ./doc/rcvars.txt 1525 ./doc/reading-mail.txt 4947 ./doc/umlaute.txt 4246 ./doc/umlauts.txt - 5536 ./doc/url_handler.1 - 127598 ./doc/tin.1 - 78093 ./doc/tin.5 + 6723 ./doc/url_handler.1 + 128360 ./doc/tin.1 + 78323 ./doc/tin.5 4952 ./doc/tin.defaults - 13098 ./doc/tinews.1 + 13099 ./doc/tinews.1 2418 ./doc/tools.txt 4733 ./doc/w2r.1 2196 ./doc/wildmat.3 @@ -56,92 +55,92 @@ MANIFEST for tin-1.9.6 (Fri Nov 26 16:07 3815 ./tools/metamutt 2788 ./tools/opt-case.pl 1410 ./tools/tinlock - 32191 ./tools/tinews.pl - 3638 ./tools/url_handler.pl + 32677 ./tools/tinews.pl + 3643 ./tools/url_handler.pl 1657 ./tools/url_handler.sh 3347 ./tools/w2r.pl 1661 ./tools/expand_aliases.tgz 2586 ./include/bool.h 1947 ./include/bugrep.h 2210 ./include/debug.h - 65981 ./include/extern.h - 14050 ./include/keymap.h + 66553 ./include/extern.h + 14068 ./include/keymap.h 6333 ./include/newsrc.h 8685 ./include/nntplib.h 664 ./include/plp_snprintf.h - 13617 ./include/policy.h - 32121 ./include/proto.h + 14528 ./include/policy.h + 32325 ./include/proto.h 5374 ./include/rfc2046.h 3377 ./include/stpwatch.h - 5847 ./include/tcurses.h - 67235 ./include/tin.h - 16226 ./include/tinrc.h + 5898 ./include/tcurses.h + 68484 ./include/tin.h + 16390 ./include/tinrc.h 4346 ./include/tnntp.h 2264 ./include/trace.h - 2351 ./include/version.h + 2354 ./include/version.h 34225 ./src/active.c - 70932 ./src/art.c - 71570 ./src/attrib.c + 71178 ./src/art.c + 74865 ./src/attrib.c 14980 ./src/auth.c - 12442 ./src/charset.c - 8380 ./src/color.c - 61143 ./src/config.c - 27452 ./src/cook.c - 26867 ./src/curses.c - 9915 ./src/debug.c + 12555 ./src/charset.c + 8551 ./src/color.c + 62398 ./src/config.c + 27541 ./src/cook.c + 27152 ./src/curses.c + 9917 ./src/debug.c 3408 ./src/envarg.c - 30209 ./src/feed.c - 56004 ./src/filter.c + 30327 ./src/feed.c + 56135 ./src/filter.c 18126 ./src/getline.c 9070 ./src/global.c - 47042 ./src/group.c + 47049 ./src/group.c 3900 ./src/hashstr.c 8215 ./src/header.c - 40299 ./src/help.c + 43731 ./src/help.c 14005 ./src/inews.c - 36938 ./src/init.c + 37255 ./src/init.c 2435 ./src/joinpath.c - 101229 ./src/keymap.c - 131944 ./src/lang.c + 101520 ./src/keymap.c + 133613 ./src/lang.c 4486 ./src/langinfo.c 7728 ./src/list.c 6673 ./src/lock.c - 16598 ./src/mail.c - 24180 ./src/main.c + 16611 ./src/mail.c + 25458 ./src/main.c 10879 ./src/makecfg.c - 13234 ./src/memory.c + 13232 ./src/memory.c 5283 ./src/mimetypes.c - 91380 ./src/misc.c - 38534 ./src/newsrc.c - 53367 ./src/nntplib.c + 91686 ./src/misc.c + 38541 ./src/newsrc.c + 53404 ./src/nntplib.c 7502 ./src/nrctbl.c - 94773 ./src/options_menu.c - 64853 ./src/page.c + 99090 ./src/options_menu.c + 65812 ./src/page.c 24138 ./src/parsdate.y 17057 ./src/plp_snprintf.c - 12757 ./src/pgp.c - 144382 ./src/post.c - 18823 ./src/prompt.c - 10100 ./src/read.c - 27214 ./src/refs.c + 13003 ./src/pgp.c + 150469 ./src/post.c + 18837 ./src/prompt.c + 10384 ./src/read.c + 27319 ./src/refs.c 5481 ./src/regex.c 14483 ./src/rfc1524.c 15069 ./src/rfc2045.c - 31800 ./src/rfc2046.c - 36194 ./src/rfc2047.c - 56328 ./src/save.c - 11025 ./src/screen.c - 18169 ./src/search.c - 32999 ./src/select.c + 32047 ./src/rfc2046.c + 36199 ./src/rfc2047.c + 57186 ./src/save.c + 11233 ./src/screen.c + 18173 ./src/search.c + 33022 ./src/select.c 7805 ./src/sigfile.c 14154 ./src/signal.c 7215 ./src/strftime.c - 26700 ./src/string.c + 27454 ./src/string.c 13345 ./src/tags.c - 17169 ./src/tcurses.c + 17371 ./src/tcurses.c 3070 ./src/tmpfile.c 3706 ./src/my_tmpfile.c - 40636 ./src/thread.c + 41352 ./src/thread.c 2472 ./src/trace.c 4315 ./src/version.c 5453 ./src/wildmat.c @@ -214,21 +213,21 @@ MANIFEST for tin-1.9.6 (Fri Nov 26 16:07 108966 ./pcre/testdata/testoutput7 53056 ./pcre/testdata/testoutput8 28769 ./pcre/testdata/testoutput9 - 20287 ./include/autoconf.hin - 21514 ./src/Makefile.in - 10807 ./src/tincfg.tbl + 20380 ./include/autoconf.hin + 21511 ./src/Makefile.in + 10961 ./src/tincfg.tbl 1929 ./libcanlock/CHANGES 2464 ./libcanlock/HOWTO 1259 ./libcanlock/README - 1311 ./libcanlock/Makefile.in - 3700 ./libcanlock/src/base64.c + 1331 ./libcanlock/Makefile.in + 3712 ./libcanlock/src/base64.c 5271 ./libcanlock/src/canlock.c 3794 ./libcanlock/src/hmac_sha1.c 12514 ./libcanlock/src/sha1.c 1873 ./libcanlock/include/base64.h 378 ./libcanlock/include/canlock.h 119 ./libcanlock/include/hmac_sha1.h - 1208 ./libcanlock/include/sha1.h + 1413 ./libcanlock/include/sha1.h 2889 ./libcanlock/t/canlocktest.c 3135 ./libcanlock/t/hmactest.c 766 ./libcanlock/t/canlocktest.shouldbe @@ -256,42 +255,40 @@ MANIFEST for tin-1.9.6 (Fri Nov 26 16:07 6905 ./intl/localcharset.c 2657 ./intl/locale.alias 9432 ./intl/localealias.c - 10014 ./intl/Makefile.in + 9854 ./intl/Makefile.in 2001 ./intl/ngettext.c 38981 ./intl/plural.c - 8376 ./intl/plural.y + 8375 ./intl/plural.y 1089 ./intl/ref-add.sin 1044 ./intl/ref-del.sin 4481 ./intl/textdomain.c 41 ./intl/VERSION - 4962 ./po/Makefile.inn + 5068 ./po/Makefile.inn 847 ./po/POTFILES.in - 139041 ./po/tin.pot - 59999 ./po/da.gmo - 174070 ./po/da.po - 175799 ./po/de.gmo - 234024 ./po/de.po + 140976 ./po/tin.pot + 60091 ./po/da.gmo + 176284 ./po/da.po + 177001 ./po/de.gmo + 234517 ./po/de.po 8420 ./po/en_GB.gmo - 150900 ./po/en_GB.po - 169561 ./po/et.gmo - 226117 ./po/et.po - 177174 ./po/fr.gmo - 232369 ./po/fr.po - 124778 ./po/ru.gmo - 211095 ./po/ru.po - 2081 ./po/rw.gmo - 197641 ./po/rw.po - 22794 ./po/sv.gmo - 157477 ./po/sv.po + 152907 ./po/en_GB.po + 169563 ./po/et.gmo + 228845 ./po/et.po + 185808 ./po/fr.gmo + 237856 ./po/fr.po + 124584 ./po/ru.gmo + 213441 ./po/ru.po + 22907 ./po/sv.gmo + 159495 ./po/sv.po 4671 ./po/tr.gmo - 223067 ./po/tr.po - 132668 ./doc/l10n/de/tin.1 - 80997 ./doc/l10n/de/tin.5 + 225583 ./po/tr.po + 133459 ./doc/l10n/de/tin.1 + 81220 ./doc/l10n/de/tin.5 129 ./doc/l10n/de.add - 321717 ./doc/l10n/de.po - 131205 ./doc/l10n/en_GB/tin.1 - 80594 ./doc/l10n/en_GB/tin.5 - 448565 ./doc/l10n/en_GB.po + 324372 ./doc/l10n/de.po + 132014 ./doc/l10n/en_GB/tin.1 + 80828 ./doc/l10n/en_GB/tin.5 + 451247 ./doc/l10n/en_GB.po 346 ./doc/l10n/po4a.conf - 280632 ./doc/l10n/tin-man.pot -10304015 total + 282544 ./doc/l10n/tin-man.pot +10234437 total diff -Nurp --exclude='.bzr*' tin-1.9.6/Makefile tin-2.0.0/Makefile --- tin-1.9.6/Makefile 2010-11-26 16:07:59.000000000 +0100 +++ tin-2.0.0/Makefile 2011-08-23 00:03:55.061306179 +0200 @@ -1,15 +1,15 @@ # Top level Makefile for tin # - for configuration options read the doc/INSTALL file. # -# Updated: 2010-09-16 +# Updated: 2011-04-17 # PROJECT = tin -LVER = 1 -PVER = 9 -SVER = 6 +LVER = 2 +PVER = 0 +SVER = 0 VER = $(LVER).$(PVER).$(SVER) -DVER = 20101126 +DVER = 20110823 EXE = tin # directory structure @@ -178,8 +178,7 @@ TOP = \ $(TOPDIR)/config.sub \ $(TOPDIR)/configure \ $(TOPDIR)/configure.in \ - $(TOPDIR)/install.sh \ - $(TOPDIR)/mkdirs.sh \ + $(TOPDIR)/install-sh \ $(TOPDIR)/tin.spec PCRE = \ @@ -323,8 +322,6 @@ POFILES = \ $(PODIR)/fr.po \ $(PODIR)/ru.gmo \ $(PODIR)/ru.po \ - $(PODIR)/rw.gmo \ - $(PODIR)/rw.po \ $(PODIR)/sv.gmo \ $(PODIR)/sv.po \ $(PODIR)/tr.gmo \ @@ -434,8 +431,7 @@ chmod: $(TOPDIR)/config.guess \ $(TOPDIR)/config.sub \ $(TOPDIR)/configure \ - $(TOPDIR)/install.sh \ - $(TOPDIR)/mkdirs.sh \ + $(TOPDIR)/install-sh \ $(TOLDIR)/expiretover \ $(TOLDIR)/metamutt \ $(TOLDIR)/opt-case.pl \ diff -Nurp --exclude='.bzr*' tin-1.9.6/README.MAC tin-2.0.0/README.MAC --- tin-1.9.6/README.MAC 2009-08-14 22:03:37.000000000 +0200 +++ tin-2.0.0/README.MAC 2011-04-17 16:04:25.586332490 +0200 @@ -1,18 +1,21 @@ -Compiling tin for MacOS X: +Compiling tin for Mac OS X / Darwin: First, you either need: - the DevTools if you are running Mac OS X 10.2 (Darwin 6.x) or below or -- the Xcode Tools if you are running Mac OS X 10.3 (Darwin 7.x.x) +- the Xcode Tools if you are running Mac OS X 10.3 (Darwin 7.x.x) or higher configure needs at least the argument: --with-domain-name= Compile tin, install it and run in a ISO-8859-1(5) terminal. +Note for Mac OS X 10.6 / Darwin 10.0.0 users: you may also set a FQDN with +`/usr/sbin/scutil --set HostName` if you set the "disable_sender" option to +ON on /etc/tin/tin.defaults Here are two other ways to build and install tin: -- DarwinPorts -- Fink +- MacPorts +- Fink Instead of using the shell-script url_handler.sh you might want to use open(1) as URL-handler. diff -Nurp --exclude='.bzr*' tin-1.9.6/aclocal.m4 tin-2.0.0/aclocal.m4 --- tin-1.9.6/aclocal.m4 2010-01-10 01:52:14.000000000 +0100 +++ tin-2.0.0/aclocal.m4 2011-06-08 13:12:02.259683352 +0200 @@ -2,10 +2,10 @@ dnl Project : tin - a Usenet reader dnl Module : aclocal.m4 dnl Author : Thomas E. Dickey dnl Created : 1995-08-24 -dnl Updated : 2009-12-31 +dnl Updated : 2011-06-08 dnl Notes : dnl -dnl Copyright (c) 1995-2010 Thomas E. Dickey +dnl Copyright (c) 1995-2011 Thomas E. Dickey dnl All rights reserved. dnl dnl Redistribution and use in source and binary forms, with or without @@ -61,7 +61,7 @@ AC_DEFUN([AC_ISC_POSIX], ] ) dnl --------------------------------------------------------------------------- -dnl AM_GNU_GETTEXT version: 11 updated: 2004/01/26 20:58:40 +dnl AM_GNU_GETTEXT version: 12 updated: 2010/06/19 07:02:11 dnl -------------- dnl Usage: Just like AM_WITH_NLS, which see. AC_DEFUN([AM_GNU_GETTEXT], @@ -122,25 +122,6 @@ strdup strtoul tsearch __argz_count __ar fi fi - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but ($top_srcdir). - dnl Try to locate it. - dnl changed mkinstalldirs to mkdirs.sh for Lynx /je spath 1998-Aug-21 - dnl added check for separate locations of scripts -mirabile 2004-Jan-18 - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkdirs.sh" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkdirs.sh" - fi - if test -n "$GNUSYSTEM_AUX_DIR" ; then - if test -e "${GNUSYSTEM_AUX_DIR}/mkinstalldirs"; then - MKINSTALLDIRS="${GNUSYSTEM_AUX_DIR}/mkinstalldirs" - fi - fi - AC_SUBST(MKINSTALLDIRS) - dnl Enable libtool support if the surrounding package wishes it. INTL_LIBTOOL_SUFFIX_PREFIX=ifelse([$1], use-libtool, [l], []) AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) @@ -420,7 +401,7 @@ AC_CACHE_VAL(ac_cv_path_$1, ac_cv_path_$1="[$]$1" # Let the user override the test with a path. ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" for ac_dir in ifelse([$5], , $PATH, [$5]); do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word$ac_exeext; then @@ -446,7 +427,7 @@ fi AC_SUBST($1)dnl ])dnl dnl --------------------------------------------------------------------------- -dnl AM_WITH_NLS version: 23 updated: 2009/01/11 19:52:42 +dnl AM_WITH_NLS version: 24 updated: 2010/06/20 09:24:28 dnl ----------- dnl Inserted as requested by gettext 0.10.40 dnl File from /usr/share/aclocal @@ -538,7 +519,7 @@ AC_DEFUN([AM_WITH_NLS], CATOBJEXT=NONE cf_save_LIBS_1="$LIBS" - LIBS="$LIBICONV $LIBS" + CF_ADD_LIBS($LIBICONV) AC_CACHE_CHECK([for libintl.h and gettext()], cf_cv_func_gettext,[ CF_FIND_LINKAGE(CF__INTL_HEAD, CF__INTL_BODY, @@ -756,7 +737,7 @@ changequote([,])dnl AC_SUBST(GENCAT) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ADD_CFLAGS version: 8 updated: 2009/01/06 19:33:30 +dnl CF_ADD_CFLAGS version: 10 updated: 2010/05/26 05:38:42 dnl ------------- dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS dnl The second parameter if given makes this macro verbose. @@ -782,8 +763,8 @@ no) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[[^=]]*='\''\"[[^"]]*//'` test "${cf_add_cflags}" != "${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" @@ -798,6 +779,12 @@ no) *$cf_add_cflags) #(vi ;; *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,$cf_tst_cppflags) + ;; + esac cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" ;; esac @@ -813,24 +800,24 @@ yes) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'` test "${cf_add_cflags}" != "${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=no + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no ;; esac done if test -n "$cf_new_cflags" ; then - ifelse($2,,,[CF_VERBOSE(add to \$CFLAGS $cf_new_cflags)]) + ifelse([$2],,,[CF_VERBOSE(add to \$CFLAGS $cf_new_cflags)]) CFLAGS="$CFLAGS $cf_new_cflags" fi if test -n "$cf_new_cppflags" ; then - ifelse($2,,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)]) + ifelse([$2],,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)]) CPPFLAGS="$CPPFLAGS $cf_new_cppflags" fi if test -n "$cf_new_extra_cppflags" ; then - ifelse($2,,,[CF_VERBOSE(add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags)]) + ifelse([$2],,,[CF_VERBOSE(add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags)]) EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" fi @@ -838,7 +825,7 @@ AC_SUBST(EXTRA_CPPFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ADD_INCDIR version: 12 updated: 2009/01/18 10:00:47 +dnl CF_ADD_INCDIR version: 13 updated: 2010/05/26 16:44:57 dnl ------------- dnl Add an include-directory to $CPPFLAGS. Don't add /usr/include, since it's dnl redundant. We don't normally need to add -I/usr/local/include for gcc, @@ -881,7 +868,7 @@ if test -n "$1" ; then if test "$cf_have_incdir" = no ; then CF_VERBOSE(adding $cf_add_incdir to include-path) - ifelse($2,,CPPFLAGS,$2)="$ifelse($2,,CPPFLAGS,$2) -I$cf_add_incdir" + ifelse([$2],,CPPFLAGS,[$2])="$ifelse([$2],,CPPFLAGS,[$2]) -I$cf_add_incdir" cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` test "$cf_top_incdir" = "$cf_add_incdir" && break @@ -895,7 +882,15 @@ if test -n "$1" ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ADD_LIBDIR version: 8 updated: 2009/01/18 10:01:08 +dnl CF_ADD_LIB version: 2 updated: 2010/06/02 05:03:05 +dnl ---------- +dnl Add a library, used to enforce consistency. +dnl +dnl $1 = library to add, without the "-l" +dnl $2 = variable to update (default $LIBS) +AC_DEFUN([CF_ADD_LIB],[CF_ADD_LIBS(-l$1,ifelse($2,,LIBS,[$2]))])dnl +dnl --------------------------------------------------------------------------- +dnl CF_ADD_LIBDIR version: 9 updated: 2010/05/26 16:44:57 dnl ------------- dnl Adds to the library-path dnl @@ -924,13 +919,34 @@ if test -n "$1" ; then fi if test "$cf_have_libdir" = no ; then CF_VERBOSE(adding $cf_add_libdir to library-path) - ifelse($2,,LDFLAGS,$2)="-L$cf_add_libdir $ifelse($2,,LDFLAGS,$2)" + ifelse([$2],,LDFLAGS,[$2])="-L$cf_add_libdir $ifelse([$2],,LDFLAGS,[$2])" fi fi done fi ])dnl dnl --------------------------------------------------------------------------- +dnl CF_ADD_LIBS version: 1 updated: 2010/06/02 05:03:05 +dnl ----------- +dnl Add one or more libraries, used to enforce consistency. +dnl +dnl $1 = libraries to add, with the "-l", etc. +dnl $2 = variable to update (default $LIBS) +AC_DEFUN([CF_ADD_LIBS],[ifelse($2,,LIBS,[$2])="$1 [$]ifelse($2,,LIBS,[$2])"])dnl +dnl --------------------------------------------------------------------------- +dnl CF_ADD_LIB_AFTER version: 2 updated: 2010/11/08 20:33:46 +dnl ---------------- +dnl Add a given library after another, e.g., following the one it satisfies a +dnl dependency for. +dnl +dnl $1 = the first library +dnl $2 = its dependency +AC_DEFUN([CF_ADD_LIB_AFTER],[ +CF_VERBOSE(...before $LIBS) +LIBS=`echo "$LIBS" | sed -e "s/[[ ]][[ ]]*/ /g" -e "s,$1 ,$1 $2 ," -e 's/ / /g'` +CF_VERBOSE(...after $LIBS) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_ADD_OPTIONAL_PATH version: 1 updated: 2007/07/29 12:33:33 dnl -------------------- dnl Add an optional search-path to the compile/link variables. @@ -980,7 +996,7 @@ $2]) done ]) dnl --------------------------------------------------------------------------- -dnl CF_ADD_SUBDIR_PATH version: 2 updated: 2007/07/29 10:12:59 +dnl CF_ADD_SUBDIR_PATH version: 3 updated: 2010/07/03 20:58:12 dnl ------------------ dnl Append to a search-list for a nonstandard header/lib-file dnl $1 = the variable to return as result @@ -992,7 +1008,7 @@ AC_DEFUN([CF_ADD_SUBDIR_PATH], [ test "$4" != "$5" && \ test -d "$4" && \ -ifelse([$5],NONE,,[(test $5 = NONE || test -d $5) &&]) { +ifelse([$5],NONE,,[(test $5 = NONE || test "$4" != "$5") &&]) { test -n "$verbose" && echo " ... testing for $3-directories under $4" test -d $4/$3 && $1="[$]$1 $4/$3" test -d $4/$3/$2 && $1="[$]$1 $4/$3/$2" @@ -1002,13 +1018,13 @@ ifelse([$5],NONE,,[(test $5 = NONE || te } ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ANSI_CC_CHECK version: 9 updated: 2001/12/30 17:53:34 +dnl CF_ANSI_CC_CHECK version: 10 updated: 2010/10/23 15:52:32 dnl ---------------- dnl This is adapted from the macros 'fp_PROG_CC_STDC' and 'fp_C_PROTOTYPES' dnl in the sharutils 4.2 distribution. AC_DEFUN([CF_ANSI_CC_CHECK], [ -AC_CACHE_CHECK(for ${CC-cc} option to accept ANSI C, cf_cv_ansi_cc,[ +AC_CACHE_CHECK(for ${CC:-cc} option to accept ANSI C, cf_cv_ansi_cc,[ cf_cv_ansi_cc=no cf_save_CFLAGS="$CFLAGS" cf_save_CPPFLAGS="$CPPFLAGS" @@ -1084,7 +1100,7 @@ dnl Allow user to enable a normally-off AC_DEFUN([CF_ARG_ENABLE], [CF_ARG_OPTION($1,[$2],[$3],[$4],no)])dnl dnl --------------------------------------------------------------------------- -dnl CF_ARG_OPTION version: 3 updated: 1997/10/18 14:42:41 +dnl CF_ARG_OPTION version: 4 updated: 2010/05/26 05:38:42 dnl ------------- dnl Restricted form of AC_ARG_ENABLE that ensures user doesn't give bogus dnl values. @@ -1096,13 +1112,13 @@ dnl $3 = action to perform if option is dnl $4 = action if perform if option is default dnl $5 = default option value (either 'yes' or 'no') AC_DEFUN([CF_ARG_OPTION], -[AC_ARG_ENABLE($1,[$2],[test "$enableval" != ifelse($5,no,yes,no) && enableval=ifelse($5,no,no,yes) +[AC_ARG_ENABLE([$1],[$2],[test "$enableval" != ifelse([$5],no,yes,no) && enableval=ifelse([$5],no,no,yes) if test "$enableval" != "$5" ; then -ifelse($3,,[ :]dnl -,[ $3]) ifelse($4,,,[ +ifelse([$3],,[ :]dnl +,[ $3]) ifelse([$4],,,[ else $4]) - fi],[enableval=$5 ifelse($4,,,[ + fi],[enableval=$5 ifelse([$4],,,[ $4 ])dnl ])])dnl @@ -1131,6 +1147,59 @@ esac $3="$withval" ])dnl dnl --------------------------------------------------------------------------- +dnl CF_AR_FLAGS version: 5 updated: 2010/05/20 20:24:29 +dnl ----------- +dnl Check for suitable "ar" (archiver) options for updating an archive. +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 -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 + fi + fi + + rm -f conftest.$ac_cv_objext + rm -f conftest.a + + cat >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 + break + fi + else + CF_VERBOSE(cannot compile test-program) + break + fi + done + rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext +]) + +if test -n "$ARFLAGS" ; then + if test -n "$cf_cv_ar_flags" ; then + ARFLAGS="$ARFLAGS $cf_cv_ar_flags" + fi +else + ARFLAGS=$cf_cv_ar_flags +fi + +AC_SUBST(ARFLAGS) +]) +dnl --------------------------------------------------------------------------- dnl CF_BUILD_CC version: 6 updated: 2006/10/14 15:23:15 dnl ----------- dnl If we're cross-compiling, allow the user to override the tools and their @@ -1222,7 +1291,7 @@ AC_SUBST(BUILD_EXEEXT) AC_SUBST(BUILD_OBJEXT) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_BUNDLED_INTL version: 13 updated: 2009/01/11 15:30:48 +dnl CF_BUNDLED_INTL version: 16 updated: 2010/10/23 15:55:05 dnl --------------- dnl Top-level macro for configuring an application with a bundled copy of dnl the intl and po directories for gettext. @@ -1231,15 +1300,20 @@ dnl $1 specifies either Makefile or make dnl $2 if nonempty sets the option to --enable-nls rather than to --disable-nls dnl dnl Sets variables which can be used to substitute in makefiles: +dnl GT_YES - "#" comment unless building intl library, otherwise empty +dnl GT_NO - "#" comment if building intl library, otherwise empty dnl INTLDIR_MAKE - to make ./intl directory dnl MSG_DIR_MAKE - to make ./po directory dnl SUB_MAKEFILE - list of makefiles in ./intl, ./po directories -dnl Defines +dnl +dnl Defines: dnl HAVE_LIBGETTEXT_H if we're using ./intl +dnl NLS_TEXTDOMAIN dnl dnl Environment: dnl ALL_LINGUAS if set, lists the root names of the ".po" files. dnl CONFIG_H assumed to be "config.h" +dnl PACKAGE must be set, used as default for textdomain dnl VERSION may be set, otherwise extract from "VERSION" file. dnl AC_DEFUN([CF_BUNDLED_INTL],[ @@ -1251,9 +1325,13 @@ dnl rather than $LC_ALL test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && echo *.po|sed -e 's/\.po//g' -e 's/*//'` # Allow override of "config.h" definition: -: ${CONFIG_H=config.h} +: ${CONFIG_H:=config.h} AC_SUBST(CONFIG_H) +if test -z "$PACKAGE" ; then + AC_MSG_ERROR([[CF_BUNDLED_INTL] used without setting [PACKAGE] variable]) +fi + if test -z "$VERSION" ; then if test -f $srcdir/VERSION ; then VERSION=`sed -e '2,$d' $srcdir/VERSION|cut -f1` @@ -1265,6 +1343,15 @@ AC_SUBST(VERSION) AM_GNU_GETTEXT(,,,[$2]) +if test "$USE_NLS" = yes ; then + AC_ARG_WITH(textdomain, + [ --with-textdomain=PKG NLS text-domain (default is package name)], + [NLS_TEXTDOMAIN=$withval], + [NLS_TEXTDOMAIN=$PACKAGE]) + AC_DEFINE_UNQUOTED(NLS_TEXTDOMAIN,"$NLS_TEXTDOMAIN") + AC_SUBST(NLS_TEXTDOMAIN) +fi + INTLDIR_MAKE= MSG_DIR_MAKE= SUB_MAKEFILE= @@ -1480,7 +1567,7 @@ CF_CHECK_1_DECL(${ac_func}, ${ac_tr_func done ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CHECK_ERRNO version: 10 updated: 2008/08/22 16:33:22 +dnl CF_CHECK_ERRNO version: 11 updated: 2010/05/26 05:38:42 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 @@ -1498,7 +1585,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, [cf_cv_dcl_$1=yes], [cf_cv_dcl_$1=no]) ]) @@ -1509,7 +1596,7 @@ if test "$cf_cv_dcl_$1" = no ; then fi # It's possible (for near-UNIX clones) that the data doesn't exist -CF_CHECK_EXTERN_DATA($1,ifelse($2,,int,$2)) +CF_CHECK_EXTERN_DATA($1,ifelse([$2],,int,[$2])) ])dnl dnl --------------------------------------------------------------------------- dnl CF_CHECK_EXTERN_DATA version: 3 updated: 2001/12/30 18:03:23 @@ -1600,7 +1687,7 @@ AC_MSG_RESULT($cf_cv_nested_params) test $cf_cv_nested_params = yes && AC_DEFINE(HAVE_NESTED_PARAMS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_COLOR_CURSES version: 6 updated: 2002/10/27 18:21:42 +dnl CF_COLOR_CURSES version: 7 updated: 2010/10/23 15:54:49 dnl --------------- dnl Check if curses supports color. (Note that while SVr3 curses supports dnl color, it does this differently from SVr4 curses; more work would be needed @@ -1611,7 +1698,7 @@ AC_DEFUN([CF_COLOR_CURSES], AC_MSG_CHECKING(if curses supports color attributes) AC_CACHE_VAL(cf_cv_color_curses,[ AC_TRY_LINK([ -#include <${cf_cv_ncurses_header-curses.h}> +#include <${cf_cv_ncurses_header:-curses.h}> ], [chtype x = COLOR_BLUE; has_colors(); @@ -1656,7 +1743,7 @@ else fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_COREFILE version: 3 updated: 2007/04/28 09:15:55 +dnl CF_COREFILE version: 4 updated: 2010/10/23 15:52:32 dnl ----------- dnl Check if the application can dump core (for debugging). AC_DEFUN([CF_COREFILE], @@ -1681,13 +1768,13 @@ int main() /* 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); + ${cf_cv_main_return:-return}(1); #else int pid, status; if (found()) unlink("core"); if (found()) - ${cf_cv_main_return-return}(1); + ${cf_cv_main_return:-return}(1); if ((pid = fork()) != 0) { while (wait(&status) <= 0) ; @@ -1696,9 +1783,9 @@ int main() } if (found()) { unlink("core"); - ${cf_cv_main_return-return}(0); + ${cf_cv_main_return:-return}(0); } - ${cf_cv_main_return-return}(1); + ${cf_cv_main_return:-return}(1); #endif }], [cf_cv_corefile=yes], @@ -1742,7 +1829,19 @@ AC_MSG_RESULT($cf_cv_cpp_expands) test $cf_cv_cpp_expands = yes && AC_DEFINE(CPP_DOES_EXPAND) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_CPPFLAGS version: 10 updated: 2009/01/06 19:34:11 +dnl CF_CURSES_CONFIG version: 2 updated: 2006/10/29 11:06:27 +dnl ---------------- +dnl Tie together the configure-script macros for curses. It may be ncurses, +dnl but unless asked, we do not make a special search for ncurses. However, +dnl still check for the ncurses version number, for use in other macros. +AC_DEFUN([CF_CURSES_CONFIG], +[ +CF_CURSES_CPPFLAGS +CF_NCURSES_VERSION +CF_CURSES_LIBS +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_CURSES_CPPFLAGS version: 11 updated: 2011/04/09 14:51:08 dnl ------------------ dnl Look for the curses headers. AC_DEFUN([CF_CURSES_CPPFLAGS],[ @@ -1751,13 +1850,19 @@ AC_CACHE_CHECK(for extra include directo cf_cv_curses_incdir=no case $host_os in #(vi hpux10.*) #(vi - test -d /usr/include/curses_colr && \ - cf_cv_curses_incdir="-I/usr/include/curses_colr" + 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*) - test -d /usr/5lib && \ - test -d /usr/5include && \ - cf_cv_curses_incdir="-I/usr/5include" + 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 ]) @@ -1767,20 +1872,20 @@ CF_CURSES_HEADER CF_TERM_HEADER ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_HEADER version: 1 updated: 2005/12/31 13:28:25 +dnl CF_CURSES_HEADER version: 2 updated: 2010/04/28 06:02:16 dnl ---------------- dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common dnl variations of ncurses' installs. dnl -dnl See also CF_NCURSES_HEADER, which sets the same cache variable. +dnl $1 = ncurses when looking for ncurses, or is empty AC_DEFUN([CF_CURSES_HEADER],[ AC_CACHE_CHECK(if we have identified curses headers,cf_cv_ncurses_header,[ cf_cv_ncurses_header=none -for cf_header in \ - curses.h \ +for cf_header in ifelse($1,,,[ \ + $1/ncurses.h \ + $1/curses.h]) \ ncurses.h \ - ncurses/curses.h \ - ncurses/ncurses.h + curses.h ifelse($1,,[ncurses/ncurses.h ncurses/curses.h]) do AC_TRY_COMPILE([#include <${cf_header}>], [initscr(); tgoto("?", 0,0)], @@ -1796,7 +1901,7 @@ fi AC_CHECK_HEADERS($cf_cv_ncurses_header) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_LIBS version: 29 updated: 2009/01/06 19:34:57 +dnl CF_CURSES_LIBS version: 34 updated: 2011/04/09 14:51:08 dnl -------------- dnl Look for the curses libraries. Older curses implementations may require dnl termcap/termlib to be linked as well. Call CF_CURSES_CPPFLAGS first. @@ -1804,7 +1909,7 @@ AC_DEFUN([CF_CURSES_LIBS],[ AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl AC_MSG_CHECKING(if we have identified curses libraries) -AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>], +AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], [initscr(); tgoto("?", 0,0)], cf_result=yes, cf_result=no) @@ -1813,27 +1918,49 @@ AC_MSG_RESULT($cf_result) if test "$cf_result" = no ; then case $host_os in #(vi freebsd*) #(vi - AC_CHECK_LIB(mytinfo,tgoto,[LIBS="-lmytinfo $LIBS"]) + AC_CHECK_LIB(mytinfo,tgoto,[CF_ADD_LIBS(-lmytinfo)]) ;; hpux10.*) #(vi - AC_CHECK_LIB(cur_colr,initscr,[ - LIBS="-lcur_colr $LIBS" - ac_cv_func_initscr=yes - ],[ - AC_CHECK_LIB(Hcurses,initscr,[ - # HP's header uses __HP_CURSES, but user claims _HP_CURSES. - LIBS="-lHcurses $LIBS" - CPPFLAGS="$CPPFLAGS -D__HP_CURSES -D_HP_CURSES" - ac_cv_func_initscr=yes - ])]) + # 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 + AC_CHECK_LIB(cur_colr,initscr,[ + CF_ADD_LIBS(-lcur_colr) + ac_cv_func_initscr=yes + ],[ + AC_CHECK_LIB(Hcurses,initscr,[ + # HP's header uses __HP_CURSES, but user claims _HP_CURSES. + CF_ADD_LIBS(-lHcurses) + CPPFLAGS="$CPPFLAGS -D__HP_CURSES -D_HP_CURSES" + ac_cv_func_initscr=yes + ])]) + fi ;; -linux*) # Suse Linux does not follow /usr/lib convention - CF_ADD_LIBDIR(/lib) +linux*) + case `arch 2>/dev/null` in + x86_64) + if test -d /lib64 + then + CF_ADD_LIBDIR(/lib64) + else + CF_ADD_LIBDIR(/lib) + fi + ;; + *) + CF_ADD_LIBDIR(/lib) + ;; + esac ;; sunos3*|sunos4*) - if test -d /usr/5lib ; then - CF_ADD_LIBDIR(/usr/5lib) - LIBS="$LIBS -lcurses -ltermcap" + if test "x$cf_cv_screen" = "xcurses_5lib" + then + if test -d /usr/5lib ; then + CF_ADD_LIBDIR(/usr/5lib) + CF_ADD_LIBS(-lcurses -ltermcap) + fi fi ac_cv_func_initscr=yes ;; @@ -1844,7 +1971,7 @@ if test ".$ac_cv_func_initscr" != .yes ; cf_term_lib="" cf_curs_lib="" - if test ".${cf_cv_ncurses_version-no}" != .no + if test ".${cf_cv_ncurses_version:-no}" != .no then cf_check_list="ncurses curses cursesX" else @@ -1871,7 +1998,7 @@ if test ".$ac_cv_func_initscr" != .yes ; LIBS="-l$cf_curs_lib $cf_save_LIBS" if test "$cf_term_lib" = unknown ; then AC_MSG_CHECKING(if we can link with $cf_curs_lib library) - AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>], + AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], [initscr()], [cf_result=yes], [cf_result=no]) @@ -1881,12 +2008,12 @@ if test ".$ac_cv_func_initscr" != .yes ; : elif test "$cf_term_lib" != predefined ; then AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib libraries) - AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>], + AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], [initscr(); tgoto((char *)0, 0, 0);], [cf_result=no], [ LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" - AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>], + AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], [initscr()], [cf_result=yes], [cf_result=error]) @@ -1982,7 +2109,7 @@ esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_TERM_H version: 6 updated: 2003/11/06 19:59:57 +dnl CF_CURSES_TERM_H version: 9 updated: 2011/04/09 18:19:55 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, @@ -1990,30 +2117,60 @@ dnl as well as in misconfigured systems dnl running with Solaris 2.5.1). AC_DEFUN([CF_CURSES_TERM_H], [ +AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl + AC_CACHE_CHECK(for term.h, cf_cv_term_header,[ -AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl # If we found , look for , but always look # for if we do not find the variant. -for cf_header in \ - `echo ${cf_cv_ncurses_header-curses.h} | sed -e 's%/.*%/%'`term.h \ - term.h + +cf_header_list="term.h ncurses/term.h ncursesw/term.h" + +case ${cf_cv_ncurses_header:-curses.h} in #(vi +*/*) + 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 AC_TRY_COMPILE([ -#include <${cf_cv_ncurses_header-curses.h}> +#include <${cf_cv_ncurses_header:-curses.h}> #include <${cf_header}>], [WINDOW *x], [cf_cv_term_header=$cf_header break], [cf_cv_term_header=no]) done + +case $cf_cv_term_header in #(vi +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 + AC_TRY_COMPILE([ +#include <${cf_cv_ncurses_header:-curses.h}> +#ifdef NCURSES_VERSION +#include <${cf_header}> +#else +make an error +#endif], + [WINDOW *x], + [cf_cv_term_header=$cf_header + break], + [cf_cv_term_header=no]) + done + ;; +esac ]) case $cf_cv_term_header in #(vi term.h) #(vi AC_DEFINE(HAVE_TERM_H) ;; -ncurses/term.h) +ncurses/term.h) #(vi AC_DEFINE(HAVE_NCURSES_TERM_H) ;; ncursesw/term.h) @@ -2410,7 +2567,7 @@ fi ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FIND_LINKAGE version: 13 updated: 2008/12/24 07:59:55 +dnl CF_FIND_LINKAGE version: 19 updated: 2010/05/29 16:31:02 dnl --------------- dnl Find a library (specifically the linkage used in the code fragment), dnl searching for it if it is not already in the library path. @@ -2439,9 +2596,24 @@ cf_cv_library_path_$3= CF_MSG_LOG([Starting [FIND_LINKAGE]($3,$6)]) -AC_TRY_LINK([$1],[$2], - cf_cv_find_linkage_$3=yes,[ - cf_cv_find_linkage_$3=no +cf_save_LIBS="$LIBS" + +AC_TRY_LINK([$1],[$2],[ + cf_cv_find_linkage_$3=yes + cf_cv_header_path_$3=/usr/include + cf_cv_library_path_$3=/usr/lib +],[ + +LIBS="-l$3 $7 $cf_save_LIBS" + +AC_TRY_LINK([$1],[$2],[ + cf_cv_find_linkage_$3=yes + cf_cv_header_path_$3=/usr/include + cf_cv_library_path_$3=/usr/lib + cf_cv_library_file_$3="-l$3" +],[ + cf_cv_find_linkage_$3=no + LIBS="$cf_save_LIBS" CF_VERBOSE(find linkage for $3 library) CF_MSG_LOG([Searching for headers in [FIND_LINKAGE]($3,$6)]) @@ -2502,7 +2674,6 @@ AC_TRY_LINK([$1],[$2], ]) fi done - LIBS="$cf_save_LIBS" CPPFLAGS="$cf_save_CPPFLAGS" LDFLAGS="$cf_save_LDFLAGS" fi @@ -2511,12 +2682,15 @@ AC_TRY_LINK([$1],[$2], cf_cv_find_linkage_$3=no fi ],$7) +]) + +LIBS="$cf_save_LIBS" if test "$cf_cv_find_linkage_$3" = yes ; then ifelse([$4],,[ - CF_ADD_INCDIR($cf_cv_header_path_$3) - CF_ADD_LIBDIR($cf_cv_library_path_$3) - LIBS="-l$3 $LIBS" + CF_ADD_INCDIR($cf_cv_header_path_$3) + CF_ADD_LIBDIR($cf_cv_library_path_$3) + CF_ADD_LIB($3) ],[$4]) else ifelse([$5],,AC_MSG_WARN(Cannot find $3 library),[$5]) @@ -2560,7 +2734,7 @@ linux*|gnu*) esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FUNC_FORK version: 3 updated: 2007/04/28 09:15:55 +dnl CF_FUNC_FORK version: 4 updated: 2010/10/23 15:52:32 dnl ------------ dnl Check if 'fork()' is available, and working. Amiga (and possibly other dnl machines) have a non-working 'fork()' entrypoint. @@ -2571,8 +2745,8 @@ AC_TRY_RUN([ int main() { if (fork() < 0) - ${cf_cv_main_return-return}(1); - ${cf_cv_main_return-return}(0); + ${cf_cv_main_return:-return}(1); + ${cf_cv_main_return:-return}(0); }], [cf_cv_func_fork=yes], [cf_cv_func_fork=no], [cf_cv_func_fork=unknown]) @@ -2581,7 +2755,7 @@ AC_MSG_RESULT($cf_cv_func_fork) test $cf_cv_func_fork = yes && AC_DEFINE(HAVE_FORK) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FUNC_GETADDRINFO version: 6 updated: 2007/04/28 09:15:55 +dnl CF_FUNC_GETADDRINFO version: 7 updated: 2010/10/23 15:52:32 dnl ------------------- dnl Look for a working version of getaddrinfo(), for IPV6 support. AC_DEFUN([CF_FUNC_GETADDRINFO],[ @@ -2654,12 +2828,12 @@ int main() if (aitop) freeaddrinfo(aitop); - ${cf_cv_main_return-return}(0); + ${cf_cv_main_return:-return}(0); bad: if (aitop) freeaddrinfo(aitop); - ${cf_cv_main_return-return}(1); + ${cf_cv_main_return:-return}(1); } ], [cf_cv_getaddrinfo=yes], @@ -2703,7 +2877,7 @@ int main() { fi ])])dnl dnl --------------------------------------------------------------------------- -dnl CF_FUNC_SYSTEM version: 4 updated: 2007/04/28 09:15:55 +dnl CF_FUNC_SYSTEM version: 5 updated: 2010/10/23 15:52:32 dnl -------------- dnl Check if the 'system()' function returns a usable status, or if not, try dnl to use the status returned by a SIGCHLD. @@ -2729,7 +2903,7 @@ RETSIGTYPE signal_handler (int sig) int system_status; wait (&wait_status); system_status = WEXITSTATUS(wait_status); /* should be nonzero */ - ${cf_cv_main_return-return}(system_status != 23); + ${cf_cv_main_return:-return}(system_status != 23); } int main() @@ -2739,12 +2913,12 @@ int main() */ signal (SIGCHLD, signal_handler); system("exit 23"); - ${cf_cv_main_return-return}(1); + ${cf_cv_main_return:-return}(1); } ], [cf_cv_system_status=no], [AC_TRY_RUN( - [int main() { ${cf_cv_main_return-return}(system("exit 23") != (23 << 8)); }], + [int main() { ${cf_cv_main_return:-return}(system("exit 23") != (23 << 8)); }], [cf_cv_system_status=yes], [cf_cv_system_status=unknown], [cf_cv_system_status=unknown])], @@ -2754,7 +2928,7 @@ AC_MSG_RESULT($cf_cv_system_status) test $cf_cv_system_status = no && AC_DEFINE(USE_SYSTEM_STATUS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GCC_VERSION version: 4 updated: 2005/08/27 09:53:42 +dnl CF_GCC_VERSION version: 5 updated: 2010/04/24 11:02:31 dnl -------------- dnl Find version of gcc AC_DEFUN([CF_GCC_VERSION],[ @@ -2762,13 +2936,13 @@ AC_REQUIRE([AC_PROG_CC]) GCC_VERSION=none if test "$GCC" = yes ; then AC_MSG_CHECKING(version of $CC) - GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`" + GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown AC_MSG_RESULT($GCC_VERSION) fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GCC_WARNINGS version: 24 updated: 2009/02/01 15:21:00 +dnl CF_GCC_WARNINGS version: 27 updated: 2010/10/23 15:52:32 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: @@ -2793,7 +2967,7 @@ AC_REQUIRE([CF_GCC_VERSION]) CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS) cat > conftest.$ac_ext </dev/null | sed -e 's,[[ ]]*$,,'` + cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[[ ]]*$,,'` case "$cf_result" in .*k) - cf_result=`${MAKE-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null` + cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null` case "$cf_result" in .*CC=*) cf_cv_makeflags= ;; @@ -3156,15 +3335,15 @@ CF_EOF AC_SUBST(cf_cv_makeflags) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_MSG_LOG version: 4 updated: 2007/07/29 09:55:12 +dnl CF_MSG_LOG version: 5 updated: 2010/10/23 15:52:32 dnl ---------- dnl Write a debug message to config.log, along with the line number in the dnl configure script. AC_DEFUN([CF_MSG_LOG],[ -echo "${as_me-configure}:__oline__: testing $* ..." 1>&AC_FD_CC +echo "${as_me:-configure}:__oline__: testing $* ..." 1>&AC_FD_CC ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_BROKEN version: 6 updated: 1998/04/27 20:32:34 +dnl CF_NCURSES_BROKEN version: 7 updated: 2010/10/23 15:54:49 dnl ----------------- dnl Check for pre-1.9.9g ncurses (among other problems, the most obvious is dnl that color combinations don't work). @@ -3175,7 +3354,7 @@ if test "$cf_cv_ncurses_version" != no ; AC_MSG_CHECKING(for obsolete/broken version of ncurses) AC_CACHE_VAL(cf_cv_ncurses_broken,[ AC_TRY_COMPILE([ -#include <${cf_cv_ncurses_header-curses.h}>],[ +#include <${cf_cv_ncurses_header:-curses.h}>],[ #if defined(NCURSES_VERSION) && defined(wgetbkgd) make an error #else @@ -3226,7 +3405,47 @@ printf("old\n"); ,[$1=no]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_CPPFLAGS version: 19 updated: 2007/07/29 13:35:20 +dnl CF_NCURSES_CONFIG version: 8 updated: 2010/07/08 05:17:30 +dnl ----------------- +dnl Tie together the configure-script macros for ncurses. +dnl Prefer the "-config" script from ncurses 6.x, to simplify analysis. +dnl Allow that to be overridden using the $NCURSES_CONFIG environment variable. +dnl +dnl $1 is the root library name (default: "ncurses") +AC_DEFUN([CF_NCURSES_CONFIG], +[ +cf_ncuconfig_root=ifelse($1,,ncurses,$1) + +echo "Looking for ${cf_ncuconfig_root}-config" +AC_PATH_PROGS(NCURSES_CONFIG,${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config,none) + +if test "$NCURSES_CONFIG" != none ; then + +CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" +CF_ADD_LIBS(`$NCURSES_CONFIG --libs`) + +# even with config script, some packages use no-override for curses.h +CF_CURSES_HEADER(ifelse($1,,ncurses,$1)) + +dnl like CF_NCURSES_CPPFLAGS +AC_DEFINE(NCURSES) + +dnl like CF_NCURSES_LIBS +CF_UPPER(cf_nculib_ROOT,HAVE_LIB$cf_ncuconfig_root) +AC_DEFINE_UNQUOTED($cf_nculib_ROOT) + +dnl like CF_NCURSES_VERSION +cf_cv_ncurses_version=`$NCURSES_CONFIG --version` + +else + +CF_NCURSES_CPPFLAGS(ifelse($1,,ncurses,$1)) +CF_NCURSES_LIBS(ifelse($1,,ncurses,$1)) + +fi +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_NCURSES_CPPFLAGS version: 20 updated: 2010/11/20 17:02:38 dnl ------------------- dnl Look for the SVr4 curses clone 'ncurses' in the standard places, adjusting dnl the CPPFLAGS variable so we can include its header. @@ -3255,7 +3474,7 @@ cf_ncuhdr_root=ifelse($1,,ncurses,$1) test -n "$cf_cv_curses_dir" && \ test "$cf_cv_curses_dir" != "no" && { \ - CF_ADD_INCDIR($cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root) + CF_ADD_INCDIR($cf_cv_curses_dir/include/$cf_ncuhdr_root) } AC_CACHE_CHECK(for $cf_ncuhdr_root header in include-path, cf_cv_ncurses_h,[ @@ -3343,7 +3562,7 @@ esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_LIBS version: 13 updated: 2007/07/29 10:29:20 +dnl CF_NCURSES_LIBS version: 16 updated: 2010/11/20 17:02:38 dnl --------------- dnl Look for the ncurses library. This is a little complicated on Linux, dnl because it may be linked with the gpm (general purpose mouse) library. @@ -3379,15 +3598,14 @@ freebsd*) ;; esac -LIBS="$cf_ncurses_LIBS $LIBS" +CF_ADD_LIBS($cf_ncurses_LIBS) if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) then - CF_ADD_LIBDIR($cf_cv_curses_dir/lib) - LIBS="-l$cf_nculib_root $LIBS" + CF_ADD_LIBS(-l$cf_nculib_root) else CF_FIND_LIBRARY($cf_nculib_root,$cf_nculib_root, - [#include <${cf_cv_ncurses_header-curses.h}>], + [#include <${cf_cv_ncurses_header:-curses.h}>], [initscr()], initscr) fi @@ -3401,7 +3619,7 @@ if test -n "$cf_ncurses_LIBS" ; then LIBS="$q" fi done - AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>], + AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], [initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);], [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no) @@ -3412,7 +3630,7 @@ CF_UPPER(cf_nculib_ROOT,HAVE_LIB$cf_ncul AC_DEFINE_UNQUOTED($cf_nculib_ROOT) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_VERSION version: 12 updated: 2007/04/28 09:15:55 +dnl CF_NCURSES_VERSION version: 13 updated: 2010/10/23 15:54:49 dnl ------------------ dnl Check for the version of ncurses, to aid in reporting bugs, etc. dnl Call CF_CURSES_CPPFLAGS first, or CF_NCURSES_CPPFLAGS. We don't use @@ -3425,7 +3643,7 @@ AC_CACHE_CHECK(for ncurses version, cf_c cf_tempfile=out$$ rm -f $cf_tempfile AC_TRY_RUN([ -#include <${cf_cv_ncurses_header-curses.h}> +#include <${cf_cv_ncurses_header:-curses.h}> #include int main() { @@ -3443,14 +3661,14 @@ int main() make an error # endif #endif - ${cf_cv_main_return-return}(0); + ${cf_cv_main_return:-return}(0); }],[ cf_cv_ncurses_version=`cat $cf_tempfile`],,[ # This will not work if the preprocessor splits the line after the # Autoconf token. The 'unproto' program does that. cat > conftest.$ac_ext < +#include <${cf_cv_ncurses_header:-curses.h}> #undef Autoconf #ifdef NCURSES_VERSION Autoconf NCURSES_VERSION @@ -3474,7 +3692,7 @@ EOF test "$cf_cv_ncurses_version" = no || AC_DEFINE(NCURSES) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NETLIBS version: 6 updated: 2009/12/24 04:20:51 +dnl CF_NETLIBS version: 7 updated: 2010/06/20 09:24:28 dnl ---------- dnl After checking for functions in the default $LIBS, make a further check dnl for the functions that are netlib-related (these aren't always in the @@ -3508,7 +3726,7 @@ mingw32) # (vi fi cf_save_LIBS="$LIBS" - LIBS="$cf_winsock_lib $LIBS" + CF_ADD_LIBS($cf_winsock_lib) AC_TRY_LINK([ #ifdef HAVE_WINDOWS_H @@ -3562,7 +3780,7 @@ case $cf_cv_netlibs in #(vi ;; esac -LIBS="$LIBS $cf_cv_netlibs" +CF_ADD_LIBS($cf_cv_netlibs) test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&AC_FD_MSG ])dnl dnl --------------------------------------------------------------------------- @@ -3632,7 +3850,7 @@ AC_SUBST(MSG_DIR_MAKE) AC_SUBST(SUB_MAKEFILE) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PATHSEP version: 4 updated: 2009/01/11 20:30:23 +dnl CF_PATHSEP version: 5 updated: 2010/05/26 05:38:42 dnl ---------- dnl Provide a value for the $PATH and similar separator AC_DEFUN([CF_PATHSEP], @@ -3641,7 +3859,7 @@ AC_DEFUN([CF_PATHSEP], os2*) PATH_SEPARATOR=';' ;; *) PATH_SEPARATOR=':' ;; esac -ifelse($1,,,[$1=$PATH_SEPARATOR]) +ifelse([$1],,,[$1=$PATH_SEPARATOR]) AC_SUBST(PATH_SEPARATOR) ])dnl dnl --------------------------------------------------------------------------- @@ -3725,7 +3943,7 @@ fi AC_MSG_RESULT($DEFAULT_MAILER) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PATH_SYNTAX version: 12 updated: 2008/03/23 14:45:59 +dnl CF_PATH_SYNTAX version: 13 updated: 2010/05/26 05:38:42 dnl -------------- dnl Check the argument to see that it looks like a pathname. Rewrite it if it dnl begins with one of the prefix/exec_prefix variables, and then again if the @@ -3757,12 +3975,12 @@ case ".[$]$1" in #(vi $1=`echo [$]$1 | sed -e s%NONE%$cf_path_syntax%` ;; *) - ifelse($2,,[AC_MSG_ERROR([expected a pathname, not \"[$]$1\"])],$2) + ifelse([$2],,[AC_MSG_ERROR([expected a pathname, not \"[$]$1\"])],$2) ;; esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PDCURSES_X11 version: 9 updated: 2009/01/11 15:31:37 +dnl CF_PDCURSES_X11 version: 11 updated: 2011/01/15 18:45:38 dnl --------------- dnl Configure for PDCurses' X11 library AC_DEFUN([CF_PDCURSES_X11],[ @@ -3773,7 +3991,7 @@ AC_PATH_PROGS(XCURSES_CONFIG,xcurses-con if test "$XCURSES_CONFIG" != none ; then CPPFLAGS="$CPPFLAGS `$XCURSES_CONFIG --cflags`" -LIBS="`$XCURSES_CONFIG --libs` $LIBS" +CF_ADD_LIBS(`$XCURSES_CONFIG --libs`) cf_cv_lib_XCurses=yes @@ -3782,10 +4000,10 @@ else LDFLAGS="$LDFLAGS $X_LIBS" CF_CHECK_CFLAGS($X_CFLAGS) AC_CHECK_LIB(X11,XOpenDisplay, - [LIBS="-lX11 $LIBS"],, + [CF_ADD_LIBS(-lX11)],, [$X_PRE_LIBS $LIBS $X_EXTRA_LIBS]) AC_CACHE_CHECK(for XCurses library,cf_cv_lib_XCurses,[ -LIBS="-lXCurses $LIBS" +CF_ADD_LIBS(-lXCurses) AC_TRY_LINK([ #include char *XCursesProgramName = "test"; @@ -3799,13 +4017,45 @@ fi if test $cf_cv_lib_XCurses = yes ; then AC_DEFINE(UNIX) AC_DEFINE(XCURSES) - AC_DEFINE(HAVE_XCURSES) + AC_CHECK_HEADER(xcurses.h, AC_DEFINE(HAVE_XCURSES)) else AC_MSG_ERROR(Cannot link with XCurses) fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_POSIX_C_SOURCE version: 6 updated: 2005/07/14 20:25:10 +dnl CF_PKG_CONFIG version: 6 updated: 2011/04/17 06:36:21 +dnl ------------- +dnl Check for the package-config program, unless disabled by command-line. +AC_DEFUN([CF_PKG_CONFIG], +[ +AC_MSG_CHECKING(if you want to use pkg-config) +AC_ARG_WITH(pkg-config, + [ --with-pkg-config{=path} enable/disable use of pkg-config], + [cf_pkg_config=$withval], + [cf_pkg_config=yes]) +AC_MSG_RESULT($cf_pkg_config) + +case $cf_pkg_config in #(vi +no) #(vi + PKG_CONFIG=none + ;; +yes) #(vi + AC_PATH_PROG(PKG_CONFIG, pkg-config, none) + ;; +*) + PKG_CONFIG=$withval + ;; +esac + +test -z "$PKG_CONFIG" && PKG_CONFIG=none +if test "$PKG_CONFIG" != none ; then + CF_PATH_SYNTAX(PKG_CONFIG) +fi + +AC_SUBST(PKG_CONFIG) +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_POSIX_C_SOURCE version: 8 updated: 2010/05/26 05:38:42 dnl ----------------- dnl Define _POSIX_C_SOURCE to the given level, and _POSIX_SOURCE if needed. dnl @@ -3821,7 +4071,7 @@ dnl Parameters: dnl $1 is the nominal value for _POSIX_C_SOURCE AC_DEFUN([CF_POSIX_C_SOURCE], [ -cf_POSIX_C_SOURCE=ifelse($1,,199506L,$1) +cf_POSIX_C_SOURCE=ifelse([$1],,199506L,[$1]) cf_save_CFLAGS="$CFLAGS" cf_save_CPPFLAGS="$CPPFLAGS" @@ -3873,12 +4123,7 @@ make an error if test "$cf_cv_posix_c_source" != no ; then CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" - if test "$cf_cv_cc_u_d_options" = yes ; then - cf_temp_posix_c_source=`echo "$cf_cv_posix_c_source" | \ - sed -e 's/-D/-U/g' -e 's/=[[^ ]]*//g'` - CPPFLAGS="$CPPFLAGS $cf_temp_posix_c_source" - fi - CPPFLAGS="$CPPFLAGS $cf_cv_posix_c_source" + CF_ADD_CFLAGS($cf_cv_posix_c_source) fi ])dnl @@ -3924,6 +4169,13 @@ test "$cf_cv_sigaction_funcs" = yes && A fi ])dnl dnl --------------------------------------------------------------------------- +dnl CF_PROG_AR version: 1 updated: 2009/01/01 20:15:22 +dnl ---------- +dnl Check for archiver "ar". +AC_DEFUN([CF_PROG_AR],[ +AC_CHECK_TOOL(AR, ar, ar) +]) +dnl --------------------------------------------------------------------------- dnl CF_PROG_CC_U_D version: 1 updated: 2005/07/14 16:59:30 dnl -------------- dnl Check if C (preprocessor) -U and -D options are processed in the order @@ -4096,7 +4348,7 @@ AC_CHECK_LIB($2,$1,[ [[$]$3]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_REMOVE_DEFINE version: 2 updated: 2005/07/09 16:12:18 +dnl CF_REMOVE_DEFINE version: 3 updated: 2010/01/09 11:05:50 dnl ---------------- dnl Remove all -U and -D options that refer to the given symbol from a list dnl of C compiler options. This works around the problem that not all @@ -4108,10 +4360,9 @@ dnl $2 = source (including '$') dnl $3 = symbol to remove define([CF_REMOVE_DEFINE], [ -# remove $3 symbol from $2 $1=`echo "$2" | \ - sed -e 's/-[[UD]]$3\(=[[^ ]]*\)\?[[ ]]/ /g' \ - -e 's/-[[UD]]$3\(=[[^ ]]*\)\?[$]//g'` + sed -e 's/-[[UD]]'"$3"'\(=[[^ ]]*\)\?[[ ]]/ /g' \ + -e 's/-[[UD]]'"$3"'\(=[[^ ]]*\)\?[$]//g'` ])dnl dnl --------------------------------------------------------------------------- dnl CF_SET_GID_UID version: 2 updated: 1997/08/28 23:57:55 @@ -4132,6 +4383,65 @@ AC_MSG_RESULT($cf_cv_setuid_funcs) test $cf_cv_setuid_funcs = yes && AC_DEFINE(HAVE_SET_GID_UID) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_SIGWINCH version: 1 updated: 2006/04/02 16:41:09 +dnl ----------- +dnl Use this macro after CF_XOPEN_SOURCE, but do not require it (not all +dnl programs need this test). +dnl +dnl This is really a MacOS 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. +AC_DEFUN([CF_SIGWINCH], +[ +AC_CACHE_CHECK(if SIGWINCH is defined,cf_cv_define_sigwinch,[ + AC_TRY_COMPILE([ +#include +#include +],[int x = SIGWINCH], + [cf_cv_define_sigwinch=yes], + [AC_TRY_COMPILE([ +#undef _XOPEN_SOURCE +#undef _POSIX_SOURCE +#undef _POSIX_C_SOURCE +#include +#include +],[int x = SIGWINCH], + [cf_cv_define_sigwinch=maybe], + [cf_cv_define_sigwinch=no]) +]) +]) + +if test "$cf_cv_define_sigwinch" = maybe ; then +AC_CACHE_CHECK(for actual SIGWINCH definition,cf_cv_fixup_sigwinch,[ +cf_cv_fixup_sigwinch=unknown +cf_sigwinch=32 +while test $cf_sigwinch != 1 +do + AC_TRY_COMPILE([ +#undef _XOPEN_SOURCE +#undef _POSIX_SOURCE +#undef _POSIX_C_SOURCE +#include +#include +],[ +#if SIGWINCH != $cf_sigwinch +make an error +#endif +int x = SIGWINCH], + [cf_cv_fixup_sigwinch=$cf_sigwinch + break]) + +cf_sigwinch=`expr $cf_sigwinch - 1` +done +]) + + if test "$cf_cv_fixup_sigwinch" != unknown ; then + CPPFLAGS="$CPPFLAGS -DSIGWINCH=$cf_cv_fixup_sigwinch" + fi +fi +])dnl +dnl --------------------------------------------------------------------------- dnl CF_SIG_ARGS version: 2 updated: 1997/08/28 23:57:55 dnl ----------- dnl Check for systems that have signal-handlers prototyped with one argument @@ -4154,7 +4464,7 @@ AC_MSG_RESULT($cf_cv_sig_args) AC_DEFINE_UNQUOTED(SIG_ARGS,$cf_cv_sig_args) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SIG_CONST version: 3 updated: 2007/04/28 09:15:55 +dnl CF_SIG_CONST version: 4 updated: 2010/10/23 15:52:32 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 @@ -4187,9 +4497,9 @@ int main() #define SIG_IGN NEW_IGN #define SIG_ERR NEW_ERR || NEW_DFL != SIG_DFL) - ${cf_cv_main_return-return}(1); + ${cf_cv_main_return:-return}(1); signal(SIGINT, SIG_DFL); - ${cf_cv_main_return-return}(0); + ${cf_cv_main_return:-return}(0); }], [cf_cv_sig_const=yes], [cf_cv_sig_const=no], @@ -4200,65 +4510,6 @@ AC_MSG_RESULT($cf_cv_sig_const) test "$cf_cv_sig_const" = yes && AC_DEFINE(DECL_SIG_CONST) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SIGWINCH version: 1 updated: 2006/04/02 16:41:09 -dnl ----------- -dnl Use this macro after CF_XOPEN_SOURCE, but do not require it (not all -dnl programs need this test). -dnl -dnl This is really a MacOS 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. -AC_DEFUN([CF_SIGWINCH], -[ -AC_CACHE_CHECK(if SIGWINCH is defined,cf_cv_define_sigwinch,[ - AC_TRY_COMPILE([ -#include -#include -],[int x = SIGWINCH], - [cf_cv_define_sigwinch=yes], - [AC_TRY_COMPILE([ -#undef _XOPEN_SOURCE -#undef _POSIX_SOURCE -#undef _POSIX_C_SOURCE -#include -#include -],[int x = SIGWINCH], - [cf_cv_define_sigwinch=maybe], - [cf_cv_define_sigwinch=no]) -]) -]) - -if test "$cf_cv_define_sigwinch" = maybe ; then -AC_CACHE_CHECK(for actual SIGWINCH definition,cf_cv_fixup_sigwinch,[ -cf_cv_fixup_sigwinch=unknown -cf_sigwinch=32 -while test $cf_sigwinch != 1 -do - AC_TRY_COMPILE([ -#undef _XOPEN_SOURCE -#undef _POSIX_SOURCE -#undef _POSIX_C_SOURCE -#include -#include -],[ -#if SIGWINCH != $cf_sigwinch -make an error -#endif -int x = SIGWINCH], - [cf_cv_fixup_sigwinch=$cf_sigwinch - break]) - -cf_sigwinch=`expr $cf_sigwinch - 1` -done -]) - - if test "$cf_cv_fixup_sigwinch" != unknown ; then - CPPFLAGS="$CPPFLAGS -DSIGWINCH=$cf_cv_fixup_sigwinch" - fi -fi -])dnl -dnl --------------------------------------------------------------------------- dnl CF_SIZECHANGE version: 8 updated: 2000/11/04 12:22:16 dnl ------------- dnl Check for definitions & structures needed for window size-changing @@ -4329,7 +4580,7 @@ if test "$cf_cv_sizechange" != no ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SOCKS version: 6 updated: 2008/03/23 14:48:54 +dnl CF_SOCKS version: 8 updated: 2010/05/05 20:27:55 dnl -------- dnl Check for socks library dnl $1 = the [optional] directory in which the library may be found @@ -4340,11 +4591,9 @@ AC_DEFUN([CF_SOCKS],[ ],[ Raccept((char *)0) ], - socks, - cf_cv_have_socks=yes, - cf_cv_have_socks=no) + socks) - if test "$cf_cv_have_socks" = yes ; then + if test "x$cf_cv_find_linkage_socks" = "xyes" ; then AC_DEFINE(SOCKS) AC_DEFINE(accept,Raccept) @@ -4355,23 +4604,19 @@ AC_DEFUN([CF_SOCKS],[ AC_DEFINE(listen,Rlisten) AC_DEFINE(recvfrom,Rrecvfrom) AC_DEFINE(select,Rselect) - - CF_ADD_INCDIR($cf_cv_header_path_socks) - CF_ADD_LIBDIR($cf_cv_library_path_socks) - LIBS="$LIBS -lsocks" else AC_MSG_ERROR(cannot link with socks library) fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SOCKS5 version: 10 updated: 2008/03/23 14:48:54 +dnl CF_SOCKS5 version: 11 updated: 2010/06/20 09:24:28 dnl --------- dnl Check for socks5 configuration dnl $1 = the [optional] directory in which the library may be found AC_DEFUN([CF_SOCKS5],[ CF_ADD_OPTIONAL_PATH($1, [socks5 library]) -LIBS="$LIBS -lsocks5" +CF_ADD_LIBS(-lsocks5) AC_DEFINE(USE_SOCKS5) AC_DEFINE(SOCKS) @@ -4425,16 +4670,18 @@ AC_DEFUN([CF_STRERROR],[ AC_CHECK_FUNCS(strerror, AC_DEFINE(HAVE_STRERROR),[CF_SYS_ERRLIST]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_STRUCT_TERMIOS version: 5 updated: 2000/11/04 12:22:46 +dnl CF_STRUCT_TERMIOS version: 6 updated: 2011/04/16 11:52:53 dnl ----------------- dnl Some machines require _POSIX_SOURCE to completely define struct termios. -dnl If so, define SVR4_TERMIO AC_DEFUN([CF_STRUCT_TERMIOS],[ +AC_REQUIRE([CF_XOPEN_SOURCE]) + AC_CHECK_HEADERS( \ termio.h \ termios.h \ unistd.h \ ) + if test "$ISC" = yes ; then AC_CHECK_HEADERS( sys/termio.h ) fi @@ -4454,21 +4701,22 @@ if test "$ac_cv_header_termios_h" = yes #include ], [struct termios foo; int x = foo.c_iflag], termios_bad=unknown, - termios_bad=yes AC_DEFINE(SVR4_TERMIO)) + termios_bad=yes AC_DEFINE(_POSIX_SOURCE)) ]) AC_MSG_RESULT($termios_bad) fi fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SUBDIR_PATH version: 5 updated: 2007/07/29 09:55:12 +dnl CF_SUBDIR_PATH version: 6 updated: 2010/04/21 06:20:50 dnl -------------- dnl Construct a search-list for a nonstandard header/lib-file dnl $1 = the variable to return as result dnl $2 = the package name dnl $3 = the subdirectory, e.g., bin, include or lib AC_DEFUN([CF_SUBDIR_PATH], -[$1="" +[ +$1= CF_ADD_SUBDIR_PATH($1,$2,$3,/usr,$prefix) CF_ADD_SUBDIR_PATH($1,$2,$3,$prefix,NONE) @@ -4565,7 +4813,7 @@ AC_MSG_RESULT($cf_cv_sys_select_timeval) test $cf_cv_sys_select_timeval = yes && AC_DEFINE(NEED_TIMEVAL_FIX) ]) dnl --------------------------------------------------------------------------- -dnl CF_TERMCAP_LIBS version: 11 updated: 2006/10/28 15:15:38 +dnl CF_TERMCAP_LIBS version: 12 updated: 2010/06/20 09:24:28 dnl --------------- dnl Look for termcap libraries, or the equivalent in terminfo. dnl @@ -4615,8 +4863,8 @@ if test "$cf_cv_termlib" = none; then fi if test "$cf_cv_termlib" = none; then # allow curses library for broken AIX system. - AC_CHECK_LIB(curses, initscr, [LIBS="$LIBS -lcurses" cf_cv_termlib=termcap]) - AC_CHECK_LIB(termcap, tgoto, [LIBS="$LIBS -ltermcap" cf_cv_termlib=termcap]) + AC_CHECK_LIB(curses, initscr, [CF_ADD_LIBS(-lcurses)]) + AC_CHECK_LIB(termcap, tgoto, [CF_ADD_LIBS(-ltermcap) cf_cv_termlib=termcap]) fi ]) if test "$cf_cv_termlib" = none; then @@ -4658,7 +4906,7 @@ if test $cf_cv_use_termios_h = yes; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_TERM_HEADER version: 1 updated: 2005/12/31 13:26:39 +dnl CF_TERM_HEADER version: 2 updated: 2010/10/23 15:54:49 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, @@ -4677,7 +4925,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do AC_TRY_COMPILE([#include -#include <${cf_cv_ncurses_header-curses.h}> +#include <${cf_cv_ncurses_header:-curses.h}> #include <$cf_test> ],[int x = auto_left_margin],[ cf_cv_term_header="$cf_test"],[ @@ -4705,7 +4953,7 @@ ncursesw/term.h) esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_TIOCGWINSZ version: 4 updated: 2007/04/28 09:15:55 +dnl CF_TIOCGWINSZ version: 5 updated: 2010/10/23 15:52:32 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 @@ -4733,16 +4981,16 @@ int main() if (ioctl (0, TIOCGSIZE, &size) == 0 && size.ts_lines > 0 && size.ts_cols > 0) - ${cf_cv_main_return-return}(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); + ${cf_cv_main_return:-return}(0); #endif } - ${cf_cv_main_return-return}(0); /* we cannot guarantee this is run interactively */ + ${cf_cv_main_return:-return}(0); /* we cannot guarantee this is run interactively */ }], [cf_cv_use_tiocgwinsz=yes], [cf_cv_use_tiocgwinsz=no], @@ -4781,6 +5029,31 @@ AC_MSG_RESULT($cf_cv_tm_gmtoff) test $cf_cv_tm_gmtoff = no && AC_DEFINE(DONT_HAVE_TM_GMTOFF) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_TRY_PKG_CONFIG version: 4 updated: 2010/06/14 17:42:30 +dnl ----------------- +dnl This is a simple wrapper to use for pkg-config, for libraries which may be +dnl available in that form. +dnl +dnl $1 = package name +dnl $2 = extra logic to use, if any, after updating CFLAGS and LIBS +dnl $3 = logic to use if pkg-config does not have the package +AC_DEFUN([CF_TRY_PKG_CONFIG],[ +AC_REQUIRE([CF_PKG_CONFIG]) + +if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $1; then + CF_VERBOSE(found package $1) + cf_pkgconfig_incs="`$PKG_CONFIG --cflags $1 2>/dev/null`" + cf_pkgconfig_libs="`$PKG_CONFIG --libs $1 2>/dev/null`" + CF_VERBOSE(package $1 CFLAGS: $cf_pkgconfig_incs) + CF_VERBOSE(package $1 LIBS: $cf_pkgconfig_libs) + CF_ADD_CFLAGS($cf_pkgconfig_incs) + CF_ADD_LIBS($cf_pkgconfig_libs) + ifelse([$2],,:,[$2]) +else + ifelse([$3],,:,[$3]) +fi +]) +dnl --------------------------------------------------------------------------- dnl CF_TYPE_OUTCHAR version: 13 updated: 2002/10/09 20:00:37 dnl --------------- dnl Check for return and param type of 3rd -- OutChar() -- param of tputs(). @@ -4968,19 +5241,31 @@ fi fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_CURSES_DIR version: 2 updated: 2002/11/10 14:46:59 +dnl CF_WITH_CURSES_DIR version: 3 updated: 2010/11/20 17:02:38 dnl ------------------ dnl Wrapper for AC_ARG_WITH to specify directory under which to look for curses dnl libraries. AC_DEFUN([CF_WITH_CURSES_DIR],[ + +AC_MSG_CHECKING(for specific curses-directory) AC_ARG_WITH(curses-dir, [ --with-curses-dir=DIR directory in which (n)curses is installed], - [CF_PATH_SYNTAX(withval) - cf_cv_curses_dir=$withval], + [cf_cv_curses_dir=$withval], [cf_cv_curses_dir=no]) +AC_MSG_RESULT($cf_cv_curses_dir) + +if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) +then + CF_PATH_SYNTAX(withval) + if test -d "$cf_cv_curses_dir" + then + CF_ADD_INCDIR($cf_cv_curses_dir/include) + CF_ADD_LIBDIR($cf_cv_curses_dir/lib) + fi +fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_DBMALLOC version: 6 updated: 2006/12/16 14:24:05 +dnl CF_WITH_DBMALLOC version: 7 updated: 2010/06/21 17:26:47 dnl ---------------- dnl Configure-option for dbmalloc. The optional parameter is used to override dnl the updating of $LIBS, e.g., to avoid conflict with subsequent tests. @@ -4991,7 +5276,7 @@ CF_NO_LEAKS_OPTION(dbmalloc, if test "$with_dbmalloc" = yes ; then AC_CHECK_HEADER(dbmalloc.h, - [AC_CHECK_LIB(dbmalloc,[debug_malloc]ifelse($1,,[],[,$1]))]) + [AC_CHECK_LIB(dbmalloc,[debug_malloc]ifelse([$1],,[],[,$1]))]) fi ])dnl dnl --------------------------------------------------------------------------- @@ -5015,7 +5300,7 @@ $3="$withval" AC_DEFINE_UNQUOTED($3,"[$]$3")dnl ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_DMALLOC version: 6 updated: 2006/12/16 14:24:05 +dnl CF_WITH_DMALLOC version: 7 updated: 2010/06/21 17:26:47 dnl --------------- dnl Configure-option for dmalloc. The optional parameter is used to override dnl the updating of $LIBS, e.g., to avoid conflict with subsequent tests. @@ -5026,11 +5311,11 @@ CF_NO_LEAKS_OPTION(dmalloc, if test "$with_dmalloc" = yes ; then AC_CHECK_HEADER(dmalloc.h, - [AC_CHECK_LIB(dmalloc,[dmalloc_debug]ifelse($1,,[],[,$1]))]) + [AC_CHECK_LIB(dmalloc,[dmalloc_debug]ifelse([$1],,[],[,$1]))]) fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_PATH version: 8 updated: 2007/05/13 13:16:35 +dnl CF_WITH_PATH version: 10 updated: 2010/10/23 15:44:18 dnl ------------ dnl Wrapper for AC_ARG_WITH to ensure that user supplies a pathname, not just dnl defaulting to yes/no. @@ -5042,9 +5327,9 @@ dnl $4 = default value, shown in the hel dnl $5 = default value, if it's an expression & cannot be in the help-message dnl AC_DEFUN([CF_WITH_PATH], -[AC_ARG_WITH($1,[$2 ](default: ifelse($4,,empty,$4)),, -ifelse($4,,[withval="${$3}"],[withval="${$3-ifelse($5,,$4,$5)}"]))dnl -if ifelse($5,,true,[test -n "$5"]) ; then +[AC_ARG_WITH($1,[$2 ](default: ifelse([$4],,empty,[$4])),, +ifelse([$4],,[withval="${$3}"],[withval="${$3:-ifelse([$5],,[$4],[$5])}"]))dnl +if ifelse([$5],,true,[test -n "$5"]) ; then CF_PATH_SYNTAX(withval) fi $3="$withval" @@ -5102,7 +5387,7 @@ AC_DEFUN([CF_WITH_VALUE], AC_DEFINE_UNQUOTED($3,"$withval")dnl ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_CURSES version: 8 updated: 2003/11/07 19:47:46 +dnl CF_XOPEN_CURSES version: 11 updated: 2011/01/18 18:15:30 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. @@ -5115,7 +5400,12 @@ AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl AC_CACHE_CHECK(if we must define _XOPEN_SOURCE_EXTENDED,cf_cv_need_xopen_extension,[ AC_TRY_LINK([ #include -#include <${cf_cv_ncurses_header-curses.h}>],[ +#include <${cf_cv_ncurses_header:-curses.h}>],[ +#if defined(NCURSES_VERSION_PATCH) +#if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403) + make an error +#endif +#endif long x = winnstr(stdscr, "", 0); int x1, y1; getbegyx(stdscr, y1, x1)], @@ -5123,7 +5413,11 @@ AC_TRY_LINK([ [AC_TRY_LINK([ #define _XOPEN_SOURCE_EXTENDED #include -#include <${cf_cv_ncurses_header-curses.h}>],[ +#include <${cf_cv_ncurses_header:-curses.h}>],[ +#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)], @@ -5132,7 +5426,7 @@ AC_TRY_LINK([ test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_SOURCE version: 30 updated: 2009/12/30 08:32:55 +dnl CF_XOPEN_SOURCE version: 35 updated: 2011/02/20 20:37:37 dnl --------------- dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, dnl or adapt to the vendor's definitions to get equivalent functionality, @@ -5143,20 +5437,22 @@ dnl $1 is the nominal value for _XOPEN_S dnl $2 is the nominal value for _POSIX_C_SOURCE AC_DEFUN([CF_XOPEN_SOURCE],[ -AC_REQUIRE([CF_PROG_CC_U_D]) - -cf_XOPEN_SOURCE=ifelse($1,,500,$1) -cf_POSIX_C_SOURCE=ifelse($2,,199506L,$2) +cf_XOPEN_SOURCE=ifelse([$1],,500,[$1]) +cf_POSIX_C_SOURCE=ifelse([$2],,199506L,[$2]) +cf_xopen_source= case $host_os in #(vi aix[[456]]*) #(vi - CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE" + cf_xopen_source="-D_ALL_SOURCE" + ;; +cygwin) #(vi + cf_XOPEN_SOURCE=600 ;; darwin[[0-8]].*) #(vi - CPPFLAGS="$CPPFLAGS -D_APPLE_C_SOURCE" + cf_xopen_source="-D_APPLE_C_SOURCE" ;; darwin*) #(vi - CPPFLAGS="$CPPFLAGS -D_DARWIN_C_SOURCE" + cf_xopen_source="-D_DARWIN_C_SOURCE" ;; freebsd*|dragonfly*) #(vi # 5.x headers associate @@ -5164,13 +5460,16 @@ freebsd*|dragonfly*) #(vi # _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L cf_POSIX_C_SOURCE=200112L cf_XOPEN_SOURCE=600 - CPPFLAGS="$CPPFLAGS -D_BSD_TYPES -D__BSD_VISIBLE -D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + cf_xopen_source="-D_BSD_TYPES -D__BSD_VISIBLE -D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + ;; +hpux11*) #(vi + cf_xopen_source="-D_HPUX_SOURCE -D_XOPEN_SOURCE=500" ;; hpux*) #(vi - CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE" + cf_xopen_source="-D_HPUX_SOURCE" ;; irix[[56]].*) #(vi - CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE" + cf_xopen_source="-D_SGI_SOURCE" ;; linux*|gnu*|mint*|k*bsd*-gnu) #(vi CF_GNU_SOURCE @@ -5185,16 +5484,19 @@ openbsd*) #(vi # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw ;; osf[[45]]*) #(vi - CPPFLAGS="$CPPFLAGS -D_OSF_SOURCE" + cf_xopen_source="-D_OSF_SOURCE" ;; nto-qnx*) #(vi - CPPFLAGS="$CPPFLAGS -D_QNX_SOURCE" + cf_xopen_source="-D_QNX_SOURCE" ;; sco*) #(vi # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer ;; -solaris*) #(vi - CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__" +solaris2.1[[0-9]]) #(vi + cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + ;; +solaris2.[[1-9]]) #(vi + cf_xopen_source="-D__EXTENSIONS__" ;; *) AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[ @@ -5217,23 +5519,26 @@ make an error if test "$cf_cv_xopen_source" != no ; then CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE) CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE) - test "$cf_cv_cc_u_d_options" = yes && \ - CPPFLAGS="$CPPFLAGS -U_XOPEN_SOURCE" - CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_cv_xopen_source" + cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" + CF_ADD_CFLAGS($cf_temp_xopen_source) fi CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE) ;; esac + +if test -n "$cf_xopen_source" ; then + CF_ADD_CFLAGS($cf_xopen_source) +fi ]) dnl --------------------------------------------------------------------------- -dnl CF_X_ATHENA version: 12 updated: 2004/06/15 21:14:41 +dnl CF_X_ATHENA version: 20 updated: 2010/11/09 05:18:02 dnl ----------- dnl Check for Xaw (Athena) libraries dnl dnl Sets $cf_x_athena according to the flavor of Xaw which is used. AC_DEFUN([CF_X_ATHENA], -[AC_REQUIRE([CF_X_TOOLKIT]) -cf_x_athena=${cf_x_athena-Xaw} +[ +cf_x_athena=${cf_x_athena:-Xaw} AC_MSG_CHECKING(if you want to link with Xaw 3d library) withval= @@ -5268,23 +5573,63 @@ else AC_MSG_RESULT(no) fi -AC_CHECK_LIB(Xext,XextCreateExtension, - [LIBS="-lXext $LIBS"]) - cf_x_athena_lib="" -CF_X_ATHENA_CPPFLAGS($cf_x_athena) -CF_X_ATHENA_LIBS($cf_x_athena) +if test "$PKG_CONFIG" != none ; then + cf_athena_list= + test "$cf_x_athena" = Xaw && cf_athena_list="xaw8 xaw7 xaw6" + for cf_athena_pkg in \ + $cf_athena_list \ + ${cf_x_athena} \ + ${cf_x_athena}-devel \ + lib${cf_x_athena} \ + lib${cf_x_athena}-devel + do + CF_TRY_PKG_CONFIG($cf_athena_pkg,[ + cf_x_athena_lib="$cf_pkgconfig_libs" + CF_UPPER(cf_x_athena_LIBS,HAVE_LIB_$cf_x_athena) + AC_DEFINE_UNQUOTED($cf_x_athena_LIBS) + +AC_CACHE_CHECK(for usable $cf_x_athena/Xmu package,cf_cv_xaw_compat,[ +AC_TRY_LINK([ +#include +],[ +int check = XmuCompareISOLatin1("big", "small") +],[cf_cv_xaw_compat=yes],[cf_cv_xaw_compat=no])]) + + if test "$cf_cv_xaw_compat" = no + then + # workaround for broken ".pc" files... + case "$cf_x_athena_lib" in #(vi + *-lXmu*) #(vi + ;; + *) + CF_VERBOSE(work around broken package) + CF_TRY_PKG_CONFIG(xmu,,[CF_ADD_LIB_AFTER(-lXt,-lXmu)]) + ;; + esac + fi + + break]) + done +fi + +if test -z "$cf_x_athena_lib" ; then + CF_X_EXT + CF_X_TOOLKIT + CF_X_ATHENA_CPPFLAGS($cf_x_athena) + CF_X_ATHENA_LIBS($cf_x_athena) +fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_X_ATHENA_CPPFLAGS version: 3 updated: 2009/01/11 15:33:39 +dnl CF_X_ATHENA_CPPFLAGS version: 5 updated: 2010/05/26 17:35:30 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], [ -cf_x_athena_root=ifelse($1,,Xaw,$1) -cf_x_athena_include="" +cf_x_athena_root=ifelse([$1],,Xaw,[$1]) +cf_x_athena_inc="" for cf_path in default \ /usr/contrib/X11R6 \ @@ -5292,7 +5637,7 @@ for cf_path in default \ /usr/lib/X11R5 \ /usr/local do - if test -z "$cf_x_athena_include" ; then + if test -z "$cf_x_athena_inc" ; then cf_save="$CPPFLAGS" cf_test=X11/$cf_x_athena_root/SimpleMenu.h if test $cf_path != default ; then @@ -5308,7 +5653,7 @@ do [cf_result=no]) AC_MSG_RESULT($cf_result) if test "$cf_result" = yes ; then - cf_x_athena_include=$cf_path + cf_x_athena_inc=$cf_path break else CPPFLAGS="$cf_save" @@ -5316,21 +5661,21 @@ do fi done -if test -z "$cf_x_athena_include" ; then +if test -z "$cf_x_athena_inc" ; then AC_MSG_WARN( [Unable to successfully find Athena header files with test program]) -elif test "$cf_x_athena_include" != default ; then - CPPFLAGS="$CPPFLAGS -I$cf_x_athena_include" +elif test "$cf_x_athena_inc" != default ; then + CPPFLAGS="$CPPFLAGS -I$cf_x_athena_inc" fi ]) dnl --------------------------------------------------------------------------- -dnl CF_X_ATHENA_LIBS version: 7 updated: 2008/03/23 14:46:03 +dnl CF_X_ATHENA_LIBS version: 10 updated: 2011/02/13 13:31:33 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_LIBS], [AC_REQUIRE([CF_X_TOOLKIT]) -cf_x_athena_root=ifelse($1,,Xaw,$1) +cf_x_athena_root=ifelse([$1],,Xaw,[$1]) cf_x_athena_lib="" for cf_path in default \ @@ -5348,13 +5693,17 @@ do cf_save="$LIBS" cf_test=XawSimpleMenuAddGlobalActions if test $cf_path != default ; then - LIBS="-L$cf_path/lib $cf_lib $LIBS" + CF_ADD_LIBS(-L$cf_path/lib $cf_lib) AC_MSG_CHECKING(for $cf_lib in $cf_path) else - LIBS="$cf_lib $LIBS" + CF_ADD_LIBS($cf_lib) AC_MSG_CHECKING(for $cf_test in $cf_lib) fi - AC_TRY_LINK([],[$cf_test()], + AC_TRY_LINK([ +#include +#include +],[ +$cf_test((XtAppContext) 0)], [cf_result=yes], [cf_result=no]) AC_MSG_RESULT($cf_result) @@ -5376,7 +5725,15 @@ CF_UPPER(cf_x_athena_LIBS,HAVE_LIB_$cf_x AC_DEFINE_UNQUOTED($cf_x_athena_LIBS) ]) dnl --------------------------------------------------------------------------- -dnl CF_X_TOOLKIT version: 12 updated: 2008/03/23 15:04:54 +dnl CF_X_EXT version: 3 updated: 2010/06/02 05:03:05 +dnl -------- +AC_DEFUN([CF_X_EXT],[ +CF_TRY_PKG_CONFIG(Xext,,[ + AC_CHECK_LIB(Xext,XextCreateExtension, + [CF_ADD_LIB(Xext)])]) +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_X_TOOLKIT version: 20 updated: 2010/11/19 05:43:04 dnl ------------ dnl Check for X Toolkit libraries dnl @@ -5385,24 +5742,76 @@ AC_DEFUN([CF_X_TOOLKIT], AC_REQUIRE([AC_PATH_XTRA]) AC_REQUIRE([CF_CHECK_CACHE]) -# SYSTEM_NAME=`echo "$cf_cv_system_name"|tr ' ' -` - cf_have_X_LIBS=no -LDFLAGS="$X_LIBS $LDFLAGS" -CF_CHECK_CFLAGS($X_CFLAGS) +CF_TRY_PKG_CONFIG(xt,[ -AC_CHECK_FUNC(XOpenDisplay,,[ -AC_CHECK_LIB(X11,XOpenDisplay, - [LIBS="-lX11 $LIBS"],, - [$X_PRE_LIBS $LIBS $X_EXTRA_LIBS])]) + case "x$LIBS" in #(vi + *-lX11*) #(vi + ;; + *) +# we have an "xt" package, but it may omit Xt's dependency on X11 +AC_CACHE_CHECK(for usable X dependency,cf_cv_xt_x11_compat,[ +AC_TRY_LINK([ +#include +],[ + int rc1 = XDrawLine((Display*) 0, (Drawable) 0, (GC) 0, 0, 0, 0, 0); + int rc2 = XClearWindow((Display*) 0, (Window) 0); + int rc3 = XMoveWindow((Display*) 0, (Window) 0, 0, 0); + int rc4 = XMoveResizeWindow((Display*)0, (Window)0, 0, 0, 0, 0); +],[cf_cv_xt_x11_compat=yes],[cf_cv_xt_x11_compat=no])]) + if test "$cf_cv_xt_x11_compat" = no + then + CF_VERBOSE(work around broken X11 dependency) + # 2010/11/19 - good enough until a working Xt on Xcb is delivered. + CF_TRY_PKG_CONFIG(x11,,[CF_ADD_LIB_AFTER(-lXt,-lX11)]) + fi + ;; + esac + +AC_CACHE_CHECK(for usable X Toolkit package,cf_cv_xt_ice_compat,[ +AC_TRY_LINK([ +#include +],[int num = IceConnectionNumber(0) +],[cf_cv_xt_ice_compat=yes],[cf_cv_xt_ice_compat=no])]) + + if test "$cf_cv_xt_ice_compat" = no + then + # workaround for broken ".pc" files used for X Toolkit. + case "x$X_PRE_LIBS" in #(vi + *-lICE*) + case "x$LIBS" in #(vi + *-lICE*) #(vi + ;; + *) + CF_VERBOSE(work around broken ICE dependency) + CF_TRY_PKG_CONFIG(ice, + [CF_TRY_PKG_CONFIG(sm)], + [CF_ADD_LIB_AFTER(-lXt,$X_PRE_LIBS)]) + ;; + esac + ;; + esac + fi -AC_CHECK_FUNC(XtAppInitialize,,[ -AC_CHECK_LIB(Xt, XtAppInitialize, - [AC_DEFINE(HAVE_LIBXT) - cf_have_X_LIBS=Xt - LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS"],, - [$X_PRE_LIBS $LIBS $X_EXTRA_LIBS])]) + cf_have_X_LIBS=yes +],[ + + LDFLAGS="$X_LIBS $LDFLAGS" + CF_CHECK_CFLAGS($X_CFLAGS) + + AC_CHECK_FUNC(XOpenDisplay,,[ + AC_CHECK_LIB(X11,XOpenDisplay, + [CF_ADD_LIB(X11)],, + [$X_PRE_LIBS $LIBS $X_EXTRA_LIBS])]) + + AC_CHECK_FUNC(XtAppInitialize,,[ + AC_CHECK_LIB(Xt, XtAppInitialize, + [AC_DEFINE(HAVE_LIBXT) + cf_have_X_LIBS=Xt + LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS"],, + [$X_PRE_LIBS $LIBS $X_EXTRA_LIBS])]) +]) if test $cf_have_X_LIBS = no ; then AC_MSG_WARN( @@ -5479,44 +5888,3 @@ AC_DEFUN([jm_GLIBC21], GLIBC21="$ac_cv_gnu_library_2_1" ] ) -dnl --------------------------------------------------------------------------- -dnl CF_AR_FLAGS version: 4 updated: 2009/02/07 13:42:23 -dnl ----------- -dnl Check for suitable "ar" (archiver) options for updating an archive. -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 -curv curv -crv crv -cqv cqv -rv rv - do - rm -f conftest.$ac_cv_objext - rm -f conftest.a - - cat >conftest.$ac_ext <&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 - done - rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext -]) -test -z "$ARFLAGS" && ARFLAGS=$cf_cv_ar_flags -AC_SUBST(ARFLAGS,$cf_cv_ar_flags) -]) -dnl --------------------------------------------------------------------------- -dnl CF_PROG_AR version: 1 updated: 2009/01/01 20:15:22 -dnl ---------- -dnl Check for archiver "ar". -AC_DEFUN([CF_PROG_AR],[ -AC_CHECK_TOOL(AR, ar, ar) -]) diff -Nurp --exclude='.bzr*' tin-1.9.6/config.guess tin-2.0.0/config.guess --- tin-1.9.6/config.guess 2010-09-29 01:11:39.000000000 +0200 +++ tin-2.0.0/config.guess 2011-08-21 18:20:45.560262776 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2911 Free Software Foundation, Inc. -timestamp='2010-09-24' +timestamp='2011-08-20' # 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 @@ -57,8 +57,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +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." @@ -92,7 +92,7 @@ if test $# != 0; then exit 1 fi -trap 'exit 1' HUP INT TERM +trap 'exit 1' 1 2 15 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a # compiler to aid in system detection is discouraged as it requires @@ -106,7 +106,7 @@ trap 'exit 1' HUP INT TERM set_cc_for_build=' trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || @@ -270,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -326,8 +329,8 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ sparc) echo sparc-icl-nx7; exit ;; esac ;; s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; @@ -495,7 +498,7 @@ EOF else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -789,13 +792,12 @@ EOF echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) @@ -820,8 +822,8 @@ EOF echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; IA64) - echo ia64-unknown-interix${UNAME_RELEASE} - exit ;; + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks @@ -879,7 +881,13 @@ EOF then echo ${UNAME_MACHINE}-unknown-linux-gnu else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + fi fi exit ;; avr32*:Linux:*:*) @@ -934,14 +942,14 @@ EOF test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu - exit ;; + echo or32-unknown-linux-gnu + exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit ;; + echo hppa64-unknown-linux-gnu + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -969,7 +977,7 @@ EOF echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-tilera-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu diff -Nurp --exclude='.bzr*' tin-1.9.6/config.sub tin-2.0.0/config.sub --- tin-1.9.6/config.sub 2010-09-11 00:25:58.000000000 +0200 +++ tin-2.0.0/config.sub 2011-08-17 00:06:14.281816503 +0200 @@ -2,9 +2,9 @@ # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# 2011 Free Software Foundation, Inc. -timestamp='2010-09-11' +timestamp='2011-08-15' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -76,8 +76,8 @@ version="\ GNU config.sub ($timestamp) Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +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." @@ -175,10 +175,10 @@ case $os in os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -246,6 +246,7 @@ case $basic_machine in # Recognize the basic CPU types without company name. # Some are omitted here because they have special meanings below. 1750a | 580 \ + | 32e[bl] | 64e[bl] \ | a29k \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ @@ -283,12 +284,13 @@ case $basic_machine in | moxie \ | mt \ | msp430 \ - | nds32 | nds32le | nds32be\ + | nds32 | nds32le | nds32be \ | nios | nios2 \ | ns16k | ns32k \ + | open8 \ | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ | rx \ | score \ @@ -296,12 +298,12 @@ case $basic_machine in | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; @@ -324,7 +326,15 @@ case $basic_machine in ms1) basic_machine=mt-unknown ;; - + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + xscaleel) + basic_machine=armel-unknown + ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -338,6 +348,7 @@ case $basic_machine in ;; # Recognize the basic CPU types with company name. 580-* \ + | 32e[bl]-* | 64e[bl]-* \ | a29k-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ @@ -382,24 +393,26 @@ case $basic_machine in | nds32-* | nds32le-* | nds32be-* \ | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile-* | tilegx-* \ + | tile-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-* | z80-*) @@ -539,7 +552,7 @@ case $basic_machine in basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -798,6 +811,10 @@ case $basic_machine in basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=32el-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -826,10 +843,10 @@ case $basic_machine in basic_machine=v70-nec os=-sysv ;; - next | m*-next ) + next | m*-next) basic_machine=m68k-next case $os in - -nextstep* ) + -nextstep*) ;; -ns2*) os=-nextstep2 @@ -948,11 +965,14 @@ case $basic_machine in pn) basic_machine=pn-gould ;; - power) basic_machine=power-ibm + power) + basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) + basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -960,9 +980,11 @@ case $basic_machine in ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppc64) basic_machine=powerpc64-unknown + ppc64) + basic_machine=powerpc64-unknown ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-*) + basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown @@ -1046,6 +1068,9 @@ case $basic_machine in basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -1102,13 +1127,8 @@ case $basic_machine in basic_machine=t90-cray os=-unicos ;; - # This must be matched before tile*. - tilegx*) - basic_machine=tilegx-unknown - os=-linux-gnu - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1178,6 +1198,9 @@ case $basic_machine in xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1400,7 +1423,7 @@ case $os in -nova*) os=-rtmk-nova ;; - -ns2 ) + -ns2) os=-nextstep2 ;; -nsk*) @@ -1597,7 +1620,7 @@ case $basic_machine in m88k-omron*) os=-luna ;; - *-next ) + *-next) os=-nextstep ;; *-sequent) diff -Nurp --exclude='.bzr*' tin-1.9.6/configure tin-2.0.0/configure --- tin-1.9.6/configure 2010-11-26 16:07:59.000000000 +0100 +++ tin-2.0.0/configure 2011-08-23 00:03:55.533379469 +0200 @@ -1,7 +1,7 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.13.20030927 +# Generated automatically using autoconf version 2.13.20110430 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -230,8 +230,8 @@ cat <<\EOF --with-curses-dir=DIR directory in which (n)curses is installed EOF cat <<\EOF - --with-ncurses link with ncurses if available (depriciated) - --enable-curses use curses interface (depriciated) + --with-ncurses link with ncurses if available (deprecated) + --enable-curses use curses interface (deprecated) --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 @@ -281,13 +281,15 @@ cat <<\EOF search for libiconv in DIR/include and DIR/lib --disable-nls do not use Native Language Support --with-included-gettext use the GNU gettext library included here - --disable-included-msgs use included messages, for i18n support + --with-textdomain=PKG NLS text-domain (default is package name) EOF cat <<\EOF - --with-x use the X Window System + --disable-included-msgs use included messages, for i18n support --with-Xaw3d link with Xaw 3d library --with-neXtaw link with neXT Athena library --with-XawPlus link with Athena-Plus library + --with-pkg-config{=path} enable/disable use of pkg-config + --with-x use the X Window System EOF exit 0 ;; @@ -438,7 +440,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.13.20030927" + echo "configure generated by autoconf version 2.13.20110430" exit 0 ;; -with-* | --with-*) @@ -625,247 +627,12 @@ else ac_n= ac_c='\c' ac_t= fi -# If we find X, set shell vars x_includes and x_libraries to the -# paths, otherwise set no_x=yes. -# Uses ac_ vars as temps to allow command line to override cache and checks. -# --without-x overrides everything else, but does not touch the cache. -echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:634: checking for X" >&5 - - -# 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 - if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then - # Both variables are already set. - have_x=yes - else -if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&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 conftestdir -if mkdir conftestdir; then - cd conftestdir - # 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; 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 conftestdir -fi - -if test "$ac_x_includes" = NO; then - # Guess where to find include files, by looking for this one X11 .h file. - test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h - - # First, try using that file with no special directory specified. -cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - # We can compile using X headers with no special include directory. -ac_x_includes= -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - # Look for the header file in a standard set of common directories. -# Check X11 before X11Rn because it is often a symlink to the current release. - for ac_dir in \ - /usr/X11/include \ - /usr/X11R6/include \ - /usr/X11R5/include \ - /usr/X11R4/include \ - \ - /usr/include/X11 \ - /usr/include/X11R6 \ - /usr/include/X11R5 \ - /usr/include/X11R4 \ - \ - /usr/local/X11/include \ - /usr/local/X11R6/include \ - /usr/local/X11R5/include \ - /usr/local/X11R4/include \ - \ - /usr/local/include/X11 \ - /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 \ - ; \ - do - if test -r "$ac_dir/$x_direct_test_include"; then - ac_x_includes=$ac_dir - break - fi - done -fi -rm -f conftest* -fi # $ac_x_includes = NO - -if test "$ac_x_libraries" = NO; then - # Check for the libraries. - - test -z "$x_direct_test_library" && x_direct_test_library=Xt - test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc - - # See if we find them without any special options. - # Don't add to $LIBS permanently. - ac_save_LIBS="$LIBS" - LIBS="-l$x_direct_test_library $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - LIBS="$ac_save_LIBS" -# We can link X programs with no special library path. -ac_x_libraries= -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - LIBS="$ac_save_LIBS" -# First see if replacing the include by lib works. -# Check X11 before X11Rn because it is often a symlink to the current release. -for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \ - /usr/X11/lib \ - /usr/X11R6/lib \ - /usr/X11R5/lib \ - /usr/X11R4/lib \ - \ - /usr/lib/X11 \ - /usr/lib/X11R6 \ - /usr/lib/X11R5 \ - /usr/lib/X11R4 \ - \ - /usr/local/X11/lib \ - /usr/local/X11R6/lib \ - /usr/local/X11R5/lib \ - /usr/local/X11R4/lib \ - \ - /usr/local/lib/X11 \ - /usr/local/lib/X11R6 \ - /usr/local/lib/X11R5 \ - /usr/local/lib/X11R4 \ - \ - /usr/X386/lib \ - /usr/x386/lib \ - /usr/XFree86/lib/X11 \ - \ - /usr/lib \ - /usr/local/lib \ - /usr/unsupported/lib \ - /usr/athena/lib \ - /usr/local/x11r5/lib \ - /usr/lpp/Xamples/lib \ - /lib/usr/lib/X11 \ - \ - /usr/openwin/lib \ - /usr/openwin/share/lib \ - ; \ -do - for ac_extension in a so sl; do - if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then - ac_x_libraries=$ac_dir - break 2 - fi - done -done -fi -rm -f conftest* -fi # $ac_x_libraries = NO - -if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then - # Didn't find X anywhere. Cache the known absence of X. - ac_cv_have_x="have_x=no" -else - # Record where we found X for the cache. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" -fi -fi - fi - eval "$ac_cv_have_x" -fi # $with_x != no - -if test "$have_x" != yes; then - echo "$ac_t""$have_x" 1>&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 "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6 -fi - PACKAGE=tin -VERSION=1.9.6 +VERSION=2.0.0 cat >> confdefs.h <&6 -echo "configure:909: checking host system type" >&5 +echo "configure:676: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -966,7 +733,7 @@ if test "${with_install_prefix+set}" = s withval="$with_install_prefix" : else - withval="${DESTDIR-/}" + withval="${DESTDIR:-/}" fi if true ; then @@ -1037,7 +804,7 @@ case "$host_os" in # Extract the first word of "xlc", so it can be a program name with args. set dummy xlc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1041: checking for $ac_word" >&5 +echo "configure:808: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XLC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1080,14 +847,14 @@ fi esac ### Native Language Support -ALL_LINGUAS="da de en_GB et fr ru rw sv tr" +ALL_LINGUAS="da de en_GB et fr ru sv tr" ### Checks for programs save_CFLAGS="$CFLAGS" # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1091: checking for $ac_word" >&5 +echo "configure:858: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1117,7 +884,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1121: checking for $ac_word" >&5 +echo "configure:888: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1168,7 +935,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1172: checking for $ac_word" >&5 +echo "configure:939: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1200,7 +967,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1204: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:971: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1211,12 +978,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1215 "configure" +#line 982 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1242,12 +1009,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1246: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1013: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1251: checking whether we are using GNU C" >&5 +echo "configure:1018: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1256,7 +1023,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1260: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1275,7 +1042,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1279: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1046: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1307,7 +1074,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1311: checking how to run the C preprocessor" >&5 +echo "configure:1078: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1322,13 +1089,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1332: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1339,13 +1106,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1349: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1356,13 +1123,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1366: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1133: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1388,13 +1155,13 @@ echo "$ac_t""$CPP" 1>&6 if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:1392: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:1159: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -1412,7 +1179,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -1434,7 +1201,7 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1438: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1205: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1472,7 +1239,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1476: checking for a BSD compatible install" >&5 +echo "configure:1243: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1549,14 +1316,14 @@ EOF do rm -f y.tab.ch echo $ac_n "checking for $cf_prog""... $ac_c" 1>&6 -echo "configure:1553: checking for $cf_prog" >&5 +echo "configure:1320: checking for $cf_prog" >&5 cf_command="$cf_prog conftest.y" cf_result=no - if { (eval echo configure:1556: \"$cf_command\") 1>&5; (eval $cf_command) 2>&5; } && test -s y.tab.c ; then + if { (eval echo configure:1323: \"$cf_command\") 1>&5; (eval $cf_command) 2>&5; } && test -s y.tab.c ; then mv y.tab.c conftest.c rm -f y.tab.h if test "$cf_prog" = 'bison -y' ; then - if { (eval echo configure:1560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest ; then + if { (eval echo configure:1327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest ; then cf_result=yes fi else @@ -1580,7 +1347,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1584: checking for $ac_word" >&5 +echo "configure:1351: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LINT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1611,9 +1378,9 @@ done test -n "$LINT" || LINT=":" echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:1615: checking for AIX" >&5 +echo "configure:1382: checking for AIX" >&5 cat > conftest.$ac_ext <&6 -echo "configure:1640: checking if $CC -U and -D options work together" >&5 -if eval "test \"`echo '$''{'cf_cv_cc_u_d_options'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cf_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS" - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - cf_cv_cc_u_d_options=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - cf_cv_cc_u_d_options=no -fi -rm -f conftest* - CPPFLAGS="$cf_save_CPPFLAGS" - -fi - -echo "$ac_t""$cf_cv_cc_u_d_options" 1>&6 - - - - - -cf_XOPEN_SOURCE=500 -cf_POSIX_C_SOURCE=199506L +cf_XOPEN_SOURCE=500 +cf_POSIX_C_SOURCE=199506L +cf_xopen_source= case $host_os in #(vi aix[456]*) #(vi - CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE" + cf_xopen_source="-D_ALL_SOURCE" + ;; +cygwin) #(vi + cf_XOPEN_SOURCE=600 ;; darwin[0-8].*) #(vi - CPPFLAGS="$CPPFLAGS -D_APPLE_C_SOURCE" + cf_xopen_source="-D_APPLE_C_SOURCE" ;; darwin*) #(vi - CPPFLAGS="$CPPFLAGS -D_DARWIN_C_SOURCE" + cf_xopen_source="-D_DARWIN_C_SOURCE" ;; freebsd*|dragonfly*) #(vi # 5.x headers associate @@ -1699,24 +1426,27 @@ freebsd*|dragonfly*) #(vi # _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L cf_POSIX_C_SOURCE=200112L cf_XOPEN_SOURCE=600 - CPPFLAGS="$CPPFLAGS -D_BSD_TYPES -D__BSD_VISIBLE -D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + cf_xopen_source="-D_BSD_TYPES -D__BSD_VISIBLE -D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + ;; +hpux11*) #(vi + cf_xopen_source="-D_HPUX_SOURCE -D_XOPEN_SOURCE=500" ;; hpux*) #(vi - CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE" + cf_xopen_source="-D_HPUX_SOURCE" ;; irix[56].*) #(vi - CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE" + cf_xopen_source="-D_SGI_SOURCE" ;; linux*|gnu*|mint*|k*bsd*-gnu) #(vi echo $ac_n "checking if we must define _GNU_SOURCE""... $ac_c" 1>&6 -echo "configure:1714: checking if we must define _GNU_SOURCE" >&5 +echo "configure:1444: checking if we must define _GNU_SOURCE" >&5 if eval "test \"`echo '$''{'cf_cv_gnu_source'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -1726,7 +1456,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:1730: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_gnu_source=no else @@ -1736,7 +1466,7 @@ else cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" cat > conftest.$ac_ext < int main() { @@ -1746,7 +1476,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:1750: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1480: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_gnu_source=no else @@ -1777,26 +1507,29 @@ openbsd*) #(vi # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw ;; osf[45]*) #(vi - CPPFLAGS="$CPPFLAGS -D_OSF_SOURCE" + cf_xopen_source="-D_OSF_SOURCE" ;; nto-qnx*) #(vi - CPPFLAGS="$CPPFLAGS -D_QNX_SOURCE" + cf_xopen_source="-D_QNX_SOURCE" ;; sco*) #(vi # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer ;; -solaris*) #(vi - CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__" +solaris2.1[0-9]) #(vi + cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + ;; +solaris2.[1-9]) #(vi + cf_xopen_source="-D__EXTENSIONS__" ;; *) echo $ac_n "checking if we should define _XOPEN_SOURCE""... $ac_c" 1>&6 -echo "configure:1794: checking if we should define _XOPEN_SOURCE" >&5 +echo "configure:1527: checking if we should define _XOPEN_SOURCE" >&5 if eval "test \"`echo '$''{'cf_cv_xopen_source'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -1806,7 +1539,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:1810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1543: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_xopen_source=no else @@ -1816,7 +1549,7 @@ else cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat > conftest.$ac_ext < int main() { @@ -1826,7 +1559,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:1830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_xopen_source=no else @@ -1846,20 +1579,98 @@ fi echo "$ac_t""$cf_cv_xopen_source" 1>&6 if test "$cf_cv_xopen_source" != no ; then -# remove _XOPEN_SOURCE symbol from $CFLAGS CFLAGS=`echo "$CFLAGS" | \ - sed -e 's/-[UD]_XOPEN_SOURCE\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]_XOPEN_SOURCE\(=[^ ]*\)\?$//g'` + sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` + + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` + cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" -# remove _XOPEN_SOURCE symbol from $CPPFLAGS +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in $cf_temp_xopen_source +do +case $cf_fix_cppflags in +no) + case $cf_add_cflags in #(vi + -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi + case $cf_add_cflags in + -D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + fi + ;; + esac + case "$CPPFLAGS" in + *$cf_add_cflags) #(vi + ;; + *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + CPPFLAGS=`echo "$CPPFLAGS" | \ - sed -e 's/-[UD]_XOPEN_SOURCE\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]_XOPEN_SOURCE\(=[^ ]*\)\?$//g'` + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + ;; + esac + ;; + *) + cf_new_cflags="$cf_new_cflags $cf_add_cflags" + ;; + esac + ;; +yes) + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + CFLAGS="$CFLAGS $cf_new_cflags" +fi + +if test -n "$cf_new_cppflags" ; then + + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" +fi + +if test -n "$cf_new_extra_cppflags" ; then + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" +fi + + + - test "$cf_cv_cc_u_d_options" = yes && \ - CPPFLAGS="$CPPFLAGS -U_XOPEN_SOURCE" - CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_cv_xopen_source" fi cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE @@ -1868,29 +1679,27 @@ cf_save_CFLAGS="$CFLAGS" cf_save_CPPFLAGS="$CPPFLAGS" -# remove _POSIX_C_SOURCE symbol from $cf_save_CFLAGS cf_trim_CFLAGS=`echo "$cf_save_CFLAGS" | \ - sed -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?$//g'` + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -# remove _POSIX_C_SOURCE symbol from $cf_save_CPPFLAGS cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ - sed -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?$//g'` + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` echo $ac_n "checking if we should define _POSIX_C_SOURCE""... $ac_c" 1>&6 -echo "configure:1885: checking if we should define _POSIX_C_SOURCE" >&5 +echo "configure:1694: checking if we should define _POSIX_C_SOURCE" >&5 if eval "test \"`echo '$''{'cf_cv_posix_c_source'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -echo "${as_me-configure}:1891: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:1700: testing if the symbol is already defined go no further ..." 1>&5 cat > conftest.$ac_ext < int main() { @@ -1900,7 +1709,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:1904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1713: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_posix_c_source=no else @@ -1922,7 +1731,7 @@ else esac if test "$cf_want_posix_source" = yes ; then cat > conftest.$ac_ext < int main() { @@ -1932,7 +1741,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:1936: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -1943,15 +1752,15 @@ fi rm -f conftest* fi -echo "${as_me-configure}:1947: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:1756: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" -echo "${as_me-configure}:1952: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:1761: testing if the second compile does not leave our definition intact error ..." 1>&5 cat > conftest.$ac_ext < int main() { @@ -1961,7 +1770,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:1965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1774: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -1983,27 +1792,188 @@ echo "$ac_t""$cf_cv_posix_c_source" 1>&6 if test "$cf_cv_posix_c_source" != no ; then CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" - if test "$cf_cv_cc_u_d_options" = yes ; then - cf_temp_posix_c_source=`echo "$cf_cv_posix_c_source" | \ - sed -e 's/-D/-U/g' -e 's/=[^ ]*//g'` - CPPFLAGS="$CPPFLAGS $cf_temp_posix_c_source" - fi - CPPFLAGS="$CPPFLAGS $cf_cv_posix_c_source" + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in $cf_cv_posix_c_source +do +case $cf_fix_cppflags in +no) + case $cf_add_cflags in #(vi + -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi + case $cf_add_cflags in + -D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + fi + ;; + esac + case "$CPPFLAGS" in + *$cf_add_cflags) #(vi + ;; + *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + ;; + esac + ;; + *) + cf_new_cflags="$cf_new_cflags $cf_add_cflags" + ;; + esac + ;; +yes) + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + CFLAGS="$CFLAGS $cf_new_cflags" +fi + +if test -n "$cf_new_cppflags" ; then + + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" +fi + +if test -n "$cf_new_extra_cppflags" ; then + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" +fi + + + + fi ;; esac +if test -n "$cf_xopen_source" ; then + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in $cf_xopen_source +do +case $cf_fix_cppflags in +no) + case $cf_add_cflags in #(vi + -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi + case $cf_add_cflags in + -D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + fi + ;; + esac + case "$CPPFLAGS" in + *$cf_add_cflags) #(vi + ;; + *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + ;; + esac + ;; + *) + cf_new_cflags="$cf_new_cflags $cf_add_cflags" + ;; + esac + ;; +yes) + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + CFLAGS="$CFLAGS $cf_new_cflags" +fi + +if test -n "$cf_new_cppflags" ; then + + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" +fi + +if test -n "$cf_new_extra_cppflags" ; then + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" +fi + + + + +fi + echo $ac_n "checking if SIGWINCH is defined""... $ac_c" 1>&6 -echo "configure:2001: checking if SIGWINCH is defined" >&5 +echo "configure:1971: checking if SIGWINCH is defined" >&5 if eval "test \"`echo '$''{'cf_cv_define_sigwinch'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2013,7 +1983,7 @@ int main() { int x = SIGWINCH ; return 0; } EOF -if { (eval echo configure:2017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_define_sigwinch=yes else @@ -2021,7 +1991,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2008: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_define_sigwinch=maybe else @@ -2054,7 +2024,7 @@ echo "$ac_t""$cf_cv_define_sigwinch" 1>& if test "$cf_cv_define_sigwinch" = maybe ; then echo $ac_n "checking for actual SIGWINCH definition""... $ac_c" 1>&6 -echo "configure:2058: checking for actual SIGWINCH definition" >&5 +echo "configure:2028: checking for actual SIGWINCH definition" >&5 if eval "test \"`echo '$''{'cf_cv_fixup_sigwinch'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2064,7 +2034,7 @@ cf_sigwinch=32 while test $cf_sigwinch != 1 do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2055: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_fixup_sigwinch=$cf_sigwinch break @@ -2105,7 +2075,7 @@ fi echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 -echo "configure:2109: checking for strerror in -lcposix" >&5 +echo "configure:2079: checking for strerror in -lcposix" >&5 ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2113,7 +2083,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:2098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi @@ -2147,8 +2117,8 @@ fi -echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 -echo "configure:2152: checking for ${CC-cc} option to accept ANSI C" >&5 +echo $ac_n "checking for ${CC:-cc} option to accept ANSI C""... $ac_c" 1>&6 +echo "configure:2122: checking for ${CC:-cc} option to accept ANSI C" >&5 if eval "test \"`echo '$''{'cf_cv_ansi_cc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2188,8 +2158,8 @@ no) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "${cf_add_cflags}" != "${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" @@ -2204,6 +2174,16 @@ no) *$cf_add_cflags) #(vi ;; *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" ;; esac @@ -2219,8 +2199,8 @@ yes) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` test "${cf_add_cflags}" != "${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=no + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no ;; esac done @@ -2244,7 +2224,7 @@ fi cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2244: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ansi_cc="$cf_arg"; break else @@ -2295,8 +2275,8 @@ no) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "${cf_add_cflags}" != "${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" @@ -2311,6 +2291,16 @@ no) *$cf_add_cflags) #(vi ;; *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" ;; esac @@ -2326,8 +2316,8 @@ yes) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` test "${cf_add_cflags}" != "${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=no + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no ;; esac done @@ -2368,12 +2358,12 @@ You have the following choices: fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:2372: checking for Cygwin environment" >&5 +echo "configure:2362: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -2401,19 +2391,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:2405: checking for mingw32 environment" >&5 +echo "configure:2395: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2407: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -2445,7 +2435,7 @@ esac echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:2449: checking for executable suffix" >&5 +echo "configure:2439: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2455,7 +2445,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:2459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:2449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -2476,13 +2466,13 @@ echo "$ac_t""${ac_cv_exeext}" 1>&6 ac_exeext=$EXEEXT echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:2480: checking for object suffix" >&5 +echo "configure:2470: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:2486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2476: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2519,7 +2509,7 @@ LIB_PREFIX=$LIB_PREFIX echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2523: checking whether ln -s works" >&5 +echo "configure:2513: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2563,7 +2553,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2567: checking for $ac_word" >&5 +echo "configure:2557: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BUILD_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2595,11 +2585,11 @@ done fi echo $ac_n "checking for native build C compiler""... $ac_c" 1>&6 -echo "configure:2599: checking for native build C compiler" >&5 +echo "configure:2589: checking for native build C compiler" >&5 echo "$ac_t""$BUILD_CC" 1>&6 echo $ac_n "checking for native build C preprocessor""... $ac_c" 1>&6 -echo "configure:2603: checking for native build C preprocessor" >&5 +echo "configure:2593: checking for native build C preprocessor" >&5 # Check whether --with-build-cpp or --without-build-cpp was given. if test "${with_build_cpp+set}" = set; then @@ -2612,7 +2602,7 @@ fi echo "$ac_t""$BUILD_CPP" 1>&6 echo $ac_n "checking for native build C flags""... $ac_c" 1>&6 -echo "configure:2616: checking for native build C flags" >&5 +echo "configure:2606: checking for native build C flags" >&5 # Check whether --with-build-cflags or --without-build-cflags was given. if test "${with_build_cflags+set}" = set; then @@ -2623,7 +2613,7 @@ fi echo "$ac_t""$BUILD_CFLAGS" 1>&6 echo $ac_n "checking for native build C preprocessor-flags""... $ac_c" 1>&6 -echo "configure:2627: checking for native build C preprocessor-flags" >&5 +echo "configure:2617: checking for native build C preprocessor-flags" >&5 # Check whether --with-build-cppflags or --without-build-cppflags was given. if test "${with_build_cppflags+set}" = set; then @@ -2634,7 +2624,7 @@ fi echo "$ac_t""$BUILD_CPPFLAGS" 1>&6 echo $ac_n "checking for native build linker-flags""... $ac_c" 1>&6 -echo "configure:2638: checking for native build linker-flags" >&5 +echo "configure:2628: checking for native build linker-flags" >&5 # Check whether --with-build-ldflags or --without-build-ldflags was given. if test "${with_build_ldflags+set}" = set; then @@ -2645,7 +2635,7 @@ fi echo "$ac_t""$BUILD_LDFLAGS" 1>&6 echo $ac_n "checking for native build linker-libraries""... $ac_c" 1>&6 -echo "configure:2649: checking for native build linker-libraries" >&5 +echo "configure:2639: checking for native build linker-libraries" >&5 # Check whether --with-build-libs or --without-build-libs was given. if test "${with_build_libs+set}" = set; then @@ -2688,7 +2678,7 @@ fi echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:2692: checking build system type" >&5 +echo "configure:2682: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -2714,7 +2704,7 @@ fi # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2718: checking for $ac_word" >&5 +echo "configure:2708: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2746,7 +2736,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2750: checking for $ac_word" >&5 +echo "configure:2740: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2781,7 +2771,7 @@ fi # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. set dummy ${ac_tool_prefix}ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2785: checking for $ac_word" >&5 +echo "configure:2775: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2813,7 +2803,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ld", so it can be a program name with args. set dummy ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2817: checking for $ac_word" >&5 +echo "configure:2807: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2849,7 +2839,7 @@ fi # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2853: checking for $ac_word" >&5 +echo "configure:2843: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2881,7 +2871,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2885: checking for $ac_word" >&5 +echo "configure:2875: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2918,7 +2908,7 @@ fi echo $ac_n "checking for options to update archives""... $ac_c" 1>&6 -echo "configure:2922: checking for options to update archives" >&5 +echo "configure:2912: checking for options to update archives" >&5 if eval "test \"`echo '$''{'cf_cv_ar_flags'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2926,6 +2916,16 @@ else cf_cv_ar_flags=unknown for cf_ar_flags in -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 + fi + fi + rm -f conftest.$ac_cv_objext rm -f conftest.a @@ -2934,7 +2934,8 @@ else int testdata[3] = { 123, 456, 789 }; EOF if { (eval echo configure:2937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } ; then - $AR $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null + 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 @@ -2942,7 +2943,7 @@ EOF else test -n "$verbose" && echo " cannot compile test-program" 1>&6 -echo "${as_me-configure}:2946: testing cannot compile test-program ..." 1>&5 +echo "${as_me:-configure}:2947: testing cannot compile test-program ..." 1>&5 break @@ -2953,9 +2954,17 @@ echo "${as_me-configure}:2946: testing c fi echo "$ac_t""$cf_cv_ar_flags" 1>&6 -test -z "$ARFLAGS" && ARFLAGS=$cf_cv_ar_flags - - + +if test -n "$ARFLAGS" ; then + if test -n "$cf_cv_ar_flags" ; then + ARFLAGS="$ARFLAGS $cf_cv_ar_flags" + fi +else + ARFLAGS=$cf_cv_ar_flags +fi + + + case "$host_cpu:$host_vendor:$host_os" in # check for MacOS X, exclude Darwin on ix86 @@ -2990,7 +2999,7 @@ if test "${with_ispell+set}" = set; then *) # user supplied option-value for "--with-ispell=path" echo $ac_n "checking for ispell""... $ac_c" 1>&6 -echo "configure:2994: checking for ispell" >&5 +echo "configure:3003: checking for ispell" >&5 ac_cv_path_PATH_ISPELL="$withval" cat >> confdefs.h <&6 -echo "configure:3011: checking for $ac_word" >&5 +echo "configure:3020: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATH_ISPELL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3064,7 +3073,7 @@ if test "${with_metamail+set}" = set; th *) # user supplied option-value for "--with-metamail=path" echo $ac_n "checking for metamail""... $ac_c" 1>&6 -echo "configure:3068: checking for metamail" >&5 +echo "configure:3077: checking for metamail" >&5 ac_cv_path_PATH_METAMAIL="$withval" cat >> confdefs.h <&6 -echo "configure:3085: checking for $ac_word" >&5 +echo "configure:3094: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATH_METAMAIL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3138,7 +3147,7 @@ if test "${with_sum+set}" = set; then *) # user supplied option-value for "--with-sum=path" echo $ac_n "checking for sum""... $ac_c" 1>&6 -echo "configure:3142: checking for sum" >&5 +echo "configure:3151: checking for sum" >&5 ac_cv_path_PATH_SUM="$withval" cat >> confdefs.h <&6 -echo "configure:3159: checking for $ac_word" >&5 +echo "configure:3168: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATH_SUM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3202,12 +3211,12 @@ fi if test $ac_cv_path_PATH_SUM then echo $ac_n "checking if $ac_cv_path_PATH_SUM takes -r""... $ac_c" 1>&6 -echo "configure:3206: checking if $ac_cv_path_PATH_SUM takes -r" >&5 +echo "configure:3215: checking if $ac_cv_path_PATH_SUM takes -r" >&5 if eval "test \"`echo '$''{'ac_cv_prog_sum_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -if { ac_try='$ac_cv_path_PATH_SUM -r config.log 1>&5'; { (eval echo configure:3211: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } +if { ac_try='$ac_cv_path_PATH_SUM -r config.log 1>&5'; { (eval echo configure:3220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then ac_cv_prog_sum_r=yes else @@ -3237,7 +3246,7 @@ fi echo $ac_n "checking for default editor""... $ac_c" 1>&6 -echo "configure:3241: checking for default editor" >&5 +echo "configure:3250: checking for default editor" >&5 # Check whether --with-editor or --without-editor was given. if test "${with_editor+set}" = set; then @@ -3265,7 +3274,7 @@ if test -z "$DEFAULT_EDITOR" ; then # Extract the first word of "vi", so it can be a program name with args. set dummy vi; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3269: checking for $ac_word" >&5 +echo "configure:3278: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DEFAULT_EDITOR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3310,7 +3319,7 @@ EOF # Extract the first word of "sendmail", so it can be a program name with args. set dummy sendmail; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3314: checking for $ac_word" >&5 +echo "configure:3323: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DEFAULT_MAILER'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3364,7 +3373,7 @@ if test -z "$DEFAULT_MAILER" ; then # Extract the first word of "mailx", so it can be a program name with args. set dummy mailx; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3368: checking for $ac_word" >&5 +echo "configure:3377: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DEFAULT_MAILER'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3401,7 +3410,7 @@ if test -z "$DEFAULT_MAILER" ; then # Extract the first word of "mail", so it can be a program name with args. set dummy mail; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3405: checking for $ac_word" >&5 +echo "configure:3414: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DEFAULT_MAILER'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3435,7 +3444,7 @@ fi fi echo $ac_n "checking for default mailer""... $ac_c" 1>&6 -echo "configure:3439: checking for default mailer" >&5 +echo "configure:3448: checking for default mailer" >&5 if test -n "$DEFAULT_MAILER" ; then case $cf_cv_system_name in #(vi @@ -3462,7 +3471,7 @@ echo "$ac_t""$DEFAULT_MAILER" 1>&6 echo $ac_n "checking for incoming-mail directory""... $ac_c" 1>&6 -echo "configure:3466: checking for incoming-mail directory" >&5 +echo "configure:3475: checking for incoming-mail directory" >&5 # Check whether --with-mailbox or --without-mailbox was given. if test "${with_mailbox+set}" = set; then @@ -3508,7 +3517,7 @@ echo "$ac_t""$DEFAULT_MAILBOX" 1>&6 ## PGP Support echo $ac_n "checking if you want PGP/GPG-Support""... $ac_c" 1>&6 -echo "configure:3512: checking if you want PGP/GPG-Support" >&5 +echo "configure:3521: checking if you want PGP/GPG-Support" >&5 # Check whether --enable-pgp-gpg or --disable-pgp-gpg was given. if test "${enable_pgp_gpg+set}" = set; then @@ -3540,7 +3549,7 @@ if test "${with_pgp+set}" = set; then *) # user supplied option-value for "--with-pgp=path" echo $ac_n "checking for pgp""... $ac_c" 1>&6 -echo "configure:3544: checking for pgp" >&5 +echo "configure:3553: checking for pgp" >&5 ac_cv_path_PATH_PGP="$withval" cat >> confdefs.h <&6 -echo "configure:3561: checking for $ac_word" >&5 +echo "configure:3570: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATH_PGP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3615,7 +3624,7 @@ if test "${with_pgpk+set}" = set; then *) # user supplied option-value for "--with-pgpk=path" echo $ac_n "checking for pgpk""... $ac_c" 1>&6 -echo "configure:3619: checking for pgpk" >&5 +echo "configure:3628: checking for pgpk" >&5 ac_cv_path_PATH_PGPK="$withval" cat >> confdefs.h <&6 -echo "configure:3636: checking for $ac_word" >&5 +echo "configure:3645: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATH_PGPK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3690,7 +3699,7 @@ if test "${with_gpg+set}" = set; then *) # user supplied option-value for "--with-gpg=path" echo $ac_n "checking for gpg""... $ac_c" 1>&6 -echo "configure:3694: checking for gpg" >&5 +echo "configure:3703: checking for gpg" >&5 ac_cv_path_PATH_GPG="$withval" cat >> confdefs.h <&6 -echo "configure:3711: checking for $ac_word" >&5 +echo "configure:3720: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATH_GPG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3766,7 +3775,7 @@ if test "${with_slrnface+set}" = set; th *) # user supplied option-value for "--with-slrnface=path" echo $ac_n "checking for slrnface""... $ac_c" 1>&6 -echo "configure:3770: checking for slrnface" >&5 +echo "configure:3779: checking for slrnface" >&5 ac_cv_path_PATH_SLRNFACE="$withval" cat >> confdefs.h <&6 -echo "configure:3787: checking for $ac_word" >&5 +echo "configure:3796: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATH_SLRNFACE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3839,13 +3848,13 @@ fi echo $ac_n "checking for the default shell program""... $ac_c" 1>&6 -echo "configure:3843: checking for the default shell program" >&5 +echo "configure:3852: checking for the default shell program" >&5 cf_shell_progs="$cf_cv_default_shell" if test -z "$cf_shell_progs" ; then cf_shell_progs="sh ksh bash zsh pdksh mksh jsh keysh ash dash" # TIN preferred default shell for BSD systems is csh. Others are sh. cat > conftest.$ac_ext < @@ -3858,7 +3867,7 @@ make an error ; return 0; } EOF -if { (eval echo configure:3862: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3871: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* $cf_shell_progs="csh tcsh $cf_shell_progs" else @@ -3868,11 +3877,11 @@ fi rm -f conftest* fi -echo "${as_me-configure}:3872: testing paths of shell programs: $cf_shell_progs ..." 1>&5 +echo "${as_me:-configure}:3881: 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}:3876: testing /etc/shells ..." 1>&5 +echo "${as_me:-configure}:3885: testing /etc/shells ..." 1>&5 for cf_prog in $cf_shell_progs do @@ -3907,14 +3916,14 @@ echo "${as_me-configure}:3876: testing / echo "$ac_t""$DEFAULT_SHELL" 1>&6 else -echo "${as_me-configure}:3911: testing $PATH ..." 1>&5 +echo "${as_me:-configure}:3920: testing $PATH ..." 1>&5 for ac_prog in $cf_shell_progs do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3918: checking for $ac_word" >&5 +echo "configure:3927: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DEFAULT_SHELL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3967,7 +3976,7 @@ EOF ### check for this early, since it'll override several options echo $ac_n "checking if NNTP-support will be used""... $ac_c" 1>&6 -echo "configure:3971: checking if NNTP-support will be used" >&5 +echo "configure:3980: checking if NNTP-support will be used" >&5 # Check whether --enable-nntp or --disable-nntp was given. if test "${enable_nntp+set}" = set; then @@ -3989,7 +3998,7 @@ echo "$ac_t""$enableval" 1>&6 USE_SPOOLDIR=yes if test "$USE_NNTP" = "yes" ; then echo $ac_n "checking whether to be NNTP_ONLY""... $ac_c" 1>&6 -echo "configure:3993: checking whether to be NNTP_ONLY" >&5 +echo "configure:4002: checking whether to be NNTP_ONLY" >&5 # Check whether --enable-nntp-only or --disable-nntp-only was given. if test "${enable_nntp_only+set}" = set; then @@ -4021,7 +4030,7 @@ fi ### use option --enable-debug to compile-in test/development code echo $ac_n "checking if you want to compile-in debug support""... $ac_c" 1>&6 -echo "configure:4025: checking if you want to compile-in debug support" >&5 +echo "configure:4034: checking if you want to compile-in debug support" >&5 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then @@ -4048,7 +4057,7 @@ echo "$ac_t""$enableval" 1>&6 ### use option --disable-echo to suppress full display compiling commands echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6 -echo "configure:4052: checking if you want to see long compiling messages" >&5 +echo "configure:4061: checking if you want to see long compiling messages" >&5 # Check whether --enable-echo or --disable-echo was given. if test "${enable_echo+set}" = set; then @@ -4093,7 +4102,7 @@ echo "$ac_t""$enableval" 1>&6 ### use option --enable-prototypes to turn on optional prototypes echo $ac_n "checking if you want to compile with fallback prototypes""... $ac_c" 1>&6 -echo "configure:4097: checking if you want to compile with fallback prototypes" >&5 +echo "configure:4106: checking if you want to compile with fallback prototypes" >&5 # Check whether --enable-prototypes or --disable-prototypes was given. if test "${enable_prototypes+set}" = set; then @@ -4117,7 +4126,7 @@ EXTRA_CFLAGS="" if test -n "$GCC" then echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6 -echo "configure:4121: checking if you want to turn on gcc warnings" >&5 +echo "configure:4130: checking if you want to turn on gcc warnings" >&5 # Check whether --enable-warnings or --disable-warnings was given. if test "${enable_warnings+set}" = set; then @@ -4143,8 +4152,8 @@ then GCC_VERSION=none if test "$GCC" = yes ; then echo $ac_n "checking version of $CC""... $ac_c" 1>&6 -echo "configure:4147: checking version of $CC" >&5 - GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" +echo "configure:4156: checking version of $CC" >&5 + GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown echo "$ac_t""$GCC_VERSION" 1>&6 fi @@ -4158,11 +4167,11 @@ if test "$GCC" = yes ; then case $host_os in linux*|gnu*) echo $ac_n "checking if this is really Intel C compiler""... $ac_c" 1>&6 -echo "configure:4162: checking if this is really Intel C compiler" >&5 +echo "configure:4171: checking if this is really Intel C compiler" >&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -no-gcc" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4187: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" @@ -4192,7 +4201,7 @@ fi cat > conftest.$ac_ext <&6 -echo "configure:4214: checking for $CC warning options" >&5 +echo "configure:4223: checking for $CC warning options" >&5 cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-Wall" for cf_opt in \ @@ -4225,7 +4234,7 @@ echo "configure:4214: checking for $CC w wd981 do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo configure:4229: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:4238: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -4235,12 +4244,12 @@ echo "configure:4214: checking for $CC w elif test "$GCC" = yes then echo "checking for $CC warning options" 1>&6 -echo "configure:4239: checking for $CC warning options" >&5 +echo "configure:4248: checking for $CC warning options" >&5 cf_save_CFLAGS="$CFLAGS" - EXTRA_CFLAGS="-W -Wall" + EXTRA_CFLAGS= cf_warn_CONST="" test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings" - for cf_opt in \ + for cf_opt in W Wall \ Wbad-function-cast \ Wcast-align \ Wcast-qual \ @@ -4254,7 +4263,7 @@ echo "configure:4239: checking for $CC w Wundef $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo configure:4258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:4267: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6 case $cf_opt in #(vi Wcast-qual) #(vi @@ -4265,7 +4274,7 @@ echo "configure:4239: checking for $CC w [34].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me-configure}:4269: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:4278: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; @@ -4277,7 +4286,7 @@ echo "${as_me-configure}:4269: testing f done CFLAGS="$cf_save_CFLAGS" fi -rm -f conftest* +rm -rf conftest* @@ -4288,14 +4297,14 @@ fi if test "$USE_SPOOLDIR" = "yes"; then ## options for directories echo $ac_n "checking for news-library path""... $ac_c" 1>&6 -echo "configure:4292: checking for news-library path" >&5 +echo "configure:4301: checking for news-library path" >&5 # 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}" + withval="${NEWSLIBDIR:-/usr/lib/news}" fi if true ; then @@ -4334,14 +4343,14 @@ NEWSLIBDIR="$withval" echo "$ac_t""$NEWSLIBDIR" 1>&6 echo $ac_n "checking for news spool-directory path""... $ac_c" 1>&6 -echo "configure:4338: checking for news spool-directory path" >&5 +echo "configure:4347: checking for news spool-directory path" >&5 # 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}" + withval="${SPOOLDIR:-/var/spool/news}" fi if true ; then @@ -4380,14 +4389,14 @@ SPOOLDIR="$withval" echo "$ac_t""$SPOOLDIR" 1>&6 echo $ac_n "checking for news overview-directory path""... $ac_c" 1>&6 -echo "configure:4384: checking for news overview-directory path" >&5 +echo "configure:4393: checking for news overview-directory path" >&5 # Check whether --with-nov-dir or --without-nov-dir was given. if test "${with_nov_dir+set}" = set; then withval="$with_nov_dir" : else - withval="${NOVROOTDIR-$SPOOLDIR}" + withval="${NOVROOTDIR:-$SPOOLDIR}" fi if true ; then @@ -4426,7 +4435,7 @@ NOVROOTDIR="$withval" echo "$ac_t""$NOVROOTDIR" 1>&6 echo $ac_n "checking for overview filename""... $ac_c" 1>&6 -echo "configure:4430: checking for overview filename" >&5 +echo "configure:4439: checking for overview filename" >&5 # Check whether --with-nov-fname or --without-nov-fname was given. if test "${with_nov_fname+set}" = set; then @@ -4462,14 +4471,14 @@ fi ## TODO: kick the --with-inews-dir= stuff, the check below should be enough ## (requires some code rework in tin) echo $ac_n "checking for directory containing \"inews\"""... $ac_c" 1>&6 -echo "configure:4466: checking for directory containing \"inews\"" >&5 +echo "configure:4475: checking for directory containing \"inews\"" >&5 # Check whether --with-inews-dir or --without-inews-dir was given. if test "${with_inews_dir+set}" = set; then withval="$with_inews_dir" : else - withval="${INEWSDIR-$INEWSPATH}" + withval="${INEWSDIR:-$INEWSPATH}" fi if true ; then @@ -4511,7 +4520,7 @@ echo "$ac_t""$INEWSDIR" 1>&6 # Extract the first word of "inews", so it can be a program name with args. set dummy inews; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4515: checking for $ac_word" >&5 +echo "configure:4524: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_INEWS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4567,7 +4576,7 @@ fi ### Look for network libraries first, since some functions (such as gethostname) ### are used in a lot of places. echo $ac_n "checking if you want socks library""... $ac_c" 1>&6 -echo "configure:4571: checking if you want socks library" >&5 +echo "configure:4580: checking if you want socks library" >&5 if eval "test \"`echo '$''{'cf_cv_use_libsocks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4587,7 +4596,7 @@ fi echo "$ac_t""$cf_cv_use_libsocks" 1>&6 echo $ac_n "checking if you want socks5 library""... $ac_c" 1>&6 -echo "configure:4591: checking if you want socks5 library" >&5 +echo "configure:4600: checking if you want socks5 library" >&5 if eval "test \"`echo '$''{'cf_cv_use_libsocks5'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4644,14 +4653,14 @@ if test -n "$cf_searchpath/include" ; th cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:4655: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4664: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -4668,7 +4677,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me-configure}:4672: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:4681: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -4710,14 +4719,14 @@ if test -n "$cf_searchpath/../include" ; cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:4721: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4730: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -4734,7 +4743,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me-configure}:4738: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:4747: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -4774,7 +4783,7 @@ if test -n "$cf_searchpath/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me-configure}:4778: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:4787: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" @@ -4804,7 +4813,7 @@ if test -n "$cf_searchpath" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me-configure}:4808: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:4817: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" @@ -4829,11 +4838,13 @@ cf_cv_header_path_socks= cf_cv_library_path_socks= -echo "${as_me-configure}:4833: testing Starting FIND_LINKAGE(socks,) ..." 1>&5 +echo "${as_me:-configure}:4842: testing Starting FIND_LINKAGE(socks,) ..." 1>&5 + +cf_save_LIBS="$LIBS" cat > conftest.$ac_ext < @@ -4844,29 +4855,65 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - cf_cv_find_linkage_socks=yes +if { (eval echo configure:4859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + + cf_cv_find_linkage_socks=yes + cf_cv_header_path_socks=/usr/include + cf_cv_library_path_socks=/usr/lib + else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + + + +LIBS="-lsocks $cf_save_LIBS" + +cat > conftest.$ac_ext < + +int main() { + + Raccept((char *)0) + +; return 0; } +EOF +if { (eval echo configure:4886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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" + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + - cf_cv_find_linkage_socks=no + 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}:4860: testing find linkage for socks library ..." 1>&5 +echo "${as_me:-configure}:4904: testing find linkage for socks library ..." 1>&5 -echo "${as_me-configure}:4864: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5 +echo "${as_me:-configure}:4908: 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 @@ -4892,12 +4939,14 @@ test -d "$cf_header_path" && \ done fi -cf_search="" +# add the variations for the package we are looking for + +cf_search= test "/usr" != "$prefix" && \ test -d "/usr" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/usr" != "$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /usr" test -d /usr/include && cf_search="$cf_search /usr/include" test -d /usr/include/socks && cf_search="$cf_search /usr/include/socks" @@ -4921,7 +4970,7 @@ test -d "$prefix" && \ test "/usr/local" != "$prefix" && \ test -d "/usr/local" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/usr/local" != "$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /usr/local" test -d /usr/local/include && cf_search="$cf_search /usr/local/include" test -d /usr/local/include/socks && cf_search="$cf_search /usr/local/include/socks" @@ -4933,7 +4982,7 @@ test -d "/usr/local" && \ test "/opt" != "$prefix" && \ test -d "/opt" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/opt" != "$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /opt" test -d /opt/include && cf_search="$cf_search /opt/include" test -d /opt/include/socks && cf_search="$cf_search /opt/include/socks" @@ -4945,7 +4994,7 @@ test -d "/opt" && \ test "$HOME" != "$prefix" && \ test -d "$HOME" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "$HOME" != "$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under $HOME" test -d $HOME/include && cf_search="$cf_search $HOME/include" test -d $HOME/include/socks && cf_search="$cf_search $HOME/include/socks" @@ -4970,19 +5019,19 @@ test -d "$oldincludedir" && { test -d $oldincludedir/socks && cf_search="$cf_search $oldincludedir/socks" } -cf_search="$cf_header_path_list $cf_search" +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}:4981: testing ... testing $cf_cv_header_path_socks ..." 1>&5 +echo "${as_me:-configure}:5030: testing ... testing $cf_cv_header_path_socks ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_socks" cat > conftest.$ac_ext < @@ -4993,12 +5042,12 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4997: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5046: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* test -n "$verbose" && echo " ... found socks headers in $cf_cv_header_path_socks" 1>&6 -echo "${as_me-configure}:5002: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5 +echo "${as_me:-configure}:5051: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5 cf_cv_find_linkage_socks=maybe @@ -5019,7 +5068,7 @@ rm -f conftest* if test "$cf_cv_find_linkage_socks" = maybe ; then -echo "${as_me-configure}:5023: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5 +echo "${as_me:-configure}:5072: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5 cf_save_LIBS="$LIBS" @@ -5029,6 +5078,7 @@ echo "${as_me-configure}:5023: testing S 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 @@ -5054,12 +5104,13 @@ test -d "$cf_library_path" && \ done fi -cf_search="" + +cf_search= test "/usr" != "$prefix" && \ test -d "/usr" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/usr" != "$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /usr" test -d /usr/lib && cf_search="$cf_search /usr/lib" test -d /usr/lib/socks && cf_search="$cf_search /usr/lib/socks" @@ -5083,7 +5134,7 @@ test -d "$prefix" && \ test "/usr/local" != "$prefix" && \ test -d "/usr/local" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/usr/local" != "$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /usr/local" test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib" test -d /usr/local/lib/socks && cf_search="$cf_search /usr/local/lib/socks" @@ -5095,7 +5146,7 @@ test -d "/usr/local" && \ test "/opt" != "$prefix" && \ test -d "/opt" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/opt" != "$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /opt" test -d /opt/lib && cf_search="$cf_search /opt/lib" test -d /opt/lib/socks && cf_search="$cf_search /opt/lib/socks" @@ -5107,7 +5158,7 @@ test -d "/opt" && \ test "$HOME" != "$prefix" && \ test -d "$HOME" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "$HOME" != "$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under $HOME" test -d $HOME/lib && cf_search="$cf_search $HOME/lib" test -d $HOME/lib/socks && cf_search="$cf_search $HOME/lib/socks" @@ -5125,14 +5176,14 @@ cf_search="$cf_library_path_list $cf_sea if test -d $cf_cv_library_path_socks ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_socks" 1>&6 -echo "${as_me-configure}:5129: testing ... testing $cf_cv_library_path_socks ..." 1>&5 +echo "${as_me:-configure}:5180: 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 < @@ -5143,12 +5194,12 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:5198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + test -n "$verbose" && echo " ... found socks library in $cf_cv_library_path_socks" 1>&6 -echo "${as_me-configure}:5152: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5 +echo "${as_me:-configure}:5203: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5 cf_cv_find_linkage_socks=yes @@ -5157,17 +5208,16 @@ echo "${as_me-configure}:5152: testing . else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + CPPFLAGS="$cf_save_CPPFLAGS" LIBS="$cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS" fi -rm -f conftest* +rm -rf conftest* fi done - LIBS="$cf_save_LIBS" CPPFLAGS="$cf_save_CPPFLAGS" LDFLAGS="$cf_save_LDFLAGS" fi @@ -5177,55 +5227,16 @@ rm -f conftest* fi fi -rm -f conftest* +rm -rf conftest* -if test "$cf_cv_find_linkage_socks" = yes ; then -cf_cv_have_socks=yes -else -cf_cv_have_socks=no fi +rm -rf conftest* +LIBS="$cf_save_LIBS" - if test "$cf_cv_have_socks" = yes ; 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 - +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 @@ -5250,14 +5261,14 @@ if test -n "$cf_cv_header_path_socks" ; cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:5261: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5272: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -5274,7 +5285,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me-configure}:5278: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:5289: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -5290,7 +5301,7 @@ echo "${as_me-configure}:5278: testing a done fi - + if test -n "$cf_cv_library_path_socks" ; then for cf_add_libdir in $cf_cv_library_path_socks do @@ -5310,7 +5321,7 @@ if test -n "$cf_cv_library_path_socks" ; if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me-configure}:5314: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:5325: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" @@ -5319,7 +5330,51 @@ echo "${as_me-configure}:5314: testing a done fi - LIBS="$LIBS -lsocks" + LIBS="-lsocks $LIBS" + +else +echo "configure: warning: Cannot find socks library" 1>&2 +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 "configure: error: cannot link with socks library" 1>&2; exit 1; } fi @@ -5329,7 +5384,7 @@ else cf_test_netlibs=no echo $ac_n "checking for network libraries""... $ac_c" 1>&6 -echo "configure:5333: checking for network libraries" >&5 +echo "configure:5388: checking for network libraries" >&5 if eval "test \"`echo '$''{'cf_cv_netlibs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5346,17 +5401,17 @@ mingw32) # (vi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5350: checking for $ac_hdr" >&5 +echo "configure:5405: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5360: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5393,7 +5448,7 @@ done LIBS="$cf_winsock_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:5474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + cf_cv_netlibs="$cf_winsock_lib $cf_cv_netlibs" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + { echo "configure: error: Cannot link against winsock library" 1>&2; exit 1; } fi -rm -f conftest* +rm -rf conftest* LIBS="$cf_save_LIBS" ;; @@ -5432,12 +5487,12 @@ rm -f conftest* for ac_func in gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5436: checking for $ac_func" >&5 +echo "configure:5491: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:5519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_func_$ac_func=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_func_$ac_func=no" fi -rm -f conftest* +rm -rf conftest* fi if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then @@ -5483,7 +5538,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:5487: checking for gethostname in -lnsl" >&5 +echo "configure:5542: checking for gethostname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5491,7 +5546,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:5561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi @@ -5535,7 +5590,7 @@ else echo $ac_n "checking for gethostname in -lsocket""... $ac_c" 1>&6 -echo "configure:5539: checking for gethostname in -lsocket" >&5 +echo "configure:5594: checking for gethostname in -lsocket" >&5 ac_lib_var=`echo socket'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5543,7 +5598,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:5613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi @@ -5596,7 +5651,7 @@ done echo $ac_n "checking for main in -linet""... $ac_c" 1>&6 -echo "configure:5600: checking for main in -linet" >&5 +echo "configure:5655: checking for main in -linet" >&5 ac_lib_var=`echo inet'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5604,23 +5659,23 @@ else ac_save_LIBS="$LIBS" LIBS="-linet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:5670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi @@ -5636,12 +5691,12 @@ fi for ac_func in socket do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5640: checking for $ac_func" >&5 +echo "configure:5695: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:5723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_func_$ac_func=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_func_$ac_func=no" fi -rm -f conftest* +rm -rf conftest* fi if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then @@ -5687,7 +5742,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:5691: checking for socket in -lsocket" >&5 +echo "configure:5746: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5695,7 +5750,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:5765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi @@ -5739,7 +5794,7 @@ else echo $ac_n "checking for socket in -lbsd""... $ac_c" 1>&6 -echo "configure:5743: checking for socket in -lbsd" >&5 +echo "configure:5798: checking for socket in -lbsd" >&5 ac_lib_var=`echo bsd'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5747,7 +5802,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:5817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi @@ -5803,12 +5858,12 @@ done for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5807: checking for $ac_func" >&5 +echo "configure:5862: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:5890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_func_$ac_func=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_func_$ac_func=no" fi -rm -f conftest* +rm -rf conftest* fi if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then @@ -5854,7 +5909,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:5858: checking for gethostbyname in -lnsl" >&5 +echo "configure:5913: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5862,7 +5917,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:5932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi @@ -5914,12 +5969,12 @@ done for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5918: checking for $ac_func" >&5 +echo "configure:5973: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:6001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_func_$ac_func=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_func_$ac_func=no" fi -rm -f conftest* +rm -rf conftest* fi if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then @@ -5965,7 +6020,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnetwork""... $ac_c" 1>&6 -echo "configure:5969: checking for gethostbyname in -lnetwork" >&5 +echo "configure:6024: checking for gethostbyname in -lnetwork" >&5 ac_lib_var=`echo network'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5973,7 +6028,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnetwork $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:6043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi @@ -6025,12 +6080,12 @@ done for ac_func in strcasecmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6029: checking for $ac_func" >&5 +echo "configure:6084: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:6112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_func_$ac_func=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_func_$ac_func=no" fi -rm -f conftest* +rm -rf conftest* fi if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then @@ -6076,7 +6131,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for strcasecmp in -lresolv""... $ac_c" 1>&6 -echo "configure:6080: checking for strcasecmp in -lresolv" >&5 +echo "configure:6135: checking for strcasecmp in -lresolv" >&5 ac_lib_var=`echo resolv'_'strcasecmp | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6084,7 +6139,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:6154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi @@ -6147,7 +6202,7 @@ EOF ;; esac -LIBS="$LIBS $cf_cv_netlibs" +LIBS="$cf_cv_netlibs $LIBS" test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&6 if test "x$cf_cv_use_libsocks5" != xno ; then @@ -6188,14 +6243,14 @@ if test -n "$cf_searchpath/include" ; th cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:6199: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6254: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -6212,7 +6267,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me-configure}:6216: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:6271: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -6254,14 +6309,14 @@ if test -n "$cf_searchpath/../include" ; cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:6265: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6320: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -6278,7 +6333,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me-configure}:6282: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:6337: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -6318,7 +6373,7 @@ if test -n "$cf_searchpath/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me-configure}:6322: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:6377: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" @@ -6348,7 +6403,7 @@ if test -n "$cf_searchpath" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me-configure}:6352: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:6407: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" @@ -6366,7 +6421,7 @@ done esac -LIBS="$LIBS -lsocks5" +LIBS="-lsocks5 $LIBS" cat >> confdefs.h <<\EOF #define USE_SOCKS5 1 @@ -6378,10 +6433,10 @@ EOF echo $ac_n "checking if the socks library uses socks4 prefix""... $ac_c" 1>&6 -echo "configure:6382: checking if the socks library uses socks4 prefix" >&5 +echo "configure:6437: checking if the socks library uses socks4 prefix" >&5 cf_use_socks4=error cat > conftest.$ac_ext < @@ -6390,8 +6445,8 @@ int main() { Rinit((char *)0) ; return 0; } EOF -if { (eval echo configure:6394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:6449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + cat >> confdefs.h <<\EOF #define USE_SOCKS4_PREFIX 1 EOF @@ -6400,27 +6455,27 @@ EOF else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + cat > conftest.$ac_ext < int main() { SOCKSinit((char *)0) ; return 0; } EOF -if { (eval echo configure:6413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:6468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + cf_use_socks4=no else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + { echo "configure: error: Cannot link with socks5 library" 1>&2; exit 1; } fi -rm -f conftest* +rm -rf conftest* fi -rm -f conftest* +rm -rf conftest* echo "$ac_t""$cf_use_socks4" 1>&6 if test "$cf_use_socks4" = "yes" ; then @@ -6476,9 +6531,9 @@ EOF fi echo $ac_n "checking if socks5p.h is available""... $ac_c" 1>&6 -echo "configure:6480: checking if socks5p.h is available" >&5 +echo "configure:6535: checking if socks5p.h is available" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6547: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_use_socks5p_h=yes else @@ -6515,17 +6570,17 @@ for ac_hdr in unistd.h fcntl.h sys/file. do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6519: checking for $ac_hdr" >&5 +echo "configure:6574: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6529: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6584: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6552,12 +6607,12 @@ fi done echo $ac_n "checking for fcntl""... $ac_c" 1>&6 -echo "configure:6556: checking for fcntl" >&5 +echo "configure:6611: checking for fcntl" >&5 if eval "test \"`echo '$''{'ac_cv_func_fcntl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:6639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_func_fcntl=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_func_fcntl=no" fi -rm -f conftest* +rm -rf conftest* fi if eval "test \"`echo '$ac_cv_func_'fcntl`\" = yes"; then @@ -6600,12 +6655,12 @@ else fi echo $ac_n "checking for lockf""... $ac_c" 1>&6 -echo "configure:6604: checking for lockf" >&5 +echo "configure:6659: checking for lockf" >&5 if eval "test \"`echo '$''{'ac_cv_func_lockf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:6687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_func_lockf=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_func_lockf=no" fi -rm -f conftest* +rm -rf conftest* fi if eval "test \"`echo '$ac_cv_func_'lockf`\" = yes"; then @@ -6648,12 +6703,12 @@ else fi echo $ac_n "checking for flock""... $ac_c" 1>&6 -echo "configure:6652: checking for flock" >&5 +echo "configure:6707: checking for flock" >&5 if eval "test \"`echo '$''{'ac_cv_func_flock'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:6735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_func_flock=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_func_flock=no" fi -rm -f conftest* +rm -rf conftest* fi if eval "test \"`echo '$ac_cv_func_'flock`\" = yes"; then @@ -6697,7 +6752,7 @@ fi echo $ac_n "checking for file-locking functions""... $ac_c" 1>&6 -echo "configure:6701: checking for file-locking functions" >&5 +echo "configure:6756: checking for file-locking functions" >&5 if eval "test \"`echo '$''{'cf_cv_lockfile'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6709,7 +6764,7 @@ if eval 'test ${ac_cv_func_'$cf_lock'+se case $cf_lock in #(vi fcntl) #(vi cat > conftest.$ac_ext < @@ -6737,7 +6792,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6741: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6796: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -6749,7 +6804,7 @@ rm -f conftest* ;; lockf) #(vi cat > conftest.$ac_ext < @@ -6769,7 +6824,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6773: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6828: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -6781,7 +6836,7 @@ rm -f conftest* ;; flock) cat > conftest.$ac_ext < @@ -6804,7 +6859,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6808: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -6825,7 +6880,7 @@ echo "$ac_t""$cf_cv_lockfile" 1>&6 echo $ac_n "checking which locking method will be used""... $ac_c" 1>&6 -echo "configure:6829: checking which locking method will be used" >&5 +echo "configure:6884: checking which locking method will be used" >&5 ### fcntl() is preferred, if the user just disables fcntl() ### without specifying an alternative lockf() is preferred @@ -6895,7 +6950,7 @@ fi echo $ac_n "checking for screen type""... $ac_c" 1>&6 -echo "configure:6899: checking for screen type" >&5 +echo "configure:6954: checking for screen type" >&5 # Check whether --with-screen or --without-screen was given. if test "${with_screen+set}" = set; then @@ -6910,14 +6965,24 @@ echo "$ac_t""$cf_with_screen" 1>&6 use_curses=no use_ncurses=no -echo $ac_n "checking if you specified curses install-directory""... $ac_c" 1>&6 -echo "configure:6915: checking if you specified curses install-directory" >&5 +echo $ac_n "checking for specific curses-directory""... $ac_c" 1>&6 +echo "configure:6972: checking for specific curses-directory" >&5 + # Check whether --with-curses-dir or --without-curses-dir was given. if test "${with_curses_dir+set}" = set; then withval="$with_curses_dir" - + cf_cv_curses_dir=$withval +else + cf_cv_curses_dir=no +fi + +echo "$ac_t""$cf_cv_curses_dir" 1>&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 @@ -6947,24 +7012,116 @@ case ".$withval" in #(vi ;; esac - cf_cv_curses_dir=$withval -else - cf_cv_curses_dir=no -fi - - -echo "$ac_t""$cf_cv_curses_dir" 1>&6 - -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 - ;; + 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 + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat > conftest.$ac_ext < +int main() { +printf("Hello") +; return 0; } +EOF +if { (eval echo configure:7050: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + cf_have_incdir=yes +fi +rm -f conftest* + 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}:7067: 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 + 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}:7103: testing adding $cf_add_libdir to library-path ..." 1>&5 + + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done +fi + + fi +fi + + +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 @@ -6974,7 +7131,7 @@ pdcurses) #(vi ;; none) echo $ac_n "checking if you want to use ncurses library""... $ac_c" 1>&6 -echo "configure:6978: checking if you want to use ncurses library" >&5 +echo "configure:7135: checking if you want to use ncurses library" >&5 # Check whether --with-ncurses or --without-ncurses was given. if test "${with_ncurses+set}" = set; then @@ -6987,7 +7144,7 @@ fi echo "$ac_t""$use_ncurses" 1>&6 echo $ac_n "checking if you want curses rather than termcap interface""... $ac_c" 1>&6 -echo "configure:6991: checking if you want curses rather than termcap interface" >&5 +echo "configure:7148: checking if you want curses rather than termcap interface" >&5 # Check whether --enable-curses or --disable-curses was given. if test "${enable_curses+set}" = set; then @@ -7016,14 +7173,166 @@ EOF case $cf_with_screen in #(vi ncurses) #(vi +cf_ncuconfig_root=ncurses + +echo "Looking for ${cf_ncuconfig_root}-config" +for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config +do +# Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:7185: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_NCURSES_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$NCURSES_CONFIG" in + /*) + ac_cv_path_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + ;; +esac +fi +NCURSES_CONFIG="$ac_cv_path_NCURSES_CONFIG" +if test -n "$NCURSES_CONFIG"; then + echo "$ac_t""$NCURSES_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$NCURSES_CONFIG" && break +done +test -n "$NCURSES_CONFIG" || NCURSES_CONFIG="none" + + +if test "$NCURSES_CONFIG" != none ; then + +CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" +LIBS="`$NCURSES_CONFIG --libs` $LIBS" + +# even with config script, some packages use no-override for curses.h + +echo $ac_n "checking if we have identified curses headers""... $ac_c" 1>&6 +echo "configure:7230: checking if we have identified curses headers" >&5 +if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + +cf_cv_ncurses_header=none +for cf_header in \ + ncurses/ncurses.h \ + ncurses/curses.h \ + ncurses.h \ + curses.h +do +cat > conftest.$ac_ext < +int main() { +initscr(); tgoto("?", 0,0) +; return 0; } +EOF +if { (eval echo configure:7250: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + cf_cv_ncurses_header=$cf_header; break +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* +done + +fi + +echo "$ac_t""$cf_cv_ncurses_header" 1>&6 + +if test "$cf_cv_ncurses_header" = none ; then + { echo "configure: error: No curses header-files found" 1>&2; exit 1; } +fi + +# cheat, to get the right #define's for HAVE_NCURSES_H, etc. +for ac_hdr in $cf_cv_ncurses_header +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:7273: checking for $ac_hdr" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:7283: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 +fi +done + + + +cat >> confdefs.h <<\EOF +#define NCURSES 1 +EOF + + + +cf_nculib_ROOT=`echo "HAVE_LIB$cf_ncuconfig_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + +cat >> confdefs.h < conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:7057: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7366: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -7070,7 +7379,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me-configure}:7074: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:7383: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -7089,7 +7398,7 @@ fi } echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6 -echo "configure:7093: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "configure:7402: checking for $cf_ncuhdr_root header in include-path" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7100,7 +7409,7 @@ else do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7434: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h=$cf_header @@ -7147,13 +7456,16 @@ if test "$cf_cv_ncurses_h" != no ; then else echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6 -echo "configure:7151: checking for $cf_ncuhdr_root include-path" >&5 +echo "configure:7460: checking for $cf_ncuhdr_root include-path" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else test -n "$verbose" && echo +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 @@ -7179,12 +7491,14 @@ test -d "$cf_header_path" && \ done fi -cf_search="" +# add the variations for the package we are looking for + +cf_search= test "/usr" != "$prefix" && \ test -d "/usr" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/usr" != "$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /usr" test -d /usr/include && cf_search="$cf_search /usr/include" test -d /usr/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/include/$cf_ncuhdr_root" @@ -7208,7 +7522,7 @@ test -d "$prefix" && \ test "/usr/local" != "$prefix" && \ test -d "/usr/local" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/usr/local" != "$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /usr/local" test -d /usr/local/include && cf_search="$cf_search /usr/local/include" test -d /usr/local/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root" @@ -7220,7 +7534,7 @@ test -d "/usr/local" && \ test "/opt" != "$prefix" && \ test -d "/opt" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/opt" != "$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /opt" test -d /opt/include && cf_search="$cf_search /opt/include" test -d /opt/include/$cf_ncuhdr_root && cf_search="$cf_search /opt/include/$cf_ncuhdr_root" @@ -7232,7 +7546,7 @@ test -d "/opt" && \ test "$HOME" != "$prefix" && \ test -d "$HOME" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "$HOME" != "$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under $HOME" test -d $HOME/include && cf_search="$cf_search $HOME/include" test -d $HOME/include/$cf_ncuhdr_root && cf_search="$cf_search $HOME/include/$cf_ncuhdr_root" @@ -7257,7 +7571,7 @@ test -d "$oldincludedir" && { test -d $oldincludedir/$cf_ncuhdr_root && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root" } -cf_search="$cf_header_path_list $cf_search" +cf_search="$cf_search $cf_header_path_list" test -n "$verbose" && echo search path $cf_search cf_save2_CPPFLAGS="$CPPFLAGS" @@ -7288,14 +7602,14 @@ if test -n "$cf_incdir" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:7299: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7613: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -7312,7 +7626,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me-configure}:7316: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:7630: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -7334,7 +7648,7 @@ fi do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7673: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h2=$cf_header @@ -7413,14 +7727,14 @@ if test -n "$cf_1st_incdir" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:7424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -7437,7 +7751,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me-configure}:7441: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:7755: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -7485,7 +7799,7 @@ esac echo $ac_n "checking for terminfo header""... $ac_c" 1>&6 -echo "configure:7489: checking for terminfo header" >&5 +echo "configure:7803: checking for terminfo header" >&5 if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7502,17 +7816,17 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat > conftest.$ac_ext < -#include <${cf_cv_ncurses_header-curses.h}> +#include <${cf_cv_ncurses_header:-curses.h}> #include <$cf_test> int main() { int x = auto_left_margin ; return 0; } EOF -if { (eval echo configure:7516: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_term_header="$cf_test" @@ -7567,7 +7881,7 @@ EOF echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:7571: checking for ncurses version" >&5 +echo "configure:7885: checking for ncurses version" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7581,7 +7895,7 @@ else # This will not work if the preprocessor splits the line after the # Autoconf token. The 'unproto' program does that. cat > conftest.$ac_ext < +#include <${cf_cv_ncurses_header:-curses.h}> #undef Autoconf #ifdef NCURSES_VERSION Autoconf NCURSES_VERSION @@ -7593,7 +7907,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:7597: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:7911: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" @@ -7602,10 +7916,10 @@ EOF else cat > conftest.$ac_ext < +#include <${cf_cv_ncurses_header:-curses.h}> #include int main() { @@ -7623,10 +7937,10 @@ int main() make an error # endif #endif - ${cf_cv_main_return-return}(0); + ${cf_cv_main_return:-return}(0); } EOF -if { (eval echo configure:7630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -7648,7 +7962,7 @@ EOF - + cf_nculib_root=ncurses # This works, except for the special case where we find gpm, but @@ -7657,7 +7971,7 @@ cf_nculib_root=ncurses cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:7661: checking for Gpm_Open in -lgpm" >&5 +echo "configure:7975: checking for Gpm_Open in -lgpm" >&5 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7665,7 +7979,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:7994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6 -echo "configure:7696: checking for initscr in -lgpm" >&5 +echo "configure:8010: checking for initscr in -lgpm" >&5 ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7700,7 +8014,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:8029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi @@ -7743,7 +8057,7 @@ freebsd*) # version of ncurses (but it should do no harm, since it's static). if test "$cf_nculib_root" = ncurses ; then echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:7747: checking for tgoto in -lmytinfo" >&5 +echo "configure:8061: checking for tgoto in -lmytinfo" >&5 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7751,7 +8065,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:8080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi @@ -7790,47 +8104,18 @@ LIBS="$cf_ncurses_LIBS $LIBS" if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) then - -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}:7814: testing adding $cf_add_libdir to library-path ..." 1>&5 - - - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi - fi - done -fi - - LIBS="-l$cf_nculib_root $LIBS" -else + LIBS="-l$cf_nculib_root $LIBS" +else eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" echo $ac_n "checking for initscr""... $ac_c" 1>&6 -echo "configure:7829: checking for initscr" >&5 +echo "configure:8114: checking for initscr" >&5 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:8142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_func_initscr=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_func_initscr=no" fi -rm -f conftest* +rm -rf conftest* fi if eval "test \"`echo '$ac_cv_func_'initscr`\" = yes"; then @@ -7873,27 +8158,28 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6 -echo "configure:7877: checking for initscr in -l$cf_nculib_root" >&5 +echo "configure:8162: checking for initscr in -l$cf_nculib_root" >&5 LIBS="-l$cf_nculib_root $LIBS" cat > conftest.$ac_ext < +#include <${cf_cv_ncurses_header:-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:7887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:8172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + echo "$ac_t""no" 1>&6 +cf_search= cf_library_path_list="" if test -n "${LDFLAGS}${LIBS}" ; then for cf_library_path in $LDFLAGS $LIBS @@ -7919,12 +8205,13 @@ test -d "$cf_library_path" && \ done fi -cf_search="" + +cf_search= test "/usr" != "$prefix" && \ test -d "/usr" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/usr" != "$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /usr" test -d /usr/lib && cf_search="$cf_search /usr/lib" test -d /usr/lib/$cf_nculib_root && cf_search="$cf_search /usr/lib/$cf_nculib_root" @@ -7948,7 +8235,7 @@ test -d "$prefix" && \ test "/usr/local" != "$prefix" && \ test -d "/usr/local" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/usr/local" != "$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /usr/local" test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib" test -d /usr/local/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/lib/$cf_nculib_root" @@ -7960,7 +8247,7 @@ test -d "/usr/local" && \ test "/opt" != "$prefix" && \ test -d "/opt" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/opt" != "$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /opt" test -d /opt/lib && cf_search="$cf_search /opt/lib" test -d /opt/lib/$cf_nculib_root && cf_search="$cf_search /opt/lib/$cf_nculib_root" @@ -7972,7 +8259,7 @@ test -d "/opt" && \ test "$HOME" != "$prefix" && \ test -d "$HOME" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "$HOME" != "$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under $HOME" test -d $HOME/lib && cf_search="$cf_search $HOME/lib" test -d $HOME/lib/$cf_nculib_root && cf_search="$cf_search $HOME/lib/$cf_nculib_root" @@ -7988,33 +8275,33 @@ cf_search="$cf_library_path_list $cf_sea for cf_libdir in $cf_search do echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6 -echo "configure:7992: checking for -l$cf_nculib_root in $cf_libdir" >&5 +echo "configure:8279: checking for -l$cf_nculib_root in $cf_libdir" >&5 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat > conftest.$ac_ext < +#include <${cf_cv_ncurses_header:-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:8002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:8289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' break else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + echo "$ac_t""no" 1>&6 LIBS="$cf_save_LIBS" fi -rm -f conftest* +rm -rf conftest* done fi -rm -f conftest* +rm -rf conftest* fi @@ -8029,7 +8316,7 @@ fi if test -n "$cf_ncurses_LIBS" ; then echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6 -echo "configure:8033: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 +echo "configure:8320: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` @@ -8038,24 +8325,24 @@ echo "configure:8033: checking if we can fi done cat > conftest.$ac_ext < +#include <${cf_cv_ncurses_header:-curses.h}> int main() { initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); ; return 0; } EOF -if { (eval echo configure:8049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:8336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + echo "$ac_t""yes" 1>&6 else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + echo "$ac_t""no" 1>&6 LIBS="$cf_ncurses_SAVE" fi -rm -f conftest* +rm -rf conftest* fi @@ -8066,15 +8353,18 @@ cat >> confdefs.h <&6 -echo "configure:8076: checking for $cf_hdr" >&5 +echo "configure:8366: checking for $cf_hdr" >&5 cat > conftest.$ac_ext < @@ -8082,7 +8372,7 @@ echo "configure:8076: checking for $cf_h EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8086: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8376: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8109,12 +8399,12 @@ done echo $ac_n "checking for wide char and multibyte support""... $ac_c" 1>&6 -echo "configure:8113: checking for wide char and multibyte support" >&5 +echo "configure:8403: checking for wide char and multibyte support" >&5 if eval "test \"`echo '$''{'am_cv_multibyte_able'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifdef HAVE_STDLIB_H @@ -8168,17 +8458,17 @@ const char icb[5] = {0xa4, 0xa4, 0xa4, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:8172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:8462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + am_cv_multibyte_able=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + cf_save_LIBS="$LIBS" LIBS="-lutf8 $LIBS" cat > conftest.$ac_ext < int main() { @@ -8222,20 +8512,20 @@ const char icb[5] = {0xa4, 0xa4, 0xa4, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:8226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:8516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + am_cv_multibyte_able=libutf8 else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + am_cv_multibyte_able=no fi -rm -f conftest* +rm -rf conftest* LIBS="$cf_save_LIBS" fi -rm -f conftest* +rm -rf conftest* fi @@ -8255,14 +8545,166 @@ EOF fi +cf_ncuconfig_root=ncursesw + +echo "Looking for ${cf_ncuconfig_root}-config" +for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config +do +# Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:8557: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_NCURSES_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$NCURSES_CONFIG" in + /*) + ac_cv_path_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + ;; +esac +fi +NCURSES_CONFIG="$ac_cv_path_NCURSES_CONFIG" +if test -n "$NCURSES_CONFIG"; then + echo "$ac_t""$NCURSES_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$NCURSES_CONFIG" && break +done +test -n "$NCURSES_CONFIG" || NCURSES_CONFIG="none" + + +if test "$NCURSES_CONFIG" != none ; then + +CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" +LIBS="`$NCURSES_CONFIG --libs` $LIBS" + +# even with config script, some packages use no-override for curses.h + +echo $ac_n "checking if we have identified curses headers""... $ac_c" 1>&6 +echo "configure:8602: checking if we have identified curses headers" >&5 +if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + +cf_cv_ncurses_header=none +for cf_header in \ + ncursesw/ncurses.h \ + ncursesw/curses.h \ + ncurses.h \ + curses.h +do +cat > conftest.$ac_ext < +int main() { +initscr(); tgoto("?", 0,0) +; return 0; } +EOF +if { (eval echo configure:8622: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + cf_cv_ncurses_header=$cf_header; break +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* +done + +fi + +echo "$ac_t""$cf_cv_ncurses_header" 1>&6 + +if test "$cf_cv_ncurses_header" = none ; then + { echo "configure: error: No curses header-files found" 1>&2; exit 1; } +fi + +# cheat, to get the right #define's for HAVE_NCURSES_H, etc. +for ac_hdr in $cf_cv_ncurses_header +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:8645: checking for $ac_hdr" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:8655: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 +fi +done + + + +cat >> confdefs.h <<\EOF +#define NCURSES 1 +EOF + + + +cf_nculib_ROOT=`echo "HAVE_LIB$cf_ncuconfig_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + +cat >> confdefs.h < conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:8296: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -8309,7 +8751,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me-configure}:8313: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:8755: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -8328,7 +8770,7 @@ fi } echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6 -echo "configure:8332: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "configure:8774: checking for $cf_ncuhdr_root header in include-path" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8339,7 +8781,7 @@ else do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8814: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h=$cf_header @@ -8394,13 +8836,16 @@ if test "$cf_cv_ncurses_h" != no ; then else echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6 -echo "configure:8398: checking for $cf_ncuhdr_root include-path" >&5 +echo "configure:8840: checking for $cf_ncuhdr_root include-path" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else test -n "$verbose" && echo +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 @@ -8426,12 +8871,14 @@ test -d "$cf_header_path" && \ done fi -cf_search="" +# add the variations for the package we are looking for + +cf_search= test "/usr" != "$prefix" && \ test -d "/usr" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/usr" != "$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /usr" test -d /usr/include && cf_search="$cf_search /usr/include" test -d /usr/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/include/$cf_ncuhdr_root" @@ -8455,7 +8902,7 @@ test -d "$prefix" && \ test "/usr/local" != "$prefix" && \ test -d "/usr/local" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/usr/local" != "$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /usr/local" test -d /usr/local/include && cf_search="$cf_search /usr/local/include" test -d /usr/local/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root" @@ -8467,7 +8914,7 @@ test -d "/usr/local" && \ test "/opt" != "$prefix" && \ test -d "/opt" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/opt" != "$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /opt" test -d /opt/include && cf_search="$cf_search /opt/include" test -d /opt/include/$cf_ncuhdr_root && cf_search="$cf_search /opt/include/$cf_ncuhdr_root" @@ -8479,7 +8926,7 @@ test -d "/opt" && \ test "$HOME" != "$prefix" && \ test -d "$HOME" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "$HOME" != "$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under $HOME" test -d $HOME/include && cf_search="$cf_search $HOME/include" test -d $HOME/include/$cf_ncuhdr_root && cf_search="$cf_search $HOME/include/$cf_ncuhdr_root" @@ -8504,7 +8951,7 @@ test -d "$oldincludedir" && { test -d $oldincludedir/$cf_ncuhdr_root && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root" } -cf_search="$cf_header_path_list $cf_search" +cf_search="$cf_search $cf_header_path_list" test -n "$verbose" && echo search path $cf_search cf_save2_CPPFLAGS="$CPPFLAGS" @@ -8535,14 +8982,14 @@ if test -n "$cf_incdir" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:8546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8993: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -8559,7 +9006,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me-configure}:8563: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9010: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -8581,7 +9028,7 @@ fi do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9053: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h2=$cf_header @@ -8660,14 +9107,14 @@ if test -n "$cf_1st_incdir" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:8671: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9118: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -8684,7 +9131,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me-configure}:8688: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9135: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -8732,7 +9179,7 @@ esac echo $ac_n "checking for terminfo header""... $ac_c" 1>&6 -echo "configure:8736: checking for terminfo header" >&5 +echo "configure:9183: checking for terminfo header" >&5 if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8749,17 +9196,17 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat > conftest.$ac_ext < -#include <${cf_cv_ncurses_header-curses.h}> +#include <${cf_cv_ncurses_header:-curses.h}> #include <$cf_test> int main() { int x = auto_left_margin ; return 0; } EOF -if { (eval echo configure:8763: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9210: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_term_header="$cf_test" @@ -8814,7 +9261,7 @@ EOF echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:8818: checking for ncurses version" >&5 +echo "configure:9265: checking for ncurses version" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8828,7 +9275,7 @@ else # This will not work if the preprocessor splits the line after the # Autoconf token. The 'unproto' program does that. cat > conftest.$ac_ext < +#include <${cf_cv_ncurses_header:-curses.h}> #undef Autoconf #ifdef NCURSES_VERSION Autoconf NCURSES_VERSION @@ -8840,7 +9287,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:8844: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:9291: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" @@ -8849,10 +9296,10 @@ EOF else cat > conftest.$ac_ext < +#include <${cf_cv_ncurses_header:-curses.h}> #include int main() { @@ -8870,10 +9317,10 @@ int main() make an error # endif #endif - ${cf_cv_main_return-return}(0); + ${cf_cv_main_return:-return}(0); } EOF -if { (eval echo configure:8877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -8895,7 +9342,7 @@ EOF - + cf_nculib_root=ncursesw # This works, except for the special case where we find gpm, but @@ -8904,7 +9351,7 @@ cf_nculib_root=ncursesw cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:8908: checking for Gpm_Open in -lgpm" >&5 +echo "configure:9355: checking for Gpm_Open in -lgpm" >&5 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8912,7 +9359,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:9374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6 -echo "configure:8943: checking for initscr in -lgpm" >&5 +echo "configure:9390: checking for initscr in -lgpm" >&5 ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8947,7 +9394,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:9409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi @@ -8990,7 +9437,7 @@ freebsd*) # version of ncurses (but it should do no harm, since it's static). if test "$cf_nculib_root" = ncurses ; then echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:8994: checking for tgoto in -lmytinfo" >&5 +echo "configure:9441: checking for tgoto in -lmytinfo" >&5 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8998,7 +9445,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:9460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi @@ -9037,47 +9484,18 @@ LIBS="$cf_ncurses_LIBS $LIBS" if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) then - -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}:9061: testing adding $cf_add_libdir to library-path ..." 1>&5 - - - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi - fi - done -fi - LIBS="-l$cf_nculib_root $LIBS" else eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" echo $ac_n "checking for initscr""... $ac_c" 1>&6 -echo "configure:9076: checking for initscr" >&5 +echo "configure:9494: checking for initscr" >&5 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:9522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_func_initscr=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_func_initscr=no" fi -rm -f conftest* +rm -rf conftest* fi if eval "test \"`echo '$ac_cv_func_'initscr`\" = yes"; then @@ -9120,27 +9538,28 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6 -echo "configure:9124: checking for initscr in -l$cf_nculib_root" >&5 +echo "configure:9542: checking for initscr in -l$cf_nculib_root" >&5 LIBS="-l$cf_nculib_root $LIBS" cat > conftest.$ac_ext < +#include <${cf_cv_ncurses_header:-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:9134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:9552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + echo "$ac_t""no" 1>&6 +cf_search= cf_library_path_list="" if test -n "${LDFLAGS}${LIBS}" ; then for cf_library_path in $LDFLAGS $LIBS @@ -9166,12 +9585,13 @@ test -d "$cf_library_path" && \ done fi -cf_search="" + +cf_search= test "/usr" != "$prefix" && \ test -d "/usr" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/usr" != "$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /usr" test -d /usr/lib && cf_search="$cf_search /usr/lib" test -d /usr/lib/$cf_nculib_root && cf_search="$cf_search /usr/lib/$cf_nculib_root" @@ -9195,7 +9615,7 @@ test -d "$prefix" && \ test "/usr/local" != "$prefix" && \ test -d "/usr/local" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/usr/local" != "$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /usr/local" test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib" test -d /usr/local/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/lib/$cf_nculib_root" @@ -9207,7 +9627,7 @@ test -d "/usr/local" && \ test "/opt" != "$prefix" && \ test -d "/opt" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/opt" != "$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /opt" test -d /opt/lib && cf_search="$cf_search /opt/lib" test -d /opt/lib/$cf_nculib_root && cf_search="$cf_search /opt/lib/$cf_nculib_root" @@ -9219,7 +9639,7 @@ test -d "/opt" && \ test "$HOME" != "$prefix" && \ test -d "$HOME" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "$HOME" != "$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under $HOME" test -d $HOME/lib && cf_search="$cf_search $HOME/lib" test -d $HOME/lib/$cf_nculib_root && cf_search="$cf_search $HOME/lib/$cf_nculib_root" @@ -9235,33 +9655,33 @@ cf_search="$cf_library_path_list $cf_sea for cf_libdir in $cf_search do echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6 -echo "configure:9239: checking for -l$cf_nculib_root in $cf_libdir" >&5 +echo "configure:9659: checking for -l$cf_nculib_root in $cf_libdir" >&5 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat > conftest.$ac_ext < +#include <${cf_cv_ncurses_header:-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:9249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:9669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' break else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + echo "$ac_t""no" 1>&6 LIBS="$cf_save_LIBS" fi -rm -f conftest* +rm -rf conftest* done fi -rm -f conftest* +rm -rf conftest* fi @@ -9276,7 +9696,7 @@ fi if test -n "$cf_ncurses_LIBS" ; then echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6 -echo "configure:9280: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 +echo "configure:9700: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` @@ -9285,24 +9705,24 @@ echo "configure:9280: checking if we can fi done cat > conftest.$ac_ext < +#include <${cf_cv_ncurses_header:-curses.h}> int main() { initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); ; return 0; } EOF -if { (eval echo configure:9296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:9716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + echo "$ac_t""yes" 1>&6 else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + echo "$ac_t""no" 1>&6 LIBS="$cf_ncurses_SAVE" fi -rm -f conftest* +rm -rf conftest* fi @@ -9313,141 +9733,71 @@ cat >> confdefs.h <&6 -echo "configure:9319: checking for ncurses version" >&5 -if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cf_cv_ncurses_version=no - cf_tempfile=out$$ - rm -f $cf_tempfile - if test "$cross_compiling" = yes; then - - - # 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 configure:9345: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } - if test -f conftest.out ; then - cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` - test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" - rm -f conftest.out - fi - -else - cat > conftest.$ac_ext < -#include -int main() -{ - 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); -} -EOF -if { (eval echo configure:9378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - - cf_cv_ncurses_version=`cat $cf_tempfile` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -fr conftest* -fi - - rm -f $cf_tempfile - -fi - -echo "$ac_t""$cf_cv_ncurses_version" 1>&6 -test "$cf_cv_ncurses_version" = no || cat >> confdefs.h <<\EOF -#define NCURSES 1 -EOF - - - -echo $ac_n "checking if we must define _XOPEN_SOURCE_EXTENDED""... $ac_c" 1>&6 -echo "configure:9401: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 -if eval "test \"`echo '$''{'cf_cv_need_xopen_extension'+set}'`\" = set"; then +echo $ac_n "checking if we must define _XOPEN_SOURCE_EXTENDED""... $ac_c" 1>&6 +echo "configure:9742: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 +if eval "test \"`echo '$''{'cf_cv_need_xopen_extension'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < -#include <${cf_cv_ncurses_header-curses.h}> +#include <${cf_cv_ncurses_header:-curses.h}> int main() { +#if defined(NCURSES_VERSION_PATCH) +#if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403) + make an error +#endif +#endif long x = winnstr(stdscr, "", 0); int x1, y1; getbegyx(stdscr, y1, x1) ; return 0; } EOF -if { (eval echo configure:9419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:9765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + cf_cv_need_xopen_extension=no else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + cat > conftest.$ac_ext < -#include <${cf_cv_ncurses_header-curses.h}> +#include <${cf_cv_ncurses_header:-curses.h}> int main() { +#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; } EOF -if { (eval echo configure:9440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:9790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + cf_cv_need_xopen_extension=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + cf_cv_need_xopen_extension=unknown fi -rm -f conftest* +rm -rf conftest* fi -rm -f conftest* +rm -rf conftest* fi echo "$ac_t""$cf_cv_need_xopen_extension" 1>&6 @@ -9458,8 +9808,9 @@ test $cf_cv_need_xopen_extension = yes & curses) #(vi + echo $ac_n "checking for extra include directories""... $ac_c" 1>&6 -echo "configure:9463: checking for extra include directories" >&5 +echo "configure:9814: checking for extra include directories" >&5 if eval "test \"`echo '$''{'cf_cv_curses_incdir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9467,13 +9818,19 @@ else cf_cv_curses_incdir=no case $host_os in #(vi hpux10.*) #(vi - test -d /usr/include/curses_colr && \ - cf_cv_curses_incdir="-I/usr/include/curses_colr" + 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*) - test -d /usr/5lib && \ - test -d /usr/5include && \ - cf_cv_curses_incdir="-I/usr/5include" + 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 @@ -9484,27 +9841,25 @@ test "$cf_cv_curses_incdir" != no && CPP echo $ac_n "checking if we have identified curses headers""... $ac_c" 1>&6 -echo "configure:9488: checking if we have identified curses headers" >&5 +echo "configure:9845: checking if we have identified curses headers" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cf_cv_ncurses_header=none -for cf_header in \ - curses.h \ +for cf_header in \ ncurses.h \ - ncurses/curses.h \ - ncurses/ncurses.h + curses.h ncurses/ncurses.h ncurses/curses.h do cat > conftest.$ac_ext < int main() { initscr(); tgoto("?", 0,0) ; return 0; } EOF -if { (eval echo configure:9508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_header=$cf_header; break else @@ -9527,17 +9882,17 @@ for ac_hdr in $cf_cv_ncurses_header do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9531: checking for $ac_hdr" >&5 +echo "configure:9886: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9541: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9896: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9566,7 +9921,7 @@ done echo $ac_n "checking for terminfo header""... $ac_c" 1>&6 -echo "configure:9570: checking for terminfo header" >&5 +echo "configure:9925: checking for terminfo header" >&5 if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9583,17 +9938,17 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat > conftest.$ac_ext < -#include <${cf_cv_ncurses_header-curses.h}> +#include <${cf_cv_ncurses_header:-curses.h}> #include <$cf_test> int main() { int x = auto_left_margin ; return 0; } EOF -if { (eval echo configure:9597: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9952: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_term_header="$cf_test" @@ -9640,35 +9995,117 @@ EOF esac - + +echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 +echo "configure:10001: checking for ncurses version" >&5 +if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + cf_cv_ncurses_version=no + cf_tempfile=out$$ + rm -f $cf_tempfile + if test "$cross_compiling" = yes; then + + + # 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 configure:10027: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + if test -f conftest.out ; then + cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` + test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" + rm -f conftest.out + fi + +else + cat > conftest.$ac_ext < +#include +int main() +{ + 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); +} +EOF +if { (eval echo configure:10060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + + cf_cv_ncurses_version=`cat $cf_tempfile` +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -fr conftest* +fi + + rm -f $cf_tempfile + +fi + +echo "$ac_t""$cf_cv_ncurses_version" 1>&6 +test "$cf_cv_ncurses_version" = no || cat >> confdefs.h <<\EOF +#define NCURSES 1 +EOF + + + echo $ac_n "checking if we have identified curses libraries""... $ac_c" 1>&6 -echo "configure:9647: checking if we have identified curses libraries" >&5 +echo "configure:10084: checking if we have identified curses libraries" >&5 cat > conftest.$ac_ext < +#include <${cf_cv_ncurses_header:-curses.h}> int main() { initscr(); tgoto("?", 0,0) ; return 0; } EOF -if { (eval echo configure:9656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:10093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + cf_result=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + cf_result=no fi -rm -f conftest* +rm -rf conftest* echo "$ac_t""$cf_result" 1>&6 if test "$cf_result" = no ; then case $host_os in #(vi freebsd*) #(vi echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:9672: checking for tgoto in -lmytinfo" >&5 +echo "configure:10109: checking for tgoto in -lmytinfo" >&5 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9676,7 +10113,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:10128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi @@ -9709,8 +10146,14 @@ fi ;; hpux10.*) #(vi - echo $ac_n "checking for initscr in -lcur_colr""... $ac_c" 1>&6 -echo "configure:9714: checking for initscr in -lcur_colr" >&5 + # 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 $ac_n "checking for initscr in -lcur_colr""... $ac_c" 1>&6 +echo "configure:10157: checking for initscr in -lcur_colr" >&5 ac_lib_var=`echo cur_colr'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9718,7 +10161,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcur_colr $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:10176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIBS="-lcur_colr $LIBS" - ac_cv_func_initscr=yes - + LIBS="-lcur_colr $LIBS" + ac_cv_func_initscr=yes + else echo "$ac_t""no" 1>&6 - echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6 -echo "configure:9756: checking for initscr in -lHcurses" >&5 + echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6 +echo "configure:10199: checking for initscr in -lHcurses" >&5 ac_lib_var=`echo Hcurses'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9760,7 +10203,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lHcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:10218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - # HP's header uses __HP_CURSES, but user claims _HP_CURSES. - LIBS="-lHcurses $LIBS" - CPPFLAGS="$CPPFLAGS -D__HP_CURSES -D_HP_CURSES" - ac_cv_func_initscr=yes - + # HP's header uses __HP_CURSES, but user claims _HP_CURSES. + LIBS="-lHcurses $LIBS" + CPPFLAGS="$CPPFLAGS -D__HP_CURSES -D_HP_CURSES" + ac_cv_func_initscr=yes + else echo "$ac_t""no" 1>&6 fi fi + fi ;; -linux*) # Suse Linux does not follow /usr/lib convention - -if test -n "/lib" ; then - for cf_add_libdir in /lib +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 : @@ -9820,7 +10268,7 @@ if test -n "/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me-configure}:9824: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:10272: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" @@ -9829,12 +10277,10 @@ echo "${as_me-configure}:9824: testing a done fi - ;; -sunos3*|sunos4*) - if test -d /usr/5lib ; then - -if test -n "/usr/5lib" ; then - for cf_add_libdir in /usr/5lib + else + +if test -n "/lib" ; then + for cf_add_libdir in /lib do if test $cf_add_libdir = /usr/lib ; then : @@ -9852,7 +10298,7 @@ if test -n "/usr/5lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me-configure}:9856: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:10302: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" @@ -9861,33 +10307,102 @@ echo "${as_me-configure}:9856: testing a done fi - LIBS="$LIBS -lcurses -ltermcap" - fi - ac_cv_func_initscr=yes - ;; -esac + 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 -if test ".$ac_cv_func_initscr" != .yes ; then - cf_save_LIBS="$LIBS" - cf_term_lib="" - cf_curs_lib="" +echo "${as_me:-configure}:10334: testing adding $cf_add_libdir to library-path ..." 1>&5 - if test ".${cf_cv_ncurses_version-no}" != .no - then - cf_check_list="ncurses curses cursesX" - else - cf_check_list="cursesX curses ncurses" + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi fi + done +fi - # Check for library containing tgoto. Do this before curses library - # because it may be needed to link the test-case for initscr. - echo $ac_n "checking for tgoto""... $ac_c" 1>&6 -echo "configure:9886: checking for tgoto" >&5 -if eval "test \"`echo '$''{'ac_cv_func_tgoto'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else + ;; + esac + ;; +sunos3*|sunos4*) + if test "x$cf_cv_screen" = "xcurses_5lib" + then + if test -d /usr/5lib ; then + +if test -n "/usr/5lib" ; then + for cf_add_libdir in /usr/5lib + do + if test $cf_add_libdir = /usr/lib ; then + : + elif test -d $cf_add_libdir + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +echo "${as_me:-configure}:10370: testing adding $cf_add_libdir to library-path ..." 1>&5 + + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done +fi + + LIBS="-lcurses -ltermcap $LIBS" + fi + fi + ac_cv_func_initscr=yes + ;; +esac + +if test ".$ac_cv_func_initscr" != .yes ; then + cf_save_LIBS="$LIBS" + cf_term_lib="" + cf_curs_lib="" + + if test ".${cf_cv_ncurses_version:-no}" != .no + then + cf_check_list="ncurses curses cursesX" + else + cf_check_list="cursesX curses ncurses" + fi + + # Check for library containing tgoto. Do this before curses library + # because it may be needed to link the test-case for initscr. + echo $ac_n "checking for tgoto""... $ac_c" 1>&6 +echo "configure:10401: checking for tgoto" >&5 +if eval "test \"`echo '$''{'ac_cv_func_tgoto'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:10429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_func_tgoto=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_func_tgoto=no" fi -rm -f conftest* +rm -rf conftest* fi if eval "test \"`echo '$ac_cv_func_'tgoto`\" = yes"; then @@ -9931,7 +10446,7 @@ else for cf_term_lib in $cf_check_list termcap termlib unknown do echo $ac_n "checking for tgoto in -l$cf_term_lib""... $ac_c" 1>&6 -echo "configure:9935: checking for tgoto in -l$cf_term_lib" >&5 +echo "configure:10450: checking for tgoto in -l$cf_term_lib" >&5 ac_lib_var=`echo $cf_term_lib'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9939,7 +10454,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$cf_term_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:10469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi @@ -9980,7 +10495,7 @@ fi for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown do echo $ac_n "checking for initscr in -l$cf_curs_lib""... $ac_c" 1>&6 -echo "configure:9984: checking for initscr in -l$cf_curs_lib" >&5 +echo "configure:10499: checking for initscr in -l$cf_curs_lib" >&5 ac_lib_var=`echo $cf_curs_lib'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9988,7 +10503,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$cf_curs_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:10518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi @@ -10025,211 +10540,139 @@ fi LIBS="-l$cf_curs_lib $cf_save_LIBS" if test "$cf_term_lib" = unknown ; then echo $ac_n "checking if we can link with $cf_curs_lib library""... $ac_c" 1>&6 -echo "configure:10029: checking if we can link with $cf_curs_lib library" >&5 +echo "configure:10544: checking if we can link with $cf_curs_lib library" >&5 cat > conftest.$ac_ext < +#include <${cf_cv_ncurses_header:-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:10038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:10553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + cf_result=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + cf_result=no fi -rm -f conftest* +rm -rf conftest* echo "$ac_t""$cf_result" 1>&6 test $cf_result = no && { echo "configure: error: Cannot link curses library" 1>&2; exit 1; } elif test "$cf_curs_lib" = "$cf_term_lib" ; then : elif test "$cf_term_lib" != predefined ; then echo $ac_n "checking if we need both $cf_curs_lib and $cf_term_lib libraries""... $ac_c" 1>&6 -echo "configure:10054: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 +echo "configure:10569: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 cat > conftest.$ac_ext < +#include <${cf_cv_ncurses_header:-curses.h}> int main() { initscr(); tgoto((char *)0, 0, 0); ; return 0; } EOF -if { (eval echo configure:10063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:10578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + cf_result=no else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" cat > conftest.$ac_ext < +#include <${cf_cv_ncurses_header:-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:10080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:10595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + cf_result=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + cf_result=error fi -rm -f conftest* +rm -rf conftest* fi -rm -f conftest* +rm -rf conftest* echo "$ac_t""$cf_result" 1>&6 fi fi fi - -echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:10101: checking for ncurses version" >&5 -if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cf_cv_ncurses_version=no - cf_tempfile=out$$ - rm -f $cf_tempfile - if test "$cross_compiling" = yes; then - - - # 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 configure:10127: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } - if test -f conftest.out ; then - cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` - test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" - rm -f conftest.out - fi - -else - cat > conftest.$ac_ext < -#include -int main() -{ - 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); -} -EOF -if { (eval echo configure:10160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - - cf_cv_ncurses_version=`cat $cf_tempfile` -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -fr conftest* -fi - - rm -f $cf_tempfile - -fi - -echo "$ac_t""$cf_cv_ncurses_version" 1>&6 -test "$cf_cv_ncurses_version" = no || cat >> confdefs.h <<\EOF -#define NCURSES 1 -EOF - echo $ac_n "checking if we must define _XOPEN_SOURCE_EXTENDED""... $ac_c" 1>&6 -echo "configure:10183: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 +echo "configure:10617: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 if eval "test \"`echo '$''{'cf_cv_need_xopen_extension'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < -#include <${cf_cv_ncurses_header-curses.h}> +#include <${cf_cv_ncurses_header:-curses.h}> int main() { +#if defined(NCURSES_VERSION_PATCH) +#if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403) + make an error +#endif +#endif long x = winnstr(stdscr, "", 0); int x1, y1; getbegyx(stdscr, y1, x1) ; return 0; } EOF -if { (eval echo configure:10201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:10640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + cf_cv_need_xopen_extension=no else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + cat > conftest.$ac_ext < -#include <${cf_cv_ncurses_header-curses.h}> +#include <${cf_cv_ncurses_header:-curses.h}> int main() { +#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; } EOF -if { (eval echo configure:10222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:10665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + cf_cv_need_xopen_extension=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + cf_cv_need_xopen_extension=unknown fi -rm -f conftest* +rm -rf conftest* fi -rm -f conftest* +rm -rf conftest* fi echo "$ac_t""$cf_cv_need_xopen_extension" 1>&6 @@ -10241,7 +10684,7 @@ fi ## substitute externally-installed PCRE library for our bundled version echo $ac_n "checking if you want to use installed version of pcre""... $ac_c" 1>&6 -echo "configure:10245: checking if you want to use installed version of pcre" >&5 +echo "configure:10688: checking if you want to use installed version of pcre" >&5 # Check whether --with-pcre or --without-pcre was given. if test "${with_pcre+set}" = set; then @@ -10323,7 +10766,7 @@ debug_malloc=none echo $ac_n "checking if you want to use dbmalloc for testing""... $ac_c" 1>&6 -echo "configure:10327: checking if you want to use dbmalloc for testing" >&5 +echo "configure:10770: checking if you want to use dbmalloc for testing" >&5 # Check whether --with-dbmalloc or --without-dbmalloc was given. if test "${with_dbmalloc+set}" = set; then @@ -10366,8 +10809,8 @@ no) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "${cf_add_cflags}" != "${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" @@ -10382,6 +10825,16 @@ no) *$cf_add_cflags) #(vi ;; *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" ;; esac @@ -10397,8 +10850,8 @@ yes) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` test "${cf_add_cflags}" != "${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=no + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no ;; esac done @@ -10430,17 +10883,17 @@ esac if test "$with_dbmalloc" = yes ; then ac_safe=`echo "dbmalloc.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dbmalloc.h""... $ac_c" 1>&6 -echo "configure:10434: checking for dbmalloc.h" >&5 +echo "configure:10887: checking for dbmalloc.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10444: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10897: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10457,7 +10910,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for debug_malloc in -ldbmalloc""... $ac_c" 1>&6 -echo "configure:10461: checking for debug_malloc in -ldbmalloc" >&5 +echo "configure:10914: checking for debug_malloc in -ldbmalloc" >&5 ac_lib_var=`echo dbmalloc'_'debug_malloc | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10465,7 +10918,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldbmalloc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:10933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi @@ -10505,7 +10958,7 @@ fi echo $ac_n "checking if you want to use dmalloc for testing""... $ac_c" 1>&6 -echo "configure:10509: checking if you want to use dmalloc for testing" >&5 +echo "configure:10962: checking if you want to use dmalloc for testing" >&5 # Check whether --with-dmalloc or --without-dmalloc was given. if test "${with_dmalloc+set}" = set; then @@ -10548,8 +11001,8 @@ no) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "${cf_add_cflags}" != "${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" @@ -10564,6 +11017,16 @@ no) *$cf_add_cflags) #(vi ;; *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" ;; esac @@ -10579,8 +11042,8 @@ yes) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` test "${cf_add_cflags}" != "${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=no + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no ;; esac done @@ -10612,17 +11075,17 @@ esac if test "$with_dmalloc" = yes ; then ac_safe=`echo "dmalloc.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dmalloc.h""... $ac_c" 1>&6 -echo "configure:10616: checking for dmalloc.h" >&5 +echo "configure:11079: checking for dmalloc.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10626: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11089: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10639,7 +11102,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for dmalloc_debug in -ldmalloc""... $ac_c" 1>&6 -echo "configure:10643: checking for dmalloc_debug in -ldmalloc" >&5 +echo "configure:11106: checking for dmalloc_debug in -ldmalloc" >&5 ac_lib_var=`echo dmalloc'_'dmalloc_debug | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10647,7 +11110,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldmalloc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:11125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi @@ -10692,12 +11155,12 @@ if test "${with_trace+set}" = set; then withval="$with_trace" echo $ac_n "checking for _tracef""... $ac_c" 1>&6 -echo "configure:10696: checking for _tracef" >&5 +echo "configure:11159: checking for _tracef" >&5 if eval "test \"`echo '$''{'ac_cv_func__tracef'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:11187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_func__tracef=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_func__tracef=no" fi -rm -f conftest* +rm -rf conftest* fi if eval "test \"`echo '$ac_cv_func_'_tracef`\" = yes"; then @@ -10742,7 +11205,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for _tracef in -l${cf_with_screen}_g""... $ac_c" 1>&6 -echo "configure:10746: checking for _tracef in -l${cf_with_screen}_g" >&5 +echo "configure:11209: checking for _tracef in -l${cf_with_screen}_g" >&5 ac_lib_var=`echo ${cf_with_screen}_g'_'_tracef | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10750,7 +11213,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l${cf_with_screen}_g $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:11228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi @@ -10807,7 +11270,7 @@ fi ## options for miscellaneous definitions echo $ac_n "checking for domain-name""... $ac_c" 1>&6 -echo "configure:10811: checking for domain-name" >&5 +echo "configure:11274: checking for domain-name" >&5 # Check whether --with-domain-name or --without-domain-name was given. if test "${with_domain_name+set}" = set; then @@ -10836,7 +11299,7 @@ echo "$ac_t""$DOMAIN_NAME" 1>&6 if test "$USE_NNTP" = "yes" ; then echo $ac_n "checking for NNTP default-server""... $ac_c" 1>&6 -echo "configure:10840: checking for NNTP default-server" >&5 +echo "configure:11303: checking for NNTP default-server" >&5 # Check whether --with-nntp-default-server or --without-nntp-default-server was given. if test "${with_nntp_default_server+set}" = set; then @@ -10902,7 +11365,7 @@ EOF ## optional features echo $ac_n "checking whether to use MH style mail handling for mailgroups""... $ac_c" 1>&6 -echo "configure:10906: checking whether to use MH style mail handling for mailgroups" >&5 +echo "configure:11369: checking whether to use MH style mail handling for mailgroups" >&5 # Check whether --enable-mh-mail-handling or --disable-mh-mail-handling was given. if test "${enable_mh_mail_handling+set}" = set; then @@ -10923,7 +11386,7 @@ echo "$ac_t""$enableval" 1>&6 CAN_MAKEFILE= CANDIR_MAKE= echo $ac_n "checking whether to use Cancel-Locks""... $ac_c" 1>&6 -echo "configure:10927: checking whether to use Cancel-Locks" >&5 +echo "configure:11390: checking whether to use Cancel-Locks" >&5 # Check whether --enable-cancel-locks or --disable-cancel-locks was given. if test "${enable_cancel_locks+set}" = set; then @@ -10954,17 +11417,17 @@ echo "$ac_t""$enableval" 1>&6 ## gsasl - used for AUTH SASL PLAIN ac_safe=`echo "gsasl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gsasl.h""... $ac_c" 1>&6 -echo "configure:10958: checking for gsasl.h" >&5 +echo "configure:11421: checking for gsasl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10968: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11431: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10981,7 +11444,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gsasl_check_version in -lgsasl""... $ac_c" 1>&6 -echo "configure:10985: checking for gsasl_check_version in -lgsasl" >&5 +echo "configure:11448: checking for gsasl_check_version in -lgsasl" >&5 ac_lib_var=`echo gsasl'_'gsasl_check_version | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10989,7 +11452,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgsasl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:11467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi @@ -11056,7 +11519,7 @@ fi fi echo $ac_n "checking whether to enable 8-bit keycodes""... $ac_c" 1>&6 -echo "configure:11060: checking whether to enable 8-bit keycodes" >&5 +echo "configure:11523: checking whether to enable 8-bit keycodes" >&5 # Check whether --enable-8bit-keys or --disable-8bit-keys was given. if test "${enable_8bit_keys+set}" = set; then @@ -11082,7 +11545,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable ANSI-color""... $ac_c" 1>&6 -echo "configure:11086: checking whether to enable ANSI-color" >&5 +echo "configure:11549: checking whether to enable ANSI-color" >&5 # Check whether --enable-color or --disable-color was given. if test "${enable_color+set}" = set; then @@ -11099,7 +11562,7 @@ use_color=$enableval echo "$ac_t""$use_color" 1>&6 echo $ac_n "checking whether to enable posting-etiquette""... $ac_c" 1>&6 -echo "configure:11103: checking whether to enable posting-etiquette" >&5 +echo "configure:11566: checking whether to enable posting-etiquette" >&5 # Check whether --enable-etiquette or --disable-etiquette was given. if test "${enable_etiquette+set}" = set; then @@ -11118,7 +11581,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to strictly observe RFC2047 and break long lines""... $ac_c" 1>&6 -echo "configure:11122: checking whether to strictly observe RFC2047 and break long lines" >&5 +echo "configure:11585: checking whether to strictly observe RFC2047 and break long lines" >&5 # Check whether --enable-break-long-lines or --disable-break-long-lines was given. if test "${enable_break_long_lines+set}" = set; then @@ -11137,7 +11600,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to force MM_CHARSET obeyance when decoding mime""... $ac_c" 1>&6 -echo "configure:11141: checking whether to force MM_CHARSET obeyance when decoding mime" >&5 +echo "configure:11604: checking whether to force MM_CHARSET obeyance when decoding mime" >&5 # Check whether --enable-mime-strict-charset or --disable-mime-strict-charset was given. if test "${enable_mime_strict_charset+set}" = set; then @@ -11163,7 +11626,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking for MIME character-set""... $ac_c" 1>&6 -echo "configure:11167: checking for MIME character-set" >&5 +echo "configure:11630: checking for MIME character-set" >&5 # Check whether --with-mime-default-charset or --without-mime-default-charset was given. if test "${with_mime_default_charset+set}" = set; then @@ -11185,7 +11648,7 @@ EOF echo "$ac_t""$MM_CHARSET" 1>&6 echo $ac_n "checking for default ISO/ASCII table""... $ac_c" 1>&6 -echo "configure:11189: checking for default ISO/ASCII table" >&5 +echo "configure:11652: checking for default ISO/ASCII table" >&5 # Check whether --with-iso-to-ascii or --without-iso-to-ascii was given. if test "${with_iso_to_ascii+set}" = set; then @@ -11207,7 +11670,7 @@ EOF echo "$ac_t""$DEFAULT_ISO2ASC" 1>&6 echo $ac_n "checking whether to enable locale support""... $ac_c" 1>&6 -echo "configure:11211: checking whether to enable locale support" >&5 +echo "configure:11674: checking whether to enable locale support" >&5 # Check whether --enable-locale or --disable-locale was given. if test "${enable_locale+set}" = set; then @@ -11226,7 +11689,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable posting""... $ac_c" 1>&6 -echo "configure:11230: checking whether to enable posting" >&5 +echo "configure:11693: checking whether to enable posting" >&5 # Check whether --enable-posting or --disable-posting was given. if test "${enable_posting+set}" = set; then @@ -11245,7 +11708,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable shell escape""... $ac_c" 1>&6 -echo "configure:11249: checking whether to enable shell escape" >&5 +echo "configure:11712: checking whether to enable shell escape" >&5 # Check whether --enable-shell-escape or --disable-shell-escape was given. if test "${enable_shell_escape+set}" = set; then @@ -11264,7 +11727,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to have fascist newsadmin""... $ac_c" 1>&6 -echo "configure:11268: checking whether to have fascist newsadmin" >&5 +echo "configure:11731: checking whether to have fascist newsadmin" >&5 # Check whether --enable-fascist-newsadmin or --disable-fascist-newsadmin was given. if test "${enable_fascist_newsadmin+set}" = set; then @@ -11283,7 +11746,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable inverse video and highlighting""... $ac_c" 1>&6 -echo "configure:11287: checking whether to enable inverse video and highlighting" >&5 +echo "configure:11750: checking whether to enable inverse video and highlighting" >&5 # Check whether --enable-inverse-video or --disable-inverse-video was given. if test "${enable_inverse_video+set}" = set; then @@ -11302,7 +11765,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable piping support""... $ac_c" 1>&6 -echo "configure:11306: checking whether to enable piping support" >&5 +echo "configure:11769: checking whether to enable piping support" >&5 # Check whether --enable-piping or --disable-piping was given. if test "${enable_piping+set}" = set; then @@ -11321,7 +11784,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable printer support""... $ac_c" 1>&6 -echo "configure:11325: checking whether to enable printer support" >&5 +echo "configure:11788: checking whether to enable printer support" >&5 # Check whether --enable-printing or --disable-printing was given. if test "${enable_printing+set}" = set; then @@ -11340,7 +11803,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to unique tmp-files by appending .pid""... $ac_c" 1>&6 -echo "configure:11344: checking whether to unique tmp-files by appending .pid" >&5 +echo "configure:11807: checking whether to unique tmp-files by appending .pid" >&5 # Check whether --enable-append-pid or --disable-append-pid was given. if test "${enable_append_pid+set}" = set; then @@ -11366,7 +11829,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to fallback to XHDR XREF if XOVER isn't supported""... $ac_c" 1>&6 -echo "configure:11370: checking whether to fallback to XHDR XREF if XOVER isn't supported" >&5 +echo "configure:11833: checking whether to fallback to XHDR XREF if XOVER isn't supported" >&5 # Check whether --enable-xhdr-xref or --disable-xhdr-xref was given. if test "${enable_xhdr_xref+set}" = set; then @@ -11393,7 +11856,7 @@ echo "$ac_t""$enableval" 1>&6 ### bypass a bug in old versions of leafnode & NNTPcache echo $ac_n "checking whether to send a GROUP command before a LISTGROUP""... $ac_c" 1>&6 -echo "configure:11397: checking whether to send a GROUP command before a LISTGROUP" >&5 +echo "configure:11860: checking whether to send a GROUP command before a LISTGROUP" >&5 # Check whether --enable-broken-listgroup-fix or --disable-broken-listgroup-fix was given. if test "${enable_broken_listgroup_fix+set}" = set; then @@ -11413,7 +11876,7 @@ echo "$ac_t""$enableval" 1>&6 ### on some old systems the WIFEXITED()/WEXITSTATUS() macros do not work echo $ac_n "checking whether to ignore system()s return value""... $ac_c" 1>&6 -echo "configure:11417: checking whether to ignore system()s return value" >&5 +echo "configure:11880: checking whether to ignore system()s return value" >&5 # Check whether --enable-broken-system-fix or --disable-broken-system-fix was given. if test "${enable_broken_system_fix+set}" = set; then @@ -11433,14 +11896,14 @@ echo "$ac_t""$enableval" 1>&6 ### checks for the location of the system-wide default setting file echo $ac_n "checking for directory containing tin.defaults file""... $ac_c" 1>&6 -echo "configure:11437: checking for directory containing tin.defaults file" >&5 +echo "configure:11900: checking for directory containing tin.defaults file" >&5 # Check whether --with-defaults-dir or --without-defaults-dir was given. if test "${with_defaults_dir+set}" = set; then withval="$with_defaults_dir" : else - withval="${TIN_DEFAULTS_DIR-/etc/tin}" + withval="${TIN_DEFAULTS_DIR:-/etc/tin}" fi if true ; then @@ -11484,7 +11947,7 @@ EOF ### check for ipv6 support echo $ac_n "checking whether to enable IPv6""... $ac_c" 1>&6 -echo "configure:11488: checking whether to enable IPv6" >&5 +echo "configure:11951: checking whether to enable IPv6" >&5 # Check whether --enable-ipv6 or --disable-ipv6 was given. if test "${enable_ipv6+set}" = set; then @@ -11505,7 +11968,7 @@ if test "$enableval" = "yes"; then echo $ac_n "checking ipv6 stack type""... $ac_c" 1>&6 -echo "configure:11509: checking ipv6 stack type" >&5 +echo "configure:11972: checking ipv6 stack type" >&5 if eval "test \"`echo '$''{'cf_cv_ipv6type'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11525,7 +11988,7 @@ do ;; inria) #(vi cat > conftest.$ac_ext < @@ -11543,7 +12006,7 @@ rm -f conftest* ;; kame) #(vi cat > conftest.$ac_ext < @@ -11561,7 +12024,7 @@ rm -f conftest* ;; linux-glibc) #(vi cat > conftest.$ac_ext < @@ -11588,7 +12051,7 @@ rm -f conftest* ;; toshiba) #(vi cat > conftest.$ac_ext < @@ -11606,7 +12069,7 @@ rm -f conftest* ;; v6d) #(vi cat > conftest.$ac_ext < @@ -11624,7 +12087,7 @@ rm -f conftest* ;; zeta) cat > conftest.$ac_ext < @@ -11657,7 +12120,7 @@ cf_ipv6lib=none cf_ipv6dir=none echo $ac_n "checking for IPv6 library if required""... $ac_c" 1>&6 -echo "configure:11661: checking for IPv6 library if required" >&5 +echo "configure:12124: checking for IPv6 library if required" >&5 case $cf_cv_ipv6type in #(vi solaris) #(vi ;; @@ -11691,7 +12154,7 @@ echo "$ac_t""$cf_ipv6lib" 1>&6 if test "$cf_ipv6lib" != "none"; then cat > conftest.$ac_ext < @@ -11702,14 +12165,17 @@ int main() { getaddrinfo(0, 0, 0, 0) ; return 0; } EOF -if { (eval echo configure:11706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + +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 @@ -11735,12 +12201,14 @@ test -d "$cf_header_path" && \ done fi -cf_search="" +# add the variations for the package we are looking for + +cf_search= test "/usr" != "$prefix" && \ test -d "/usr" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/usr" != "$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /usr" test -d /usr/include && cf_search="$cf_search /usr/include" test -d /usr/include/$cf_ipv6dir && cf_search="$cf_search /usr/include/$cf_ipv6dir" @@ -11764,7 +12232,7 @@ test -d "$prefix" && \ test "/usr/local" != "$prefix" && \ test -d "/usr/local" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/usr/local" != "$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /usr/local" test -d /usr/local/include && cf_search="$cf_search /usr/local/include" test -d /usr/local/include/$cf_ipv6dir && cf_search="$cf_search /usr/local/include/$cf_ipv6dir" @@ -11776,7 +12244,7 @@ test -d "/usr/local" && \ test "/opt" != "$prefix" && \ test -d "/opt" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/opt" != "$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /opt" test -d /opt/include && cf_search="$cf_search /opt/include" test -d /opt/include/$cf_ipv6dir && cf_search="$cf_search /opt/include/$cf_ipv6dir" @@ -11788,7 +12256,7 @@ test -d "/opt" && \ test "$HOME" != "$prefix" && \ test -d "$HOME" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "$HOME" != "$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under $HOME" test -d $HOME/include && cf_search="$cf_search $HOME/include" test -d $HOME/include/$cf_ipv6dir && cf_search="$cf_search $HOME/include/$cf_ipv6dir" @@ -11813,7 +12281,7 @@ test -d "$oldincludedir" && { test -d $oldincludedir/$cf_ipv6dir && cf_search="$cf_search $oldincludedir/$cf_ipv6dir" } -cf_search="$cf_header_path_list $cf_search" +cf_search="$cf_search $cf_header_path_list" for cf_incdir in $cf_search do @@ -11845,14 +12313,14 @@ if test -n "$cf_incdir" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:11856: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -11869,7 +12337,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me-configure}:11873: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:12341: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -11892,18 +12360,18 @@ fi done fi -rm -f conftest* +rm -rf conftest* eval 'cf_cv_have_lib_'$cf_ipv6lib'=no' cf_libdir="" echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6 -echo "configure:11902: checking for getaddrinfo" >&5 +echo "configure:12370: checking for getaddrinfo" >&5 if eval "test \"`echo '$''{'ac_cv_func_getaddrinfo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:12398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_func_getaddrinfo=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_func_getaddrinfo=no" fi -rm -f conftest* +rm -rf conftest* fi if eval "test \"`echo '$ac_cv_func_'getaddrinfo`\" = yes"; then @@ -11946,10 +12414,10 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for getaddrinfo in -l$cf_ipv6lib""... $ac_c" 1>&6 -echo "configure:11950: checking for getaddrinfo in -l$cf_ipv6lib" >&5 +echo "configure:12418: checking for getaddrinfo in -l$cf_ipv6lib" >&5 LIBS="-l$cf_ipv6lib $LIBS" cat > conftest.$ac_ext < @@ -11960,17 +12428,18 @@ int main() { getaddrinfo(0, 0, 0, 0) ; return 0; } EOF -if { (eval echo configure:11964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:12432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes' else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + echo "$ac_t""no" 1>&6 +cf_search= cf_library_path_list="" if test -n "${LDFLAGS}${LIBS}" ; then for cf_library_path in $LDFLAGS $LIBS @@ -11996,12 +12465,13 @@ test -d "$cf_library_path" && \ done fi -cf_search="" + +cf_search= test "/usr" != "$prefix" && \ test -d "/usr" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/usr" != "$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /usr" test -d /usr/lib && cf_search="$cf_search /usr/lib" test -d /usr/lib/$cf_ipv6dir && cf_search="$cf_search /usr/lib/$cf_ipv6dir" @@ -12025,7 +12495,7 @@ test -d "$prefix" && \ test "/usr/local" != "$prefix" && \ test -d "/usr/local" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/usr/local" != "$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /usr/local" test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib" test -d /usr/local/lib/$cf_ipv6dir && cf_search="$cf_search /usr/local/lib/$cf_ipv6dir" @@ -12037,7 +12507,7 @@ test -d "/usr/local" && \ test "/opt" != "$prefix" && \ test -d "/opt" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/opt" != "$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /opt" test -d /opt/lib && cf_search="$cf_search /opt/lib" test -d /opt/lib/$cf_ipv6dir && cf_search="$cf_search /opt/lib/$cf_ipv6dir" @@ -12049,7 +12519,7 @@ test -d "/opt" && \ test "$HOME" != "$prefix" && \ test -d "$HOME" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "$HOME" != "$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under $HOME" test -d $HOME/lib && cf_search="$cf_search $HOME/lib" test -d $HOME/lib/$cf_ipv6dir && cf_search="$cf_search $HOME/lib/$cf_ipv6dir" @@ -12065,10 +12535,10 @@ cf_search="$cf_library_path_list $cf_sea for cf_libdir in $cf_search do echo $ac_n "checking for -l$cf_ipv6lib in $cf_libdir""... $ac_c" 1>&6 -echo "configure:12069: checking for -l$cf_ipv6lib in $cf_libdir" >&5 +echo "configure:12539: checking for -l$cf_ipv6lib in $cf_libdir" >&5 LIBS="-L$cf_libdir -l$cf_ipv6lib $cf_save_LIBS" cat > conftest.$ac_ext < @@ -12079,23 +12549,23 @@ int main() { getaddrinfo(0, 0, 0, 0) ; return 0; } EOF -if { (eval echo configure:12083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:12553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes' break else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + echo "$ac_t""no" 1>&6 LIBS="$cf_save_LIBS" fi -rm -f conftest* +rm -rf conftest* done fi -rm -f conftest* +rm -rf conftest* fi @@ -12112,7 +12582,7 @@ fi echo $ac_n "checking working getaddrinfo""... $ac_c" 1>&6 -echo "configure:12116: checking working getaddrinfo" >&5 +echo "configure:12586: checking working getaddrinfo" >&5 if eval "test \"`echo '$''{'cf_cv_getaddrinfo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12121,7 +12591,7 @@ if test "$cross_compiling" = yes; then cf_cv_getaddrinfo=unknown else cat > conftest.$ac_ext < @@ -12191,16 +12661,16 @@ int main() if (aitop) freeaddrinfo(aitop); - ${cf_cv_main_return-return}(0); + ${cf_cv_main_return:-return}(0); bad: if (aitop) freeaddrinfo(aitop); - ${cf_cv_main_return-return}(1); + ${cf_cv_main_return:-return}(1); } EOF -if { (eval echo configure:12204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_getaddrinfo=yes else @@ -12244,12 +12714,12 @@ fi for ac_func in getaddrinfo getnameinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12248: checking for $ac_func" >&5 +echo "configure:12718: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:12746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_func_$ac_func=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_func_$ac_func=no" fi -rm -f conftest* +rm -rf conftest* fi if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then @@ -12301,7 +12771,7 @@ done ### checks for operator characteristics (should be the last option) echo $ac_n "checking whether to make a coffee while compiling""... $ac_c" 1>&6 -echo "configure:12305: checking whether to make a coffee while compiling" >&5 +echo "configure:12775: checking whether to make a coffee while compiling" >&5 # Check whether --with-coffee or --without-coffee was given. if test "${with_coffee+set}" = set; then @@ -12326,7 +12796,7 @@ fi ### checks for compiler characteristics echo $ac_n "checking for makeflags variable""... $ac_c" 1>&6 -echo "configure:12330: checking for makeflags variable" >&5 +echo "configure:12800: checking for makeflags variable" >&5 if eval "test \"`echo '$''{'cf_cv_makeflags'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12339,10 +12809,10 @@ SHELL = /bin/sh all : @ echo '.$cf_option' CF_EOF - cf_result=`${MAKE-make} -k -f cf_makeflags.tmp 2>/dev/null | sed -e 's,[ ]*$,,'` + cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[ ]*$,,'` case "$cf_result" in .*k) - cf_result=`${MAKE-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null` + cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null` case "$cf_result" in .*CC=*) cf_cv_makeflags= ;; @@ -12372,12 +12842,12 @@ ac_link='${CC-cc} -o conftest${ac_exeext cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:12376: checking for working const" >&5 +echo "configure:12846: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -12447,21 +12917,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:12451: checking for inline" >&5 +echo "configure:12921: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12935: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -12488,13 +12958,13 @@ esac echo $ac_n "checking for ansi token expansion/substitution""... $ac_c" 1>&6 -echo "configure:12492: checking for ansi token expansion/substitution" >&5 +echo "configure:12962: checking for ansi token expansion/substitution" >&5 if eval "test \"`echo '$''{'cf_cv_cpp_expands'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12976: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_cpp_expands=yes else @@ -12523,13 +12993,13 @@ EOF echo $ac_n "checking for ansi token concatenation""... $ac_c" 1>&6 -echo "configure:12527: checking for ansi token concatenation" >&5 +echo "configure:12997: checking for ansi token concatenation" >&5 if eval "test \"`echo '$''{'cf_cv_cpp_concats'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_cpp_concats=yes else @@ -12558,20 +13028,20 @@ EOF echo $ac_n "checking if nested parameters work""... $ac_c" 1>&6 -echo "configure:12562: checking if nested parameters work" >&5 +echo "configure:13032: checking if nested parameters work" >&5 if eval "test \"`echo '$''{'cf_cv_nested_params'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13045: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_nested_params=yes else @@ -12594,12 +13064,12 @@ EOF ### Checks for header files. echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:12598: checking for ANSI C header files" >&5 +echo "configure:13068: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -12607,7 +13077,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12611: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13081: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12624,7 +13094,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -12642,7 +13112,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -12663,7 +13133,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -12674,7 +13144,7 @@ if (XOR (islower (i), ISLOWER (i)) || to exit (0); } EOF -if { (eval echo configure:12678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -12702,12 +13172,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/di do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:12706: checking for $ac_hdr that defines DIR" >&5 +echo "configure:13176: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -12715,7 +13185,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:12719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -12740,7 +13210,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:12744: checking for opendir in -ldir" >&5 +echo "configure:13214: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12748,7 +13218,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:13233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi @@ -12781,7 +13251,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:12785: checking for opendir in -lx" >&5 +echo "configure:13255: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12789,7 +13259,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:13274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi @@ -12823,12 +13293,12 @@ fi fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:12827: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:13297: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -12837,7 +13307,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:12841: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -12858,12 +13328,12 @@ EOF fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:12862: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:13332: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -12879,7 +13349,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:12883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -12908,6 +13378,7 @@ for cf_hdr in \ fcntl.h \ getopt.h \ ioctl.h \ + inttypes.h \ langinfo.h \ libc.h \ locale.h \ @@ -12927,6 +13398,7 @@ for cf_hdr in \ stdarg.h \ stdbool.h \ stddef.h \ + stdint.h \ stdlib.h \ string.h \ strings.h \ @@ -12958,9 +13430,9 @@ for cf_hdr in \ do echo $ac_n "checking for $cf_hdr""... $ac_c" 1>&6 -echo "configure:12962: checking for $cf_hdr" >&5 +echo "configure:13434: checking for $cf_hdr" >&5 cat > conftest.$ac_ext < @@ -12968,7 +13440,7 @@ echo "configure:12962: checking for $cf_ EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12972: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13444: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12996,6 +13468,8 @@ done ### Checks that depend on existence-checks for headers + + for ac_hdr in \ termio.h \ termios.h \ @@ -13004,17 +13478,17 @@ unistd.h \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:13008: checking for $ac_hdr" >&5 +echo "configure:13482: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13018: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13492: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13040,22 +13514,23 @@ else fi done + if test "$ISC" = yes ; then for ac_hdr in sys/termio.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:13049: checking for $ac_hdr" >&5 +echo "configure:13524: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13059: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13534: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13090,16 +13565,16 @@ if test "$ac_cv_header_termios_h" = yes esac if test "$termios_bad" = maybe ; then echo $ac_n "checking whether termios.h needs _POSIX_SOURCE""... $ac_c" 1>&6 -echo "configure:13094: checking whether termios.h needs _POSIX_SOURCE" >&5 +echo "configure:13569: checking whether termios.h needs _POSIX_SOURCE" >&5 cat > conftest.$ac_ext < int main() { struct termios foo; int x = foo.c_iflag ; return 0; } EOF -if { (eval echo configure:13103: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13578: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* termios_bad=no else @@ -13108,7 +13583,7 @@ else rm -rf conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13596: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* termios_bad=unknown else @@ -13125,7 +13600,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* termios_bad=yes cat >> confdefs.h <<\EOF -#define SVR4_TERMIO 1 +#define _POSIX_SOURCE 1 EOF fi @@ -13140,7 +13615,7 @@ fi echo $ac_n "checking declaration of size-change""... $ac_c" 1>&6 -echo "configure:13144: checking declaration of size-change" >&5 +echo "configure:13619: checking declaration of size-change" >&5 if eval "test \"`echo '$''{'cf_cv_sizechange'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13154,7 +13629,7 @@ do CPPFLAGS="$cf_save_CPPFLAGS" test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" cat > conftest.$ac_ext < #ifdef HAVE_TERMIOS_H @@ -13193,7 +13668,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:13197: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sizechange=yes else @@ -13232,7 +13707,7 @@ fi echo $ac_n "checking if sys/time.h conflicts with sys/select.h""... $ac_c" 1>&6 -echo "configure:13236: checking if sys/time.h conflicts with sys/select.h" >&5 +echo "configure:13711: checking if sys/time.h conflicts with sys/select.h" >&5 if eval "test \"`echo '$''{'cf_cv_sys_select_timeval'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13240,7 +13715,7 @@ else for cf_opts in no yes do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13747: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sys_select_timeval=$cf_opts break @@ -13292,12 +13767,12 @@ EOF ### Checks for Datatypes. echo $ac_n "checking for gid_t""... $ac_c" 1>&6 -echo "configure:13296: checking for gid_t" >&5 +echo "configure:13771: checking for gid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_gid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -13325,12 +13800,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:13329: checking for mode_t" >&5 +echo "configure:13804: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -13358,12 +13833,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:13362: checking for off_t" >&5 +echo "configure:13837: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -13391,12 +13866,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:13395: checking for pid_t" >&5 +echo "configure:13870: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -13424,12 +13899,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:13428: checking for size_t" >&5 +echo "configure:13903: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -13457,12 +13932,12 @@ EOF fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:13461: checking for ssize_t" >&5 +echo "configure:13936: checking for ssize_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -13490,12 +13965,12 @@ EOF fi echo $ac_n "checking for time_t""... $ac_c" 1>&6 -echo "configure:13494: checking for time_t" >&5 +echo "configure:13969: checking for time_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_time_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -13523,7 +13998,7 @@ EOF fi cat > conftest.$ac_ext < EOF @@ -13534,7 +14009,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < EOF @@ -13545,12 +14020,12 @@ else rm -rf conftest* echo $ac_n "checking for in_addr_t""... $ac_c" 1>&6 -echo "configure:13549: checking for in_addr_t" >&5 +echo "configure:14024: checking for in_addr_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_in_addr_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -13586,12 +14061,12 @@ fi rm -f conftest* echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:13590: checking for uid_t in sys/types.h" >&5 +echo "configure:14065: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -13621,9 +14096,9 @@ fi echo $ac_n "checking for quad_t""... $ac_c" 1>&6 -echo "configure:13625: checking for quad_t" >&5 +echo "configure:14100: checking for quad_t" >&5 cat > conftest.$ac_ext < @@ -13636,7 +14111,7 @@ int main() { quad_t x; x = 0 ; return 0; } EOF -if { (eval echo configure:13640: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_quad_t=yes else @@ -13655,9 +14130,9 @@ EOF fi echo $ac_n "checking for long long""... $ac_c" 1>&6 -echo "configure:13659: checking for long long" >&5 +echo "configure:14134: checking for long long" >&5 cat > conftest.$ac_ext < @@ -13666,7 +14141,7 @@ int main() { long long x; x = 0 ; return 0; } EOF -if { (eval echo configure:13670: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14145: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_long_long=yes else @@ -13685,9 +14160,9 @@ EOF fi echo $ac_n "checking for nl_item""... $ac_c" 1>&6 -echo "configure:13689: checking for nl_item" >&5 +echo "configure:14164: checking for nl_item" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14181: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_nl_item=yes else @@ -13724,7 +14199,7 @@ fi # libuu/uudeview # only define HAVE_LIBUU and HAVE_UUDEVIEW_H if both are found echo $ac_n "checking for UUInitialize in -luu""... $ac_c" 1>&6 -echo "configure:13728: checking for UUInitialize in -luu" >&5 +echo "configure:14203: checking for UUInitialize in -luu" >&5 ac_lib_var=`echo uu'_'UUInitialize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13732,7 +14207,7 @@ else ac_save_LIBS="$LIBS" LIBS="-luu $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:14222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi @@ -13760,17 +14235,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l echo "$ac_t""yes" 1>&6 ac_safe=`echo "uudeview.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for uudeview.h""... $ac_c" 1>&6 -echo "configure:13764: checking for uudeview.h" >&5 +echo "configure:14239: checking for uudeview.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13774: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14249: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13808,7 +14283,7 @@ fi # libidn - Internationalized Domain Names echo $ac_n "checking for stringprep_check_version in -lidn""... $ac_c" 1>&6 -echo "configure:13812: checking for stringprep_check_version in -lidn" >&5 +echo "configure:14287: checking for stringprep_check_version in -lidn" >&5 ac_lib_var=`echo idn'_'stringprep_check_version | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13816,7 +14291,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lidn $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:14306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi @@ -13844,17 +14319,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l echo "$ac_t""yes" 1>&6 ac_safe=`echo "stringprep.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for stringprep.h""... $ac_c" 1>&6 -echo "configure:13848: checking for stringprep.h" >&5 +echo "configure:14323: checking for stringprep.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13858: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13877,17 +14352,17 @@ EOF ac_safe=`echo "idna.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for idna.h""... $ac_c" 1>&6 -echo "configure:13881: checking for idna.h" >&5 +echo "configure:14356: checking for idna.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13891: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14366: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13909,7 +14384,7 @@ if eval "test \"`echo '$ac_cv_header_'$a EOF echo $ac_n "checking for idna_to_unicode_lzlz in -lidn""... $ac_c" 1>&6 -echo "configure:13913: checking for idna_to_unicode_lzlz in -lidn" >&5 +echo "configure:14388: checking for idna_to_unicode_lzlz in -lidn" >&5 ac_lib_var=`echo idn'_'idna_to_unicode_lzlz | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13917,7 +14392,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lidn $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:14407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi @@ -13949,9 +14424,9 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l EOF echo $ac_n "checking for IDNA_USE_STD3_ASCII_RULES""... $ac_c" 1>&6 -echo "configure:13953: checking for IDNA_USE_STD3_ASCII_RULES" >&5 +echo "configure:14428: checking for IDNA_USE_STD3_ASCII_RULES" >&5 cat > conftest.$ac_ext < EOF @@ -14000,17 +14475,17 @@ fi # ICU - International Components for Unicode ac_safe=`echo "unicode/unorm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for unicode/unorm.h""... $ac_c" 1>&6 -echo "configure:14004: checking for unicode/unorm.h" >&5 +echo "configure:14479: checking for unicode/unorm.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14014: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14489: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -14029,17 +14504,17 @@ if eval "test \"`echo '$ac_cv_header_'$a ac_safe=`echo "unicode/ustring.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for unicode/ustring.h""... $ac_c" 1>&6 -echo "configure:14033: checking for unicode/ustring.h" >&5 +echo "configure:14508: checking for unicode/ustring.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14043: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14518: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -14065,12 +14540,12 @@ EOF EOF echo $ac_n "checking for unorm_normalize in libicuuc""... $ac_c" 1>&6 -echo "configure:14069: checking for unorm_normalize in libicuuc" >&5 +echo "configure:14544: checking for unorm_normalize in libicuuc" >&5 cf_save_LIBS="$LIBS" cf_try_icuuc="no" LIBS="$LIBS -licuuc" cat > conftest.$ac_ext < int main() { @@ -14080,8 +14555,8 @@ int main() { needed = unorm_normalize(ustr, -1, UNORM_DEFAULT, 0, NULL, 0, &status); ; return 0; } EOF -if { (eval echo configure:14084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:14559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + cat >> confdefs.h <<\EOF #define HAVE_LIBICUUC 1 @@ -14091,25 +14566,25 @@ EOF else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + LIBS=$cf_save_LIBS fi -rm -f conftest* +rm -rf conftest* echo "$ac_t""$cf_try_icuuc" 1>&6 ac_safe=`echo "unicode/ubidi.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for unicode/ubidi.h""... $ac_c" 1>&6 -echo "configure:14103: checking for unicode/ubidi.h" >&5 +echo "configure:14578: checking for unicode/ubidi.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14113: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14588: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -14156,43 +14631,43 @@ else cf_cv_termlib=none cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:14642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:14652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + cf_cv_termlib=terminfo else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + cf_cv_termlib=termcap fi -rm -f conftest* +rm -rf conftest* test -n "$verbose" && echo " using functions in predefined $cf_cv_termlib LIBS" 1>&6 -echo "${as_me-configure}:14189: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5 +echo "${as_me:-configure}:14664: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5 else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + if test "$cf_cv_termlib" = none; then @@ -14205,25 +14680,25 @@ if test "$cf_cv_termlib" = none; then for cf_func in tigetstr tgetstr do echo $ac_n "checking for $cf_func in -l$cf_lib""... $ac_c" 1>&6 -echo "configure:14209: checking for $cf_func in -l$cf_lib" >&5 +echo "configure:14684: checking for $cf_func in -l$cf_lib" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:14693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + cf_result=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + cf_result=no fi -rm -f conftest* +rm -rf conftest* echo "$ac_t""$cf_result" 1>&6 if test "$cf_result" = yes ; then if test "$cf_func" = tigetstr ; then @@ -14241,7 +14716,7 @@ fi if test "$cf_cv_termlib" = none; then # allow curses library for broken AIX system. echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6 -echo "configure:14245: checking for initscr in -lcurses" >&5 +echo "configure:14720: checking for initscr in -lcurses" >&5 ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14249,7 +14724,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:14739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIBS="$LIBS -lcurses" cf_cv_termlib=termcap + LIBS="-lcurses $LIBS" else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:14285: checking for tgoto in -ltermcap" >&5 +echo "configure:14760: checking for tgoto in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14289,7 +14764,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:14779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIBS="$LIBS -ltermcap" cf_cv_termlib=termcap + LIBS="-ltermcap $LIBS" cf_cv_termlib=termcap else echo "$ac_t""no" 1>&6 fi @@ -14323,7 +14798,7 @@ fi fi fi -rm -f conftest* +rm -rf conftest* if test "$cf_cv_termlib" = none; then echo "configure: warning: Cannot find -ltermlib, -lcurses, or -ltermcap" 1>&2 fi @@ -14333,11 +14808,11 @@ fi # terminfo-based termcap interfaces may be prototyped in , # which may/may not be compatible with echo $ac_n "checking if we should include termcap.h""... $ac_c" 1>&6 -echo "configure:14337: checking if we should include termcap.h" >&5 +echo "configure:14812: checking if we should include termcap.h" >&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -I$srcdir/include" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_result=yes else @@ -14367,8 +14842,9 @@ rm -f conftest* EOF + echo $ac_n "checking for term.h""... $ac_c" 1>&6 -echo "configure:14372: checking for term.h" >&5 +echo "configure:14848: checking for term.h" >&5 if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14376,21 +14852,29 @@ else # If we found , look for , but always look # for if we do not find the variant. -for cf_header in \ - `echo ${cf_cv_ncurses_header-curses.h} | sed -e 's%/.*%/%'`term.h \ - term.h + +cf_header_list="term.h ncurses/term.h ncursesw/term.h" + +case ${cf_cv_ncurses_header:-curses.h} in #(vi +*/*) + 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 < +#include <${cf_cv_ncurses_header:-curses.h}> #include <${cf_header}> int main() { WINDOW *x ; return 0; } EOF -if { (eval echo configure:14394: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_term_header=$cf_header break @@ -14403,6 +14887,41 @@ fi rm -f conftest* done +case $cf_cv_term_header in #(vi +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 < +#ifdef NCURSES_VERSION +#include <${cf_header}> +#else +make an error +#endif +int main() { +WINDOW *x +; return 0; } +EOF +if { (eval echo configure:14911: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + cf_cv_term_header=$cf_header + break +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + cf_cv_term_header=no +fi +rm -f conftest* + done + ;; +esac + fi echo "$ac_t""$cf_cv_term_header" 1>&6 @@ -14414,7 +14933,7 @@ term.h) #(vi EOF ;; -ncurses/term.h) +ncurses/term.h) #(vi cat >> confdefs.h <<\EOF #define HAVE_NCURSES_TERM_H 1 EOF @@ -14431,7 +14950,7 @@ esac echo $ac_n "checking if we should include curses.h or termcap.h""... $ac_c" 1>&6 -echo "configure:14435: checking if we should include curses.h or termcap.h" >&5 +echo "configure:14954: checking if we should include curses.h or termcap.h" >&5 if eval "test \"`echo '$''{'cf_cv_need_curses_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14449,7 +14968,7 @@ do test -n "$cf_t_opts" && CPPFLAGS="$CPPFLAGS -D$cf_t_opts" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:14980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + test "$cf_cv_need_curses_h" = no && { cf_cv_need_curses_h=maybe cf_ok_c_opts=$cf_c_opts @@ -14467,10 +14986,10 @@ if { (eval echo configure:14461: \"$ac_l else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + echo "Recompiling with corrected call (C:$cf_c_opts, T:$cf_t_opts)" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:15001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + cf_cv_need_curses_h=yes cf_ok_c_opts=$cf_c_opts cf_ok_t_opts=$cf_t_opts @@ -14487,9 +15006,9 @@ else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 fi -rm -f conftest* +rm -rf conftest* fi -rm -f conftest* +rm -rf conftest* CPPFLAGS="$cf_save_CPPFLAGS" test "$cf_cv_need_curses_h" = yes && break @@ -14554,7 +15073,7 @@ esac echo $ac_n "checking declaration of tputs 3rd param""... $ac_c" 1>&6 -echo "configure:14558: checking declaration of tputs 3rd param" >&5 +echo "configure:15077: checking declaration of tputs 3rd param" >&5 if eval "test \"`echo '$''{'cf_cv_type_outchar'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14570,10 +15089,10 @@ for Q in int void; do for R in int char; do for S in "" const; do -echo "${as_me-configure}:14574: testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5 +echo "${as_me:-configure}:15093: testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15105: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_type_outchar="$Q OutChar($R)" cf_cv_found=yes @@ -14637,15 +15156,15 @@ EOF elif test ".$cf_cv_termlib" = .termcap ; then # BSD 'tputs()' may need 'PC' to be set. cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:15167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + cat >> confdefs.h <<\EOF #define HAVE_EXTERN_TCAP_PC 1 EOF @@ -14654,7 +15173,7 @@ else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 fi -rm -f conftest* +rm -rf conftest* cf_tc_funcs="tgetint tgetnum tparam tparm" cf_tc_externs="$cf_tc_funcs tgoto tgetstr tputs tgetent tgetflag" fi @@ -14663,13 +15182,13 @@ fi echo $ac_n "checking if external errno is declared""... $ac_c" 1>&6 -echo "configure:14667: checking if external errno is declared" >&5 +echo "configure:15186: checking if external errno is declared" >&5 if eval "test \"`echo '$''{'cf_cv_dcl_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15205: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_dcl_errno=yes else @@ -14710,13 +15229,13 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist echo $ac_n "checking if external errno exists""... $ac_c" 1>&6 -echo "configure:14714: checking if external errno exists" >&5 +echo "configure:15233: checking if external errno exists" >&5 if eval "test \"`echo '$''{'cf_cv_have_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:15249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + cf_cv_have_errno=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + cf_cv_have_errno=no fi -rm -f conftest* +rm -rf conftest* fi @@ -14758,12 +15277,12 @@ fi for ac_func in strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:14762: checking for $ac_func" >&5 +echo "configure:15281: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:15309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_func_$ac_func=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_func_$ac_func=no" fi -rm -f conftest* +rm -rf conftest* fi if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then @@ -14813,13 +15332,13 @@ else echo $ac_n "checking if external sys_nerr is declared""... $ac_c" 1>&6 -echo "configure:14817: checking if external sys_nerr is declared" >&5 +echo "configure:15336: checking if external sys_nerr is declared" >&5 if eval "test \"`echo '$''{'cf_cv_dcl_sys_nerr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15355: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_dcl_sys_nerr=yes else @@ -14860,13 +15379,13 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist echo $ac_n "checking if external sys_nerr exists""... $ac_c" 1>&6 -echo "configure:14864: checking if external sys_nerr exists" >&5 +echo "configure:15383: checking if external sys_nerr exists" >&5 if eval "test \"`echo '$''{'cf_cv_have_sys_nerr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:15399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + cf_cv_have_sys_nerr=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + cf_cv_have_sys_nerr=no fi -rm -f conftest* +rm -rf conftest* fi @@ -14905,13 +15424,13 @@ fi echo $ac_n "checking if external sys_errlist is declared""... $ac_c" 1>&6 -echo "configure:14909: checking if external sys_errlist is declared" >&5 +echo "configure:15428: checking if external sys_errlist is declared" >&5 if eval "test \"`echo '$''{'cf_cv_dcl_sys_errlist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_dcl_sys_errlist=yes else @@ -14952,13 +15471,13 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist echo $ac_n "checking if external sys_errlist exists""... $ac_c" 1>&6 -echo "configure:14956: checking if external sys_errlist exists" >&5 +echo "configure:15475: checking if external sys_errlist exists" >&5 if eval "test \"`echo '$''{'cf_cv_have_sys_errlist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:15491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + cf_cv_have_sys_errlist=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + cf_cv_have_sys_errlist=no fi -rm -f conftest* +rm -rf conftest* fi @@ -15015,6 +15534,7 @@ for ac_func in \ fork \ ftime \ ftruncate \ + fsync \ getcwd \ gettimeofday \ getwd \ @@ -15048,6 +15568,7 @@ for ac_func in \ strdup \ strftime \ strpbrk \ + strrchr \ strrstr \ strsep \ strstr \ @@ -15064,12 +15585,12 @@ for ac_func in \ $cf_tc_funcs do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15068: checking for $ac_func" >&5 +echo "configure:15589: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:15617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_func_$ac_func=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_func_$ac_func=no" fi -rm -f conftest* +rm -rf conftest* fi if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then @@ -15118,12 +15639,12 @@ done echo $ac_n "checking for flock""... $ac_c" 1>&6 -echo "configure:15122: checking for flock" >&5 +echo "configure:15643: checking for flock" >&5 if eval "test \"`echo '$''{'ac_cv_func_flock'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:15671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_func_flock=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_func_flock=no" fi -rm -f conftest* +rm -rf conftest* fi if eval "test \"`echo '$ac_cv_func_'flock`\" = yes"; then @@ -15168,7 +15689,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for flock in -lbsd""... $ac_c" 1>&6 -echo "configure:15172: checking for flock in -lbsd" >&5 +echo "configure:15693: checking for flock in -lbsd" >&5 ac_lib_var=`echo bsd'_'flock | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15176,7 +15697,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:15712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi @@ -15216,12 +15737,12 @@ fi echo $ac_n "checking for wide char and multibyte support""... $ac_c" 1>&6 -echo "configure:15220: checking for wide char and multibyte support" >&5 +echo "configure:15741: checking for wide char and multibyte support" >&5 if eval "test \"`echo '$''{'am_cv_multibyte_able'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifdef HAVE_STDLIB_H @@ -15275,17 +15796,17 @@ const char icb[5] = {0xa4, 0xa4, 0xa4, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:15279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:15800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + am_cv_multibyte_able=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + cf_save_LIBS="$LIBS" LIBS="-lutf8 $LIBS" cat > conftest.$ac_ext < int main() { @@ -15329,20 +15850,20 @@ const char icb[5] = {0xa4, 0xa4, 0xa4, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:15333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:15854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + am_cv_multibyte_able=libutf8 else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + am_cv_multibyte_able=no fi -rm -f conftest* +rm -rf conftest* LIBS="$cf_save_LIBS" fi -rm -f conftest* +rm -rf conftest* fi @@ -15363,9 +15884,9 @@ EOF echo $ac_n "checking if gettimeofday takes two arguments""... $ac_c" 1>&6 -echo "configure:15367: checking if gettimeofday takes two arguments" >&5 +echo "configure:15888: checking if gettimeofday takes two arguments" >&5 cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_func_gettimeofday_2args=yes else @@ -15396,12 +15917,12 @@ EOF fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:15400: checking return type of signal handlers" >&5 +echo "configure:15921: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -15418,7 +15939,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:15422: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15943: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -15438,7 +15959,7 @@ EOF echo $ac_n "checking declaration of signal arguments""... $ac_c" 1>&6 -echo "configure:15442: checking declaration of signal arguments" >&5 +echo "configure:15963: checking declaration of signal arguments" >&5 if eval "test \"`echo '$''{'cf_cv_sig_args'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15447,7 +15968,7 @@ cf_cv_sig_args= for cf_test in "int sig" "int sig, ..." do cat > conftest.$ac_ext < @@ -15455,7 +15976,7 @@ int main() { extern RETSIGTYPE catch($cf_test); signal(SIGINT, catch) ; return 0; } EOF -if { (eval echo configure:15459: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sig_args="$cf_test";break else @@ -15481,13 +16002,13 @@ EOF if test "$ac_cv_func_sigaction" = yes; then echo $ac_n "checking whether sigaction needs _POSIX_SOURCE""... $ac_c" 1>&6 -echo "configure:15485: checking whether sigaction needs _POSIX_SOURCE" >&5 +echo "configure:16006: checking whether sigaction needs _POSIX_SOURCE" >&5 if eval "test \"`echo '$''{'cf_cv_sigact_bad'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -15496,7 +16017,7 @@ int main() { struct sigaction act ; return 0; } EOF -if { (eval echo configure:15500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16021: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sigact_bad=no else @@ -15517,13 +16038,13 @@ EOF echo $ac_n "checking if we have sigaction/related functions""... $ac_c" 1>&6 -echo "configure:15521: checking if we have sigaction/related functions" >&5 +echo "configure:16042: checking if we have sigaction/related functions" >&5 if eval "test \"`echo '$''{'cf_cv_sigaction_funcs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:16066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + cf_cv_sigaction_funcs=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + cf_cv_sigaction_funcs=no fi -rm -f conftest* +rm -rf conftest* fi echo "$ac_t""$cf_cv_sigaction_funcs" 1>&6 @@ -15563,7 +16084,7 @@ EOF fi echo $ac_n "checking for fork""... $ac_c" 1>&6 -echo "configure:15567: checking for fork" >&5 +echo "configure:16088: checking for fork" >&5 if eval "test \"`echo '$''{'cf_cv_func_fork'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15572,17 +16093,17 @@ if test "$cross_compiling" = yes; then cf_cv_func_fork=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:16107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_func_fork=yes else @@ -15604,12 +16125,12 @@ EOF echo $ac_n "checking for memmove""... $ac_c" 1>&6 -echo "configure:15608: checking for memmove" >&5 +echo "configure:16129: checking for memmove" >&5 if eval "test \"`echo '$''{'ac_cv_func_memmove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:16157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_func_memmove=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_func_memmove=no" fi -rm -f conftest* +rm -rf conftest* fi if eval "test \"`echo '$ac_cv_func_'memmove`\" = yes"; then @@ -15651,12 +16172,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for bcopy""... $ac_c" 1>&6 -echo "configure:15655: checking for bcopy" >&5 +echo "configure:16176: checking for bcopy" >&5 if eval "test \"`echo '$''{'ac_cv_func_bcopy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:16204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_func_bcopy=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_func_bcopy=no" fi -rm -f conftest* +rm -rf conftest* fi if eval "test \"`echo '$ac_cv_func_'bcopy`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking if bcopy does overlapping moves""... $ac_c" 1>&6 -echo "configure:15699: checking if bcopy does overlapping moves" >&5 +echo "configure:16220: checking if bcopy does overlapping moves" >&5 if eval "test \"`echo '$''{'cf_cv_good_bcopy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15704,7 +16225,7 @@ else cf_cv_good_bcopy=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:16242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_good_bcopy=yes else @@ -15755,9 +16276,9 @@ fi echo $ac_n "checking if select expects int * arguments""... $ac_c" 1>&6 -echo "configure:15759: checking if select expects int * arguments" >&5 +echo "configure:16280: checking if select expects int * arguments" >&5 cat > conftest.$ac_ext < EOF @@ -15777,7 +16298,7 @@ rm -f conftest* echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&6 -echo "configure:15781: checking whether closedir returns void" >&5 +echo "configure:16302: checking whether closedir returns void" >&5 if eval "test \"`echo '$''{'ac_cv_func_closedir_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15785,13 +16306,13 @@ else ac_cv_func_closedir_void=yes else cat > conftest.$ac_ext < #include <$ac_header_dirent> int closedir(); main() { exit(closedir(opendir(".")) != 0); } EOF -if { (eval echo configure:15795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:16316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_closedir_void=no else @@ -15817,7 +16338,7 @@ fi # autoconf 2.5x assumes setvbuf is not reversed when cross-compiling if test "$cross_compiling" != yes ; then echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6 -echo "configure:15821: checking whether setvbuf arguments are reversed" >&5 +echo "configure:16342: checking whether setvbuf arguments are reversed" >&5 if eval "test \"`echo '$''{'ac_cv_func_setvbuf_reversed'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15825,7 +16346,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < /* If setvbuf has the reversed format, exit 0. */ @@ -15839,7 +16360,7 @@ main () { exit(0); /* Non-reversed systems segv here. */ } EOF -if { (eval echo configure:15843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:16364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_setvbuf_reversed=yes else @@ -15877,12 +16398,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15881: checking for $ac_func" >&5 +echo "configure:16402: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:16430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_func_$ac_func=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_func_$ac_func=no" fi -rm -f conftest* +rm -rf conftest* fi if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then @@ -15932,13 +16453,13 @@ done echo $ac_n "checking for type sigaction_t""... $ac_c" 1>&6 -echo "configure:15936: checking for type sigaction_t" >&5 +echo "configure:16457: checking for type sigaction_t" >&5 if eval "test \"`echo '$''{'cf_cv_type_sigaction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -15946,7 +16467,7 @@ int main() { sigaction_t x ; return 0; } EOF -if { (eval echo configure:15950: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16471: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_type_sigaction=yes else @@ -15966,13 +16487,13 @@ EOF echo $ac_n "checking for nonconflicting termios.h""... $ac_c" 1>&6 -echo "configure:15970: checking for nonconflicting termios.h" >&5 +echo "configure:16491: checking for nonconflicting termios.h" >&5 if eval "test \"`echo '$''{'cf_cv_use_termios_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:16519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + cf_cv_use_termios_h=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + cf_cv_use_termios_h=no fi -rm -f conftest* +rm -rf conftest* fi @@ -16025,13 +16546,13 @@ fi echo $ac_n "checking for passwd.pw_gecos""... $ac_c" 1>&6 -echo "configure:16029: checking for passwd.pw_gecos" >&5 +echo "configure:16550: checking for passwd.pw_gecos" >&5 if eval "test \"`echo '$''{'cf_cv_pw_gecos'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -16042,7 +16563,7 @@ int main() { char bar = foo.pw_gecos ; return 0; } EOF -if { (eval echo configure:16046: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_pw_gecos=yes else @@ -16062,13 +16583,13 @@ EOF echo $ac_n "checking for tm.tm_gmtoff""... $ac_c" 1>&6 -echo "configure:16066: checking for tm.tm_gmtoff" >&5 +echo "configure:16587: checking for tm.tm_gmtoff" >&5 if eval "test \"`echo '$''{'cf_cv_tm_gmtoff'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16613: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_tm_gmtoff=yes else @@ -16108,7 +16629,7 @@ EOF echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:16112: checking for long file names" >&5 +echo "configure:16633: checking for long file names" >&5 if eval "test \"`echo '$''{'ac_cv_sys_long_file_names'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16156,17 +16677,17 @@ for ac_hdr in sys/wait.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:16160: checking for $ac_hdr" >&5 +echo "configure:16681: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:16170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:16691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -16203,17 +16724,17 @@ for ac_hdr in wait.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:16207: checking for $ac_hdr" >&5 +echo "configure:16728: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:16217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:16738: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -16243,17 +16764,17 @@ for ac_hdr in waitstatus.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:16247: checking for $ac_hdr" >&5 +echo "configure:16768: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:16257: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:16778: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -16294,13 +16815,13 @@ fi echo $ac_n "checking for union wait""... $ac_c" 1>&6 -echo "configure:16298: checking for union wait" >&5 +echo "configure:16819: checking for union wait" >&5 if eval "test \"`echo '$''{'cf_cv_type_unionwait'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:16836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + cf_cv_type_unionwait=no echo compiles ok w/o union wait 1>&5 else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:16862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + cf_cv_type_unionwait=yes echo compiles ok with union wait and possibly macros too 1>&5 else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + cf_cv_type_unionwait=no fi -rm -f conftest* +rm -rf conftest* fi -rm -f conftest* +rm -rf conftest* fi echo "$ac_t""$cf_cv_type_unionwait" 1>&6 @@ -16362,7 +16883,7 @@ EOF echo $ac_n "checking if the system function returns usable child-status""... $ac_c" 1>&6 -echo "configure:16366: checking if the system function returns usable child-status" >&5 +echo "configure:16887: checking if the system function returns usable child-status" >&5 if eval "test \"`echo '$''{'cf_cv_system_status'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16371,7 +16892,7 @@ else cf_cv_system_status=unknown else cat > conftest.$ac_ext < @@ -16390,7 +16911,7 @@ RETSIGTYPE signal_handler (int sig) int system_status; wait (&wait_status); system_status = WEXITSTATUS(wait_status); /* should be nonzero */ - ${cf_cv_main_return-return}(system_status != 23); + ${cf_cv_main_return:-return}(system_status != 23); } int main() @@ -16400,11 +16921,11 @@ int main() */ signal (SIGCHLD, signal_handler); system("exit 23"); - ${cf_cv_main_return-return}(1); + ${cf_cv_main_return:-return}(1); } EOF -if { (eval echo configure:16408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:16929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_system_status=no else @@ -16415,11 +16936,11 @@ else cf_cv_system_status=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:16944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_system_status=yes else @@ -16462,16 +16983,16 @@ EOF if test "$cf_cv_ncurses_version" != no ; then echo $ac_n "checking for obsolete/broken version of ncurses""... $ac_c" 1>&6 -echo "configure:16466: checking for obsolete/broken version of ncurses" >&5 +echo "configure:16987: checking for obsolete/broken version of ncurses" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#include <${cf_cv_ncurses_header:-curses.h}> int main() { #if defined(NCURSES_VERSION) && defined(wgetbkgd) @@ -16482,7 +17003,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17007: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_broken=no else @@ -16507,16 +17028,16 @@ fi echo $ac_n "checking if curses supports color attributes""... $ac_c" 1>&6 -echo "configure:16511: checking if curses supports color attributes" >&5 +echo "configure:17032: checking if curses supports color attributes" >&5 if eval "test \"`echo '$''{'cf_cv_color_curses'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#include <${cf_cv_ncurses_header:-curses.h}> int main() { chtype x = COLOR_BLUE; @@ -16528,16 +17049,16 @@ chtype x = COLOR_BLUE; ; return 0; } EOF -if { (eval echo configure:16532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:17053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + cf_cv_color_curses=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + cf_cv_color_curses=no fi -rm -f conftest* +rm -rf conftest* fi @@ -16579,7 +17100,7 @@ if test $check_sig_const = yes ; then echo $ac_n "checking for redefinable signal constants""... $ac_c" 1>&6 -echo "configure:16583: checking for redefinable signal constants" >&5 +echo "configure:17104: checking for redefinable signal constants" >&5 if eval "test \"`echo '$''{'cf_cv_sig_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16591,7 +17112,7 @@ if test -n "$cf_cv_sig_args"; then cf_cv_sig_const=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:17143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_sig_const=yes else @@ -16644,13 +17165,13 @@ fi echo $ac_n "checking for ANSI qsort""... $ac_c" 1>&6 -echo "configure:16648: checking for ANSI qsort" >&5 +echo "configure:17169: checking for ANSI qsort" >&5 if eval "test \"`echo '$''{'cf_cv_comptype'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17187: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_comptype=yes else @@ -16690,7 +17211,7 @@ fi echo $ac_n "checking if application can dump core""... $ac_c" 1>&6 -echo "configure:16694: checking if application can dump core" >&5 +echo "configure:17215: checking if application can dump core" >&5 if eval "test \"`echo '$''{'cf_cv_corefile'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16699,7 +17220,7 @@ else cf_cv_corefile=unknown else cat > conftest.$ac_ext < @@ -16719,13 +17240,13 @@ int main() /* 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); + ${cf_cv_main_return:-return}(1); #else int pid, status; if (found()) unlink("core"); if (found()) - ${cf_cv_main_return-return}(1); + ${cf_cv_main_return:-return}(1); if ((pid = fork()) != 0) { while (wait(&status) <= 0) ; @@ -16734,13 +17255,13 @@ int main() } if (found()) { unlink("core"); - ${cf_cv_main_return-return}(0); + ${cf_cv_main_return:-return}(0); } - ${cf_cv_main_return-return}(1); + ${cf_cv_main_return:-return}(1); #endif } EOF -if { (eval echo configure:16744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:17265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_corefile=yes else @@ -16788,18 +17309,18 @@ ac_tr_func=`echo "$ac_func" | sed y%abcd echo $ac_n "checking for missing "${ac_func}" extern""... $ac_c" 1>&6 -echo "configure:16792: checking for missing "${ac_func}" extern" >&5 +echo "configure:17313: checking for missing "${ac_func}" extern" >&5 if eval "test \"`echo '$''{'cf_cv_func_${ac_func}'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -echo "${as_me-configure}:16798: testing for missing "${ac_func}" external ..." 1>&5 +echo "${as_me:-configure}:17319: testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:17338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + if test -n "$CHECK_DECL_HDRS" ; then # try to work around system headers which are infested with non-standard syntax cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17356: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -16848,10 +17369,10 @@ fi else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval 'cf_cv_func_'${ac_func}'=no' fi -rm -f conftest* +rm -rf conftest* CFLAGS="$cf_save_CFLAGS" fi @@ -16880,18 +17401,18 @@ ac_tr_func=`echo "$ac_func" | sed y%abcd echo $ac_n "checking for missing "${ac_func}" extern""... $ac_c" 1>&6 -echo "configure:16884: checking for missing "${ac_func}" extern" >&5 +echo "configure:17405: checking for missing "${ac_func}" extern" >&5 if eval "test \"`echo '$''{'cf_cv_func_${ac_func}'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -echo "${as_me-configure}:16890: testing for missing "${ac_func}" external ..." 1>&5 +echo "${as_me:-configure}:17411: testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:17430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + if test -n "$CHECK_DECL_HDRS" ; then # try to work around system headers which are infested with non-standard syntax cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -16940,10 +17461,10 @@ fi else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval 'cf_cv_func_'${ac_func}'=no' fi -rm -f conftest* +rm -rf conftest* CFLAGS="$cf_save_CFLAGS" fi @@ -16970,18 +17491,18 @@ ac_tr_func=`echo "$ac_func" | sed y%abcd echo $ac_n "checking for missing "${ac_func}" extern""... $ac_c" 1>&6 -echo "configure:16974: checking for missing "${ac_func}" extern" >&5 +echo "configure:17495: checking for missing "${ac_func}" extern" >&5 if eval "test \"`echo '$''{'cf_cv_func_${ac_func}'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -echo "${as_me-configure}:16980: testing for missing "${ac_func}" external ..." 1>&5 +echo "${as_me:-configure}:17501: testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:17520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + if test -n "$CHECK_DECL_HDRS" ; then # try to work around system headers which are infested with non-standard syntax cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -17030,10 +17551,10 @@ fi else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval 'cf_cv_func_'${ac_func}'=no' fi -rm -f conftest* +rm -rf conftest* CFLAGS="$cf_save_CFLAGS" fi @@ -17073,7 +17594,6 @@ for ac_func in \ fwrite \ getcwd \ getopt \ - getpass \ getwd \ ioctl \ isascii \ @@ -17113,18 +17633,18 @@ ac_tr_func=`echo "$ac_func" | sed y%abcd echo $ac_n "checking for missing "${ac_func}" extern""... $ac_c" 1>&6 -echo "configure:17117: checking for missing "${ac_func}" extern" >&5 +echo "configure:17637: checking for missing "${ac_func}" extern" >&5 if eval "test \"`echo '$''{'cf_cv_func_${ac_func}'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -echo "${as_me-configure}:17123: testing for missing "${ac_func}" external ..." 1>&5 +echo "${as_me:-configure}:17643: testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:17662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + if test -n "$CHECK_DECL_HDRS" ; then # try to work around system headers which are infested with non-standard syntax cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17680: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -17173,10 +17693,10 @@ fi else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval 'cf_cv_func_'${ac_func}'=no' fi -rm -f conftest* +rm -rf conftest* CFLAGS="$cf_save_CFLAGS" fi @@ -17200,18 +17720,18 @@ ac_tr_func=`echo "$ac_func" | sed y%abcd echo $ac_n "checking for missing "${ac_func}" extern""... $ac_c" 1>&6 -echo "configure:17204: checking for missing "${ac_func}" extern" >&5 +echo "configure:17724: checking for missing "${ac_func}" extern" >&5 if eval "test \"`echo '$''{'cf_cv_func_${ac_func}'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -echo "${as_me-configure}:17210: testing for missing "${ac_func}" external ..." 1>&5 +echo "${as_me:-configure}:17730: testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:17749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + if test -n "$CHECK_DECL_HDRS" ; then # try to work around system headers which are infested with non-standard syntax cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17767: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -17260,10 +17780,10 @@ fi else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval 'cf_cv_func_'${ac_func}'=no' fi -rm -f conftest* +rm -rf conftest* CFLAGS="$cf_save_CFLAGS" fi @@ -17290,18 +17810,18 @@ ac_tr_func=`echo "$ac_func" | sed y%abcd echo $ac_n "checking for missing "${ac_func}" extern""... $ac_c" 1>&6 -echo "configure:17294: checking for missing "${ac_func}" extern" >&5 +echo "configure:17814: checking for missing "${ac_func}" extern" >&5 if eval "test \"`echo '$''{'cf_cv_func_${ac_func}'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -echo "${as_me-configure}:17300: testing for missing "${ac_func}" external ..." 1>&5 +echo "${as_me:-configure}:17820: testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:17839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + if test -n "$CHECK_DECL_HDRS" ; then # try to work around system headers which are infested with non-standard syntax cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -17350,10 +17870,10 @@ fi else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval 'cf_cv_func_'${ac_func}'=no' fi -rm -f conftest* +rm -rf conftest* CFLAGS="$cf_save_CFLAGS" fi @@ -17371,7 +17891,7 @@ fi echo $ac_n "checking for working TIOCGWINSZ""... $ac_c" 1>&6 -echo "configure:17375: checking for working TIOCGWINSZ" >&5 +echo "configure:17895: checking for working TIOCGWINSZ" >&5 if eval "test \"`echo '$''{'cf_cv_use_tiocgwinsz'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -17382,7 +17902,7 @@ else cf_cv_use_tiocgwinsz=unknown else cat > conftest.$ac_ext < 0 && size.ts_cols > 0) - ${cf_cv_main_return-return}(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); + ${cf_cv_main_return:-return}(0); #endif } - ${cf_cv_main_return-return}(0); /* we cannot guarantee this is run interactively */ + ${cf_cv_main_return:-return}(0); /* we cannot guarantee this is run interactively */ } EOF -if { (eval echo configure:17411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:17931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_use_tiocgwinsz=yes else @@ -17454,7 +17974,7 @@ esac # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:17458: checking for $ac_word" >&5 +echo "configure:17978: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -17484,28 +18004,28 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:17488: checking for working alloca.h" >&5 +echo "configure:18008: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:17500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:18020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_header_alloca_h=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + ac_cv_header_alloca_h=no fi -rm -f conftest* +rm -rf conftest* fi echo "$ac_t""$ac_cv_header_alloca_h" 1>&6 @@ -17517,12 +18037,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:17521: checking for alloca" >&5 +echo "configure:18041: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:18074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_func_alloca_works=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + ac_cv_func_alloca_works=no fi -rm -f conftest* +rm -rf conftest* fi echo "$ac_t""$ac_cv_func_alloca_works" 1>&6 @@ -17582,12 +18102,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:17586: checking whether alloca needs Cray hooks" >&5 +echo "configure:18106: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17616: checking for $ac_func" >&5 +echo "configure:18136: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:18164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_func_$ac_func=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_func_$ac_func=no" fi -rm -f conftest* +rm -rf conftest* fi if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then @@ -17667,7 +18187,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:17671: checking stack direction for C alloca" >&5 +echo "configure:18191: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -17675,7 +18195,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:18218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -17719,17 +18239,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:17723: checking for $ac_hdr" >&5 +echo "configure:18243: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:17733: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:18253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -17758,12 +18278,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17762: checking for $ac_func" >&5 +echo "configure:18282: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:18310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_func_$ac_func=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_func_$ac_func=no" fi -rm -f conftest* +rm -rf conftest* fi if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then @@ -17811,7 +18331,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:17815: checking for working mmap" >&5 +echo "configure:18335: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -17819,7 +18339,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:18483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -17983,12 +18503,12 @@ fi echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6 -echo "configure:17987: checking whether we are using the GNU C Library 2.1 or newer" >&5 +echo "configure:18507: checking whether we are using the GNU C Library 2.1 or newer" >&5 if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -18024,8 +18544,12 @@ cf_makefile=Makefile test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && echo *.po|sed -e 's/\.po//g' -e 's/*//'` # Allow override of "config.h" definition: -: ${CONFIG_H=config.h} +: ${CONFIG_H:=config.h} + +if test -z "$PACKAGE" ; then + { echo "configure: error: CF_BUNDLED_INTL used without setting PACKAGE variable" 1>&2; exit 1; } +fi if test -z "$VERSION" ; then if test -f $srcdir/VERSION ; then @@ -18042,17 +18566,17 @@ stdlib.h string.h unistd.h sys/param.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:18046: checking for $ac_hdr" >&5 +echo "configure:18570: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:18056: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:18580: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -18083,12 +18607,12 @@ getgid getuid mempcpy munmap putenv sete strdup strtoul tsearch __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18087: checking for $ac_func" >&5 +echo "configure:18611: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:18639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_func_$ac_func=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_func_$ac_func=no" fi -rm -f conftest* +rm -rf conftest* fi if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then @@ -18179,14 +18703,14 @@ if test -n "$cf_searchpath/include" ; th cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:18190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18714: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -18203,7 +18727,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me-configure}:18207: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:18731: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -18245,14 +18769,14 @@ if test -n "$cf_searchpath/../include" ; cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:18256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18780: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -18269,7 +18793,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me-configure}:18273: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:18797: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -18309,7 +18833,7 @@ if test -n "$cf_searchpath/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me-configure}:18313: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:18837: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" @@ -18339,7 +18863,7 @@ if test -n "$cf_searchpath" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me-configure}:18343: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:18867: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" @@ -18361,7 +18885,7 @@ fi echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:18365: checking for iconv" >&5 +echo "configure:18889: checking for iconv" >&5 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -18374,11 +18898,13 @@ cf_cv_header_path_iconv= cf_cv_library_path_iconv= -echo "${as_me-configure}:18378: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5 +echo "${as_me:-configure}:18902: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5 + +cf_save_LIBS="$LIBS" cat > conftest.$ac_ext < @@ -18392,30 +18918,69 @@ int main() { ; return 0; } EOF -if { (eval echo configure:18396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - cf_cv_find_linkage_iconv=yes +if { (eval echo configure:18922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + + cf_cv_find_linkage_iconv=yes + cf_cv_header_path_iconv=/usr/include + cf_cv_library_path_iconv=/usr/lib + else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + - cf_cv_find_linkage_iconv=no - test -n "$verbose" && echo " find linkage for iconv library" 1>&6 +LIBS="-liconv $cf_save_LIBS" -echo "${as_me-configure}:18408: testing find linkage for iconv library ..." 1>&5 +cat > conftest.$ac_ext < +#include - -echo "${as_me-configure}:18412: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5 +int main() { + iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); - cf_save_CPPFLAGS="$CPPFLAGS" - cf_test_CPPFLAGS="$CPPFLAGS" +; return 0; } +EOF +if { (eval echo configure:18952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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" - -cf_header_path_list="" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + + + 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}:18970: testing find linkage for iconv library ..." 1>&5 + + + +echo "${as_me:-configure}:18974: 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 @@ -18440,12 +19005,14 @@ test -d "$cf_header_path" && \ done fi -cf_search="" +# add the variations for the package we are looking for + +cf_search= test "/usr" != "$prefix" && \ test -d "/usr" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/usr" != "$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /usr" test -d /usr/include && cf_search="$cf_search /usr/include" test -d /usr/include/iconv && cf_search="$cf_search /usr/include/iconv" @@ -18469,7 +19036,7 @@ test -d "$prefix" && \ test "/usr/local" != "$prefix" && \ test -d "/usr/local" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/usr/local" != "$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /usr/local" test -d /usr/local/include && cf_search="$cf_search /usr/local/include" test -d /usr/local/include/iconv && cf_search="$cf_search /usr/local/include/iconv" @@ -18481,7 +19048,7 @@ test -d "/usr/local" && \ test "/opt" != "$prefix" && \ test -d "/opt" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/opt" != "$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /opt" test -d /opt/include && cf_search="$cf_search /opt/include" test -d /opt/include/iconv && cf_search="$cf_search /opt/include/iconv" @@ -18493,7 +19060,7 @@ test -d "/opt" && \ test "$HOME" != "$prefix" && \ test -d "$HOME" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "$HOME" != "$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under $HOME" test -d $HOME/include && cf_search="$cf_search $HOME/include" test -d $HOME/include/iconv && cf_search="$cf_search $HOME/include/iconv" @@ -18518,19 +19085,19 @@ test -d "$oldincludedir" && { test -d $oldincludedir/iconv && cf_search="$cf_search $oldincludedir/iconv" } -cf_search="$cf_header_path_list $cf_search" +cf_search="$cf_search $cf_header_path_list" for cf_cv_header_path_iconv in $cf_search do if test -d $cf_cv_header_path_iconv ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_iconv" 1>&6 -echo "${as_me-configure}:18529: testing ... testing $cf_cv_header_path_iconv ..." 1>&5 +echo "${as_me:-configure}:19096: testing ... testing $cf_cv_header_path_iconv ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_iconv" cat > conftest.$ac_ext < @@ -18544,12 +19111,12 @@ int main() { ; return 0; } EOF -if { (eval echo configure:18548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* test -n "$verbose" && echo " ... found iconv headers in $cf_cv_header_path_iconv" 1>&6 -echo "${as_me-configure}:18553: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5 +echo "${as_me:-configure}:19120: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5 cf_cv_find_linkage_iconv=maybe @@ -18570,7 +19137,7 @@ rm -f conftest* if test "$cf_cv_find_linkage_iconv" = maybe ; then -echo "${as_me-configure}:18574: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5 +echo "${as_me:-configure}:19141: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5 cf_save_LIBS="$LIBS" @@ -18580,6 +19147,7 @@ echo "${as_me-configure}:18574: testing if test "$cf_cv_find_linkage_iconv" != yes ; then +cf_search= cf_library_path_list="" if test -n "${LDFLAGS}${LIBS}" ; then for cf_library_path in $LDFLAGS $LIBS @@ -18605,12 +19173,13 @@ test -d "$cf_library_path" && \ done fi -cf_search="" + +cf_search= test "/usr" != "$prefix" && \ test -d "/usr" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/usr" != "$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /usr" test -d /usr/lib && cf_search="$cf_search /usr/lib" test -d /usr/lib/iconv && cf_search="$cf_search /usr/lib/iconv" @@ -18634,7 +19203,7 @@ test -d "$prefix" && \ test "/usr/local" != "$prefix" && \ test -d "/usr/local" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/usr/local" != "$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /usr/local" test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib" test -d /usr/local/lib/iconv && cf_search="$cf_search /usr/local/lib/iconv" @@ -18646,7 +19215,7 @@ test -d "/usr/local" && \ test "/opt" != "$prefix" && \ test -d "/opt" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/opt" != "$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /opt" test -d /opt/lib && cf_search="$cf_search /opt/lib" test -d /opt/lib/iconv && cf_search="$cf_search /opt/lib/iconv" @@ -18658,7 +19227,7 @@ test -d "/opt" && \ test "$HOME" != "$prefix" && \ test -d "$HOME" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "$HOME" != "$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under $HOME" test -d $HOME/lib && cf_search="$cf_search $HOME/lib" test -d $HOME/lib/iconv && cf_search="$cf_search $HOME/lib/iconv" @@ -18676,14 +19245,14 @@ cf_search="$cf_library_path_list $cf_sea if test -d $cf_cv_library_path_iconv ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_iconv" 1>&6 -echo "${as_me-configure}:18680: testing ... testing $cf_cv_library_path_iconv ..." 1>&5 +echo "${as_me:-configure}:19249: 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 < @@ -18697,12 +19266,12 @@ int main() { ; return 0; } EOF -if { (eval echo configure:18701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:19270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + test -n "$verbose" && echo " ... found iconv library in $cf_cv_library_path_iconv" 1>&6 -echo "${as_me-configure}:18706: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5 +echo "${as_me:-configure}:19275: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5 cf_cv_find_linkage_iconv=yes @@ -18711,17 +19280,16 @@ echo "${as_me-configure}:18706: testing else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + CPPFLAGS="$cf_save_CPPFLAGS" LIBS="$cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS" fi -rm -f conftest* +rm -rf conftest* fi done - LIBS="$cf_save_LIBS" CPPFLAGS="$cf_save_CPPFLAGS" LDFLAGS="$cf_save_LDFLAGS" fi @@ -18731,7 +19299,12 @@ rm -f conftest* fi fi -rm -f conftest* +rm -rf conftest* + +fi +rm -rf conftest* + +LIBS="$cf_save_LIBS" if test "$cf_cv_find_linkage_iconv" = yes ; then am_cv_func_iconv=yes @@ -18750,13 +19323,13 @@ EOF echo $ac_n "checking if the declaration of iconv() needs const.""... $ac_c" 1>&6 -echo "configure:18754: checking if the declaration of iconv() needs const." >&5 +echo "configure:19327: checking if the declaration of iconv() needs const." >&5 if eval "test \"`echo '$''{'am_cv_proto_iconv_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -18776,7 +19349,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:18780: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_proto_iconv_const=no else @@ -18829,14 +19402,14 @@ if test -n "$cf_cv_header_path_iconv" ; cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:18840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19413: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -18853,7 +19426,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me-configure}:18857: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:19430: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -18891,7 +19464,7 @@ if test -n "$cf_cv_library_path_iconv" ; if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me-configure}:18895: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:19468: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" @@ -18907,28 +19480,28 @@ fi echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -echo "configure:18911: checking for nl_langinfo and CODESET" >&5 +echo "configure:19484: checking for nl_langinfo and CODESET" >&5 if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char* cs = nl_langinfo(CODESET); ; return 0; } EOF -if { (eval echo configure:18923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:19496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + am_cv_langinfo_codeset=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + am_cv_langinfo_codeset=no fi -rm -f conftest* +rm -rf conftest* fi @@ -18942,28 +19515,28 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:18946: checking for LC_MESSAGES" >&5 +echo "configure:19519: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:18958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:19531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + am_cv_val_LC_MESSAGES=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + am_cv_val_LC_MESSAGES=no fi -rm -f conftest* +rm -rf conftest* fi echo "$ac_t""$am_cv_val_LC_MESSAGES" 1>&6 @@ -18975,7 +19548,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:18979: checking whether NLS is requested" >&5 +echo "configure:19552: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. @@ -18999,7 +19572,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:19003: checking whether included gettext is requested" >&5 +echo "configure:19576: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then @@ -19018,7 +19591,7 @@ fi cf_save_LIBS_1="$LIBS" LIBS="$LIBICONV $LIBS" echo $ac_n "checking for libintl.h and gettext()""... $ac_c" 1>&6 -echo "configure:19022: checking for libintl.h and gettext()" >&5 +echo "configure:19595: checking for libintl.h and gettext()" >&5 if eval "test \"`echo '$''{'cf_cv_func_gettext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -19031,11 +19604,13 @@ cf_cv_header_path_intl= cf_cv_library_path_intl= -echo "${as_me-configure}:19035: testing Starting FIND_LINKAGE(intl,) ..." 1>&5 +echo "${as_me:-configure}:19608: testing Starting FIND_LINKAGE(intl,) ..." 1>&5 +cf_save_LIBS="$LIBS" + cat > conftest.$ac_ext < @@ -19050,29 +19625,69 @@ int main() { ; return 0; } EOF -if { (eval echo configure:19054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - cf_cv_find_linkage_intl=yes +if { (eval echo configure:19629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + + cf_cv_find_linkage_intl=yes + cf_cv_header_path_intl=/usr/include + cf_cv_library_path_intl=/usr/lib + else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + + + +LIBS="-lintl $cf_save_LIBS" + +cat > conftest.$ac_ext < +extern int _nl_msg_cat_cntr; + +int main() { + + bindtextdomain ("", ""); + return (int) gettext ("") + + + _nl_msg_cat_cntr + +; return 0; } +EOF +if { (eval echo configure:19660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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" + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + - cf_cv_find_linkage_intl=no + cf_cv_find_linkage_intl=no + LIBS="$cf_save_LIBS" test -n "$verbose" && echo " find linkage for intl library" 1>&6 -echo "${as_me-configure}:19066: testing find linkage for intl library ..." 1>&5 +echo "${as_me:-configure}:19678: testing find linkage for intl library ..." 1>&5 -echo "${as_me-configure}:19070: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5 +echo "${as_me:-configure}:19682: 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 @@ -19098,12 +19713,14 @@ test -d "$cf_header_path" && \ done fi -cf_search="" +# add the variations for the package we are looking for + +cf_search= test "/usr" != "$prefix" && \ test -d "/usr" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/usr" != "$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /usr" test -d /usr/include && cf_search="$cf_search /usr/include" test -d /usr/include/intl && cf_search="$cf_search /usr/include/intl" @@ -19127,7 +19744,7 @@ test -d "$prefix" && \ test "/usr/local" != "$prefix" && \ test -d "/usr/local" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/usr/local" != "$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /usr/local" test -d /usr/local/include && cf_search="$cf_search /usr/local/include" test -d /usr/local/include/intl && cf_search="$cf_search /usr/local/include/intl" @@ -19139,7 +19756,7 @@ test -d "/usr/local" && \ test "/opt" != "$prefix" && \ test -d "/opt" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/opt" != "$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /opt" test -d /opt/include && cf_search="$cf_search /opt/include" test -d /opt/include/intl && cf_search="$cf_search /opt/include/intl" @@ -19151,7 +19768,7 @@ test -d "/opt" && \ test "$HOME" != "$prefix" && \ test -d "$HOME" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "$HOME" != "$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under $HOME" test -d $HOME/include && cf_search="$cf_search $HOME/include" test -d $HOME/include/intl && cf_search="$cf_search $HOME/include/intl" @@ -19176,19 +19793,19 @@ test -d "$oldincludedir" && { test -d $oldincludedir/intl && cf_search="$cf_search $oldincludedir/intl" } -cf_search="$cf_header_path_list $cf_search" +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}:19187: testing ... testing $cf_cv_header_path_intl ..." 1>&5 +echo "${as_me:-configure}:19804: testing ... testing $cf_cv_header_path_intl ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_intl" cat > conftest.$ac_ext < @@ -19203,12 +19820,12 @@ int main() { ; return 0; } EOF -if { (eval echo configure:19207: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19824: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* test -n "$verbose" && echo " ... found intl headers in $cf_cv_header_path_intl" 1>&6 -echo "${as_me-configure}:19212: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5 +echo "${as_me:-configure}:19829: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5 cf_cv_find_linkage_intl=maybe @@ -19229,7 +19846,7 @@ rm -f conftest* if test "$cf_cv_find_linkage_intl" = maybe ; then -echo "${as_me-configure}:19233: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5 +echo "${as_me:-configure}:19850: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5 cf_save_LIBS="$LIBS" @@ -19239,6 +19856,7 @@ echo "${as_me-configure}:19233: testing if test "$cf_cv_find_linkage_intl" != yes ; then +cf_search= cf_library_path_list="" if test -n "${LDFLAGS}${LIBS}" ; then for cf_library_path in $LDFLAGS $LIBS @@ -19264,12 +19882,13 @@ test -d "$cf_library_path" && \ done fi -cf_search="" + +cf_search= test "/usr" != "$prefix" && \ test -d "/usr" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/usr" != "$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /usr" test -d /usr/lib && cf_search="$cf_search /usr/lib" test -d /usr/lib/intl && cf_search="$cf_search /usr/lib/intl" @@ -19293,7 +19912,7 @@ test -d "$prefix" && \ test "/usr/local" != "$prefix" && \ test -d "/usr/local" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/usr/local" != "$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /usr/local" test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib" test -d /usr/local/lib/intl && cf_search="$cf_search /usr/local/lib/intl" @@ -19305,7 +19924,7 @@ test -d "/usr/local" && \ test "/opt" != "$prefix" && \ test -d "/opt" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "/opt" != "$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /opt" test -d /opt/lib && cf_search="$cf_search /opt/lib" test -d /opt/lib/intl && cf_search="$cf_search /opt/lib/intl" @@ -19317,7 +19936,7 @@ test -d "/opt" && \ test "$HOME" != "$prefix" && \ test -d "$HOME" && \ -(test $prefix = NONE || test -d $prefix) && { +(test $prefix = NONE || test "$HOME" != "$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under $HOME" test -d $HOME/lib && cf_search="$cf_search $HOME/lib" test -d $HOME/lib/intl && cf_search="$cf_search $HOME/lib/intl" @@ -19335,14 +19954,14 @@ cf_search="$cf_library_path_list $cf_sea if test -d $cf_cv_library_path_intl ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_intl" 1>&6 -echo "${as_me-configure}:19339: testing ... testing $cf_cv_library_path_intl ..." 1>&5 +echo "${as_me:-configure}:19958: 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 < @@ -19357,12 +19976,12 @@ int main() { ; return 0; } EOF -if { (eval echo configure:19361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:19980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + test -n "$verbose" && echo " ... found intl library in $cf_cv_library_path_intl" 1>&6 -echo "${as_me-configure}:19366: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5 +echo "${as_me:-configure}:19985: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5 cf_cv_find_linkage_intl=yes @@ -19371,17 +19990,16 @@ echo "${as_me-configure}:19366: testing else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + CPPFLAGS="$cf_save_CPPFLAGS" LIBS="$cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS" fi -rm -f conftest* +rm -rf conftest* fi done - LIBS="$cf_save_LIBS" CPPFLAGS="$cf_save_CPPFLAGS" LDFLAGS="$cf_save_LDFLAGS" fi @@ -19391,7 +20009,12 @@ rm -f conftest* fi fi -rm -f conftest* +rm -rf conftest* + +fi +rm -rf conftest* + +LIBS="$cf_save_LIBS" if test "$cf_cv_find_linkage_intl" = yes ; then cf_cv_func_gettext=yes @@ -19442,14 +20065,14 @@ if test -n "$cf_cv_header_path_intl" ; t cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:19453: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:20076: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -19466,7 +20089,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me-configure}:19470: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:20093: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -19505,7 +20128,7 @@ if test -n "$cf_cv_library_path_intl" ; if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me-configure}:19509: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:20132: testing adding $cf_add_libdir to library-path ..." 1>&5 INTLLIBS="-L$cf_add_libdir $INTLLIBS" @@ -19521,12 +20144,12 @@ fi for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:19525: checking for $ac_func" >&5 +echo "configure:20148: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:20176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_func_$ac_func=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_func_$ac_func=no" fi -rm -f conftest* +rm -rf conftest* fi if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then @@ -19579,7 +20202,7 @@ done set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:19583: checking for $ac_word" >&5 +echo "configure:20206: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -19588,7 +20211,7 @@ else ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" + 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 @@ -19613,7 +20236,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:19617: checking for $ac_word" >&5 +echo "configure:20240: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -19651,7 +20274,7 @@ fi set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:19655: checking for $ac_word" >&5 +echo "configure:20278: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -19660,7 +20283,7 @@ else ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" + 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 @@ -19701,7 +20324,7 @@ fi set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:19705: checking for $ac_word" >&5 +echo "configure:20328: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -19710,7 +20333,7 @@ else ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" + 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 @@ -19735,7 +20358,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:19739: checking for $ac_word" >&5 +echo "configure:20362: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -19772,7 +20395,7 @@ fi set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:19776: checking for $ac_word" >&5 +echo "configure:20399: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -19781,7 +20404,7 @@ else ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" + 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 @@ -19844,7 +20467,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:19848: checking for $ac_word" >&5 +echo "configure:20471: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -19877,7 +20500,7 @@ done ac_verc_fail=yes else echo $ac_n "checking version of bison""... $ac_c" 1>&6 -echo "configure:19881: checking version of bison" >&5 +echo "configure:20504: checking version of bison" >&5 ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; @@ -19925,7 +20548,7 @@ echo "configure:19881: checking version LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:19929: checking for catalogs to be installed" >&5 +echo "configure:20552: checking for catalogs to be installed" >&5 NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do useit=no @@ -19952,24 +20575,27 @@ echo "configure:19929: checking for cata fi fi - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkdirs.sh" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkdirs.sh" - fi - if test -n "$GNUSYSTEM_AUX_DIR" ; then - if test -e "${GNUSYSTEM_AUX_DIR}/mkinstalldirs"; then - MKINSTALLDIRS="${GNUSYSTEM_AUX_DIR}/mkinstalldirs" - fi - fi - - INTL_LIBTOOL_SUFFIX_PREFIX= +if test "$USE_NLS" = yes ; then + +# 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 + + cat >> confdefs.h <&6 -echo "configure:19985: checking if we should use included message-library" >&5 +echo "configure:20611: checking if we should use included message-library" >&5 # Check whether --enable-included-msgs or --disable-included-msgs was given. if test "${enable_included_msgs+set}" = set; then @@ -20036,17 +20662,17 @@ else do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:20040: checking for $ac_hdr" >&5 +echo "configure:20666: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:20050: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:20676: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -20130,28 +20756,28 @@ if test ".$use_alloca" = .yes ; then # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:20134: checking for working alloca.h" >&5 +echo "configure:20760: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:20146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:20772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_header_alloca_h=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + ac_cv_header_alloca_h=no fi -rm -f conftest* +rm -rf conftest* fi echo "$ac_t""$ac_cv_header_alloca_h" 1>&6 @@ -20163,12 +20789,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:20167: checking for alloca" >&5 +echo "configure:20793: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:20826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_func_alloca_works=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + ac_cv_func_alloca_works=no fi -rm -f conftest* +rm -rf conftest* fi echo "$ac_t""$ac_cv_func_alloca_works" 1>&6 @@ -20228,12 +20854,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:20232: checking whether alloca needs Cray hooks" >&5 +echo "configure:20858: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:20262: checking for $ac_func" >&5 +echo "configure:20888: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:20916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_func_$ac_func=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_func_$ac_func=no" fi -rm -f conftest* +rm -rf conftest* fi if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then @@ -20313,7 +20939,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:20317: checking stack direction for C alloca" >&5 +echo "configure:20943: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -20321,7 +20947,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:20970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -20385,9 +21011,9 @@ fi for cf_hdr in iconv.h do echo $ac_n "checking for $cf_hdr""... $ac_c" 1>&6 -echo "configure:20389: checking for $cf_hdr" >&5 +echo "configure:21015: checking for $cf_hdr" >&5 cat > conftest.$ac_ext < @@ -20395,7 +21021,7 @@ echo "configure:20389: checking for $cf_ EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:20399: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:21025: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -20421,13 +21047,13 @@ fi done echo $ac_n "checking for iconv_open() //TRANSLIT extension""... $ac_c" 1>&6 -echo "configure:20425: checking for iconv_open() //TRANSLIT extension" >&5 +echo "configure:21051: checking for iconv_open() //TRANSLIT extension" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""unknown" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:21074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF #define HAVE_ICONV_OPEN_TRANSLIT 1 @@ -20500,12 +21126,12 @@ EOF ;; *) echo $ac_n "checking for link""... $ac_c" 1>&6 -echo "configure:20504: checking for link" >&5 +echo "configure:21130: checking for link" >&5 if eval "test \"`echo '$''{'ac_cv_func_link'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:21158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_func_link=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_func_link=no" fi -rm -f conftest* +rm -rf conftest* fi if eval "test \"`echo '$ac_cv_func_'link`\" = yes"; then @@ -20552,236 +21178,563 @@ fi esac -# tin has mkdirs.sh instead of mkinstalldirs, overwrite the result of test -# in gettext.m4 -MKINSTALLDIRS="\$(top_srcdir)/mkdirs.sh" - - if test "$cf_cv_termlib" = pdcurses ; then - if test "$no_x" = yes; then - # Not all programs may use this symbol, but it does not hurt to define it. - cat >> confdefs.h <<\EOF -#define X_DISPLAY_MISSING 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 + # If we find X, set shell vars x_includes and x_libraries to the +# paths, otherwise set no_x=yes. +# Uses ac_ vars as temps to allow command line to override cache and checks. +# --without-x overrides everything else, but does not touch the cache. +echo $ac_n "checking for X""... $ac_c" 1>&6 +echo "configure:21188: checking for X" >&5 - # 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 $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:20582: checking whether -R must be followed by a space" >&5 - ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_R_nospace=yes +# $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 "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_R_nospace=no + if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then + # Both variables are already set. + have_x=yes + else +if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&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 conftestdir +if mkdir conftestdir; then + cd conftestdir + # 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; 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 conftestdir fi -rm -f conftest* - if test $ac_R_nospace = yes; then - echo "$ac_t""no" 1>&6 - X_LIBS="$X_LIBS -R$x_libraries" - else - LIBS="$ac_xsave_LIBS -R $x_libraries" - cat > conftest.$ac_ext < conftest.$ac_ext < EOF -if { (eval echo configure:20615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:21256: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then rm -rf conftest* - ac_R_space=yes + # We can compile using X headers with no special include directory. +ac_x_includes= else + echo "$ac_err" >&5 echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - ac_R_space=no -fi -rm -f conftest* - if test $ac_R_space = yes; then - echo "$ac_t""yes" 1>&6 - X_LIBS="$X_LIBS -R $x_libraries" - else - echo "$ac_t""neither works" 1>&6 - fi - fi - LIBS="$ac_xsave_LIBS" - esac - fi - - # 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 "$ISC" = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" - else - # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X - # libraries were built with DECnet support. And karl@cs.umb.edu says - # the Alpha needs dnet_stub (dnet does not exist). - echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:20647: checking for dnet_ntoa in -ldnet" >&5 -ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-ldnet $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + # Look for the header file in a standard set of common directories. +# Check X11 before X11Rn because it is often a symlink to the current release. + for ac_dir in \ + /usr/X11/include \ + /usr/X11R6/include \ + /usr/X11R5/include \ + /usr/X11R4/include \ + \ + /usr/include/X11 \ + /usr/include/X11R6 \ + /usr/include/X11R5 \ + /usr/include/X11R4 \ + \ + /usr/local/X11/include \ + /usr/local/X11R6/include \ + /usr/local/X11R5/include \ + /usr/local/X11R4/include \ + \ + /usr/local/include/X11 \ + /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 \ + ; \ + do + if test -r "$ac_dir/$x_direct_test_include"; then + ac_x_includes=$ac_dir + break + fi + done fi rm -f conftest* -LIBS="$ac_save_LIBS" +fi # $ac_x_includes = NO -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" -else - echo "$ac_t""no" 1>&6 -fi +if test "$ac_x_libraries" = NO; then + # Check for the libraries. - if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:20688: checking for dnet_ntoa in -ldnet_stub" >&5 -ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else + test -z "$x_direct_test_library" && x_direct_test_library=Xt + test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc + + # See if we find them without any special options. + # Don't add to $LIBS permanently. ac_save_LIBS="$LIBS" -LIBS="-ldnet_stub $LIBS" + LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +if { (eval echo configure:21332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + LIBS="$ac_save_LIBS" +# We can link X programs with no special library path. +ac_x_libraries= else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" + LIBS="$ac_save_LIBS" +# First see if replacing the include by lib works. +# Check X11 before X11Rn because it is often a symlink to the current release. +for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \ + /usr/X11/lib \ + /usr/X11R6/lib \ + /usr/X11R5/lib \ + /usr/X11R4/lib \ + \ + /usr/lib/X11 \ + /usr/lib/X11R6 \ + /usr/lib/X11R5 \ + /usr/lib/X11R4 \ + \ + /usr/local/X11/lib \ + /usr/local/X11R6/lib \ + /usr/local/X11R5/lib \ + /usr/local/X11R4/lib \ + \ + /usr/local/lib/X11 \ + /usr/local/lib/X11R6 \ + /usr/local/lib/X11R5 \ + /usr/local/lib/X11R4 \ + \ + /usr/X386/lib \ + /usr/x386/lib \ + /usr/XFree86/lib/X11 \ + \ + /usr/lib \ + /usr/local/lib \ + /usr/unsupported/lib \ + /usr/athena/lib \ + /usr/local/x11r5/lib \ + /usr/lpp/Xamples/lib \ + /lib/usr/lib/X11 \ + \ + /usr/openwin/lib \ + /usr/openwin/share/lib \ + ; \ +do + for ac_extension in a so sl; do + if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then + ac_x_libraries=$ac_dir + break 2 + fi + done +done fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" +rm -rf conftest* +fi # $ac_x_libraries = NO + +if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then + # Didn't find X anywhere. Cache the known absence of X. + ac_cv_have_x="have_x=no" else - echo "$ac_t""no" 1>&6 + # Record where we found X for the cache. + ac_cv_have_x="have_x=yes \ + ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" fi +fi + fi + eval "$ac_cv_have_x" +fi # $with_x != no - fi - - # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, - # to get the SysV transport functions. - # chad@anasazi.com 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 dickey@clark.net. - echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:20736: checking for gethostbyname" >&5 -if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +if test "$have_x" != yes; then + echo "$ac_t""$have_x" 1>&6 + no_x=yes else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname(); + # 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 "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6 +fi -int main() { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) -choke me -#else -gethostbyname(); -#endif +echo $ac_n "checking if you want to use pkg-config""... $ac_c" 1>&6 +echo "configure:21420: checking if you want to use pkg-config" >&5 -; return 0; } -EOF -if { (eval echo configure:20764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_gethostbyname=yes" +# 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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_gethostbyname=no" -fi -rm -f conftest* + cf_pkg_config=yes fi -if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then - echo "$ac_t""yes" 1>&6 - : +echo "$ac_t""$cf_pkg_config" 1>&6 + +case $cf_pkg_config in #(vi +no) #(vi + PKG_CONFIG=none + ;; +yes) #(vi + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:21440: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$PKG_CONFIG" in + /*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="none" + ;; +esac +fi +PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +if test -n "$PKG_CONFIG"; then + echo "$ac_t""$PKG_CONFIG" 1>&6 else echo "$ac_t""no" 1>&6 fi - if test $ac_cv_func_gethostbyname = no; then - echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:20785: checking for gethostbyname in -lnsl" >&5 + ;; +*) + PKG_CONFIG=$withval + ;; +esac + +test -z "$PKG_CONFIG" && PKG_CONFIG=none +if test "$PKG_CONFIG" != none ; then + +if test "x$prefix" != xNONE; then + cf_path_syntax="$prefix" +else + cf_path_syntax="$ac_default_prefix" +fi + +case ".$PKG_CONFIG" in #(vi +.\$\(*\)*|.\'*\'*) #(vi + ;; +..|./*|.\\*) #(vi + ;; +.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX + ;; +.\${*prefix}*) #(vi + eval PKG_CONFIG="$PKG_CONFIG" + case ".$PKG_CONFIG" in #(vi + .NONE/*) + PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` + ;; + esac + ;; #(vi +.no|.NONE/*) + PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` + ;; +*) + { echo "configure: error: expected a pathname, not \"$PKG_CONFIG\"" 1>&2; exit 1; } + ;; +esac + +fi + + + +if test "$no_x" = yes; then + # Not all programs may use this symbol, but it does not hurt to define it. + cat >> confdefs.h <<\EOF +#define X_DISPLAY_MISSING 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 + + # 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 $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 +echo "configure:21535: checking whether -R must be followed by a space" >&5 + ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + ac_R_nospace=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + + ac_R_nospace=no +fi +rm -rf conftest* + if test $ac_R_nospace = yes; then + echo "$ac_t""no" 1>&6 + X_LIBS="$X_LIBS -R$x_libraries" + else + LIBS="$ac_xsave_LIBS -R $x_libraries" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + ac_R_space=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + + ac_R_space=no +fi +rm -rf conftest* + if test $ac_R_space = yes; then + echo "$ac_t""yes" 1>&6 + X_LIBS="$X_LIBS -R $x_libraries" + else + echo "$ac_t""neither works" 1>&6 + fi + fi + LIBS="$ac_xsave_LIBS" + esac + fi + + # 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 "$ISC" = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" + else + # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X + # libraries were built with DECnet support. And karl@cs.umb.edu says + # the Alpha needs dnet_stub (dnet does not exist). + echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 +echo "configure:21600: checking for dnet_ntoa in -ldnet" >&5 +ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-ldnet $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -rf conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" +else + echo "$ac_t""no" 1>&6 +fi + + if test $ac_cv_lib_dnet_dnet_ntoa = no; then + echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 +echo "configure:21641: checking for dnet_ntoa in -ldnet_stub" >&5 +ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-ldnet_stub $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -rf conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" +else + echo "$ac_t""no" 1>&6 +fi + + fi + + # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, + # to get the SysV transport functions. + # chad@anasazi.com 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 dickey@clark.net. + echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 +echo "configure:21689: checking for gethostbyname" >&5 +if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char gethostbyname(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) +choke me +#else +gethostbyname(); +#endif + +; return 0; } +EOF +if { (eval echo configure:21717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + eval "ac_cv_func_gethostbyname=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + + eval "ac_cv_func_gethostbyname=no" +fi +rm -rf conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 +fi + + if test $ac_cv_func_gethostbyname = no; then + echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 +echo "configure:21738: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -20789,7 +21742,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:21757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi @@ -20830,12 +21783,12 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:20834: checking for connect" >&5 +echo "configure:21787: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:21815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_func_connect=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_func_connect=no" fi -rm -f conftest* +rm -rf conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 +fi + + if test $ac_cv_func_connect = no; then + echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 +echo "configure:21836: checking for connect in -lsocket" >&5 +ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lsocket $X_EXTRA_LIBS $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -rf conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" +else + echo "$ac_t""no" 1>&6 +fi + + fi + + # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. + echo $ac_n "checking for remove""... $ac_c" 1>&6 +echo "configure:21879: checking for remove" >&5 +if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char remove(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_remove) || defined (__stub___remove) +choke me +#else +remove(); +#endif + +; return 0; } +EOF +if { (eval echo configure:21907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + eval "ac_cv_func_remove=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + + eval "ac_cv_func_remove=no" +fi +rm -rf conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 +fi + + if test $ac_cv_func_remove = no; then + echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 +echo "configure:21928: checking for remove in -lposix" >&5 +ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lposix $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -rf conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" +else + echo "$ac_t""no" 1>&6 +fi + + fi + + # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. + echo $ac_n "checking for shmat""... $ac_c" 1>&6 +echo "configure:21971: checking for shmat" >&5 +if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char shmat(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_shmat) || defined (__stub___shmat) +choke me +#else +shmat(); +#endif + +; return 0; } +EOF +if { (eval echo configure:21999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + eval "ac_cv_func_shmat=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + + eval "ac_cv_func_shmat=no" +fi +rm -rf conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 +fi + + if test $ac_cv_func_shmat = no; then + echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 +echo "configure:22020: checking for shmat in -lipc" >&5 +ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lipc $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -rf conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" +else + echo "$ac_t""no" 1>&6 +fi + + fi + fi + + # 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. + # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. + echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 +echo "configure:22072: checking for IceConnectionNumber in -lICE" >&5 +ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lICE $X_EXTRA_LIBS $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -rf conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" +else + echo "$ac_t""no" 1>&6 +fi + + LDFLAGS="$ac_save_LDFLAGS" + +fi + + +cf_x_athena=${cf_x_athena:-Xaw} + +echo $ac_n "checking if you want to link with Xaw 3d library""... $ac_c" 1>&6 +echo "configure:22119: checking if you want to link with Xaw 3d library" >&5 +withval= + +# Check whether --with-Xaw3d or --without-Xaw3d was given. +if test "${with_Xaw3d+set}" = set; then + withval="$with_Xaw3d" + : +fi + +if test "$withval" = yes ; then + cf_x_athena=Xaw3d + echo "$ac_t""yes" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +echo $ac_n "checking if you want to link with neXT Athena library""... $ac_c" 1>&6 +echo "configure:22136: checking if you want to link with neXT Athena library" >&5 +withval= + +# Check whether --with-neXtaw or --without-neXtaw was given. +if test "${with_neXtaw+set}" = set; then + withval="$with_neXtaw" + : +fi + +if test "$withval" = yes ; then + cf_x_athena=neXtaw + echo "$ac_t""yes" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +echo $ac_n "checking if you want to link with Athena-Plus library""... $ac_c" 1>&6 +echo "configure:22153: checking if you want to link with Athena-Plus library" >&5 +withval= + +# Check whether --with-XawPlus or --without-XawPlus was given. +if test "${with_XawPlus+set}" = set; then + withval="$with_XawPlus" + : +fi + +if test "$withval" = yes ; then + cf_x_athena=XawPlus + echo "$ac_t""yes" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +cf_x_athena_lib="" + +if test "$PKG_CONFIG" != none ; then + cf_athena_list= + test "$cf_x_athena" = Xaw && cf_athena_list="xaw8 xaw7 xaw6" + for cf_athena_pkg in \ + $cf_athena_list \ + ${cf_x_athena} \ + ${cf_x_athena}-devel \ + lib${cf_x_athena} \ + lib${cf_x_athena}-devel + do + + + +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}:22187: 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}:22194: 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}:22199: testing package $cf_athena_pkg 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 #(vi + -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi + case $cf_add_cflags in + -D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + fi + ;; + esac + case "$CPPFLAGS" in + *$cf_add_cflags) #(vi + ;; + *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + ;; + esac + ;; + *) + cf_new_cflags="$cf_new_cflags $cf_add_cflags" + ;; + esac + ;; +yes) + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + CFLAGS="$CFLAGS $cf_new_cflags" +fi + +if test -n "$cf_new_cppflags" ; then + + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" +fi + +if test -n "$cf_new_extra_cppflags" ; then + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" +fi + + + + + LIBS="$cf_pkgconfig_libs $LIBS" + + cf_x_athena_lib="$cf_pkgconfig_libs" + +cf_x_athena_LIBS=`echo "HAVE_LIB_$cf_x_athena" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + cat >> confdefs.h <&6 +echo "configure:22296: checking for usable $cf_x_athena/Xmu package" >&5 +if eval "test \"`echo '$''{'cf_cv_xaw_compat'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + +cat > conftest.$ac_ext < + +int main() { + +int check = XmuCompareISOLatin1("big", "small") + +; return 0; } +EOF +if { (eval echo configure:22313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + cf_cv_xaw_compat=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + + cf_cv_xaw_compat=no +fi +rm -rf conftest* +fi + +echo "$ac_t""$cf_cv_xaw_compat" 1>&6 + + if test "$cf_cv_xaw_compat" = no + then + # workaround for broken ".pc" files... + case "$cf_x_athena_lib" in #(vi + *-lXmu*) #(vi + ;; + *) + test -n "$verbose" && echo " work around broken package" 1>&6 + +echo "${as_me:-configure}:22336: testing work around broken package ..." 1>&5 + + + + + +if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then + test -n "$verbose" && echo " found package xmu" 1>&6 + +echo "${as_me:-configure}:22345: 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}:22352: 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}:22357: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 + + + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in $cf_pkgconfig_incs +do +case $cf_fix_cppflags in +no) + case $cf_add_cflags in #(vi + -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi + case $cf_add_cflags in + -D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + fi + ;; + esac + case "$CPPFLAGS" in + *$cf_add_cflags) #(vi + ;; + *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + ;; + esac + ;; + *) + cf_new_cflags="$cf_new_cflags $cf_add_cflags" + ;; + esac + ;; +yes) + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + CFLAGS="$CFLAGS $cf_new_cflags" +fi + +if test -n "$cf_new_cppflags" ; then + + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" +fi + +if test -n "$cf_new_extra_cppflags" ; then + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" +fi + + + + + LIBS="$cf_pkgconfig_libs $LIBS" + : +else + +test -n "$verbose" && echo " ...before $LIBS" 1>&6 + +echo "${as_me:-configure}:22448: testing ...before $LIBS ..." 1>&5 + + +LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s,-lXt ,-lXt -lXmu ," -e 's/ / /g'` +test -n "$verbose" && echo " ...after $LIBS" 1>&6 + +echo "${as_me:-configure}:22454: testing ...after $LIBS ..." 1>&5 + + + +fi + + ;; + esac + fi + + break +else + : +fi + + done +fi + +if test -z "$cf_x_athena_lib" ; then + + + + +if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then + test -n "$verbose" && echo " found package Xext" 1>&6 + +echo "${as_me:-configure}:22480: 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}:22487: 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}:22492: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 + + + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in $cf_pkgconfig_incs +do +case $cf_fix_cppflags in +no) + case $cf_add_cflags in #(vi + -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi + case $cf_add_cflags in + -D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + fi + ;; + esac + case "$CPPFLAGS" in + *$cf_add_cflags) #(vi + ;; + *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + ;; + esac + ;; + *) + cf_new_cflags="$cf_new_cflags $cf_add_cflags" + ;; + esac + ;; +yes) + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + CFLAGS="$CFLAGS $cf_new_cflags" +fi + +if test -n "$cf_new_cppflags" ; then + + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" fi -if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then - echo "$ac_t""yes" 1>&6 - : -else - echo "$ac_t""no" 1>&6 +if test -n "$cf_new_extra_cppflags" ; then + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" fi - if test $ac_cv_func_connect = no; then - echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:20883: checking for connect in -lsocket" >&5 -ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` + + + + LIBS="$cf_pkgconfig_libs $LIBS" + : +else + + echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6 +echo "configure:22582: checking for XextCreateExtension in -lXext" >&5 +ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lsocket $X_EXTRA_LIBS $LIBS" +LIBS="-lXext $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:22601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" + LIBS="-lXext $LIBS" else echo "$ac_t""no" 1>&6 fi - fi +fi - # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. - echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:20926: checking for remove" >&5 -if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then + + + + + +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}:22636: 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}:22643: 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}:22648: testing package xt 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 #(vi + -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi + case $cf_add_cflags in + -D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + fi + ;; + esac + case "$CPPFLAGS" in + *$cf_add_cflags) #(vi + ;; + *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + ;; + esac + ;; + *) + cf_new_cflags="$cf_new_cflags $cf_add_cflags" + ;; + esac + ;; +yes) + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + CFLAGS="$CFLAGS $cf_new_cflags" +fi + +if test -n "$cf_new_cppflags" ; then + + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" +fi + +if test -n "$cf_new_extra_cppflags" ; then + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" +fi + + + + + LIBS="$cf_pkgconfig_libs $LIBS" + + + case "x$LIBS" in #(vi + *-lX11*) #(vi + ;; + *) +# we have an "xt" package, but it may omit Xt's dependency on X11 +echo $ac_n "checking for usable X dependency""... $ac_c" 1>&6 +echo "configure:22742: checking for usable X dependency" >&5 +if eval "test \"`echo '$''{'cf_cv_xt_x11_compat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - cat > conftest.$ac_ext < conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char remove(); + +#include int main() { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_remove) || defined (__stub___remove) -choke me -#else -remove(); -#endif + int rc1 = XDrawLine((Display*) 0, (Drawable) 0, (GC) 0, 0, 0, 0, 0); + int rc2 = XClearWindow((Display*) 0, (Window) 0); + int rc3 = XMoveWindow((Display*) 0, (Window) 0, 0, 0); + int rc4 = XMoveResizeWindow((Display*)0, (Window)0, 0, 0, 0, 0); ; return 0; } EOF -if { (eval echo configure:20954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_remove=yes" +if { (eval echo configure:22762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + cf_cv_xt_x11_compat=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_remove=no" + + cf_cv_xt_x11_compat=no fi -rm -f conftest* +rm -rf conftest* +fi + +echo "$ac_t""$cf_cv_xt_x11_compat" 1>&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}:22779: 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}:22789: 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}:22796: 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}:22801: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 + + + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in $cf_pkgconfig_incs +do +case $cf_fix_cppflags in +no) + case $cf_add_cflags in #(vi + -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi + case $cf_add_cflags in + -D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + fi + ;; + esac + case "$CPPFLAGS" in + *$cf_add_cflags) #(vi + ;; + *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + ;; + esac + ;; + *) + cf_new_cflags="$cf_new_cflags $cf_add_cflags" + ;; + esac + ;; +yes) + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + CFLAGS="$CFLAGS $cf_new_cflags" +fi + +if test -n "$cf_new_cppflags" ; then + + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" +fi + +if test -n "$cf_new_extra_cppflags" ; then + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" fi -if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then - echo "$ac_t""yes" 1>&6 - : + + + + LIBS="$cf_pkgconfig_libs $LIBS" + : else - echo "$ac_t""no" 1>&6 + +test -n "$verbose" && echo " ...before $LIBS" 1>&6 + +echo "${as_me:-configure}:22892: 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}:22898: testing ...after $LIBS ..." 1>&5 + + + fi - if test $ac_cv_func_remove = no; then - echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:20975: checking for remove in -lposix" >&5 -ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + fi + ;; + esac + +echo $ac_n "checking for usable X Toolkit package""... $ac_c" 1>&6 +echo "configure:22909: checking for usable X Toolkit package" >&5 +if eval "test \"`echo '$''{'cf_cv_xt_ice_compat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - ac_save_LIBS="$LIBS" -LIBS="-lposix $LIBS" + cat > conftest.$ac_ext < int main() { -remove() +int num = IceConnectionNumber(0) + ; return 0; } EOF -if { (eval echo configure:20994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +if { (eval echo configure:22925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + cf_cv_xt_ice_compat=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" + cf_cv_xt_ice_compat=no fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" -else - echo "$ac_t""no" 1>&6 +rm -rf conftest* fi - fi +echo "$ac_t""$cf_cv_xt_ice_compat" 1>&6 - # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:21018: checking for shmat" >&5 -if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shmat(); + if test "$cf_cv_xt_ice_compat" = no + then + # workaround for broken ".pc" files used for X Toolkit. + case "x$X_PRE_LIBS" in #(vi + *-lICE*) + case "x$LIBS" in #(vi + *-lICE*) #(vi + ;; + *) + test -n "$verbose" && echo " work around broken ICE dependency" 1>&6 -int main() { +echo "${as_me:-configure}:22950: testing work around broken ICE dependency ..." 1>&5 -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_shmat) || defined (__stub___shmat) -choke me -#else -shmat(); -#endif -; return 0; } -EOF -if { (eval echo configure:21046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_shmat=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_shmat=no" + + + +if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then + test -n "$verbose" && echo " found package ice" 1>&6 + +echo "${as_me:-configure}:22959: 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}:22966: 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}:22971: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 + + + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in $cf_pkgconfig_incs +do +case $cf_fix_cppflags in +no) + case $cf_add_cflags in #(vi + -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi + case $cf_add_cflags in + -D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + fi + ;; + esac + case "$CPPFLAGS" in + *$cf_add_cflags) #(vi + ;; + *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + ;; + esac + ;; + *) + cf_new_cflags="$cf_new_cflags $cf_add_cflags" + ;; + esac + ;; +yes) + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + CFLAGS="$CFLAGS $cf_new_cflags" fi -rm -f conftest* + +if test -n "$cf_new_cppflags" ; then + + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" fi -if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then - echo "$ac_t""yes" 1>&6 - : -else - echo "$ac_t""no" 1>&6 +if test -n "$cf_new_extra_cppflags" ; then + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" fi - if test $ac_cv_func_shmat = no; then - echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:21067: checking for shmat in -lipc" >&5 -ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lipc $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + + + LIBS="$cf_pkgconfig_libs $LIBS" + + + +if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then + test -n "$verbose" && echo " found package sm" 1>&6 + +echo "${as_me:-configure}:23063: 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}:23070: 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}:23075: testing package sm 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 #(vi + -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi + case $cf_add_cflags in + -D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + fi + ;; + esac + case "$CPPFLAGS" in + *$cf_add_cflags) #(vi + ;; + *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + ;; + esac + ;; + *) + cf_new_cflags="$cf_new_cflags $cf_add_cflags" + ;; + esac + ;; +yes) + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + CFLAGS="$CFLAGS $cf_new_cflags" fi -rm -f conftest* -LIBS="$ac_save_LIBS" +if test -n "$cf_new_cppflags" ; then + + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" -else - echo "$ac_t""no" 1>&6 + +if test -n "$cf_new_extra_cppflags" ; then + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" fi - fi - fi - # 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. - # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. - echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:21119: checking for IceConnectionNumber in -lICE" >&5 -ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lICE $X_EXTRA_LIBS $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" + + LIBS="$cf_pkgconfig_libs $LIBS" + : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + : fi -rm -f conftest* -LIBS="$ac_save_LIBS" -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" else - echo "$ac_t""no" 1>&6 -fi + +test -n "$verbose" && echo " ...before $LIBS" 1>&6 - LDFLAGS="$ac_save_LDFLAGS" +echo "${as_me:-configure}:23170: testing ...before $LIBS ..." 1>&5 -fi +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}:23176: testing ...after $LIBS ..." 1>&5 +fi -# SYSTEM_NAME=`echo "$cf_cv_system_name"|tr ' ' -` + ;; + esac + ;; + esac + fi -cf_have_X_LIBS=no + cf_have_X_LIBS=yes -LDFLAGS="$X_LIBS $LDFLAGS" +else + + LDFLAGS="$X_LIBS $LDFLAGS" + test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me-configure}:21174: testing checking additions to CFLAGS ..." 1>&5 +echo "${as_me:-configure}:23197: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" @@ -21192,8 +23215,8 @@ no) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "${cf_add_cflags}" != "${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" @@ -21208,6 +23231,16 @@ no) *$cf_add_cflags) #(vi ;; *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" ;; esac @@ -21223,8 +23256,8 @@ yes) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` test "${cf_add_cflags}" != "${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=no + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no ;; esac done @@ -21232,7 +23265,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}:21236: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:23269: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 CFLAGS="$CFLAGS $cf_new_cflags" @@ -21241,7 +23274,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}:21245: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:23278: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 CPPFLAGS="$CPPFLAGS $cf_new_cppflags" @@ -21250,7 +23283,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}:21254: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:23287: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" @@ -21261,44 +23294,44 @@ fi if test "$cf_check_cflags" != "$CFLAGS" ; then cat > conftest.$ac_ext < int main() { printf("Hello world"); ; return 0; } EOF -if { (eval echo configure:21272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:23305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 -echo "${as_me-configure}:21280: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 +echo "${as_me:-configure}:23313: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 -echo "${as_me-configure}:21286: testing but keeping change to \$CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:23319: testing but keeping change to \$CPPFLAGS ..." 1>&5 fi CFLAGS="$cf_check_flags" fi -rm -f conftest* +rm -rf conftest* fi -echo $ac_n "checking for XOpenDisplay""... $ac_c" 1>&6 -echo "configure:21297: checking for XOpenDisplay" >&5 + echo $ac_n "checking for XOpenDisplay""... $ac_c" 1>&6 +echo "configure:23330: checking for XOpenDisplay" >&5 if eval "test \"`echo '$''{'ac_cv_func_XOpenDisplay'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:23358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_func_XOpenDisplay=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_func_XOpenDisplay=no" fi -rm -f conftest* +rm -rf conftest* fi if eval "test \"`echo '$ac_cv_func_'XOpenDisplay`\" = yes"; then @@ -21339,8 +23372,8 @@ if eval "test \"`echo '$ac_cv_func_'XOpe else echo "$ac_t""no" 1>&6 -echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:21344: checking for XOpenDisplay in -lX11" >&5 + echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 +echo "configure:23377: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -21348,7 +23381,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:23396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi @@ -21382,13 +23415,13 @@ fi fi -echo $ac_n "checking for XtAppInitialize""... $ac_c" 1>&6 -echo "configure:21387: checking for XtAppInitialize" >&5 + echo $ac_n "checking for XtAppInitialize""... $ac_c" 1>&6 +echo "configure:23420: checking for XtAppInitialize" >&5 if eval "test \"`echo '$''{'ac_cv_func_XtAppInitialize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:23448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_func_XtAppInitialize=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_func_XtAppInitialize=no" fi -rm -f conftest* +rm -rf conftest* fi if eval "test \"`echo '$ac_cv_func_'XtAppInitialize`\" = yes"; then @@ -21429,8 +23462,8 @@ if eval "test \"`echo '$ac_cv_func_'XtAp else echo "$ac_t""no" 1>&6 -echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6 -echo "configure:21434: checking for XtAppInitialize in -lXt" >&5 + echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6 +echo "configure:23467: checking for XtAppInitialize in -lXt" >&5 ac_lib_var=`echo Xt'_'XtAppInitialize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -21438,7 +23471,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:23486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi @@ -21468,8 +23501,8 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l #define HAVE_LIBXT 1 EOF - cf_have_X_LIBS=Xt - LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS" + cf_have_X_LIBS=Xt + LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS" else echo "$ac_t""no" 1>&6 fi @@ -21477,112 +23510,18 @@ fi fi +fi + + if test $cf_have_X_LIBS = no ; then echo "configure: 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." 1>&2 fi - -cf_x_athena=${cf_x_athena-Xaw} - -echo $ac_n "checking if you want to link with Xaw 3d library""... $ac_c" 1>&6 -echo "configure:21491: checking if you want to link with Xaw 3d library" >&5 -withval= - -# Check whether --with-Xaw3d or --without-Xaw3d was given. -if test "${with_Xaw3d+set}" = set; then - withval="$with_Xaw3d" - : -fi - -if test "$withval" = yes ; then - cf_x_athena=Xaw3d - echo "$ac_t""yes" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -echo $ac_n "checking if you want to link with neXT Athena library""... $ac_c" 1>&6 -echo "configure:21508: checking if you want to link with neXT Athena library" >&5 -withval= - -# Check whether --with-neXtaw or --without-neXtaw was given. -if test "${with_neXtaw+set}" = set; then - withval="$with_neXtaw" - : -fi - -if test "$withval" = yes ; then - cf_x_athena=neXtaw - echo "$ac_t""yes" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -echo $ac_n "checking if you want to link with Athena-Plus library""... $ac_c" 1>&6 -echo "configure:21525: checking if you want to link with Athena-Plus library" >&5 -withval= - -# Check whether --with-XawPlus or --without-XawPlus was given. -if test "${with_XawPlus+set}" = set; then - withval="$with_XawPlus" - : -fi - -if test "$withval" = yes ; then - cf_x_athena=XawPlus - echo "$ac_t""yes" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6 -echo "configure:21542: checking for XextCreateExtension in -lXext" >&5 -ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lXext $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LIBS="-lXext $LIBS" -else - echo "$ac_t""no" 1>&6 -fi - - -cf_x_athena_lib="" - - + cf_x_athena_root=$cf_x_athena -cf_x_athena_include="" +cf_x_athena_inc="" for cf_path in default \ /usr/contrib/X11R6 \ @@ -21590,19 +23529,19 @@ for cf_path in default \ /usr/lib/X11R5 \ /usr/local do - if test -z "$cf_x_athena_include" ; then + if test -z "$cf_x_athena_inc" ; then cf_save="$CPPFLAGS" cf_test=X11/$cf_x_athena_root/SimpleMenu.h if test $cf_path != default ; then CPPFLAGS="$cf_save -I$cf_path/include" echo $ac_n "checking for $cf_test in $cf_path""... $ac_c" 1>&6 -echo "configure:21600: checking for $cf_test in $cf_path" >&5 +echo "configure:23539: checking for $cf_test in $cf_path" >&5 else echo $ac_n "checking for $cf_test""... $ac_c" 1>&6 -echo "configure:21603: checking for $cf_test" >&5 +echo "configure:23542: checking for $cf_test" >&5 fi cat > conftest.$ac_ext < @@ -21611,7 +23550,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:21615: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:23554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_result=yes else @@ -21623,7 +23562,7 @@ fi rm -f conftest* echo "$ac_t""$cf_result" 1>&6 if test "$cf_result" = yes ; then - cf_x_athena_include=$cf_path + cf_x_athena_inc=$cf_path break else CPPFLAGS="$cf_save" @@ -21631,13 +23570,13 @@ rm -f conftest* fi done -if test -z "$cf_x_athena_include" ; then +if test -z "$cf_x_athena_inc" ; then echo "configure: warning: Unable to successfully find Athena header files with test program" 1>&2 -elif test "$cf_x_athena_include" != default ; then - CPPFLAGS="$CPPFLAGS -I$cf_x_athena_include" +elif test "$cf_x_athena_inc" != default ; then + CPPFLAGS="$CPPFLAGS -I$cf_x_athena_inc" fi - + cf_x_athena_root=$cf_x_athena cf_x_athena_lib="" @@ -21658,30 +23597,34 @@ do if test $cf_path != default ; then LIBS="-L$cf_path/lib $cf_lib $LIBS" echo $ac_n "checking for $cf_lib in $cf_path""... $ac_c" 1>&6 -echo "configure:21662: checking for $cf_lib in $cf_path" >&5 +echo "configure:23601: checking for $cf_lib in $cf_path" >&5 else LIBS="$cf_lib $LIBS" echo $ac_n "checking for $cf_test in $cf_lib""... $ac_c" 1>&6 -echo "configure:21666: checking for $cf_test in $cf_lib" >&5 +echo "configure:23605: checking for $cf_test in $cf_lib" >&5 fi cat > conftest.$ac_ext < +#include + int main() { -$cf_test() + +$cf_test((XtAppContext) 0) ; return 0; } EOF -if { (eval echo configure:21676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:23619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + cf_result=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + cf_result=no fi -rm -f conftest* +rm -rf conftest* echo "$ac_t""$cf_result" 1>&6 if test "$cf_result" = yes ; then cf_x_athena_lib="$cf_lib" @@ -21704,6 +23647,7 @@ cat >> confdefs.h <&6 -echo "configure:21717: checking for $ac_word" >&5 +echo "configure:23661: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XCURSES_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -21763,7 +23707,7 @@ LDFLAGS="$LDFLAGS $X_LIBS" test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me-configure}:21767: testing checking additions to CFLAGS ..." 1>&5 +echo "${as_me:-configure}:23711: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" @@ -21785,8 +23729,8 @@ no) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "${cf_add_cflags}" != "${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes if test $cf_fix_cppflags = yes ; then cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" @@ -21801,6 +23745,16 @@ no) *$cf_add_cflags) #(vi ;; *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" ;; esac @@ -21816,8 +23770,8 @@ yes) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` test "${cf_add_cflags}" != "${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=no + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no ;; esac done @@ -21825,7 +23779,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}:21829: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:23783: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 CFLAGS="$CFLAGS $cf_new_cflags" @@ -21834,7 +23788,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}:21838: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:23792: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 CPPFLAGS="$CPPFLAGS $cf_new_cppflags" @@ -21843,7 +23797,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}:21847: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:23801: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" @@ -21854,38 +23808,38 @@ fi if test "$cf_check_cflags" != "$CFLAGS" ; then cat > conftest.$ac_ext < int main() { printf("Hello world"); ; return 0; } EOF -if { (eval echo configure:21865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:23819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 -echo "${as_me-configure}:21873: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 +echo "${as_me:-configure}:23827: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 -echo "${as_me-configure}:21879: testing but keeping change to \$CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:23833: testing but keeping change to \$CPPFLAGS ..." 1>&5 fi CFLAGS="$cf_check_flags" fi -rm -f conftest* +rm -rf conftest* fi echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:21889: checking for XOpenDisplay in -lX11" >&5 +echo "configure:23843: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -21893,7 +23847,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:23862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* LIBS="$ac_save_LIBS" fi @@ -21925,14 +23879,14 @@ else fi echo $ac_n "checking for XCurses library""... $ac_c" 1>&6 -echo "configure:21929: checking for XCurses library" >&5 +echo "configure:23883: checking for XCurses library" >&5 if eval "test \"`echo '$''{'cf_cv_lib_XCurses'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else LIBS="-lXCurses $LIBS" cat > conftest.$ac_ext < @@ -21942,16 +23896,16 @@ int main() { XCursesExit(); ; return 0; } EOF -if { (eval echo configure:21946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +if { (eval echo configure:23900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + cf_cv_lib_XCurses=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* + cf_cv_lib_XCurses=no fi -rm -f conftest* +rm -rf conftest* fi @@ -21968,11 +23922,43 @@ EOF #define XCURSES 1 EOF - cat >> confdefs.h <<\EOF + ac_safe=`echo "xcurses.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for xcurses.h""... $ac_c" 1>&6 +echo "configure:23928: checking for xcurses.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:23938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF #define HAVE_XCURSES 1 EOF else + echo "$ac_t""no" 1>&6 +fi + +else { echo "configure: error: Cannot link with XCurses" 1>&2; exit 1; } fi @@ -21980,13 +23966,13 @@ fi ### sum up warnings if test "$cf_cv_termlib" = none ; then - echo "configure: warning: no term-lib found" 1>&2 + echo "configure: warning: no term-lib found, you might run into trouble later." 1>&2 fi if test "$YACC" = "" ; then - echo "configure: warning: no yacc-parser found" 1>&2 + echo "configure: warning: no yacc-parser found, you might run into trouble later." 1>&2 fi if test "$RANLIB" = "" ; then - echo "configure: warning: no library archive builder found" 1>&2 + echo "configure: warning: no library archive builder found, you might run into trouble later." 1>&2 fi ### Finally, build autoconf.h and the makefiles @@ -22135,7 +24121,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.13.20030927" + echo "$CONFIG_STATUS generated by autoconf version 2.13.20110430" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -22244,6 +24230,7 @@ s%@SPOOLDIR@%$SPOOLDIR%g s%@NOVROOTDIR@%$NOVROOTDIR%g s%@INEWSDIR@%$INEWSDIR%g s%@INEWS@%$INEWS%g +s%@NCURSES_CONFIG@%$NCURSES_CONFIG%g s%@PCRE_MAJOR@%$PCRE_MAJOR%g s%@PCRE_MINOR@%$PCRE_MINOR%g s%@PCRE_DATE@%$PCRE_DATE%g @@ -22280,13 +24267,14 @@ s%@POSUB@%$POSUB%g s%@DATADIRNAME@%$DATADIRNAME%g s%@INSTOBJEXT@%$INSTOBJEXT%g s%@GENCAT@%$GENCAT%g -s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g s%@INTL_LIBTOOL_SUFFIX_PREFIX@%$INTL_LIBTOOL_SUFFIX_PREFIX%g +s%@NLS_TEXTDOMAIN@%$NLS_TEXTDOMAIN%g s%@MSG_DIR_MAKE@%$MSG_DIR_MAKE%g s%@SUB_MAKEFILE@%$SUB_MAKEFILE%g s%@INTLDIR_MAKE@%$INTLDIR_MAKE%g s%@GT_YES@%$GT_YES%g s%@GT_NO@%$GT_NO%g +s%@PKG_CONFIG@%$PKG_CONFIG%g s%@X_CFLAGS@%$X_CFLAGS%g s%@X_PRE_LIBS@%$X_PRE_LIBS%g s%@X_LIBS@%$X_LIBS%g diff -Nurp --exclude='.bzr*' tin-1.9.6/configure.in tin-2.0.0/configure.in --- tin-1.9.6/configure.in 2010-11-26 16:07:59.000000000 +0100 +++ tin-2.0.0/configure.in 2011-08-23 00:03:55.029301209 +0200 @@ -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 : 2010-04-06 +dnl Updated : 2011-08-07 dnl Notes : dnl -dnl Copyright (c) 1995-2010 Thomas E. Dickey +dnl Copyright (c) 1995-2011 Thomas E. Dickey dnl All rights reserved. dnl dnl Redistribution and use in source and binary forms, with or without @@ -34,14 +34,14 @@ dnl SOFTWARE, EVEN IF ADVISED OF THE POS dnl dnl Process this file with autoconf to produce a configure script. -AC_PREREQ(2.13.20020210) +AC_PREREQ(2.13.20110430) AC_INIT(include/tin.h) AC_CONFIG_HEADER(include/autoconf.h:include/autoconf.hin) AC_PREFIX_DEFAULT(/usr/local) dnl PACKAGE is required for GNU gettext PACKAGE=tin -VERSION=1.9.6 +VERSION=2.0.0 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AC_SUBST(PACKAGE) @@ -79,7 +79,7 @@ case "$host_os" in esac ### Native Language Support -ALL_LINGUAS="da de en_GB et fr ru rw sv tr" +ALL_LINGUAS="da de en_GB et fr ru sv tr" ### Checks for programs save_CFLAGS="$CFLAGS" @@ -358,9 +358,7 @@ AC_MSG_RESULT($cf_with_screen) use_curses=no use_ncurses=no -AC_MSG_CHECKING(if you specified curses install-directory) CF_WITH_CURSES_DIR($cf_with_screen) -AC_MSG_RESULT($cf_cv_curses_dir) case $cf_with_screen in #(vi termcap|terminfo) #(we will determine which it really is @@ -382,14 +380,14 @@ pdcurses) #(vi none) AC_MSG_CHECKING(if you want to use ncurses library) AC_ARG_WITH(ncurses, - [ --with-ncurses link with ncurses if available (depriciated)], + [ --with-ncurses link with ncurses if available (deprecated)], [use_ncurses=$withval], [use_ncurses=no]) AC_MSG_RESULT($use_ncurses) AC_MSG_CHECKING(if you want curses rather than termcap interface) CF_ARG_ENABLE(curses, - [ --enable-curses use curses interface (depriciated)], + [ --enable-curses use curses interface (deprecated)], [cf_with_screen=curses; use_curses=$withval], [cf_with_screen=termcap; use_curses=no]) AC_MSG_RESULT($enableval) @@ -400,22 +398,17 @@ if test $use_curses != no ; then AC_DEFINE(USE_CURSES) case $cf_with_screen in #(vi ncurses) #(vi - CF_NCURSES_CPPFLAGS - CF_NCURSES_LIBS + CF_NCURSES_CONFIG ;; ncursesw) #(vi CF_CHECK_HEADERS(stdlib.h wchar.h wctype.h) AM_MULTIBYTE_ABLE - CF_NCURSES_CPPFLAGS(ncursesw) - CF_NCURSES_LIBS(ncursesw) - CF_NCURSES_VERSION + CF_NCURSES_CONFIG(ncursesw) CF_XOPEN_CURSES test "$cf_cv_need_xopen_extension" = unknown && AC_ERROR(X/Open curses not found) ;; curses) #(vi - CF_CURSES_CPPFLAGS - CF_CURSES_LIBS - CF_NCURSES_VERSION + CF_CURSES_CONFIG CF_XOPEN_CURSES ;; esac @@ -719,6 +712,7 @@ CF_CHECK_HEADERS(\ fcntl.h \ getopt.h \ ioctl.h \ + inttypes.h \ langinfo.h \ libc.h \ locale.h \ @@ -738,6 +732,7 @@ CF_CHECK_HEADERS(\ stdarg.h \ stdbool.h \ stddef.h \ + stdint.h \ stdlib.h \ string.h \ strings.h \ @@ -942,6 +937,7 @@ AC_CHECK_FUNCS(\ fork \ ftime \ ftruncate \ + fsync \ getcwd \ gettimeofday \ getwd \ @@ -975,6 +971,7 @@ AC_CHECK_FUNCS(\ strdup \ strftime \ strpbrk \ + strrchr \ strrstr \ strsep \ strstr \ @@ -1005,7 +1002,7 @@ AC_TRY_COMPILE([ #endif], [struct timeval *tv; struct timezone *tz; -gettimeofday(tv, tz);], +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 @@ -1152,7 +1149,6 @@ CF_CHECK_DECL(\ fwrite \ getcwd \ getopt \ - getpass \ getwd \ ioctl \ isascii \ @@ -1287,24 +1283,19 @@ case "$host_os" in AC_CHECK_FUNC(link, AC_DEFINE(HAVE_LINK)) esac -# tin has mkdirs.sh instead of mkinstalldirs, overwrite the result of test -# in gettext.m4 -MKINSTALLDIRS="\$(top_srcdir)/mkdirs.sh" -AC_SUBST(MKINSTALLDIRS) - if test "$cf_cv_termlib" = pdcurses ; then CF_PDCURSES_X11 fi ### sum up warnings if test "$cf_cv_termlib" = none ; then - AC_MSG_WARN(no term-lib found, you might run into trouble later.) + AC_MSG_WARN([no term-lib found, you might run into trouble later.]) fi if test "$YACC" = "" ; then - AC_MSG_WARN(no yacc-parser found, you might run into trouble later.) + AC_MSG_WARN([no yacc-parser found, you might run into trouble later.]) fi if test "$RANLIB" = "" ; then - AC_MSG_WARN(no library archive builder found, you might run into trouble later.) + AC_MSG_WARN([no library archive builder found, you might run into trouble later.]) fi ### Finally, build autoconf.h and the makefiles diff -Nurp --exclude='.bzr*' tin-1.9.6/doc/CHANGES tin-2.0.0/doc/CHANGES --- tin-1.9.6/doc/CHANGES 2010-11-26 15:51:54.000000000 +0100 +++ tin-2.0.0/doc/CHANGES 2011-08-22 00:17:19.035286979 +0200 @@ -1,3 +1,72 @@ +-- 2.0.0 release 20110823 "Ardenistiel" -- + +U029) Thomas E. Dickey + ADD. update configure macros; switch to 2.13.20110430 + ADD. --with-pkg-config configure switch + ADD. --with-textdomain configure switch + ADD. don't use hardcoded number of available colors; don't try to set + colors out of identified range + FIX. color.c, curses.c, init.c, main.c, tcurses.c, autoconf.h[in] + proto.h aclocal.m4, configure[.in], Makefile, Makefile.in + install-sh + +U028) Dennis Preiser + BUG. used preprocessor directives within snprintf which may be + implemented as a macro + BUG. fixed a typo + BUG. fixed several display problems in the !USE_CURSES case + BUG. fixed several display problems with non default foreground and + background colors. + BUG. dead increment + BUG. didn't unfold structured news_headers_to_display before calling + convert_to_printable which replaces \n with ? + BUG. scopes with just quick_{kill,select}_* rules got lost when + entering the scopes menu + BUG. last option in options 'M'enu may be invisible + BUG. unnecessary screen redraw in options 'M'enu + ADD. reject out of range background colors in menu/tinrc + ADD. removed some unnecessary variables + ADD. PageToggleAllHeaders + ADD. do not strip tabs from Subject or Organization in page header + ADD. tinrc.utf8_graphics to use UTF-8 characters for various graphics + FIX. extern.h, keymap.h, proto.h, tcurses.h, tin.h, tinrc.h, art.c + attrib.c, charset.c, color.c, config.c, cook.c, curses.c, feed.c + filter.c, group.c, help.c, init.c, keymap.c, lang.c, mail.c, misc.c + nntplib.c, options_menu.c, page.c, pgp.c, post.c, prompt.c, read.c + rfc2046.c, save.c, screen.c, select.c, string.c, tcurses.c, thread.c + tincfg.tbl, tin.1, tin.5, keymap.sample + +U027) Urs Janssen + BUG. used preprocessor directives within snprintf which may be + implemented as a macro + BUG. tinrc.ask_for_metamail had no effect + BUG. CHECK_SIGN for gpg was wrong (at least for gpg 1.4.x) + BUG. .so TLD wasn't allowed but is in use since 11/2010 + BUG. .xxx gTLD wasn't allowed but is in use since 04/2011 + BUG. .yu TLD was still allowed but is defunct since 04/2010 + BUG. forged supersedes (-DFORGERY) were only allowed via 'x'(repost) + but not via 'D'(cancel) + BUG. superseding own articles in forgery conf. didn't add Cancel-Key + BUG. possible double fclose + ADD. allow -- in domain names in URL_REGEX and NEWS_REGEX + ADD. allow new IDN ccTLDs of Algeria, India, Korea, Morocco, Serbia + Singapore and Syria + REM. Kinyarwanda po files + REM. configure check for unused getpass(3) + ADD. cache getenv("NNTPSERVER") result early + ADD. -4 / -6 cmd. line switch + ADD. config.guess, config.sub update + ADD. configure check for stdint.h and inttypes.h + ADD. configure check for fsync() + FIX. help.c, init.c, lang.c, main.c, newsrc.c, nntplib.c, pgp.c, post.c + prompt.c save.c, extern.h, policy.h, tin.h, tincfg.tbl + Makefile[.in], autoconf.h[in], configure[.in], config.guess + config.sub, tin.1, rw.po + +U026) Matt Anton + ADD. updated french translation + FIX. fr.po + -- 1.9.6 release 20101126 "Burnside" -- U025) Matt Anton @@ -17,11 +86,11 @@ U022) Thomas E. Dickey +U021) Dennis Preiser BUG. SIGWINCH at page level after a connection timeout lead to a crash BUG. no SIGWINCH hadling in setup_check_article() BUG. comments in references were not skipped - BUG. fixed some display problem in the !USE_CURSES case + BUG. fixed some display problems in the !USE_CURSES case ADD. info message on SearchRepeat without previous search ADD. attachment level 'V' at the article-pager ADD. URL level 'U' at the article-pager @@ -100,7 +169,7 @@ U016) Volker Borchert +U015) Dennis Preiser ADD. scope and attributes menu ADD. help pages to the various menus ADD. PageSkipIncludedText now skips over the next quoted block @@ -186,11 +255,11 @@ U013) Thomas E. Dickey + 021) Dennis Preiser BUG. memleak in free_attributes() FIX. memory.c -U012) Dennis Preiser +U012) Dennis Preiser ADD. enhance attributes documentation ADD. menu-option/attribute to turn verbatim block handling on and off ADD. menu-option to color the lines between the verbatim marks diff -Nurp --exclude='.bzr*' tin-1.9.6/doc/CHANGES.old tin-2.0.0/doc/CHANGES.old --- tin-1.9.6/doc/CHANGES.old 2010-09-27 15:48:39.000000000 +0200 +++ tin-2.0.0/doc/CHANGES.old 2011-06-09 11:08:42.387736075 +0200 @@ -92,7 +92,7 @@ U043) Urs Janssen BUG. PGP_INCLUDE_KEY in the pgp-2 case didn't work ADD. pcre update (5.0 -> 6.1) ADD. warning about lines exceeding 998 octets - ADD. try LIST MOTD at start and show it's output if any + ADD. try LIST MOTD at start and show its output if any ADD. merged GroupBugReport, SelectBugReport, ThreadBugReport to BugReport; GroupMarkArtUnread, PageMarkArtUnread, ThreadMarkArtUnread to MarkArticleUnread; GroupMarkThdUnread, @@ -5611,7 +5611,7 @@ U001) Urs Janssen 151) Dirk Nimmich ADD. rewrote options 'M'enu, add several configurable options - ADD. getline() now allows to set maximum number of characters to type + ADD. getline() now allows one to set maximum number of characters to type in. FIX. several supplied patches diff -Nurp --exclude='.bzr*' tin-1.9.6/doc/INSTALL tin-2.0.0/doc/INSTALL --- tin-1.9.6/doc/INSTALL 2009-09-16 16:42:00.000000000 +0200 +++ tin-2.0.0/doc/INSTALL 2011-06-09 13:22:12.043119931 +0200 @@ -69,8 +69,7 @@ TIN related: DEBUG MATCH_TAR_PATTERN JUST_TESTING NEW_HASH_METHOD OPTIMIZE_JUST_STAR REREAD_ACTIVE_FILE_SECS - USE_UTF8_HORIZONTAL_ELLIPSIS NO_LOCKING - FILE_MODE_BROKEN + NO_LOCKING FILE_MODE_BROKEN System related: --datadir --localstatedir @@ -85,6 +84,7 @@ System related: --with-build-cppflags --with-build-ldflags --with-build-libs --build --host --target + --with-pkg-config --with-textdomain News machine names ------------------ @@ -376,7 +376,7 @@ environment variable ISO2ASC. --with-curses-dir=dir (default: empty) If (n)curses is not installed in a standard location (i.e below /usr) you -can specify it's installation directory here. +can specify its installation directory here. --with-screen=type (default: termcap) This is a simpler way (than --with-ncurses and --enable-curses) to specify @@ -390,7 +390,7 @@ Define this if you want to link with ncu is required on some Linux distributions (i.e., SuSE) where there is either a curses or termcap library which is not ncurses. If ncurses is installed as the curses library, this option is usually not needed. This option is -depriciated, use --with-screen=ncurses (see above) instead. +deprecated, use --with-screen=ncurses (see above) instead. --enable-curses (default: off) Enable this if you wish to use the curses screen optimizing rather than @@ -399,7 +399,7 @@ termcap. This has been tested well start is known to have a bug in libc which prevents use of curses, ncurses works well on that platform). To build with ncurses screen optimizing, you must give both the --with-ncurses and --enable-curses options. This option is -depriciated, use --with-screen=ncurses (see above) instead. +deprecated, use --with-screen=ncurses (see above) instead. --enable-inverse-video (default: on) Disable if you want inverse video and highlighted bar disabled by default. diff -Nurp --exclude='.bzr*' tin-1.9.6/doc/TODO tin-2.0.0/doc/TODO --- tin-1.9.6/doc/TODO 2010-11-25 23:24:09.000000000 +0100 +++ tin-2.0.0/doc/TODO 2011-08-16 22:02:07.311190484 +0200 @@ -31,9 +31,6 @@ o unexpected multiline responses confus (the servers response should be a single line (INN 2.2)) [20050207 Urs Janssen ] -o piping/printing articles grabbles screen - [20030501 Urs Janssen ] - o better integrate saving of MIME/non-MIME articles when not using libuu. MIME sections are saved by the 's'ave operations, uuencoded sections are saved as part of the postprocess backend @@ -104,6 +101,11 @@ o mailers other than sendmail (f.e. elm New features ------------ +o as libidn only does IDNA 2003 but not IDNA 2008 (RFC 5890-5894) add + a configure check for libidnkit2.x () + and if found use idn_decodename() in misc.c:idna_decode() + [20110120 Urs Janssen ] + o add nntp_default_server to tin.defaults to override compile time setting. if given strings starts with / or ~ the value is taken from the referenced file, if it starts with $ it is read from the referenced variable. @@ -114,9 +116,6 @@ o the old space_goto_next_article=ON && an additional goto_next_read rc-var [20101101 Urs Janssen ] -o key to show all article headers but not switch into raw mode like ^H does - [20100911 Urs Janssen ] - o add DEFAULT_SIGDASHES_REGEX and related 'M'enu-entry for signature detection in cook.c [20080925 Urs Janssen ] @@ -299,11 +298,17 @@ o unify Fcc and posted_articles_file o MIME-pgp support according to RFC 2015, RFC 3156 - (should be easy now) and/or in the format that used by signcontrol/pgpverify (see also tinews.pl) - As MIME-pgp verification needs the undecoded mime-part with it's headers + As MIME-pgp verification needs the undecoded mime-part with its headers storing the raw-offset of each part in the article would be very helpful. +o pgpverify invocation with a single key instead of '|''a''pgpverify' or a + buildin pgpverify solution. + o pgp-{6,7} support +o add check for GPGME () and if + found use it for pgp actions. + o add feature Cc: o add feature show_new_newsgroups_since @@ -349,10 +354,6 @@ o Add to the 'M'enu: '&' (GLOBAL_TOGGLE_COLOR) and maybe a way to change built in path like DEFAULT_MAILER, PATH_PGP, ... - '?','/','\' search (partly done, currently only the displayed page is - searched which is not that useful) - 'h' (GLOBAL_HELP) - o Add to the attachment menu ('V'): 'F' post followup to current article, not including current attachment 'R' reply through mail to author, not including current attachment @@ -400,13 +401,12 @@ o add check for liblzma/libbzip2/zlib ( and add an option to write/read {g,b,l}zipped local overviews. liblzma, zlib, libbzip2 and lzo might also be used for post-processing. -o add check for GPGME () and if - found use it for pgp actions. - o rewrite/cleanup all the debugging code, the output in /tmp is messy; the on screen output either slows down things dramatically or is unreadable; add timestamps to at least the NNTP-log; split DEBUG_MISC? +o Add 'M'enu option to define chars for utf8_graphics. + Posting enhancements -------------------- o sort Followup-To:/Newsgroups: after stripping doubled newsgroups and @@ -478,6 +478,17 @@ o add 'autoview' (spawn external viewer o integrate multi-part tagging with regular tagging, eg. "This article appears to have multi-parts, try and find them (y/n)?" +o do RFC 2231 decoding of non us-ascii MIME-parameter values + (rfc2046.c:parse_params()) + [20110428 Urs Janssen ] + +o allow RFC 2231 parameter value continuations + [20110428 Urs Janssen ] + +o allow RFC 2231 language specification in encoded words + (rfc2047.c:rfc1522_decode()) + [20110428 Urs Janssen ] + o add Content-Language (RFC 3282) analysis o suppress hide_uue=2 checking unless first line in an article or following @@ -485,6 +496,22 @@ o suppress hide_uue=2 checking unless f Internal Changes ---------------- +o curses.c:input_pending() and curses.c:get_arrow_key() have + #ifdef HAVE_SELECT and a code path for the case when we don't have + select(2), but read.c:wait_for_input() has no code path the the + !HAVE_SELECT case. we should add a !HAVE_SELECT case there (or at + least have adjusted messages in txt_reading_article and txt_group) + [20110506 Urs Janssen ] + +o ditch MAX_MSG_HEADERS (post.c) + [20110212 Urs Janssen ] + +o always display (also) the servers error response string to the user, + currently tin sometimes gives generic messages (i.e. when authentication + fails), but the servers response may include additional infos (like + bandwidth exceeded) + [20101230 Urs Janssen ] + o rewrite mini-help, remove the long strings and generate them dynamicly one help text for each key makes translations more easy and uniq and can use the available space on the screen much better if not running on 80 @@ -530,7 +557,9 @@ o remove untranslatable constructs like [20050413 Urs Janssen ] o keys which could be renamed/merged: + - 'l' GroupListThd, PageListThd - 'm' GroupMail, PageMail, PostMail, ThreadMail + - 'D' GroupCancel, PageCancel, ThreadCancel - 'N' GroupNextUnreadArt, PageNextUnreadArt, (SelectNextUnreadGrp) - 'S' GroupAutoSave, PageAutoSave, ThreadAutoSave - 'P' GroupPrevUnreadArt, PagePrevUnreadArt @@ -655,6 +684,10 @@ o add configure-switch for DISABLE_PIPE o mask inline PGP SIGNATURE/KEY BLOCK like we do for uu-sections [20090722 Urs Janssen ] +o some non fixed width strings could be formatted nicer (warp on last space + before cCOLS), i.e. txt_warn_downgrade + [20110325 Urs Janssen ] + Unicode ------- o add UTF-8 (unicode) support (RFC 2279) @@ -742,6 +775,14 @@ o integrate doc/auth.txt into tin.1-man Not yet classified ------------------ +o make --with-defaults-dir= default to $sysconfdir/tin + (=/usr/local/etc/tin)? + [20110809 Urs Janssen ] + +o Supersedes (and repost) don't reuse the Reply-To: header of the original + article + [20110808 Urs Janssen ] + o what about !us-ascii chars in username/password when using AUTHINFO USER/PASS? Currently they are sent as is, RFC 3977 says "The character set for all NNTP commands is UTF-8", RFC 4643 doesn't @@ -885,11 +926,7 @@ o check_article_to_be_posted() needs a o update gettext stuff to > gettext-0.12.1 -o clean up included pcre stuff and update to >= pcre-8.10 - -o what is with conflicting tinrc settings? should we disallow those, or leave - it to the user to realise that e.g. strip_blanks=ON && inverse_okay=ON - looks ugly? +o clean up included pcre stuff and update to >= pcre-8.13 o shows up cross-postings multiple times even if read once before getting a resync/reread active/newsrc-file @@ -901,6 +938,10 @@ o think about group numbering in "only o remove tinrc.strip_blanks? IMHO it's not needed anymore [20020305 Urs Janssen ] +o what is with conflicting tinrc settings? should we disallow those, or leave + it to the user to realise that e.g. strip_blanks=ON && inverse_okay=ON + looks ugly? + o doesn't handle symlinks for .oldnewsrc (see <20021003021508.GA28021@akk10.akk.uni-karlsruhe.de> for details, urs. if we're going to 'fix' this we must be careful to avoid symlink diff -Nurp --exclude='.bzr*' tin-1.9.6/doc/WHATSNEW tin-2.0.0/doc/WHATSNEW --- tin-1.9.6/doc/WHATSNEW 2010-11-26 15:48:21.000000000 +0100 +++ tin-2.0.0/doc/WHATSNEW 2011-04-17 16:04:26.674498085 +0200 @@ -12,6 +12,8 @@ New features . writes out newsrc if getting SIGUSR2 . authentication via SASL PLAIN (RFC 4643) is preferred over USER/PASS . prefer LIST COUNTS (RFC 6048) over LIST ACTIVE if supported +. danish translation +. -4 / -6 cmd. line switches to force IPv4 / IPv6 connection Changes ------- @@ -31,7 +33,9 @@ Changes show_only_unread -> show_only_unread_arts sort_art_type -> sort_article_type thread_arts -> thread_articles -. '-s', '-m' and '-G' cmd-line options no longer changes the corresponding +. changed names in keymap: + PageToggleHeaders -> PageToggleRaw +. '-s', '-m' and '-G' cmd-line options no longer change the corresponding tinrc values . '-w' uses the first given cmd-line group as default group to post to . with positive getart_limit all unread articles less than getart_limit are @@ -45,3 +49,4 @@ Retired Features . VMS support . libinn support (was broken for ages) . AUTHINFO GENERIC (deprecated by RFC 4643) +. Kinyarwanda translation (unmaintained since initial commit) diff -Nurp --exclude='.bzr*' tin-1.9.6/doc/config-anomalies tin-2.0.0/doc/config-anomalies --- tin-1.9.6/doc/config-anomalies 2010-11-19 17:13:32.000000000 +0100 +++ tin-2.0.0/doc/config-anomalies 2011-05-08 11:53:02.432430682 +0200 @@ -32,10 +32,6 @@ art_marked_selected, art_marked_recent, art_marked_killed and art_marked_read_selected must be converted by SPACE_TO_DASH() before writing to tinrc file. -default_filter_kill_case and default_filter_select_case write inverted values -to tinrc file (not really a problem -- these are not in option_table and must -be handled explicitly anyway) - ----------------------------------------------------------------------------- tinrc variables that should be removed because they can be used in the diff -Nurp --exclude='.bzr*' tin-1.9.6/doc/keymap.sample tin-2.0.0/doc/keymap.sample --- tin-1.9.6/doc/keymap.sample 2010-10-01 22:12:37.000000000 +0200 +++ tin-2.0.0/doc/keymap.sample 2011-04-17 16:04:27.074558965 +0200 @@ -1,4 +1,4 @@ -# Keymap file V1.0.8 for the TIN newsreader +# Keymap file V1.0.9 for the TIN newsreader # # Sample keymap file # This file contains the default key mappings @@ -127,7 +127,7 @@ HelpFirstPage g PageReplyQuoteHeaders ^E PagePGPCheckArticle ^G -PageToggleHeaders ^H +PageToggleRaw ^H PageNextUnread TAB PageNextThd ^J ^M PageToggleTabs ^T @@ -136,6 +136,7 @@ PageToggleTex2iso " PageToggleRot % PageToggleUue ( PageReveal ) +PageToggleAllHeaders * PageSkipIncludedText : PageTopThd < PageBotThd > diff -Nurp --exclude='.bzr*' tin-1.9.6/doc/l10n/de/tin.1 tin-2.0.0/doc/l10n/de/tin.1 --- tin-1.9.6/doc/l10n/de/tin.1 2010-11-26 15:46:20.000000000 +0100 +++ tin-2.0.0/doc/l10n/de/tin.1 2011-08-22 00:21:06.738589017 +0200 @@ -3,7 +3,7 @@ .\" Module : tin.1 .\" Author : I. Lea, U. Janssen .\" Created : 1991-08-23 -.\" Updated : 2010-11-26 +.\" Updated : 2011-08-23 .\" 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 "26. November 2010" 1.9.6 "Usenet Newsreader" +.TH tin 1 "23. August 2011" 2.0.0 "Usenet Newsreader" .\" .\" .SH NAME @@ -26,10 +26,11 @@ tin, rtin \- Ein Usenet Newsreader .\" \fBtin\fP [\|[\|\fB\-h\fP\||\|\fB\-H\fP\||\|\fB\-V\fP\|]\ \|| [\|[\|[\|\fB\-a\fP\|] [\|\fB\-dlnq\fP\||\|\fB\-Q\fP\|] [\|\fB\-ArzxX\fP\|]\|] [\|[\|\fB\-R\fP\||\|\fB\-S\fP\|] -\|\|\fB\-s\fP \fINews\-Verz.\fP\|] [\|\fB\-cuvZ\fP\|] [\|\fB\-N\fP\||\|\fB\-M\fP \fIAdresse\fP\|] -[\|\fB\-o\fP\||\|\fB\-w\fP\|]\|] [\|\fB\-D\fP \fIDebuggrad\fP\|] [\|\fB\-G\fP -\fIArtikellimit\fP\|] [\|\fB\-f\fP \fInewsrc\-Datei\fP\|] [\|\fB\-g\fP \fIServer\fP\|] -[\|\fB\-m\fP \fIMail\-Verz.\fP\|] [\|\fB\-p\fP \fIPort\fP\|] [\|\fB\-I\fP \fIindex\-Verz.\fP\|]\ \|[\fINewsgruppe\fP\|[\|,.\|.\|.\|]\|]\|] +\|\|\fB\-s\fP \fINews\-Verz.\fP\|] [\|\fB\-cuvZ\fP\|] [\|\fB\-4\fP\||\|\fB\-6\fP\|] +[\|\fB\-N\fP\||\|\fB\-M\fP \fIAdresse\fP\|] [\|\fB\-o\fP\||\|\fB\-w\fP\|]\|] [\|\fB\-D\fP +\fIDebuggrad\fP\|] [\|\fB\-G\fP \fIArtikellimit\fP\|] [\|\fB\-f\fP \fInewsrc\-Datei\fP\|] +[\|\fB\-g\fP \fIServer\fP\|] [\|\fB\-m\fP \fIMail\-Verz.\fP\|] [\|\fB\-p\fP \fIPort\fP\|] [\|\fB\-I\fP +\fIindex\-Verz.\fP\|]\ \|[\fINewsgruppe\fP\|[\|,.\|.\|.\|]\|]\|] .SH BESCHREIBUNG \fBtin\fP ist ein einfach zu bedienender Newsreader für das Usenet. Er kann Artikel von einem lokalen (z. B. aus \fI/var/spool/news\fP) oder entfernten @@ -81,6 +82,12 @@ Ungelesene Nachrichten vorhanden .\" .SH OPTIONEN .TP 12 +\fB\-4\fP +Verbindung via IPv4 zum NNTP Server erzwingen. +.TP +\fB\-6\fP +Verbindung via IPv6 zum NNTP Server erzwingen. +.TP \fB\-a\fP ANSI\-Farben ein/\-ausschalten (Standard ist aus). .TP @@ -289,7 +296,7 @@ unread articles displayed on the same li X 5 124 news.software.readers Discussion of software used to r .fi .PP -Eventuell steht am Anfang der Zeile noch eines def folgende Zeichen: +Eventuell steht am Anfang der Zeile noch eines der folgende Zeichen: .TP 10 \fBu\fP This group is unsubscribed. To see only your subscribed groups use the @@ -921,7 +928,7 @@ Select the current thread for later proc Toggle selection of current article. .TP \fBThreadReverseSel '@'\fP -Reverse article selections. +Artikelauswahl invertieren. .TP \fBThreadUndoSel '~'\fP Undo all selections on current thread. @@ -1054,7 +1061,7 @@ article with all headers included. \fBPagePGPCheckArticle '^G'\fP Perform \fBpgp\fP(1) operations on article. .TP -\fBPageToggleHeaders '^H'\fP +\fBPageToggleRaw '^H'\fP Toggles the display mode (raw including all headers vs. cooked). .TP \fBMenuFilterKill '^K'\fP @@ -1062,7 +1069,7 @@ Kill article(s) using a menu. Read the s information. .TP \fBPageToggleTabs '^T'\fP -Toggle the TAB width between 4 and 8 characters. +Tabulatorbreite zwischen 4 und 8 Zeichen Umschalten. .TP \fBPageFollowupQuoteHeaders '^W'\fP Post a followup to the current article with a copy of the article with all @@ -1072,6 +1079,10 @@ headers included. Toggle TeX to ISO decoding for current article. The default behavior is taken from the \fBtex2iso_conv\fP variable in the tinrc file. .TP +\fBPageToggleAllHeaders '*'\fP +Toggles the display of all headers vs. headers in +\fBnews_headers_to_display\fP. +.TP \fBPageToggleRot '%'\fP Toggle ROT\-13 decoding for this article. .TP @@ -1104,10 +1115,10 @@ is everything which matches \fBquote_reg \fBquote_regex3\fP. .TP \fBPageTopThd '<'\fP -Goto the first article in the current thread. +Go to the first article in the current thread. .TP \fBPageBotThd '>'\fP -Goto the last article in the current thread. +Go to the last article in the current thread. .TP \fBPageToggleHighlight '_'\fP Toggle word highlighting on/off. @@ -1135,10 +1146,10 @@ TINRC CONFIGURABLE VARIABLES" for a full "FILTERING ARTICLES" for more information on filtering. .TP \fBPageNextThd '^J' ''\fP -Goto next base article. +Go to next base article. .TP \fBPageNextUnread ''\fP -Goto next unread article. If the tinrc variable \fBgoto_next_unread\fP doesn't +Go to next unread article. If the tinrc variable \fBgoto_next_unread\fP doesn't contain PageNextUnread, then this key will first page through the current article. .TP @@ -1179,7 +1190,7 @@ Post a followup to the current article w article. .TP \fBPageFirstPage 'g'\fP -Goto the start of the article. +Zum Anfang des Artikels springen. .TP \fBPageLastPage 'G'\fP Zum Ende des Artikels springen. @@ -1255,7 +1266,7 @@ or reposting. Return to group selection level. .TP \fBPageGotoParent 'u'\fP -Goto parent article. +Go to parent article. .TP \fBPageViewUrl 'U'\fP Display a list of URLs in the current article. See the section "URL LISTING" @@ -1284,7 +1295,7 @@ Alle Artikel als ungelesen markieren. .\"-------------------------------------------------------------------- .\" Markiere den aktuellen Thread als ungelesen. -.SS "URL LISTING" +.SS "URL LISTE" \fBPageViewUrl\fP ('\fBU\fP') displays a list of URLs in the current article. Besides the common moving keys, the following commands are available: @@ -1628,13 +1639,13 @@ OFF=apply to current group. Default is O Default for quick (1 key) kill filter header. .RS +.5i .IP 0 4 - \*(rqSubject:\*(rq (Gross/Kleinschreibung beachten) + \*(rqSubject:\*(rq (Groß/Kleinschreibung beachten) .IP 1 - \*(rqSubject:\*(rq (Gross/Kleinschreibung ignorieren) + \*(rqSubject:\*(rq (Groß/Kleinschreibung ignorieren) .IP 2 - \*(rqFrom:\*(rq (Gross/Kleinschreibung beachten) + \*(rqFrom:\*(rq (Groß/Kleinschreibung beachten) .IP 3 - \*(rqFrom:\*(rq (Gross/Kleinschreibung ignorieren) + \*(rqFrom:\*(rq (Groß/Kleinschreibung ignorieren) .IP 4 \*(rqMessage\-ID:\*(rq & alle \*(rqReferences:\*(rq Einträge .IP 5 @@ -1661,13 +1672,13 @@ groups OFF=apply to current group. Defau Default for quick (1 key) auto\-selection filter header. .RS +.5i .IP 0 4 - \*(rqSubject:\*(rq (Gross/Kleinschreibung beachten) + \*(rqSubject:\*(rq (Groß/Kleinschreibung beachten) .IP 1 - \*(rqSubject:\*(rq (Gross/Kleinschreibung ignorieren) + \*(rqSubject:\*(rq (Groß/Kleinschreibung ignorieren) .IP 2 - \*(rqFrom:\*(rq (Gross/Kleinschreibung beachten) + \*(rqFrom:\*(rq (Groß/Kleinschreibung beachten) .IP 3 - \*(rqFrom:\*(rq (Gross/Kleinschreibung ignorieren) + \*(rqFrom:\*(rq (Groß/Kleinschreibung ignorieren) .IP 4 \*(rqMessage\-ID:\*(rq & alle \*(rqReferences:\*(rq Einträge .IP 5 @@ -2283,7 +2294,7 @@ The default is Both Subject and Referenc If ON catchup group/thread when leaving with the left arrow key. Default is ON. .TP -\fBProzentualer Subject vergleich (thread_perc)\fP +\fBProzentualer Subject Vergleich (thread_perc)\fP How closely the subjects must match for two threads to be considered part of the same thread. This is a percentage and the default if 75%. .TP @@ -2361,6 +2372,10 @@ If enabled \fBtin\fP uses \fBslrnface\fP header. For this option to have any effect, \fBtin\fP must be running in an \fBxterm\fP(1x) and \fBslrnface\fP(1) must be in your $\fBPATH\fP. Default is OFF. .TP +\fBUse UTF\-8 graphics (utf8_graphics)\fP +If ON use UTF\-8 characters for indicator ('\->'), thread/attachment tree +and ellipsis ('...'). Default is OFF. +.TP \fBReg. Ausd. für den Anfang e. wortgetreuen Textblock (verbatim_begin_regex)\fP A regular expression that tin will use to find the begin of a verbatim block. @@ -2871,7 +2886,8 @@ groups you are not reading anymore with .\" $TMPDIR/REFS.info (-D 8) .\" $TMPDIR/MALLOC (-D 16) .\" $TMPDIR/ATTRIBUTES (-D 32) -.\" $TMPDIR/SCOPES (-D 32) +.\" $TMPDIR/SCOPES-R (-D 32) +.\" $TMPDIR/SCOPES-W (-D 32) .\" $TMPDIR/ACTIVE (-D 64) Für eine ausführlich Beschreibung siehe \fBtin\fP(5). .PP @@ -3092,9 +3108,29 @@ Set the article header field \*(rqDistri variable instead of the system default. .TP \fBISO2ASC\fP -.\" TODO: short document the different tables (doc/iso2asc.txt) here Set the ISO to ASCII charset decoding table character to use in decoding an article text. Values can range from 0 to 6. +.RS +.5i +.TP +\fB0\fP +universal table for many languages +.TP +\fB1\fP +single\-spacing universal table +.TP +\fB2\fP +table for Danish, Dutch, German, Norwegian and Swedish +.TP +\fB3\fP +table for Danish, Finnish, Norwegian and Swedish using the appropriate ISO +646 variant +.TP +\fB4\fP +table with RFC 1345 codes in brackets +.TP +\fB5\fP +table for printers that allow overstriking with backspace +.RE .TP \fBORGANIZATION\fP Set the article header field \*(rqOrganization:\*(rq to the contents of the @@ -3126,7 +3162,7 @@ This variable has precedence over the de mailing operations within \fBtin\fP. .TP \fBMAIL\fP -Full path to the users mailbox. +Full path to the user's mailbox. .TP \fBVISUAL\fP This variable has precedence over the default editor (i.e., \fBvi\fP(1)) that diff -Nurp --exclude='.bzr*' tin-1.9.6/doc/l10n/de/tin.5 tin-2.0.0/doc/l10n/de/tin.5 --- tin-1.9.6/doc/l10n/de/tin.5 2010-11-26 15:46:21.000000000 +0100 +++ tin-2.0.0/doc/l10n/de/tin.5 2011-08-22 00:21:07.766748414 +0200 @@ -2,7 +2,7 @@ .\" Module : tin.5 .\" Author : U. Janssen .\" Created : 2000-07-10 -.\" Updated : 2010-11-26 +.\" Updated : 2011-08-23 .\" Notes : needs a some work .\" .\" @@ -11,7 +11,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH tin 5 "26. November 2010" 1.9.6 "Usenet Newsreader" +.TH tin 5 "23. August 2011" 2.0.0 "Usenet Newsreader" .SH NAME tin, rtin \- zugehörige Dateien @@ -37,7 +37,8 @@ Zeilenenden ('\en' aka LF) haben. .\" $TMPDIR/REFS.info (-D 8) .\" $TMPDIR/MALLOC (-D 16) .\" $TMPDIR/ATTRIBUTES (-D 32) -.\" $TMPDIR/SCOPES (-D 32) +.\" $TMPDIR/SCOPES-R (-D 32) +.\" $TMPDIR/SCOPES-W (-D 32) .\" $TMPDIR/ACTIVE (-D 64) .PP \fI$MAILCAPS\fP @@ -250,7 +251,7 @@ authorization. If the password contains in doublequotes ("). Usernames must not be enclosed in doublequotes and thus can't contain spaces or tabs. Any line that starts with "#" is a comment. Blank lines are ignored. This file should be readable only for the -user as it contains the users uncrypted password for reading news! +user as it contains the user's uncrypted password for reading news! .TP \fBNNTPServer\fP Vollständiger Name (FQDN) des Newsservers. @@ -409,7 +410,7 @@ active file of user's saved newsgroups, .RS The group attributes files may be used to override some global settings from \fI${TIN_HOMEDIR:\-"$HOME"}/.tin/tinrc\fP on a per group basis. Order is -important as last match counts; this allows to refine attributes for +important as last match counts; this allows one to refine attributes for narrowed scopes. Note that the \fIscope=\fP line has to be specified before the attributes are specified for that list and each attribute can only be set once per scope section. All attributes are set to @@ -744,7 +745,7 @@ 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 +Vergleiche mit \*(rqSubject:\*(rq .TP \fBfrom\fP Match against \*(rqFrom:\*(rq. \fBtin\fP(1) converts the contents of the \*(rqFrom:\*(rq @@ -759,10 +760,10 @@ Match against \*(rqMessage\-ID:\*(rq and Match against \*(rqMessage\-ID:\*(rq and last \*(rqReferences:\*(rq entry only .TP \fBmsgid_only\fP -Match against \*(rqMessage\-ID:\*(rq +Vergleiche mit \*(rqMessage\-ID:\*(rq .TP \fBrefs_only\fP -Match against \*(rqReferences:\*(rq +Vergleiche mit \*(rqReferences:\*(rq .TP \fBlines\fP Match against \*(rqLines:\*(rq, num matches more @@ -919,12 +920,13 @@ defaults. If a keyname is bound to NULL .sp \fBPageReplyQuoteHeaders\fP ^E \fBPagePGPCheckArticle\fP ^G -\fBPageToggleHeaders\fP ^H +\fBPageToggleRaw\fP ^H \fBPageNextUnread\fP TAB \fBPageNextThd\fP ^J ^M \fBPageToggleTabs\fP ^T \fBPageFollowupQuoteHeaders\fP ^W \fBPageToggleTex2iso\fP " +\fBPageToggleAllHeaders\fP * \fBPageToggleRot\fP % \fBPageToggleUue\fP ( \fBPageReveal\fP ) @@ -1110,7 +1112,7 @@ copy exists. Each line consist of two ta \fBgroup.name\fP ist der Name der Newsgruppe .TP -\fBone\-line description\fP +\fBKurzbeschreibung\fP ist die zugehörige Kurzbeschreibung .RE .PP @@ -1146,7 +1148,7 @@ server. At startup, \fBtin\fP(1) reads in the configuration file. This contains a list of "\fIvariable\fP=\fIvalue\fP" pairs that can be used to configure the way \fBtin\fP(1) works. If it exists, the global configuration file, -\fI${TIN_LIBDIR:\-NEWSLIBDIR}/tinrc\fP is read first. After that, the users own +\fI${TIN_LIBDIR:\-NEWSLIBDIR}/tinrc\fP is read first. After that, the user's own configuration file \fI${TIN_HOMEDIR:\-"$HOME"}/.tin/tinrc\fP is read. The global file is useful for distributing system\-wide defaults to new users who have no private tinrc yet (see also \fB/etc/tin/tin.defaults\fP). @@ -1363,10 +1365,10 @@ Default for quick (1 key) kill filter he .in +.3i .nf .ta \w'0,1 'u +\w'\'\'Message\-ID:\'\' & last \'\'References:\'\' entry only'u -0 \*(rqSubject:\*(rq (Gross/Kleinschreibung beachten) -1 \*(rqSubject:\*(rq (Gross/Kleinschreibung ignorieren) -2 \*(rqFrom:\*(rq (Gross/Kleinschreibung beachten) -3 \*(rqFrom:\*(rq (Gross/Kleinschreibung ignorieren) +0 \*(rqSubject:\*(rq (Groß/Kleinschreibung beachten) +1 \*(rqSubject:\*(rq (Groß/Kleinschreibung ignorieren) +2 \*(rqFrom:\*(rq (Groß/Kleinschreibung beachten) +3 \*(rqFrom:\*(rq (Groß/Kleinschreibung ignorieren) 4 \*(rqMessage\-ID:\*(rq & alle \*(rqReferences:\*(rq Einträge 5 \*(rqMessage\-ID:\*(rq & letzter \*(rqReferences:\*(rq Eintrag 6 \*(rqMessage\-ID:\*(rq allein @@ -1391,10 +1393,10 @@ Default for quick (1 key) auto\-selectio .in +.3i .nf .ta \w'0,1 'u +\w'\'\'Message\-ID:\'\' & last \'\'References:\'\' entry only'u -0 \*(rqSubject:\*(rq (Gross/Kleinschreibung beachten) -1 \*(rqSubject:\*(rq (Gross/Kleinschreibung ignorieren) -2 \*(rqFrom:\*(rq (Gross/Kleinschreibung beachten) -3 \*(rqFrom:\*(rq (Gross/Kleinschreibung ignorieren) +0 \*(rqSubject:\*(rq (Groß/Kleinschreibung beachten) +1 \*(rqSubject:\*(rq (Groß/Kleinschreibung ignorieren) +2 \*(rqFrom:\*(rq (Groß/Kleinschreibung beachten) +3 \*(rqFrom:\*(rq (Groß/Kleinschreibung ignorieren) 4 \*(rqMessage\-ID:\*(rq & alle \*(rqReferences:\*(rq Einträge 5 \*(rqMessage\-ID:\*(rq & letzter \*(rqReferences:\*(rq Eintrag 6 \*(rqMessage\-ID:\*(rq allein @@ -1561,18 +1563,24 @@ filename to save to. Default is \fI${TIN The format string used to create the mailer command with parameters that is used for mailing articles to other people. Default is '%M "%T" < %F' (e.g., /bin/mail "iain" < .article). The flexible format allows other -mailers with different command line parameters to be used such as 'elm \-s -"%S" "%T" < "%F"' (e.g., elm \-s "subject" "iain" < .article) or -\&'sendmail \-oem \-t < %F' (e.g. sendmail \-oem \-t < .article). The -following substitutions are supported: +mailers with different command line parameters to be used such as +.in +.3i +.nf +sendmail \-oem \-t < %F +elm \-s "%S" "%T" < "%F" +claws\-mail \-\-compose "mailto:%T?subject=%S&insert=%F" +.fi +.in -.3i +\fBinteractive_mailer\fP muss passend dazu gesetzt sein. Folgende Ersetzungen +werden unterstützt: .in +.3i .nf .ta \w'%S'u +\w'subject\-field'u -%F filename +%F Dateiname %M default_mailer -%S subject\-field -%T to\-filed -%U username +%S Subject\-Feld +%T To\-Feld +%U Username %% % .fi .in -.3i @@ -1767,8 +1775,8 @@ times (for example, '> > >' will be turn .IP 2 \fBQuote Signatures\fP This option is off by default. Signatures are always quoted regardless of this option when you are viewing an article in raw mode -\fBPageToggleHeaders\fP ('\fB^H\fP') and followup or reply to it. Signatures are -never quoted regardless of this option when \fBshow_signatures\fP is off. +\fBPageToggleRaw\fP ('\fB^H\fP') and followup or reply to it. Signatures are never +quoted regardless of this option when \fBshow_signatures\fP is off. .IP 4 \fBLeerzeilen zitieren\fP Diese Option ist standardmäßig aktiviert. .RE @@ -2084,6 +2092,10 @@ If enabled \fBslrnface\fP(1) will be us header. For this option to have any effect, \fBtin\fP(1) must be running in an \fBxterm\fP(1x) and \fBslrnface\fP(1) must be in your $\fBPATH\fP. Default is OFF. .TP +\fButf8_graphics\fP +If ON use UTF\-8 characters for indicator ('\->'), thread/attachment tree +and ellipsis ('...'). Default is OFF. +.TP \fBverbatim_begin_regex\fP A regular expression that tin will use to find the begin of a verbatim block. Default is #v+ @@ -2204,7 +2216,7 @@ same dir as \fIspooldir\fP), common valu specified value. .TP \fBoverviewfile\fP -Names einer Overview\-Datei, übliche Namen sind \fI.overview\fP oder +Name einer Overview\-Datei, übliche Namen sind \fI.overview\fP oder \fIover.view\fP. .TP \fBoverviewfmtfile\fP @@ -2342,7 +2354,7 @@ created. Each line consist of two tab\-s \fBgroup.name\fP ist der Name der Newsgruppe .TP -\fBone\-line description\fP +\fBKurzbeschreibung\fP ist die zugehörige Kurzbeschreibung .TP \fBtin\fP(1) diff -Nurp --exclude='.bzr*' tin-1.9.6/doc/l10n/de.po tin-2.0.0/doc/l10n/de.po --- tin-1.9.6/doc/l10n/de.po 2010-11-26 15:46:17.000000000 +0100 +++ tin-2.0.0/doc/l10n/de.po 2011-08-22 00:21:02.773974368 +0200 @@ -1,11 +1,11 @@ # German translations for tin manpages # This file is distributed under the same license as the tin package. -# Urs Janssen , 2008-2010. +# Urs Janssen , 2008-2011. # msgid "" msgstr "" "Project-Id-Version: tin 1.9.5\n" -"POT-Creation-Date: 2010-11-26 15:44+0100\n" +"POT-Creation-Date: 2011-08-22 00:19+0200\n" "PO-Revision-Date: 2009-10-01 16:17+0200\n" "Last-Translator: Urs Janssen \n" "Language-Team: LANGUAGE \n" @@ -22,14 +22,14 @@ msgstr "tin" # type: TH #: ../tin.1:12 ../tin.5:9 #, no-wrap -msgid "November 26th, 2010" -msgstr "26. November 2010" +msgid "August 23rd, 2011" +msgstr "23. August 2011" # type: TH #: ../tin.1:12 ../tin.5:9 #, no-wrap -msgid "1.9.6" -msgstr "1.9.6" +msgid "2.0.0" +msgstr "2.0.0" # type: TH #: ../tin.1:12 ../tin.5:9 @@ -55,32 +55,34 @@ msgid "SYNOPSIS" msgstr "ÜBERSICHT" # type: Plain text -#: ../tin.1:48 +#: ../tin.1:49 msgid "" "B [\\|[\\|B<-h>\\||\\|B<-H>\\||\\|B<-V>\\|]\\ \\|| [\\|[\\|[\\|B<-a>" "\\|] [\\|B<-dlnq>\\||\\|B<-Q>\\|] [\\|B<-ArzxX>\\|]\\|] [\\|[\\|B<-R>\\||\\|" -"B<-S>\\|] \\|\\|B<-s> I\\|] [\\|B<-cuvZ>\\|] [\\|B<-N>\\||\\|B<-M> " -"I
\\|] [\\|B<-o>\\||\\|B<-w>\\|]\\|] [\\|B<-D> I\\|] " -"[\\|B<-G> I\\|] [\\|B<-f> I\\|] [\\|B<-g> " -"I\\|] [\\|B<-m> I\\|] [\\|B<-p> I\\|] [\\|B<-I> " -"I\\|]\\ \\|[I\\|[\\|,.\\|.\\|.\\|]\\|]\\|]" +"B<-S>\\|] \\|\\|B<-s> I\\|] [\\|B<-cuvZ>\\|] [\\|B<-4>\\||\\|B<-6>" +"\\|] [\\|B<-N>\\||\\|B<-M> I
\\|] [\\|B<-o>\\||\\|B<-w>\\|]\\|] [\\|" +"B<-D> I\\|] [\\|B<-G> I\\|] [\\|B<-f> " +"I\\|] [\\|B<-g> I\\|] [\\|B<-m> I\\|] [\\|B<-" +"p> I\\|] [\\|B<-I> I\\|]\\ \\|[I\\|[\\|,.\\|.\\|." +"\\|]\\|]\\|]" msgstr "" "B [\\|[\\|B<-h>\\||\\|B<-H>\\||\\|B<-V>\\|]\\ \\|| [\\|[\\|[\\|B<-a>" "\\|] [\\|B<-dlnq>\\||\\|B<-Q>\\|] [\\|B<-ArzxX>\\|]\\|] [\\|[\\|B<-R>\\||\\|" -"B<-S>\\|] \\|\\|B<-s> I\\|] [\\|B<-cuvZ>\\|] [\\|B<-N>\\||\\|B<-" -"M> I\\|] [\\|B<-o>\\||\\|B<-w>\\|]\\|] [\\|B<-D> I\\|] " -"[\\|B<-G> I\\|] [\\|B<-f> I\\|] [\\|B<-g> " -"I\\|] [\\|B<-m> I\\|] [\\|B<-p> I\\|] [\\|B<-I> " -"I\\|]\\ \\|[I\\|[\\|,.\\|.\\|.\\|]\\|]\\|]" +"B<-S>\\|] \\|\\|B<-s> I\\|] [\\|B<-cuvZ>\\|] [\\|B<-4>\\||\\|B<-" +"6>\\|] [\\|B<-N>\\||\\|B<-M> I\\|] [\\|B<-o>\\||\\|B<-w>\\|]\\|] " +"[\\|B<-D> I\\|] [\\|B<-G> I\\|] [\\|B<-f> I\\|] [\\|B<-g> I\\|] [\\|B<-m> I\\|] [\\|B<-p> " +"I\\|] [\\|B<-I> I\\|]\\ \\|[I\\|[\\|,.\\|.\\|." +"\\|]\\|]\\|]" # type: SH -#: ../tin.1:48 ../tin.5:14 +#: ../tin.1:49 ../tin.5:14 #, no-wrap msgid "DESCRIPTION" msgstr "BESCHREIBUNG" # type: Plain text -#: ../tin.1:57 +#: ../tin.1:58 msgid "" "B is a full-screen easy to use Usenet newsreader. It can read news " "locally (e.g., I) or remotely (B or B option) " @@ -95,7 +97,7 @@ msgstr "" "Indexdateien bzw. den [X]OVER NNTP-Befehl (B, B)." # type: Plain text -#: ../tin.1:63 +#: ../tin.1:64 msgid "" "B has four separate levels of operation: Selection level, Group level, " "Thread level and Article level. Use the B ('B') command to view a " @@ -106,7 +108,7 @@ msgstr "" "jeweils verfügbaren Befehle angezeigt werden." # type: Plain text -#: ../tin.1:71 +#: ../tin.1:72 msgid "" "On startup B will show a list of the newsgroups found in I<" "${TIN_HOMEDIR:-\"$HOME\"}/.newsrc>. An arrow '-E' or highlighted bar " @@ -126,7 +128,7 @@ msgstr "" "'BCRE>' betreten." # type: Plain text -#: ../tin.1:76 +#: ../tin.1:77 msgid "" "The B ('BTABE>') key enters the next " "newsgroup with unread articles." @@ -135,95 +137,117 @@ msgstr "" "die nächste Newsgruppe mit ungelesenen Artikeln betreten." # type: SH -#: ../tin.1:76 +#: ../tin.1:77 #, no-wrap msgid "EXIT STATUS" msgstr "EXIT-STATUS" # type: Plain text -#: ../tin.1:78 +#: ../tin.1:79 msgid "Interactive mode:" msgstr "Interaktiver-Modus:" # type: TP -#: ../tin.1:79 ../tin.1:89 ../tin.1:1059 +#: ../tin.1:80 ../tin.1:90 ../tin.1:1066 ../tin.1:3230 #, no-wrap msgid "B<0>" msgstr "B<0>" # type: Plain text -#: ../tin.1:82 +#: ../tin.1:83 msgid "Successful program execution." msgstr "Programm erfolgreich beendet." # type: TP -#: ../tin.1:82 ../tin.1:92 +#: ../tin.1:83 ../tin.1:93 ../tin.1:3233 #, no-wrap msgid "B<1>" msgstr "B<1>" # type: Plain text -#: ../tin.1:85 ../tin.1:95 +#: ../tin.1:86 ../tin.1:96 msgid "Usage, syntax, configuration file or network error." msgstr "Bedien-, Syntax-, Konfigurations- oder Netzwerk-Fehler." # type: Plain text -#: ../tin.1:88 +#: ../tin.1:89 msgid "Batch mode (''B<-Z>''):" msgstr "Batch-Modus (''B<-Z>''):" # type: Plain text -#: ../tin.1:92 +#: ../tin.1:93 msgid "No unread news" msgstr "Keine ungelesenen Nachrichten vorhanden" # type: TP -#: ../tin.1:95 +#: ../tin.1:96 ../tin.1:3236 #, no-wrap msgid "B<2>" msgstr "B<2>" # type: Plain text -#: ../tin.1:98 +#: ../tin.1:99 msgid "Unread news" msgstr "Ungelesene Nachrichten vorhanden" # type: SH -#: ../tin.1:101 +#: ../tin.1:102 #, no-wrap msgid "OPTIONS" msgstr "OPTIONEN" # type: TP -#: ../tin.1:102 +#: ../tin.1:103 +#, no-wrap +msgid "B<-4>" +msgstr "B<-4>" + +# type: Plain text +#: ../tin.1:106 +msgid "Force connecting via IPv4 to the remote NNTP server." +msgstr "Verbindung via IPv4 zum NNTP Server erzwingen." + +# type: TP +#: ../tin.1:106 +#, no-wrap +msgid "B<-6>" +msgstr "B<-6>" + +# type: Plain text +#: ../tin.1:109 +msgid "Force connecting via IPv6 to the remote NNTP server." +msgstr "Verbindung via IPv6 zum NNTP Server erzwingen." + +# type: TP +#: ../tin.1:109 #, no-wrap msgid "B<-a>" msgstr "B<-a>" # type: Plain text -#: ../tin.1:105 +#: ../tin.1:112 msgid "Toggle ANSI color (default is off)." msgstr "ANSI-Farben ein/-ausschalten (Standard ist aus)." # type: TP -#: ../tin.1:105 +#: ../tin.1:112 #, no-wrap msgid "B<-A>" msgstr "B<-A>" # type: Plain text -#: ../tin.1:108 +#: ../tin.1:115 msgid "Force authentication on initial connect." msgstr "Erzwinge Authentifikation beim Verbindungsaufbau." # type: TP -#: ../tin.1:108 +#: ../tin.1:115 #, no-wrap msgid "B<-c>" msgstr "B<-c>" # type: Plain text -#: ../tin.1:113 +#: ../tin.1:120 msgid "" "Create/update index files for every group in I<${TIN_HOMEDIR:-\"$HOME\"}/." "newsrc> or file specified by the ''B<-f>'' option and mark all articles as " @@ -234,24 +258,24 @@ msgstr "" "Datei und markiere alle Artikel als gelesen." # type: TP -#: ../tin.1:113 +#: ../tin.1:120 #, no-wrap msgid "B<-d>" msgstr "B<-d>" # type: Plain text -#: ../tin.1:116 +#: ../tin.1:123 msgid "Don't load newsgroup descriptions (interactive mode)." msgstr "Keine Gruppenbeschreibungen laden (Interaktiver-Modus)." # type: TP -#: ../tin.1:116 +#: ../tin.1:123 #, no-wrap msgid "B<-D>I< debug-level>" msgstr "B<-D>I< Debuggrad>" # type: Plain text -#: ../tin.1:120 +#: ../tin.1:127 msgid "" "Enter debug-level (1 = NNTP, 2 = filter, 4 = newsrc, 8 = threading, 16 = " "memory, 32 = attributes, 64 = misc)." @@ -260,13 +284,13 @@ msgstr "" "Speicher, 32 = attributes, 64 = Diverses)." # type: TP -#: ../tin.1:120 +#: ../tin.1:127 #, no-wrap msgid "B<-f>I< file>" msgstr "B<-f>I< Datei>" # type: Plain text -#: ../tin.1:124 +#: ../tin.1:131 msgid "" "Use the specified file of subscribed to newsgroups in place of I<" "${TIN_HOMEDIR:-\"$HOME\"}/.newsrc>." @@ -275,13 +299,13 @@ msgstr "" "\"}/.newsrc>." # type: TP -#: ../tin.1:124 +#: ../tin.1:131 #, no-wrap msgid "B<-g>I< server>" msgstr "B<-g>I< Server>" # type: Plain text -#: ../tin.1:128 +#: ../tin.1:135 msgid "" "Use the server and newsrc specified in I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/" "newsrctable>." @@ -290,48 +314,48 @@ msgstr "" "newsrctable> benutzen." # type: TP -#: ../tin.1:128 +#: ../tin.1:135 #, no-wrap msgid "B<-G>I< article-limit>" msgstr "B<-G>I< Artikellimit>" # type: Plain text -#: ../tin.1:131 +#: ../tin.1:138 msgid "Limit the number of articles/group to retrieve from the server." msgstr "Beschränkt die Anzahl der zu ladenden Artikel pro Gruppe." # type: TP -#: ../tin.1:131 +#: ../tin.1:138 #, no-wrap msgid "B<-h>" msgstr "B<-h>" # type: Plain text -#: ../tin.1:134 +#: ../tin.1:141 msgid "Help listing all command-line options." msgstr "Kurzübersicht der verfügbaren Komandozeilenoptionen." # type: TP -#: ../tin.1:134 +#: ../tin.1:141 #, no-wrap msgid "B<-H>" msgstr "B<-H>" # type: Plain text -#: ../tin.1:138 +#: ../tin.1:145 msgid "" "Brief introduction to B that is also shown the first time it is started." msgstr "" "Kurzeinführung in B welche auch beim allerersten Start ausgegeben wird." # type: TP -#: ../tin.1:138 +#: ../tin.1:145 #, no-wrap msgid "B<-I>I< dir>" msgstr "B<-I>I< Verzeichnis>" # type: Plain text -#: ../tin.1:144 +#: ../tin.1:151 msgid "" "Directory in which to store newsgroup index files. Default is I<" "${TIN_INDEX_NEWSDIR:-\"${TIN_HOMEDIR:-\"$HOME\"}/.tin\"}/.news>. This " @@ -340,13 +364,13 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:144 +#: ../tin.1:151 #, no-wrap msgid "B<-l>" msgstr "B<-l>" # type: Plain text -#: ../tin.1:154 +#: ../tin.1:161 msgid "" "Get number of articles per group from the I<${TIN_LIBDIR:-NEWSLIBDIR}\"/" "\"${TIN_ACTIVEFILE:-active}> file. If reading via NNTP this is done with the " @@ -358,26 +382,26 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:154 +#: ../tin.1:161 #, no-wrap msgid "B<-m>I< dir>" msgstr "B<-m>I< Verzeichnis>" # type: Plain text -#: ../tin.1:157 +#: ../tin.1:164 msgid "Mailbox directory to use. Default is I<${TIN_HOMEDIR:-\"$HOME\"}/Mail>." msgstr "" "Zu benutzendes Mailbox-Verzeichnis. Standard ist I<${TIN_HOMEDIR:-\"$HOME\"}/" "Mail>." # type: TP -#: ../tin.1:157 +#: ../tin.1:164 #, no-wrap msgid "B<-M>I< user>" msgstr "B<-M>I< Benutzer>" # type: Plain text -#: ../tin.1:161 +#: ../tin.1:168 msgid "" "Mail unread articles to specified user for later reading. For more " "information read section \"AUTOMATIC MAILING AND SAVING NEW NEWS\"." @@ -387,13 +411,13 @@ msgstr "" "UND SPEICHERN VON UNGELESENEN ARTIKELN\"." # type: TP -#: ../tin.1:161 +#: ../tin.1:168 #, no-wrap msgid "B<-n>" msgstr "B<-n>" # type: Plain text -#: ../tin.1:168 +#: ../tin.1:175 msgid "" "Only load groups from the I<${TIN_LIBDIR:-NEWSLIBDIR}\"/\"${TIN_ACTIVEFILE:-" "active}> file that are subscribed to in the user's I<${TIN_HOMEDIR:-\"$HOME" @@ -402,13 +426,13 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:168 +#: ../tin.1:175 #, no-wrap msgid "B<-N>" msgstr "B<-N>" # type: Plain text -#: ../tin.1:172 +#: ../tin.1:179 msgid "" "Mail unread articles to yourself for later reading. For more information " "read section \"AUTOMATIC MAILING AND SAVING NEW NEWS\"." @@ -418,26 +442,26 @@ msgstr "" "SPEICHERN VON UNGELESENEN ARTIKELN\"." # type: TP -#: ../tin.1:172 +#: ../tin.1:179 #, no-wrap msgid "B<-o>" msgstr "B<-o>" # type: Plain text -#: ../tin.1:176 +#: ../tin.1:183 msgid "" "Quick post all postponed articles and exit. In order for this to be really " "quick, it should be used with ''B<-n>'' if possible." msgstr "" # type: TP -#: ../tin.1:176 +#: ../tin.1:183 #, no-wrap msgid "B<-p>I< port>" msgstr "B<-p>I< Port>" # type: Plain text -#: ../tin.1:180 +#: ../tin.1:187 msgid "" "Port to use if reading via NNTP (default is 119). This also overrides the " "environment variable $B if set." @@ -446,24 +470,24 @@ msgstr "" "Übersteuert die Umgebungsvariable $B." # type: TP -#: ../tin.1:180 +#: ../tin.1:187 #, no-wrap msgid "B<-q>" msgstr "B<-q>" # type: Plain text -#: ../tin.1:183 +#: ../tin.1:190 msgid "Don't check for new newsgroups." msgstr "Nicht prüfen ob neue Newsgruppen vorhanden sind." # type: TP -#: ../tin.1:183 +#: ../tin.1:190 #, no-wrap msgid "B<-Q>" msgstr "B<-Q>" # type: Plain text -#: ../tin.1:187 +#: ../tin.1:194 msgid "" "Quick start. Start B as quickly as possible. Currently this is " "equivalent to ''B<-nqd>''." @@ -472,50 +496,50 @@ msgstr "" "diese Option ''B<-nqd>''." # type: TP -#: ../tin.1:187 +#: ../tin.1:194 #, no-wrap msgid "B<-r>" msgstr "B<-r>" # type: Plain text -#: ../tin.1:192 +#: ../tin.1:199 msgid "" "Read news remotely from the default NNTP server specified in the environment " "variable $B or contained in the file I." msgstr "" # type: TP -#: ../tin.1:192 +#: ../tin.1:199 #, no-wrap msgid "B<-R>" msgstr "B<-R>" # type: Plain text -#: ../tin.1:195 +#: ../tin.1:202 msgid "Read news saved by the ''B<-S>'' option." msgstr "Lese mittels ''B<-S>'' gespeicherte Artikel." # type: TP -#: ../tin.1:195 +#: ../tin.1:202 #, no-wrap msgid "B<-s>I< dir>" msgstr "B<-s>I< Verzeichnis>" # type: Plain text -#: ../tin.1:199 +#: ../tin.1:206 msgid "" "Save/read articles to/in directory. Default is I<${TIN_HOMEDIR:-\"$HOME\"}/" "News>." msgstr "" # type: TP -#: ../tin.1:199 +#: ../tin.1:206 #, no-wrap msgid "B<-S>" msgstr "B<-S>" # type: Plain text -#: ../tin.1:203 +#: ../tin.1:210 msgid "" "Save unread articles for later reading by the ''B<-R>'' option. For more " "information read section \"AUTOMATIC MAILING AND SAVING NEW NEWS\"." @@ -525,13 +549,13 @@ msgstr "" "SPEICHERN VON UNGELESENEN ARTIKELN\"." # type: TP -#: ../tin.1:203 +#: ../tin.1:210 #, no-wrap msgid "B<-u>" msgstr "B<-u>" # type: Plain text -#: ../tin.1:209 +#: ../tin.1:216 msgid "" "Create/update index files for every group in I<${TIN_HOMEDIR:-\"$HOME\"}/." "newsrc> or file specified by the ''B<-f>'' option. This option is disabled " @@ -540,13 +564,13 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:209 +#: ../tin.1:216 #, no-wrap msgid "B<-v>" msgstr "B<-v>" # type: Plain text -#: ../tin.1:213 +#: ../tin.1:220 msgid "" "Verbose mode for ''B<-c>'', ''B<-M>'', ''B<-N>'', ''B<-S>'', \\&''B<-u>'' " "and ''B<-Z>'' options." @@ -555,24 +579,24 @@ msgstr "" "u>'' und ''B<-Z>''-Optionen." # type: TP -#: ../tin.1:213 +#: ../tin.1:220 #, no-wrap msgid "B<-V>" msgstr "B<-V>" # type: Plain text -#: ../tin.1:216 +#: ../tin.1:223 msgid "Print version and date information." msgstr "Versionsinformationen ausgeben." # type: TP -#: ../tin.1:216 +#: ../tin.1:223 #, no-wrap msgid "B<-w>" msgstr "B<-w>" # type: Plain text -#: ../tin.1:220 +#: ../tin.1:227 msgid "" "Quick mode to post an article and then exit. In order for this to be really " "quick, it should be used with ''B<-n>'' if possible." @@ -581,24 +605,24 @@ msgstr "" "kombinieren." # type: TP -#: ../tin.1:220 +#: ../tin.1:227 #, no-wrap msgid "B<-x>" msgstr "B<-x>" # type: Plain text -#: ../tin.1:223 +#: ../tin.1:230 msgid "No posting mode. You cannot post articles if you use this option." msgstr "" # type: TP -#: ../tin.1:223 +#: ../tin.1:230 #, no-wrap msgid "B<-X>" msgstr "B<-X>" # type: Plain text -#: ../tin.1:228 +#: ../tin.1:235 msgid "" "No overwrite mode. I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc> and files in I<" "${TIN_HOMEDIR:-\"$HOME\"}/.tin> will not be overwritten but may be created " @@ -606,13 +630,13 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:228 +#: ../tin.1:235 #, no-wrap msgid "B<-z>" msgstr "B<-z>" # type: Plain text -#: ../tin.1:233 +#: ../tin.1:240 msgid "" "Only start B if there is any new/unread news. If there is news B " "will position cursor at first group with unread news. Useful for putting in " @@ -620,13 +644,13 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:233 +#: ../tin.1:240 #, no-wrap msgid "B<-Z>" msgstr "B<-Z>" # type: Plain text -#: ../tin.1:239 +#: ../tin.1:246 msgid "" "Check if there is any new/unread news and exit with appropriate status. If " "\\&''B<-v>'' option is specified the number of unread articles in each group " @@ -635,7 +659,7 @@ msgid "" msgstr "" # type: Plain text -#: ../tin.1:245 +#: ../tin.1:252 msgid "" "B can also dynamically change its options by the B ('B') " "command. Any changes are written to I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/tinrc>. " @@ -644,7 +668,7 @@ msgid "" msgstr "" # type: Plain text -#: ../tin.1:250 +#: ../tin.1:257 msgid "" "A list of groups can be specified after the other command-line options. This " "can be useful if you wish to yank in or subscribe to a hand-picked subset of " @@ -653,7 +677,7 @@ msgid "" msgstr "" # type: Plain text -#: ../tin.1:255 +#: ../tin.1:262 msgid "" "If you specify a single group-name, or a wildcard that matches a single " "group, then you will automatically enter that group. Otherwise the normal " @@ -662,7 +686,7 @@ msgid "" msgstr "" # type: Plain text -#: ../tin.1:259 +#: ../tin.1:266 msgid "" "With the ''B<-w>'' flag a given group-name is used as default group to post " "to. If more than one group or a wildcard is specified only the first group " @@ -670,7 +694,7 @@ msgid "" msgstr "" # type: Plain text -#: ../tin.1:266 +#: ../tin.1:273 msgid "" "Once you use B ('B') to yank in all active groups, or " "B ('B') to toggle the read/unread status, then " @@ -680,7 +704,7 @@ msgid "" msgstr "" # type: Plain text -#: ../tin.1:271 +#: ../tin.1:278 msgid "" "NB: With the ''B<-n>'' flag, only unsubscribed groups in the I<" "${TIN_HOMEDIR:-\"$HOME\"}/.newsrc> file (or the newsrc-file given by the " @@ -689,7 +713,7 @@ msgid "" msgstr "" # type: Plain text -#: ../tin.1:276 +#: ../tin.1:283 msgid "" "Command-line options have higher priority than attributes and tinrc " "options. Thus, command-line option takes precedence over configured values." @@ -698,19 +722,19 @@ msgstr "" "Optionen und übersteuern daher die konfigurierten Werte." # type: SH -#: ../tin.1:276 +#: ../tin.1:283 #, no-wrap msgid "USAGE" msgstr "GEBRAUCH" # type: SS -#: ../tin.1:279 +#: ../tin.1:286 #, no-wrap msgid "NEWS ADMINISTRATION" msgstr "" # type: Plain text -#: ../tin.1:283 +#: ../tin.1:290 msgid "" "Maintaining Netnews on large networks of machines can be a pretty time " "consuming job as I discovered when I was given the job of maintaining our " @@ -718,7 +742,7 @@ msgid "" msgstr "" # type: Plain text -#: ../tin.1:293 +#: ../tin.1:300 msgid "" "A user starting B for the first time can be automatically subscribed to " "a list of newsgroups that are deemed appropriate by the news administrator. " @@ -730,13 +754,13 @@ msgid "" msgstr "" # type: SS -#: ../tin.1:293 +#: ../tin.1:300 #, no-wrap msgid "SCREEN FORMAT" msgstr "" # type: Plain text -#: ../tin.1:296 +#: ../tin.1:303 msgid "" "B has four separate levels of operation: Selection level, Group level, " "Thread level and Article level." @@ -745,7 +769,7 @@ msgstr "" "Threadebene und Artikelebene." # type: Plain text -#: ../tin.1:301 +#: ../tin.1:308 msgid "" "At the Selection level the title displays (the name of the newsserver and) " "the number of subscribed groups (containing new unread articles). The " @@ -754,7 +778,7 @@ msgid "" msgstr "" # type: Plain text -#: ../tin.1:309 +#: ../tin.1:316 #, no-wrap msgid "" "-EM 1 2 comp.security.announce Announcements from the CERT abou\n" @@ -770,19 +794,19 @@ msgstr "" " X 5 124 news.software.readers Discussion of software used to r\n" # type: Plain text -#: ../tin.1:312 +#: ../tin.1:319 msgid "" "There may also be a character prefixing the line. An explanation follows:" -msgstr "Eventuell steht am Anfang der Zeile noch eines def folgende Zeichen:" +msgstr "Eventuell steht am Anfang der Zeile noch eines der folgende Zeichen:" # type: TP -#: ../tin.1:312 +#: ../tin.1:319 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:317 +#: ../tin.1:324 msgid "" "This group is unsubscribed. To see only your subscribed groups use the " "B ('B') or B ('B') toggle " @@ -790,13 +814,13 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:317 +#: ../tin.1:324 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:322 +#: ../tin.1:329 msgid "" "This is a moderated group. Any posts you make will have to be approved by " "the group administrator before it will be made public. B will ask for " @@ -804,13 +828,13 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:322 +#: ../tin.1:329 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:331 +#: ../tin.1:338 msgid "" "This is a new newsgroup which has been created since you last used B. " "New newsgroups are not subscribed to by default (However, see the " @@ -822,13 +846,13 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:331 +#: ../tin.1:338 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:336 +#: ../tin.1:343 msgid "" "This group no longer exists. If you no longer wish to see this group then " "unsubscribe from it in the normal way. This flag will only appear if you " @@ -836,26 +860,26 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:336 +#: ../tin.1:343 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:340 +#: ../tin.1:347 msgid "" "You may no longer make posts to this group. Often a group will be superseded " "by a more appropriately named one." msgstr "" # type: TP -#: ../tin.1:340 +#: ../tin.1:347 #, no-wrap msgid "B<=>" msgstr "B<=>" # type: Plain text -#: ../tin.1:345 +#: ../tin.1:352 msgid "" "This group has been renamed and you may no longer post to it. If you do, " "then you will receive an error from your newsserver telling you the correct " @@ -863,7 +887,7 @@ msgid "" msgstr "" # type: Plain text -#: ../tin.1:350 +#: ../tin.1:357 msgid "" "At the Group level the title contains the name of the group, the number of " "conversation threads, the threading method, the limit of articles to get, " @@ -873,13 +897,13 @@ msgstr "" # type: Plain text #. FIXME - make this autocenter -#: ../tin.1:354 +#: ../tin.1:361 #, no-wrap msgid " alt.sources (5B -50/23+ 0* 3o 0K)\n" msgstr " alt.sources (5B -50/23+ 0* 3o 0K)\n" # type: Plain text -#: ../tin.1:362 +#: ../tin.1:369 msgid "" "The characters after the numbers are depending to the configuration and if " "your are in B mode or not. Some numbers could be " @@ -890,7 +914,7 @@ msgid "" msgstr "" # type: Plain text -#: ../tin.1:373 +#: ../tin.1:380 msgid "" "If a thread has unread articles in it it's marked with a " "B in front of the total number of articles in the thread. " @@ -905,13 +929,13 @@ msgid "" msgstr "" # type: Plain text -#: ../tin.1:377 +#: ../tin.1:384 #, no-wrap msgid " de.admin.net-abuse.announce (11B 13+ 1* 1o 0K) M\n" msgstr " de.admin.net-abuse.announce (11B 13+ 1* 1o 0K) M\n" # type: Plain text -#: ../tin.1:382 +#: ../tin.1:389 #, no-wrap msgid "" "-E 1 + 3 108 bincancels in de.talk.sex Christopher Lueg El\n" @@ -926,14 +950,14 @@ msgstr "" # type: Plain text #. FIXME - add description of fields -#: ../tin.1:387 +#: ../tin.1:394 msgid "" "At the Thread level the screen usually (depends on the threading method " "used) looks like this:" msgstr "" # type: Plain text -#: ../tin.1:394 +#: ../tin.1:401 #, no-wrap msgid "" "-E 1 [ 7] What is this funny tree in the thr Robert F. Simmig\n" @@ -948,12 +972,12 @@ msgstr "" # type: Plain text #. FIXME - add description of fields -#: ../tin.1:399 +#: ../tin.1:406 msgid "At the Article level the page header has the following format:" msgstr "" # type: Plain text -#: ../tin.1:405 +#: ../tin.1:412 #, no-wrap msgid "" "Sun, 28 Dec 1997 21:21:01 de.admin.news.groups Thread 20 of 86\n" @@ -965,32 +989,32 @@ msgstr "" "Urs Janssen Eurs@akk.orgE bei Arbeitskreis Kultur und Kommunikati\n" # type: Plain text -#: ../tin.1:407 +#: ../tin.1:414 #, no-wrap msgid "article-body\n" msgstr "Artikel-Körper\n" # type: SS -#: ../tin.1:410 +#: ../tin.1:417 #, no-wrap msgid "COMMON MOVING KEYS" msgstr "" # type: Plain text -#: ../tin.1:413 +#: ../tin.1:420 msgid "" "This table shows the common keys used for moving around all levels within " "B." msgstr "" # type: ta -#: ../tin.1:415 +#: ../tin.1:422 #, no-wrap msgid "\\w'Beg. of list/article 'u +\\w'ANSI/vt100 'u" msgstr "" # type: Plain text -#: ../tin.1:423 +#: ../tin.1:430 #, no-wrap msgid "" "\tANSI/vt100\tOther Terminals\n" @@ -1003,13 +1027,13 @@ msgid "" msgstr "" # type: SS -#: ../tin.1:427 +#: ../tin.1:434 #, no-wrap msgid "COMMON EDITING COMMANDS" msgstr "" # type: Plain text -#: ../tin.1:432 +#: ../tin.1:439 msgid "" "An emacs style editing package allows the easy editing of input strings. An " "history list allows the easy reuse of previously entered strings. In " @@ -1018,116 +1042,116 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:433 +#: ../tin.1:440 #, no-wrap msgid "B<^A, ^E>" msgstr "B<^A, ^E>" # type: Plain text -#: ../tin.1:436 +#: ../tin.1:443 msgid "move to beginning or end of line, respectively." msgstr "" # type: TP -#: ../tin.1:436 +#: ../tin.1:443 #, no-wrap msgid "B<^F, ^B>" msgstr "B<^F, ^B>" # type: Plain text -#: ../tin.1:439 +#: ../tin.1:446 msgid "non-destructive move forward or back one location, respectively." msgstr "" # type: TP -#: ../tin.1:439 +#: ../tin.1:446 #, no-wrap msgid "B<^D>" msgstr "B<^D>" # type: Plain text -#: ../tin.1:443 +#: ../tin.1:450 msgid "" "delete the character currently under the cursor, or send EOF if no " "characters in the buffer." msgstr "" # type: TP -#: ../tin.1:443 +#: ../tin.1:450 #, no-wrap msgid "B<^H, EDELE>" msgstr "B<^H, EENTFE>" # type: Plain text -#: ../tin.1:446 +#: ../tin.1:453 msgid "delete character left of the cursor." msgstr "Zeichen links vom Cursor löschen." # type: TP -#: ../tin.1:446 +#: ../tin.1:453 #, no-wrap msgid "B<^K>" msgstr "B<^K>" # type: Plain text -#: ../tin.1:449 +#: ../tin.1:456 msgid "delete from cursor to end of line." msgstr "Lösche vom Cursor bis zum Zeilenende." # type: TP -#: ../tin.1:449 +#: ../tin.1:456 #, no-wrap msgid "B<^P, ^N>" msgstr "B<^P, ^N>" # type: Plain text -#: ../tin.1:452 +#: ../tin.1:459 msgid "move through history, previous and next, respectively." msgstr "" # type: TP -#: ../tin.1:452 +#: ../tin.1:459 #, no-wrap msgid "B<^L, ^R>" msgstr "B<^L, ^R>" # type: Plain text -#: ../tin.1:455 +#: ../tin.1:462 msgid "redraw the current line." msgstr "" # type: TP -#: ../tin.1:455 +#: ../tin.1:462 #, no-wrap msgid "BCRE>" msgstr "BCRE>" # type: Plain text -#: ../tin.1:459 +#: ../tin.1:466 msgid "" "places line on history list if non-blank, appends newline and returns to the " "caller." msgstr "" # type: TP -#: ../tin.1:459 +#: ../tin.1:466 #, no-wrap msgid "BESCE>" msgstr "BESCE>" # type: Plain text -#: ../tin.1:464 +#: ../tin.1:471 msgid "aborts the present editing operation." msgstr "" # type: SS -#: ../tin.1:464 +#: ../tin.1:471 #, no-wrap msgid "GLOBAL COMMANDS" msgstr "ALLGEMEINE BEFEHLE" # type: Plain text -#: ../tin.1:467 +#: ../tin.1:474 msgid "" "The following commands are available at all 4 menu levels and always have " "the same effect." @@ -1136,13 +1160,13 @@ msgstr "" "überall das Gleichen." # type: TP -#: ../tin.1:468 ../tin.1:1328 ../tin.1:1381 +#: ../tin.1:475 ../tin.1:1338 ../tin.1:1391 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:473 +#: ../tin.1:480 msgid "" "Shell escape. B by itself will launch a shell, B " "EcommandE will run an external EcommandE. This facility may " @@ -1150,57 +1174,57 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:473 +#: ../tin.1:480 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:476 +#: ../tin.1:483 msgid "Toggle use of ANSI color." msgstr "" # type: TP -#: ../tin.1:476 +#: ../tin.1:483 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:479 +#: ../tin.1:486 msgid "Redraw the current screen." msgstr "Bildschirminhalt neu aufbauen." # type: TP -#: ../tin.1:479 +#: ../tin.1:486 #, no-wrap msgid "B'>" msgstr "B'>" # type: Plain text -#: ../tin.1:482 +#: ../tin.1:489 msgid "Scroll screen up by one line." msgstr "Eine Zeile nach oben blättern (scrollen)." # type: TP -#: ../tin.1:482 +#: ../tin.1:489 #, no-wrap msgid "B'>" msgstr "B'>" # type: Plain text -#: ../tin.1:485 +#: ../tin.1:492 msgid "Scroll screen down by one line." msgstr "Eine Zeile nach unten blättern (scrollen)." # type: TP -#: ../tin.1:485 +#: ../tin.1:492 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:499 +#: ../tin.1:506 msgid "" "Reload postponed article. If your system blocks the B key you " "must quote it by pressing 'B<^V>' (CTRL-V) first. The postpone-menu offers " @@ -1216,13 +1240,13 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:499 ../tin.1:1334 ../tin.1:1388 +#: ../tin.1:506 ../tin.1:1344 ../tin.1:1398 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:505 +#: ../tin.1:512 msgid "" "Help screen of commands available on the current menu. You can use " "B ('B'), B ('B') and B ('B<" @@ -1230,24 +1254,24 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:505 ../tin.1:1337 ../tin.1:1391 +#: ../tin.1:512 ../tin.1:1347 ../tin.1:1401 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:508 ../tin.1:1340 ../tin.1:1394 +#: ../tin.1:515 ../tin.1:1350 ../tin.1:1404 msgid "Toggle the display of help mini menu at the bottom of the screen." msgstr "" # type: TP -#: ../tin.1:508 +#: ../tin.1:515 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:514 +#: ../tin.1:521 msgid "" "List articles posted by user. The date posted, the newsgroup and the subject " "are listed. You can use B ('B'), B ('B') and " @@ -1256,55 +1280,55 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:514 +#: ../tin.1:521 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. -------------------------------------------------------------------- -#: ../tin.1:519 +#: ../tin.1:526 msgid "Print B version information." msgstr "Versions-Informationen ausgeben." # type: SS -#: ../tin.1:519 +#: ../tin.1:526 #, no-wrap msgid "NEWSGROUP SELECTION COMMANDS" msgstr "" # type: TP -#: ../tin.1:520 ../tin.1:648 ../tin.1:898 ../tin.1:1062 +#: ../tin.1:527 ../tin.1:655 ../tin.1:905 ../tin.1:1069 ../tin.1:3242 #, no-wrap msgid "B<4>" msgstr "B<4>" # type: Plain text -#: ../tin.1:523 +#: ../tin.1:530 msgid "Select group 4." msgstr "Gruppe 4 auswählen." # type: TP -#: ../tin.1:523 +#: ../tin.1:530 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:527 +#: ../tin.1:534 msgid "" "Reset I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc> file. This will destroy all " "records of which articles have been read, so use this carefully." msgstr "" # type: TP -#: ../tin.1:527 ../tin.1:669 ../tin.1:919 +#: ../tin.1:534 ../tin.1:676 ../tin.1:926 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:531 ../tin.1:673 ../tin.1:923 +#: ../tin.1:538 ../tin.1:680 ../tin.1:930 msgid "" "Choose a range of articles to be affected by the next command. See the " "section \"RANGES\" for more information." @@ -1313,148 +1337,148 @@ msgstr "" "wird. Siehe Abschnitt \"BEREICHE\" für weitere Informationen." # type: TP -#: ../tin.1:531 +#: ../tin.1:538 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:534 +#: ../tin.1:541 msgid "Sort the list of newsgroups." msgstr "Liste vorhandener Newsgroups sortieren." # type: TP -#: ../tin.1:534 ../tin.1:676 ../tin.1:926 ../tin.1:1113 ../tin.1:1325 -#: ../tin.1:1375 +#: ../tin.1:541 ../tin.1:683 ../tin.1:933 ../tin.1:1123 ../tin.1:1335 +#: ../tin.1:1385 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:537 ../tin.1:929 ../tin.1:1116 ../tin.1:1328 ../tin.1:1378 +#: ../tin.1:544 ../tin.1:936 ../tin.1:1126 ../tin.1:1338 ../tin.1:1388 msgid "Repeat the previous search." msgstr "Vorherige Suche wiederholen." # type: TP -#: ../tin.1:537 ../tin.1:679 ../tin.1:929 ../tin.1:1116 ../tin.1:1319 -#: ../tin.1:1369 +#: ../tin.1:544 ../tin.1:686 ../tin.1:936 ../tin.1:1126 ../tin.1:1329 +#: ../tin.1:1379 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:540 +#: ../tin.1:547 msgid "Search for a group by name and description (if displayed)." msgstr "" # type: TP -#: ../tin.1:540 ../tin.1:682 ../tin.1:932 ../tin.1:1119 ../tin.1:1322 -#: ../tin.1:1372 +#: ../tin.1:547 ../tin.1:689 ../tin.1:939 ../tin.1:1129 ../tin.1:1332 +#: ../tin.1:1382 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:543 +#: ../tin.1:550 msgid "Backward search through the group names and descriptions." msgstr "" # type: TP -#: ../tin.1:543 +#: ../tin.1:550 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" # type: Plain text -#: ../tin.1:546 +#: ../tin.1:553 msgid "Read current group." msgstr "" # type: TP -#: ../tin.1:546 +#: ../tin.1:553 #, no-wrap msgid "BTABE' 'n'>" msgstr "BTABE' 'n'>" # type: Plain text -#: ../tin.1:550 +#: ../tin.1:557 msgid "" "Enter next group with unread news. Will wrap around to the beginning of the " "group selection list looking for unread groups." msgstr "" # type: TP -#: ../tin.1:550 ../tin.1:757 ../tin.1:970 ../tin.1:1177 +#: ../tin.1:557 ../tin.1:764 ../tin.1:977 ../tin.1:1187 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:554 +#: ../tin.1:561 msgid "" "Make current group as all read [after confirmation] and move to the next " "group in the group selection list." msgstr "" # type: TP -#: ../tin.1:554 ../tin.1:761 ../tin.1:974 ../tin.1:1181 +#: ../tin.1:561 ../tin.1:768 ../tin.1:981 ../tin.1:1191 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:558 +#: ../tin.1:565 msgid "" "Mark current group as all read [after confirmation] and enter the next " "unread group in the group selection list." msgstr "" # type: TP -#: ../tin.1:558 +#: ../tin.1:565 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:562 +#: ../tin.1:569 msgid "" "Toggle display to show just the group name or the group name and the group " "descriptions." msgstr "" # type: TP -#: ../tin.1:562 ../tin.1:774 ../tin.1:987 ../tin.1:1193 +#: ../tin.1:569 ../tin.1:781 ../tin.1:994 ../tin.1:1203 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:565 ../tin.1:777 ../tin.1:990 ../tin.1:1196 +#: ../tin.1:572 ../tin.1:784 ../tin.1:997 ../tin.1:1206 msgid "Edit the filter file and reload it afterwards." msgstr "Filter-Datei bearbeiten und danach anwenden." # type: TP -#: ../tin.1:565 +#: ../tin.1:572 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:569 ../tin.1:781 +#: ../tin.1:576 ../tin.1:788 msgid "" "Choose a new group by name. This command can be used to access any group, " "even those not currently yanked in." msgstr "" # type: TP -#: ../tin.1:569 ../tin.1:784 ../tin.1:990 ../tin.1:1209 ../tin.1:1331 -#: ../tin.1:1384 +#: ../tin.1:576 ../tin.1:791 ../tin.1:997 ../tin.1:1219 ../tin.1:1341 +#: ../tin.1:1394 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:574 +#: ../tin.1:581 msgid "" "Toggle the display of the description of the current newsgroup in the last " "line. This will not be available if B was started with the \\&''B<-d>'' " @@ -1462,24 +1486,24 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:574 ../tin.1:788 ../tin.1:993 ../tin.1:1212 +#: ../tin.1:581 ../tin.1:795 ../tin.1:1000 ../tin.1:1222 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:577 ../tin.1:791 ../tin.1:996 ../tin.1:1215 +#: ../tin.1:584 ../tin.1:798 ../tin.1:1003 ../tin.1:1225 msgid "Toggle inverse video." msgstr "" # type: TP -#: ../tin.1:577 +#: ../tin.1:584 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:583 +#: ../tin.1:590 msgid "" "Move the current group within the group selection list. By entering '1' the " "group will become the first displayed group in the list, by entering '8' the " @@ -1488,61 +1512,61 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:583 ../tin.1:808 ../tin.1:1229 +#: ../tin.1:590 ../tin.1:815 ../tin.1:1239 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:587 ../tin.1:812 ../tin.1:1233 +#: ../tin.1:594 ../tin.1:819 ../tin.1:1243 msgid "" "User configurable options menu (for more information see section \"GLOBAL " "OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES\")." msgstr "" # type: TP -#: ../tin.1:587 +#: ../tin.1:594 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:590 +#: ../tin.1:597 msgid "Positions the cursor on the next group with unread articles in it." msgstr "" # type: TP -#: ../tin.1:590 ../tin.1:829 ../tin.1:1015 ../tin.1:1250 +#: ../tin.1:597 ../tin.1:836 ../tin.1:1022 ../tin.1:1260 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:594 +#: ../tin.1:601 msgid "" "Quit B - ask the user to confirm if B is set " "accordingly." msgstr "" # type: TP -#: ../tin.1:594 ../tin.1:832 ../tin.1:1018 ../tin.1:1253 +#: ../tin.1:601 ../tin.1:839 ../tin.1:1025 ../tin.1:1263 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:597 ../tin.1:835 ../tin.1:1021 ../tin.1:1256 +#: ../tin.1:604 ../tin.1:842 ../tin.1:1028 ../tin.1:1266 msgid "Quit B - don't ask the user to confirm." msgstr "Beendet B sofort, ohne Bestätigungsnachfrage." # type: TP -#: ../tin.1:597 +#: ../tin.1:604 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:602 +#: ../tin.1:609 msgid "" "Toggle display of all subscribed to groups and just those groups containing " "unread articles. Command has no effect if groups were specified on the " @@ -1550,13 +1574,13 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:602 ../tin.1:838 ../tin.1:1021 +#: ../tin.1:609 ../tin.1:845 ../tin.1:1028 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:606 ../tin.1:842 ../tin.1:1025 +#: ../tin.1:613 ../tin.1:849 ../tin.1:1032 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." @@ -1566,24 +1590,24 @@ msgstr "" "bzw. nach neuen Funktionen zu fragen." # type: TP -#: ../tin.1:606 +#: ../tin.1:613 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:609 +#: ../tin.1:616 msgid "Subscribe to current group." msgstr "Ausgewählte Gruppe abonnieren." # type: TP -#: ../tin.1:609 +#: ../tin.1:616 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:614 +#: ../tin.1:621 msgid "" "Subscribe to groups matching user specified pattern. See the section " "\"NEWSGROUP LISTS & WILDCARDS\" for the types of pattern that B " @@ -1591,13 +1615,13 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:614 +#: ../tin.1:621 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:619 +#: ../tin.1:626 msgid "" "Unsubscribe to current group. This can be used to remove bogus groups. See " "B in the \"GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES" @@ -1605,13 +1629,13 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:619 +#: ../tin.1:626 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:624 +#: ../tin.1:631 msgid "" "Unsubscribe to groups matching user specified pattern. See the section " "\"NEWSGROUP LISTS & WILDCARDS\" for the types of pattern that B " @@ -1619,13 +1643,13 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:624 ../tin.1:866 ../tin.1:1040 ../tin.1:1290 +#: ../tin.1:631 ../tin.1:873 ../tin.1:1047 ../tin.1:1300 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:630 +#: ../tin.1:637 msgid "" "Post an article to current group. If posting fails for some reason, you'll " "get the chance to B ('B') the article again, B " @@ -1634,24 +1658,24 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:630 +#: ../tin.1:637 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:633 +#: ../tin.1:640 msgid "Quit B without saving any changes to the configuration." msgstr "" # type: TP -#: ../tin.1:633 +#: ../tin.1:640 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:638 +#: ../tin.1:645 msgid "" "Yanks in all groups. Toggles the displayed groups between all the groups in " "the I<${TIN_LIBDIR:-NEWSLIBDIR}\"/\"${TIN_ACTIVEFILE:-active}> file and just " @@ -1659,75 +1683,75 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:638 +#: ../tin.1:645 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:642 +#: ../tin.1:649 msgid "" "Reread the I<${TIN_LIBDIR:-NEWSLIBDIR}\"/\"${TIN_ACTIVEFILE:-active}> file " "to see if any new news has arrived since starting B." msgstr "" # type: TP -#: ../tin.1:642 +#: ../tin.1:649 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. -------------------------------------------------------------------- -#: ../tin.1:647 +#: ../tin.1:654 msgid "Mark all articles in the current group as unread." msgstr "Alle Artikel in der aktuellen Gruppe als ungelesen markieren." # type: SS -#: ../tin.1:647 +#: ../tin.1:654 #, no-wrap msgid "GROUP INDEX COMMANDS" msgstr "" # type: Plain text -#: ../tin.1:651 +#: ../tin.1:658 msgid "Select article 4." msgstr "Artikel 4 auswählen." # type: TP -#: ../tin.1:651 ../tin.1:901 ../tin.1:1065 +#: ../tin.1:658 ../tin.1:908 ../tin.1:1072 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:655 ../tin.1:905 ../tin.1:1069 +#: ../tin.1:662 ../tin.1:912 ../tin.1:1076 msgid "" "Auto select article(s) using a menu. Read the section \"FILTERING ARTICLES\" " "for more information." msgstr "" # type: TP -#: ../tin.1:655 ../tin.1:905 ../tin.1:1081 +#: ../tin.1:662 ../tin.1:912 ../tin.1:1088 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:659 ../tin.1:909 ../tin.1:1085 +#: ../tin.1:666 ../tin.1:916 ../tin.1:1092 msgid "" "Kill article(s) using a menu. Read the section \"FILTERING ARTICLES\" for " "more information." msgstr "" # type: TP -#: ../tin.1:659 ../tin.1:909 +#: ../tin.1:666 ../tin.1:916 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:664 ../tin.1:914 +#: ../tin.1:671 ../tin.1:921 msgid "" "Mark current article, thread, range, auto-selected (hot) articles, articles " "matching pattern or tagged articles as read. A prompt asks which type should " @@ -1735,13 +1759,13 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:664 ../tin.1:914 +#: ../tin.1:671 ../tin.1:921 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:669 ../tin.1:919 +#: ../tin.1:676 ../tin.1:926 msgid "" "Mark current article, thread, range, auto-selected (hot) articles, articles " "matching pattern or tagged articles as unread. A prompt asks which type " @@ -1749,63 +1773,63 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:673 ../tin.1:923 ../tin.1:1110 +#: ../tin.1:680 ../tin.1:930 ../tin.1:1120 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:676 ../tin.1:926 ../tin.1:1113 +#: ../tin.1:683 ../tin.1:933 ../tin.1:1123 msgid "Re-enter the last message that was viewed." msgstr "" # type: Plain text -#: ../tin.1:679 +#: ../tin.1:686 msgid "Repeat the previous search" msgstr "Vorherige Suche wiederholen." # type: Plain text -#: ../tin.1:682 +#: ../tin.1:689 msgid "Search forward for specified subject." msgstr "" # type: Plain text -#: ../tin.1:685 +#: ../tin.1:692 msgid "Search backward for specified subject." msgstr "" # type: TP -#: ../tin.1:685 +#: ../tin.1:692 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:688 +#: ../tin.1:695 msgid "Select current thread for later processing." msgstr "" # type: TP -#: ../tin.1:688 +#: ../tin.1:695 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:692 +#: ../tin.1:699 msgid "" "Selects all threads in current group. It is a shortcut for calling " "B with a pattern of ''*''." msgstr "" # type: TP -#: ../tin.1:692 +#: ../tin.1:699 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:697 +#: ../tin.1:704 msgid "" "Toggle selection of current thread. If at least one unread article, (but not " "every unread article) in the current thread is selected, then all unread " @@ -1813,13 +1837,13 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:697 +#: ../tin.1:704 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:702 +#: ../tin.1:709 msgid "" "For each thread in current group, if it at least one unread article is " "selected, all unread articles become selected. This is useful for auto-" @@ -1827,13 +1851,13 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:702 +#: ../tin.1:709 #, no-wrap msgid "B" # type: Plain text -#: ../tin.1:708 +#: ../tin.1:715 msgid "" "Prompts for a pattern with which to match on. All threads whose subjects " "match the pattern will be marked selected. A pattern of ''*'' will match all " @@ -1842,24 +1866,24 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:708 +#: ../tin.1:715 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:711 +#: ../tin.1:718 msgid "Reverse all selections on all articles." msgstr "" # type: TP -#: ../tin.1:711 +#: ../tin.1:718 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:717 +#: ../tin.1:724 msgid "" "Undo all selections on all articles. It clears the toggle effect of " "B ('B') command. Thus after first doing a " @@ -1868,13 +1892,13 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:717 ../tin.1:947 ../tin.1:1136 +#: ../tin.1:724 ../tin.1:954 ../tin.1:1146 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:722 ../tin.1:952 ../tin.1:1141 +#: ../tin.1:729 ../tin.1:959 ../tin.1:1151 msgid "" "Pipe current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles into command. See the section \"MAILING " @@ -1882,13 +1906,13 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:722 ../tin.1:1141 +#: ../tin.1:729 ../tin.1:1151 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:731 +#: ../tin.1:738 msgid "" "Auto select article(s) with a single key [after confirmation]. The defaults " "used for selection are based upon the following four tinrc config variables: " @@ -1900,13 +1924,13 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:731 ../tin.1:1150 +#: ../tin.1:738 ../tin.1:1160 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:740 +#: ../tin.1:747 msgid "" "Kill article(s) with a single key [after confirmation]. The defaults used " "for killing are based upon the following four tinrc config variables: " @@ -1918,99 +1942,99 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:740 +#: ../tin.1:747 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" # type: Plain text -#: ../tin.1:743 +#: ../tin.1:750 msgid "Read current article." msgstr "" # type: TP -#: ../tin.1:743 +#: ../tin.1:750 #, no-wrap msgid "BTABE'>" msgstr "BTABE'>" # type: Plain text -#: ../tin.1:746 +#: ../tin.1:753 msgid "View next unread article or group." msgstr "" # type: TP -#: ../tin.1:746 ../tin.1:958 ../tin.1:1167 +#: ../tin.1:753 ../tin.1:965 ../tin.1:1177 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:750 +#: ../tin.1:757 msgid "" "Author forward search. This searches for articles with a specific ''From:'' " "line." msgstr "" # type: TP -#: ../tin.1:750 ../tin.1:963 ../tin.1:1170 +#: ../tin.1:757 ../tin.1:970 ../tin.1:1180 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:753 ../tin.1:966 +#: ../tin.1:760 ../tin.1:973 msgid "Author backward search. Otherwise, see B ('B') above." msgstr "" # type: TP -#: ../tin.1:753 ../tin.1:966 ../tin.1:1173 +#: ../tin.1:760 ../tin.1:973 ../tin.1:1183 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:757 ../tin.1:970 ../tin.1:1177 +#: ../tin.1:764 ../tin.1:977 ../tin.1:1187 msgid "" "Search the body of all articles in group (can be slow). You can abort the " "search using B ('B')." msgstr "" # type: Plain text -#: ../tin.1:761 +#: ../tin.1:768 msgid "" "Mark all articles as read [after confirmation] then return to the group " "selection list. Move cursor to next group." msgstr "" # type: Plain text -#: ../tin.1:765 +#: ../tin.1:772 msgid "" "Mark all articles as read [after confirmation] and enter the next group with " "unread news." msgstr "" # type: TP -#: ../tin.1:765 +#: ../tin.1:772 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:769 ../tin.1:982 +#: ../tin.1:776 ../tin.1:989 msgid "" "Cycle the display of the author through all the possible options for the " "tinrc variable B." msgstr "" # type: TP -#: ../tin.1:769 +#: ../tin.1:776 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:774 ../tin.1:987 ../tin.1:1190 +#: ../tin.1:781 ../tin.1:994 ../tin.1:1200 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 " @@ -2018,37 +2042,37 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:777 +#: ../tin.1:784 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.1:781 +#: ../tin.1:788 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:784 +#: ../tin.1:791 msgid "Toggle article/group limit." msgstr "" # type: Plain text -#: ../tin.1:788 +#: ../tin.1:795 msgid "" "Display the subject of the first article in the current thread in the last " "line." msgstr "" # type: TP -#: ../tin.1:791 +#: ../tin.1:798 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:797 +#: ../tin.1:804 msgid "" "Mark article/thread as read and move onto the next unread article/thread. If " "a range of articles/threads is set, the range will be marked as read instead " @@ -2057,35 +2081,35 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:797 +#: ../tin.1:804 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:800 +#: ../tin.1:807 msgid "Open the thread under the current cursor position." msgstr "" # type: TP -#: ../tin.1:800 ../tin.1:1002 ../tin.1:1221 +#: ../tin.1:807 ../tin.1:1009 ../tin.1:1231 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:803 ../tin.1:1005 ../tin.1:1224 +#: ../tin.1:810 ../tin.1:1012 ../tin.1:1234 msgid "Look up article by ''Message-ID:''." msgstr "Artikel anhand der ''Message-ID:'' nachschlagen." # type: TP -#: ../tin.1:803 +#: ../tin.1:810 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:808 ../tin.1:1010 ../tin.1:1229 +#: ../tin.1:815 ../tin.1:1017 ../tin.1:1239 msgid "" "Mail current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles to someone. See the section \"MAILING " @@ -2093,35 +2117,35 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:812 +#: ../tin.1:819 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:815 +#: ../tin.1:822 msgid "Go to next group." msgstr "" # type: TP -#: ../tin.1:815 +#: ../tin.1:822 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:818 +#: ../tin.1:825 msgid "Go to next unread article." msgstr "" # type: TP -#: ../tin.1:818 ../tin.1:1010 ../tin.1:1239 +#: ../tin.1:825 ../tin.1:1017 ../tin.1:1249 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:823 ../tin.1:1015 ../tin.1:1244 +#: ../tin.1:830 ../tin.1:1022 ../tin.1:1254 msgid "" "Send current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles to printer. See the section \"MAILING " @@ -2129,51 +2153,51 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:823 +#: ../tin.1:830 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:826 +#: ../tin.1:833 msgid "Go to previous group." msgstr "" # type: TP -#: ../tin.1:826 +#: ../tin.1:833 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:829 +#: ../tin.1:836 msgid "Go to previous unread article." msgstr "" # type: Plain text -#: ../tin.1:832 ../tin.1:1018 +#: ../tin.1:839 ../tin.1:1025 msgid "Return to previous level." msgstr "" # type: TP -#: ../tin.1:835 +#: ../tin.1:842 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:838 +#: ../tin.1:845 msgid "Toggle the display between all articles and unread articles." msgstr "" # type: TP -#: ../tin.1:842 +#: ../tin.1:849 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:847 ../tin.1:1030 ../tin.1:1269 +#: ../tin.1:854 ../tin.1:1037 ../tin.1:1279 msgid "" "Save current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles. See the section \"MAILING PIPING " @@ -2181,24 +2205,24 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:847 +#: ../tin.1:854 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:850 ../tin.1:1033 ../tin.1:1272 +#: ../tin.1:857 ../tin.1:1040 ../tin.1:1282 msgid "Save marked articles automatically without further prompting." msgstr "Markierte Artikel automatisch ohne weiteres Nachfragen speichern." # type: TP -#: ../tin.1:850 +#: ../tin.1:857 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:855 +#: ../tin.1:862 msgid "" "Toggle tag-status of current article / thread for B ('B') / " "B ('B<|>') / B ('B') / B ('B') / " @@ -2206,25 +2230,25 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:855 +#: ../tin.1:862 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:858 +#: ../tin.1:865 msgid "" "Automatically tag in order all the parts of the current multi-part message." msgstr "" # type: TP -#: ../tin.1:858 +#: ../tin.1:865 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:863 +#: ../tin.1:870 msgid "" "Cycle the threading mode through no threading, threading by subject, " "threading by references, threading on both subject and references, group " @@ -2232,18 +2256,18 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:863 +#: ../tin.1:870 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:866 +#: ../tin.1:873 msgid "Untag all articles that were tagged." msgstr "" # type: Plain text -#: ../tin.1:872 +#: ../tin.1:879 msgid "" "Post an article to current group. If posting fails for some reason, you'll " "get the chance to edit the article again via B ('B'), postpone " @@ -2252,13 +2276,13 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:872 +#: ../tin.1:879 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:878 +#: ../tin.1:885 msgid "" "Repost an already posted article / thread / auto-selected (hot) articles / " "articles matching pattern / tagged articles to another newsgroup(s). Useful " @@ -2267,13 +2291,13 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:878 +#: ../tin.1:885 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:886 +#: ../tin.1:893 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. " @@ -2284,25 +2308,25 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:886 ../tin.1:1047 ../tin.1:1303 +#: ../tin.1:893 ../tin.1:1054 ../tin.1:1313 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:889 +#: ../tin.1:896 msgid "Mark current article as unread." msgstr "Aktuellen Artikel als ungelesen markieren." # type: TP -#: ../tin.1:889 ../tin.1:1052 ../tin.1:1306 +#: ../tin.1:896 ../tin.1:1059 ../tin.1:1316 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. -------------------------------------------------------------------- -#: ../tin.1:896 +#: ../tin.1:903 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 " @@ -2310,94 +2334,94 @@ msgid "" msgstr "" # type: SS -#: ../tin.1:896 +#: ../tin.1:903 #, no-wrap msgid "THREAD LISTING COMMANDS" msgstr "" # type: Plain text -#: ../tin.1:901 +#: ../tin.1:908 msgid "Select article 4 within thread." msgstr "Artikel 4 aus dem Thread auswählen." # type: Plain text -#: ../tin.1:932 +#: ../tin.1:939 msgid "Search forward for a specified subject." msgstr "" # type: Plain text -#: ../tin.1:935 +#: ../tin.1:942 msgid "Search backwards for a specified subject." msgstr "" # type: TP -#: ../tin.1:935 +#: ../tin.1:942 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:938 +#: ../tin.1:945 msgid "Select the current thread for later processing." msgstr "" # type: TP -#: ../tin.1:938 +#: ../tin.1:945 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:941 +#: ../tin.1:948 msgid "Toggle selection of current article." msgstr "" # type: TP -#: ../tin.1:941 +#: ../tin.1:948 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:944 +#: ../tin.1:951 msgid "Reverse article selections." -msgstr "" +msgstr "Artikelauswahl invertieren." # type: TP -#: ../tin.1:944 +#: ../tin.1:951 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:947 +#: ../tin.1:954 msgid "Undo all selections on current thread." msgstr "" # type: TP -#: ../tin.1:952 +#: ../tin.1:959 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" # type: Plain text -#: ../tin.1:955 +#: ../tin.1:962 msgid "Read current article within thread." msgstr "" # type: TP -#: ../tin.1:955 +#: ../tin.1:962 #, no-wrap msgid "BTABE'>" msgstr "BTABE'>" # type: Plain text -#: ../tin.1:958 +#: ../tin.1:965 msgid "View next unread article within thread." msgstr "Nächsten ungelesenen Artikel im Thread anzeigen." # type: Plain text -#: ../tin.1:963 +#: ../tin.1:970 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 " @@ -2405,44 +2429,44 @@ msgid "" msgstr "" # type: Plain text -#: ../tin.1:974 +#: ../tin.1:981 msgid "" "Mark thread as read [after confirmation] and return to the group index " "page. Move cursor to next thread." msgstr "" # type: Plain text -#: ../tin.1:978 +#: ../tin.1:985 msgid "" "Mark thread as read [after confirmation] and enter the next thread " "containing unread news." msgstr "" # type: TP -#: ../tin.1:978 +#: ../tin.1:985 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.1:982 +#: ../tin.1:989 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:993 ../tin.1:1212 +#: ../tin.1:1000 ../tin.1:1222 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 -#: ../tin.1:996 +#: ../tin.1:1003 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1002 +#: ../tin.1:1009 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 " @@ -2450,49 +2474,49 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:1005 +#: ../tin.1:1012 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.1:1025 +#: ../tin.1:1032 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.1:1030 +#: ../tin.1:1037 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.1:1033 +#: ../tin.1:1040 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1037 ../tin.1:1276 +#: ../tin.1:1044 ../tin.1:1286 msgid "" "Toggle tag status of current article for mailing, piping, printing, saving " "or reposting." msgstr "" # type: TP -#: ../tin.1:1037 +#: ../tin.1:1044 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1040 +#: ../tin.1:1047 msgid "Untag all tagged threads." msgstr "" # type: Plain text -#: ../tin.1:1047 +#: ../tin.1:1054 msgid "" "Post an article to current group. If posting fails for some reason, you'll " "get the chance to edit the article again via B ('B'), postpone " @@ -2501,7 +2525,7 @@ msgid "" msgstr "" # type: Plain text -#: ../tin.1:1052 +#: ../tin.1:1059 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 " @@ -2510,130 +2534,142 @@ msgstr "" # type: Plain text #. -------------------------------------------------------------------- -#: ../tin.1:1057 +#: ../tin.1:1064 msgid "Mark all articles in thread as unread." msgstr "Alle Artikel im aktuellen Thread as ungelesen markieren." # type: SS -#: ../tin.1:1057 +#: ../tin.1:1064 #, no-wrap msgid "ARTICLE VIEWER COMMANDS" msgstr "" # type: Plain text -#: ../tin.1:1062 +#: ../tin.1:1069 msgid "Read the first (base) article in this thread." msgstr "" # type: Plain text -#: ../tin.1:1065 +#: ../tin.1:1072 msgid "Read response 4 in this thread." msgstr "Antwort 4 im diesem Thread lesen." # type: TP -#: ../tin.1:1069 +#: ../tin.1:1076 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1073 +#: ../tin.1:1080 msgid "" "Reply through mail to the author of the current article with a copy of the " "article with all headers included." msgstr "" # type: TP -#: ../tin.1:1073 +#: ../tin.1:1080 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1078 +#: ../tin.1:1085 msgid "Perform B(1) operations on article." msgstr "" # type: TP -#: ../tin.1:1078 +#: ../tin.1:1085 #, no-wrap -msgid "B" -msgstr "B" +msgid "B" +msgstr "B" # type: Plain text -#: ../tin.1:1081 +#: ../tin.1:1088 msgid "Toggles the display mode (raw including all headers vs. cooked)." msgstr "" # type: TP -#: ../tin.1:1085 +#: ../tin.1:1092 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1088 +#: ../tin.1:1095 msgid "Toggle the TAB width between 4 and 8 characters." -msgstr "" +msgstr "Tabulatorbreite zwischen 4 und 8 Zeichen Umschalten." # type: TP -#: ../tin.1:1088 +#: ../tin.1:1095 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1092 +#: ../tin.1:1099 msgid "" "Post a followup to the current article with a copy of the article with all " "headers included." msgstr "" # type: TP -#: ../tin.1:1092 +#: ../tin.1:1099 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1096 +#: ../tin.1:1103 msgid "" "Toggle TeX to ISO decoding for current article. The default behavior is " "taken from the B variable in the tinrc file." msgstr "" # type: TP -#: ../tin.1:1096 +#: ../tin.1:1103 +#, no-wrap +msgid "B" +msgstr "B" + +# type: TP +#: ../tin.1:1106 +msgid "" +"Toggles the display of all headers vs. headers in B." +msgstr "" + +# type: TP +#: ../tin.1:1106 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1099 +#: ../tin.1:1109 msgid "Toggle ROT-13 decoding for this article." msgstr "" # type: TP -#: ../tin.1:1099 +#: ../tin.1:1109 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1103 +#: ../tin.1:1113 msgid "" "Toggle the display of uuencoded sections. The default behavior is taken from " "the B variable in the tinrc file." msgstr "" # type: TP -#: ../tin.1:1103 +#: ../tin.1:1113 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1110 +#: ../tin.1:1120 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 " @@ -2643,23 +2679,23 @@ msgid "" msgstr "" # type: Plain text -#: ../tin.1:1119 +#: ../tin.1:1129 msgid "Forward search the text of this article." msgstr "" # type: Plain text -#: ../tin.1:1122 +#: ../tin.1:1132 msgid "Backward search the text of this article." msgstr "" # type: TP -#: ../tin.1:1122 +#: ../tin.1:1132 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1127 +#: ../tin.1:1137 msgid "" "Skip to the end of the next quoted text-block in this article. Quoted text " "is everything which matches B, B or " @@ -2667,40 +2703,40 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:1127 +#: ../tin.1:1137 #, no-wrap msgid "B'>" msgstr "B'>" # type: Plain text -#: ../tin.1:1130 -msgid "Goto the first article in the current thread." +#: ../tin.1:1140 +msgid "Go to the first article in the current thread." msgstr "" # type: TP -#: ../tin.1:1130 +#: ../tin.1:1140 #, no-wrap msgid "B'>" msgstr "B'>" # type: Plain text -#: ../tin.1:1133 -msgid "Goto the last article in the current thread." +#: ../tin.1:1143 +msgid "Go to the last article in the current thread." msgstr "" # type: TP -#: ../tin.1:1133 +#: ../tin.1:1143 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1136 +#: ../tin.1:1146 msgid "Toggle word highlighting on/off." msgstr "" # type: Plain text -#: ../tin.1:1150 +#: ../tin.1:1160 msgid "" "Auto select article(s) with a single key. The defaults used for selection " "are set based upon the following four tinrc config variables: " @@ -2712,7 +2748,7 @@ msgid "" msgstr "" # type: Plain text -#: ../tin.1:1159 +#: ../tin.1:1169 msgid "" "Kill article(s) with a single key. The defaults used for killing are based " "upon the following four tinrc config variables: B, " @@ -2723,290 +2759,290 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:1159 +#: ../tin.1:1169 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" # type: Plain text -#: ../tin.1:1162 -msgid "Goto next base article." +#: ../tin.1:1172 +msgid "Go to next base article." msgstr "" # type: TP -#: ../tin.1:1162 +#: ../tin.1:1172 #, no-wrap msgid "BTABE'>" msgstr "BTABE'>" # type: Plain text -#: ../tin.1:1167 +#: ../tin.1:1177 msgid "" -"Goto next unread article. If the tinrc variable B doesn't " +"Go to next unread article. If the tinrc variable B doesn't " "contain PageNextUnread, then this key will first page through the current " "article." msgstr "" # type: Plain text -#: ../tin.1:1170 +#: ../tin.1:1180 msgid "Author forward search." msgstr "Suche nach Autor (vorwärts)." # type: Plain text -#: ../tin.1:1173 +#: ../tin.1:1183 msgid "Author backward search." msgstr "Suche nach Autor (rückwärts)." # type: Plain text -#: ../tin.1:1181 +#: ../tin.1:1191 msgid "" "Mark the current thread as read [after confirmation] and return to the " "previous menu. Move cursor to next item." msgstr "" # type: Plain text -#: ../tin.1:1185 +#: ../tin.1:1195 msgid "" "Mark the rest of the current thread as read [after confirmation] and enter " "the next thread with unread articles." msgstr "" # type: TP -#: ../tin.1:1185 +#: ../tin.1:1195 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.1:1190 +#: ../tin.1:1200 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1193 +#: ../tin.1:1203 msgid "" "Edit the current article. This is restricted to mailgroups and saved news." msgstr "" # type: TP -#: ../tin.1:1196 +#: ../tin.1:1206 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1199 +#: ../tin.1:1209 msgid "" "Post a followup to the current article with a copy of the article included." msgstr "" # type: TP -#: ../tin.1:1199 +#: ../tin.1:1209 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1203 +#: ../tin.1:1213 msgid "" "Post a followup to the current article without including a copy of the " "article." msgstr "" # type: TP -#: ../tin.1:1203 +#: ../tin.1:1213 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1206 -msgid "Goto the start of the article." -msgstr "" +#: ../tin.1:1216 +msgid "Go to the start of the article." +msgstr "Zum Anfang des Artikels springen." # type: TP -#: ../tin.1:1206 +#: ../tin.1:1216 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1209 -msgid "Goto the end of the article." +#: ../tin.1:1219 +msgid "Go to the end of the article." msgstr "Zum Ende des Artikels springen." # type: TP -#: ../tin.1:1215 +#: ../tin.1:1225 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1218 +#: ../tin.1:1228 msgid "Mark rest of thread as read and move onto the next unread thread." msgstr "" # type: TP -#: ../tin.1:1218 +#: ../tin.1:1228 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1221 +#: ../tin.1:1231 msgid "Show the thread menu that the current article is a part of." msgstr "" # type: TP -#: ../tin.1:1224 +#: ../tin.1:1234 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.1:1233 +#: ../tin.1:1243 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1236 +#: ../tin.1:1246 msgid "Go to the next article." msgstr "" # type: TP -#: ../tin.1:1236 +#: ../tin.1:1246 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1239 +#: ../tin.1:1249 msgid "Go to the next unread article." msgstr "" # type: TP -#: ../tin.1:1244 +#: ../tin.1:1254 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1247 +#: ../tin.1:1257 msgid "Go to the previous article." msgstr "" # type: TP -#: ../tin.1:1247 +#: ../tin.1:1257 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1250 +#: ../tin.1:1260 msgid "Go to the previous unread article." msgstr "" # type: Plain text -#: ../tin.1:1253 +#: ../tin.1:1263 msgid "Return to the previous level." msgstr "" # type: TP -#: ../tin.1:1256 +#: ../tin.1:1266 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1260 +#: ../tin.1:1270 msgid "" "Reply through mail to the author of the current article with a copy of the " "article included." msgstr "" # type: TP -#: ../tin.1:1260 +#: ../tin.1:1270 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1264 +#: ../tin.1:1274 msgid "" "Reply through mail to the author of the current article without including " "the original article." msgstr "" # type: TP -#: ../tin.1:1264 +#: ../tin.1:1274 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.1:1269 +#: ../tin.1:1279 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.1:1272 +#: ../tin.1:1282 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.1:1276 +#: ../tin.1:1286 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1279 +#: ../tin.1:1289 msgid "Return to group selection level." msgstr "" # type: TP -#: ../tin.1:1279 +#: ../tin.1:1289 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1282 -msgid "Goto parent article." +#: ../tin.1:1292 +msgid "Go to parent article." msgstr "" # type: TP -#: ../tin.1:1282 +#: ../tin.1:1292 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1286 +#: ../tin.1:1296 msgid "" "Display a list of URLs in the current article. See the section \"URL LISTING" "\" for more information." msgstr "" # type: TP -#: ../tin.1:1286 +#: ../tin.1:1296 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1290 +#: ../tin.1:1300 msgid "" "Display a list of attachments of the current article. See the section " "\"ATTACHMENT LISTING\" for more information." msgstr "" # type: Plain text -#: ../tin.1:1297 +#: ../tin.1:1307 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'), " @@ -3015,13 +3051,13 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:1297 +#: ../tin.1:1307 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1303 +#: ../tin.1:1313 msgid "" "Repost an already posted article / thread / auto-selected (hot) articles / " "articles matching pattern / tagged articles to another newsgroup(s). Useful " @@ -3030,76 +3066,76 @@ msgid "" msgstr "" # type: Plain text -#: ../tin.1:1306 +#: ../tin.1:1316 msgid "Mark article as unread." msgstr "Alle Artikel als ungelesen markieren." # type: Plain text #. -------------------------------------------------------------------- -#: ../tin.1:1311 +#: ../tin.1:1321 msgid "Mark the current thread as unread." msgstr "Markiere den aktuellen Thread als ungelesen." # type: SS -#: ../tin.1:1311 +#: ../tin.1:1321 #, no-wrap msgid "URL LISTING" -msgstr "" +msgstr "URL LISTE" # type: Plain text -#: ../tin.1:1314 +#: ../tin.1:1324 msgid "" "B ('B') displays a list of URLs in the current article. " "Besides the common moving keys, the following commands are available:" msgstr "" # type: TP -#: ../tin.1:1315 +#: ../tin.1:1325 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" # type: Plain text -#: ../tin.1:1319 +#: ../tin.1:1329 msgid "" "The current URL will be prompted and opened using the B. " "'BESCE>' or no input will skip the URL." msgstr "" # type: Plain text -#: ../tin.1:1322 +#: ../tin.1:1332 msgid "URL forward search." msgstr "Suche nach URL (vorwärts)." # type: Plain text -#: ../tin.1:1325 +#: ../tin.1:1335 msgid "URL backward search." msgstr "Suche nach URL (rückwärts)." # type: TP -#: ../tin.1:1331 ../tin.1:1384 +#: ../tin.1:1341 ../tin.1:1394 msgid "Shell escape." msgstr "" # type: Plain text -#: ../tin.1:1334 +#: ../tin.1:1344 msgid "Toggle the display of the current URL in the last line." msgstr "" # type: Plain text -#: ../tin.1:1337 ../tin.1:1391 +#: ../tin.1:1347 ../tin.1:1401 msgid "Help screen of commands available." msgstr "" # type: SS #. -------------------------------------------------------------------- -#: ../tin.1:1343 +#: ../tin.1:1353 #, no-wrap msgid "ATTACHMENT LISTING" msgstr "" # type: Plain text -#: ../tin.1:1346 +#: ../tin.1:1356 msgid "" "B ('B') displays a list of attachments of the current " "article. Besides the common moving keys, the following commands are " @@ -3107,108 +3143,108 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:1347 +#: ../tin.1:1357 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1350 +#: ../tin.1:1360 msgid "Pipe attachment into command." msgstr "" # type: TP -#: ../tin.1:1350 +#: ../tin.1:1360 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1353 +#: ../tin.1:1363 msgid "Save current attachment / tagged attachments to disk." msgstr "" # type: TP -#: ../tin.1:1353 +#: ../tin.1:1363 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" # type: Plain text -#: ../tin.1:1356 +#: ../tin.1:1366 msgid "View attachment." msgstr "Multimediaanhänge anzeigen." # type: TP -#: ../tin.1:1356 +#: ../tin.1:1366 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1359 +#: ../tin.1:1369 msgid "Tag one or more attachments for saving." msgstr "" # type: TP -#: ../tin.1:1359 +#: ../tin.1:1369 #, no-wrap msgid "B" # type: Plain text -#: ../tin.1:1363 +#: ../tin.1:1373 msgid "" "Prompts for a pattern to match. All attachments whose name/description or " "content type/transfer encoding match the pattern will be tagged." msgstr "" # type: TP -#: ../tin.1:1363 +#: ../tin.1:1373 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1366 +#: ../tin.1:1376 msgid "Reverse tagging of all attachments." msgstr "" # type: TP -#: ../tin.1:1366 +#: ../tin.1:1376 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1369 +#: ../tin.1:1379 msgid "Untag all tagged attachments." msgstr "" # type: Plain text -#: ../tin.1:1372 +#: ../tin.1:1382 msgid "Attachment forward search." msgstr "" # type: Plain text -#: ../tin.1:1375 +#: ../tin.1:1385 msgid "Attachment backward search." msgstr "" # type: TP -#: ../tin.1:1378 +#: ../tin.1:1388 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1381 +#: ../tin.1:1391 msgid "" "Pipe attachment into command. Uses the raw attachment, no decoding is done." msgstr "" # type: Plain text -#: ../tin.1:1388 +#: ../tin.1:1398 msgid "" "Toggle the display of the name/description of the current attachment in the " "last line." @@ -3216,14 +3252,14 @@ msgstr "Names oder Beschreibung des Anha # type: SS #. -------------------------------------------------------------------- -#: ../tin.1:1397 +#: ../tin.1:1407 #, no-wrap msgid "GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES" msgstr "" # type: Plain text #. FIXME - add missing descriptions -#: ../tin.1:1407 +#: ../tin.1:1417 msgid "" "At startup, B reads in the configuration files (see also B(5)). " "They contain a list of variables that can be used to configure the way " @@ -3235,7 +3271,7 @@ msgid "" msgstr "" # type: Plain text -#: ../tin.1:1415 +#: ../tin.1:1425 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 " @@ -3246,7 +3282,7 @@ msgid "" msgstr "" # type: Plain text -#: ../tin.1:1421 +#: ../tin.1:1431 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 " @@ -3256,7 +3292,7 @@ msgid "" msgstr "" # type: Plain text -#: ../tin.1:1428 +#: ../tin.1:1438 msgid "" "As with the other menus, B ('B<^L>') will redraw the screen. You " "can use B ('B'), B ('B') and B " @@ -3266,7 +3302,7 @@ msgid "" msgstr "" # type: Plain text -#: ../tin.1:1433 +#: ../tin.1:1443 msgid "" "The options menu provides access to the attributes menu for the current " "group by the B ('BTABE>') command. Pressing " @@ -3275,14 +3311,14 @@ msgid "" msgstr "" # type: Plain text -#: ../tin.1:1436 +#: ../tin.1:1446 msgid "" "The B ('B') command brings up the scopes menu. For more " "information see section \"SCOPES MENU\"." msgstr "" # type: Plain text -#: ../tin.1:1440 +#: ../tin.1:1450 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/" @@ -3290,13 +3326,13 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:1440 +#: ../tin.1:1450 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1446 ../tin.5:1183 +#: ../tin.1:1456 ../tin.5:1185 msgid "" "If ON abbreviate long newsgroup names at group selection level and article " "level (if necessary) like this: news.software.readers -E n.software." @@ -3304,161 +3340,161 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:1446 +#: ../tin.1:1456 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1450 ../tin.5:1187 +#: ../tin.1:1460 ../tin.5:1189 msgid "" "If ON add posted articles which start a new thread to filter for " "highlighting follow-ups. Default is ON." msgstr "" # type: TP -#: ../tin.1:1450 +#: ../tin.1:1460 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1453 ../tin.5:1190 +#: ../tin.1:1463 ../tin.5:1192 msgid "Turn ON advertising in header (''User-Agent:''). Default is ON." msgstr "" # type: TP -#: ../tin.1:1453 +#: ../tin.1:1463 #, no-wrap msgid "B" msgstr "B<Übersp. multipart/alternative-Teile (alternative_handling)>" # type: Plain text -#: ../tin.1:1456 ../tin.5:1193 +#: ../tin.1:1466 ../tin.5:1195 msgid "" "If ON strip multipart/alternative messages automatically. Default is ON." msgstr "" # type: TP -#: ../tin.1:1456 +#: ../tin.1:1466 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1459 ../tin.5:1196 +#: ../tin.1:1469 ../tin.5:1198 msgid "The character used to show that an article was deleted. Default is 'D'." msgstr "Zeichen das anzeigt, dass ein Artikel gelöscht wurde. Standard is 'D'." # type: TP -#: ../tin.1:1459 +#: ../tin.1:1469 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1462 ../tin.5:1199 +#: ../tin.1:1472 ../tin.5:1201 msgid "" "The character used to show that an article is in a range. Default is '#'." msgstr "" # type: TP -#: ../tin.1:1462 +#: ../tin.1:1472 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1466 ../tin.5:1203 +#: ../tin.1:1476 ../tin.5:1205 msgid "" "The character used to show that an article will return as an unread article " "when the group is next entered. Default is '-'." msgstr "" # type: TP -#: ../tin.1:1466 +#: ../tin.1:1476 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1470 ../tin.5:1207 +#: ../tin.1:1480 ../tin.5:1209 msgid "" "The character used to show that an article/thread is auto-selected (hot). " "Default is '*'." msgstr "" # type: TP -#: ../tin.1:1470 +#: ../tin.1:1480 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1474 ../tin.5:1211 +#: ../tin.1:1484 ../tin.5:1213 msgid "" "The character used to show that an article/thread is recent (not older than " "X days). See also B. Default is 'o'." msgstr "" # type: TP -#: ../tin.1:1474 +#: ../tin.1:1484 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1478 +#: ../tin.1:1488 msgid "" "The character used to show that an article has not been read. Default is " "\\&'+'." msgstr "" # type: TP -#: ../tin.1:1478 +#: ../tin.1:1488 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1481 ../tin.5:1218 +#: ../tin.1:1491 ../tin.5:1220 msgid "The character used to show that an article was read. Default is ' '." msgstr "" # type: TP -#: ../tin.1:1481 +#: ../tin.1:1491 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1485 ../tin.5:1222 +#: ../tin.1:1495 ../tin.5:1224 msgid "" "The character used to show that an article was killed. Default is 'K'. " "B must be set accordingly." msgstr "" # type: TP -#: ../tin.1:1485 +#: ../tin.1:1495 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1489 ../tin.5:1226 +#: ../tin.1:1499 ../tin.5:1228 msgid "" "The character used to show that an article was hot before it was read. " "Default is ':'. B must be set accordingly." msgstr "" # type: TP -#: ../tin.1:1489 ../tin.5:1226 +#: ../tin.1:1499 ../tin.5:1228 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1494 +#: ../tin.1:1504 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 " @@ -3466,50 +3502,50 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:1494 +#: ../tin.1:1504 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1498 ../tin.5:1237 +#: ../tin.1:1508 ../tin.5:1239 msgid "" "Automatically put your name in the ''Cc:'' and/or ''Bcc:'' field when " "mailing an article. Default is No." msgstr "" # type: TP -#: ../tin.1:1498 +#: ../tin.1:1508 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1502 ../tin.5:1241 +#: ../tin.1:1512 ../tin.5:1243 msgid "" "If ON automatically list thread when entering it using right arrow key. " "Default is ON." msgstr "" # type: TP -#: ../tin.1:1502 +#: ../tin.1:1512 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1505 ../tin.1:2420 +#: ../tin.1:1515 ../tin.1:2430 msgid "Default is OFF." msgstr "Standard ist OFF." # type: TP -#: ../tin.1:1505 +#: ../tin.1:1515 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1511 ../tin.5:1250 +#: ../tin.1:1521 ../tin.5:1252 msgid "" "If ON articles/threads with ''Archive-name:'' in header will be " "automatically saved with the Archive-name & part/patch no and post processed " @@ -3517,13 +3553,13 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:1511 +#: ../tin.1:1521 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1516 ../tin.5:1255 +#: ../tin.1:1526 ../tin.5:1257 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 " @@ -3531,13 +3567,13 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:1516 +#: ../tin.1:1526 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1521 ../tin.5:1260 +#: ../tin.1:1531 ../tin.5:1262 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 " @@ -3545,13 +3581,13 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:1521 +#: ../tin.1:1531 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1526 +#: ../tin.1:1536 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. " @@ -3559,302 +3595,302 @@ msgid "" msgstr "" # type: TP -#: ../tin.1:1526 +#: ../tin.1:1536 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1532 ../tin.5:1269 +#: ../tin.1:1542 ../tin.5:1271 msgid "" "If set ON the user is asked when quitting if all groups read during the " "current session should be marked read. Default is OFF." msgstr "" # type: TP -#: ../tin.1:1532 +#: ../tin.1:1542 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1535 ../tin.5:1272 +#: ../tin.1:1545 ../tin.5:1274 msgid "Standard background color" msgstr "Standard Hintergrundfarbe" # type: TP -#: ../tin.1:1535 +#: ../tin.1:1545 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1538 ../tin.5:1275 +#: ../tin.1:1548 ../tin.5:1277 msgid "Color of sender (From:)" msgstr "Farbe des Autors (From:)" # type: TP -#: ../tin.1:1538 +#: ../tin.1:1548 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1541 ../tin.5:1278 +#: ../tin.1:1551 ../tin.5:1280 msgid "Color of header-lines" msgstr "Farbe der Artikelheaderzeilen" # type: TP -#: ../tin.1:1541 +#: ../tin.1:1551 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1544 ../tin.5:1281 +#: ../tin.1:1554 ../tin.5:1283 msgid "Color of help pages" msgstr "Farbe des Hilfstext" # type: TP -#: ../tin.1:1544 +#: ../tin.1:1554 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1547 ../tin.5:1284 +#: ../tin.1:1557 ../tin.5:1286 msgid "Color of background for inverse text" msgstr "Hintergrundfarbe für inversen Text" # type: TP -#: ../tin.1:1547 +#: ../tin.1:1557 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1550 ../tin.5:1287 +#: ../tin.1:1560 ../tin.5:1289 msgid "Color of foreground for inverse text" msgstr "Vordergrundfarbe für inversen Text" # type: TP -#: ../tin.1:1550 +#: ../tin.1:1560 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1554 ../tin.5:1291 +#: ../tin.1:1564 ../tin.5:1293 msgid "" "Color of words emphasized like _this_. See also B and " "B." msgstr "" # type: TP -#: ../tin.1:1554 +#: ../tin.1:1564 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1558 ../tin.5:1295 +#: ../tin.1:1568 ../tin.5:1297 msgid "" "Color of words emphasized like /this/. See also B and " "B." msgstr "" # type: TP -#: ../tin.1:1558 +#: ../tin.1:1568 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1562 ../tin.5:1299 +#: ../tin.1:1572 ../tin.5:1301 msgid "" "Color of words emphasized like *this*. See also B and " "B." msgstr "" # type: TP -#: ../tin.1:1562 +#: ../tin.1:1572 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1566 ../tin.5:1303 +#: ../tin.1:1576 ../tin.5:1305 msgid "" "Color of words emphasized like -this-. See also B and " "B." msgstr "" # type: TP -#: ../tin.1:1566 +#: ../tin.1:1576 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1569 ../tin.5:1306 +#: ../tin.1:1579 ../tin.5:1308 msgid "Color of mini help menu" msgstr "Farbe des Minihilfemenü" # type: TP -#: ../tin.1:1569 +#: ../tin.1:1579 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1572 ../tin.5:1309 +#: ../tin.1:1582 ../tin.5:1311 msgid "Color of actual news header fields" msgstr "Farbe des angezeigten Headers" # type: TP -#: ../tin.1:1572 +#: ../tin.1:1582 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1575 ../tin.5:1312 +#: ../tin.1:1585 ../tin.5:1314 msgid "Standard foreground color" msgstr "Standard Vordergrundfarbe" # type: TP -#: ../tin.1:1575 +#: ../tin.1:1585 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1578 ../tin.5:1315 +#: ../tin.1:1588 ../tin.5:1317 msgid "Color of quoted lines" msgstr "Farbe der zitierten Zeilen" # type: TP -#: ../tin.1:1578 +#: ../tin.1:1588 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1581 ../tin.5:1318 +#: ../tin.1:1591 ../tin.5:1320 msgid "Color of twice quoted lines" msgstr "Farbe von zweifach zitierten Zeilen" # type: TP -#: ../tin.1:1581 +#: ../tin.1:1591 #, no-wrap msgid "B3 times quoted line (col_quote3)>" msgstr "B3-fach zitierten Zeilen (col_quote3)>" # type: Plain text -#: ../tin.1:1584 ../tin.5:1321 +#: ../tin.1:1594 ../tin.5:1323 msgid "Color of E=3 times quoted lines" msgstr "Farbe von =E3-fach zitierten Zeilen" # type: TP -#: ../tin.1:1584 +#: ../tin.1:1594 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1588 +#: ../tin.1:1598 msgid "" "Color of response counter. This is the text that says \"Response x of y\" in " "the article viewer." msgstr "" # type: TP -#: ../tin.1:1588 +#: ../tin.1:1598 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1591 ../tin.5:1328 +#: ../tin.1:1601 ../tin.5:1330 msgid "Color of signatures" msgstr "Farbe von Signaturen" # type: TP -#: ../tin.1:1591 +#: ../tin.1:1601 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1594 ../tin.5:1331 +#: ../tin.1:1604 ../tin.5:1333 msgid "Color of urls highlight" msgstr "Farbe der hervorgehobenen URLs" # type: TP -#: ../tin.1:1594 +#: ../tin.1:1604 #, no-wrap msgid "B" msgstr "B" # type: Plain text # -#: ../tin.1:1597 ../tin.5:1334 +#: ../tin.1:1607 ../tin.5:1336 msgid "Color of verbatim blocks" msgstr "Farbe des wortgetreu darzustellenden Textes" # type: TP -#: ../tin.1:1597 +#: ../tin.1:1607 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1600 ../tin.5:1337 +#: ../tin.1:1610 ../tin.5:1339 msgid "Color of article subject" msgstr "Farbe der Subjectzeile" # type: TP -#: ../tin.1:1600 +#: ../tin.1:1610 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1603 ../tin.5:1340 +#: ../tin.1:1613 ../tin.5:1342 msgid "Color of text-lines" msgstr "Farbe der Textzeilen" # type: TP -#: ../tin.1:1603 +#: ../tin.1:1613 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1606 ../tin.5:1343 +#: ../tin.1:1616 ../tin.5:1345 msgid "Color of help/mail sign" msgstr "Farbe des Hilfe/Mail-Zeichens" # type: TP -#: ../tin.1:1606 +#: ../tin.1:1616 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1609 +#: ../tin.1:1619 msgid "Ask for manual confirmation to protect the user." msgstr "" # type: IP -#: ../tin.1:1610 ../tin.1:1616 ../tin.1:1620 +#: ../tin.1:1620 ../tin.1:1626 ../tin.1:1630 #, no-wrap msgid "\\(bu" msgstr "\\(bu" # type: Plain text #. TODO: check if all affected commands are marked [after confirmation] -#: ../tin.1:1616 +#: ../tin.1:1626 msgid "" "B Ask for confirmation before executing certain dangerous commands " "(e.g., B ('B')). Commands that this affects are marked in this " @@ -3862,21 +3898,21 @@ msgid "" msgstr "" # type: Plain text -#: ../tin.1:1620 +#: ../tin.1:1630 msgid "" "B You'll be asked to confirm that you wish to exit B when you use " "the B ('B') command." msgstr "" # type: Plain text -#: ../tin.1:1624 +#: ../tin.1:1634 msgid "" "B Ask for confirmation before marking all not selected (with " "B ('B') command) articles as read." @@ -4340,7 +4377,7 @@ msgstr "" "B ('B') command) articles as read." # type: TP -#: ../tin.1:1625 +#: ../tin.1:1635 #, no-wrap msgid "B" msgstr "B" @@ -4349,7 +4386,7 @@ msgstr "B uses for date representation. A description of the " "different format options can be found at B(3). B uses " @@ -4362,47 +4399,47 @@ msgstr "" "fallback code. Default is \"%a, %d %b %Y %H:%M:%S\"." # type: TP -#: ../tin.1:1637 +#: ../tin.1:1647 #, no-wrap msgid "B<(default_art_search)>" msgstr "B<(default_art_search)>" # type: TP -#: ../tin.1:1639 +#: ../tin.1:1649 #, no-wrap msgid "B<(default_author_search)>" msgstr "B<(default_author_search)>" # type: TP -#: ../tin.1:1641 +#: ../tin.1:1651 #, no-wrap msgid "B<(default_config_search)>" msgstr "B<(default_config_search)>" # type: Plain text -#: ../tin.1:1644 ../tin.5:1382 +#: ../tin.1:1654 ../tin.5:1384 msgid "The last article/author/config option that was searched for." msgstr "The last article/author/config option that was searched for." # type: TP -#: ../tin.1:1644 +#: ../tin.1:1654 #, no-wrap msgid "B<(default_filter_days)>" msgstr "B<(default_filter_days)>" # type: Plain text -#: ../tin.1:1647 ../tin.5:1385 +#: ../tin.1:1657 ../tin.5:1387 msgid "Default is 28." msgstr "Default is 28." # type: TP -#: ../tin.1:1647 +#: ../tin.1:1657 #, no-wrap msgid "B<(default_filter_kill_case)>" msgstr "B<(default_filter_kill_case)>" # type: Plain text -#: ../tin.1:1651 +#: ../tin.1:1661 msgid "" "Default for quick (1 key) kill filter case. ON = filter case sensitive, OFF " "= ignore case. Default is OFF." @@ -4411,13 +4448,13 @@ msgstr "" "= ignore case. Default is OFF." # type: TP -#: ../tin.1:1651 +#: ../tin.1:1661 #, no-wrap msgid "B<(default_filter_kill_expire)>" msgstr "B<(default_filter_kill_expire)>" # type: Plain text -#: ../tin.1:1656 +#: ../tin.1:1666 msgid "" "Default for quick (1 key) kill filter expire. ON = limit to " "B, OFF = don't ever expire. Default is OFF." @@ -4426,13 +4463,13 @@ msgstr "" "B, OFF = don't ever expire. Default is OFF." # type: TP -#: ../tin.1:1656 +#: ../tin.1:1666 #, no-wrap msgid "B<(default_filter_kill_global)>" msgstr "B<(default_filter_kill_global)>" # type: Plain text -#: ../tin.1:1660 +#: ../tin.1:1670 msgid "" "Default for quick (1 key) kill filter global. ON=apply to all groups, " "OFF=apply to current group. Default is ON." @@ -4441,139 +4478,139 @@ msgstr "" "OFF=apply to current group. Default is ON." # type: TP -#: ../tin.1:1660 +#: ../tin.1:1670 #, no-wrap msgid "B<(default_filter_kill_header)>" msgstr "B<(default_filter_kill_header)>" # type: Plain text -#: ../tin.1:1663 ../tin.5:1400 +#: ../tin.1:1673 ../tin.5:1402 msgid "Default for quick (1 key) kill filter header." msgstr "Default for quick (1 key) kill filter header." # type: IP -#: ../tin.1:1664 ../tin.1:1698 ../tin.1:1829 ../tin.1:1999 ../tin.1:2042 -#: ../tin.1:2154 ../tin.1:2180 ../tin.1:2231 ../tin.1:2261 ../tin.1:2332 -#: ../tin.1:2360 ../tin.1:2380 ../tin.1:2464 ../tin.5:1553 ../tin.5:1736 -#: ../tin.5:1785 ../tin.5:1916 ../tin.5:1942 ../tin.5:1995 ../tin.5:2024 -#: ../tin.5:2105 ../tin.5:2125 ../tin.5:2217 +#: ../tin.1:1674 ../tin.1:1708 ../tin.1:1839 ../tin.1:2009 ../tin.1:2052 +#: ../tin.1:2164 ../tin.1:2190 ../tin.1:2241 ../tin.1:2271 ../tin.1:2342 +#: ../tin.1:2370 ../tin.1:2390 ../tin.1:2478 ../tin.5:1555 ../tin.5:1744 +#: ../tin.5:1793 ../tin.5:1924 ../tin.5:1950 ../tin.5:2003 ../tin.5:2032 +#: ../tin.5:2113 ../tin.5:2133 ../tin.5:2229 #, no-wrap msgid "0" msgstr "0" # type: Plain text -#: ../tin.1:1666 ../tin.1:1700 +#: ../tin.1:1676 ../tin.1:1710 #, no-wrap msgid " ''Subject:'' (case sensitive)\n" msgstr " ''Subject:'' (case sensitive)\n" # type: IP -#: ../tin.1:1666 ../tin.1:1700 ../tin.1:1835 ../tin.1:2001 ../tin.1:2044 -#: ../tin.1:2156 ../tin.1:2182 ../tin.1:2233 ../tin.1:2263 ../tin.1:2334 -#: ../tin.1:2362 ../tin.1:2382 ../tin.1:2466 ../tin.5:1560 ../tin.5:1738 -#: ../tin.5:1787 ../tin.5:1836 ../tin.5:1918 ../tin.5:1944 ../tin.5:1997 -#: ../tin.5:2026 ../tin.5:2107 ../tin.5:2127 ../tin.5:2219 +#: ../tin.1:1676 ../tin.1:1710 ../tin.1:1845 ../tin.1:2011 ../tin.1:2054 +#: ../tin.1:2166 ../tin.1:2192 ../tin.1:2243 ../tin.1:2273 ../tin.1:2344 +#: ../tin.1:2372 ../tin.1:2392 ../tin.1:2480 ../tin.5:1562 ../tin.5:1746 +#: ../tin.5:1795 ../tin.5:1844 ../tin.5:1926 ../tin.5:1952 ../tin.5:2005 +#: ../tin.5:2034 ../tin.5:2115 ../tin.5:2135 ../tin.5:2231 #, no-wrap msgid "1" msgstr "1" # type: Plain text -#: ../tin.1:1668 ../tin.1:1702 +#: ../tin.1:1678 ../tin.1:1712 #, no-wrap msgid " ''Subject:'' (ignore case)\n" msgstr " ''Subject:'' (ignore case)\n" # type: IP -#: ../tin.1:1668 ../tin.1:1702 ../tin.1:1840 ../tin.1:2003 ../tin.1:2048 -#: ../tin.1:2159 ../tin.1:2186 ../tin.1:2235 ../tin.1:2266 ../tin.1:2336 -#: ../tin.1:2364 ../tin.1:2384 ../tin.1:2468 ../tin.5:1565 ../tin.5:1740 -#: ../tin.5:1792 ../tin.5:1840 ../tin.5:1921 ../tin.5:1948 ../tin.5:1999 -#: ../tin.5:2029 ../tin.5:2109 ../tin.5:2129 ../tin.5:2221 +#: ../tin.1:1678 ../tin.1:1712 ../tin.1:1850 ../tin.1:2013 ../tin.1:2058 +#: ../tin.1:2169 ../tin.1:2196 ../tin.1:2245 ../tin.1:2276 ../tin.1:2346 +#: ../tin.1:2374 ../tin.1:2394 ../tin.1:2482 ../tin.5:1567 ../tin.5:1748 +#: ../tin.5:1800 ../tin.5:1848 ../tin.5:1929 ../tin.5:1956 ../tin.5:2007 +#: ../tin.5:2037 ../tin.5:2117 ../tin.5:2137 ../tin.5:2233 #, no-wrap msgid "2" msgstr "2" # type: Plain text -#: ../tin.1:1670 ../tin.1:1704 +#: ../tin.1:1680 ../tin.1:1714 #, no-wrap msgid " ''From:'' (case sensitive)\n" msgstr " ''From:'' (case sensitive)\n" # type: IP -#: ../tin.1:1670 ../tin.1:1704 ../tin.1:2005 ../tin.1:2162 ../tin.1:2190 -#: ../tin.1:2237 ../tin.1:2268 ../tin.1:2338 ../tin.1:2386 ../tin.5:1742 -#: ../tin.5:1924 ../tin.5:1952 ../tin.5:2001 ../tin.5:2031 ../tin.5:2131 +#: ../tin.1:1680 ../tin.1:1714 ../tin.1:2015 ../tin.1:2172 ../tin.1:2200 +#: ../tin.1:2247 ../tin.1:2278 ../tin.1:2348 ../tin.1:2396 ../tin.5:1750 +#: ../tin.5:1932 ../tin.5:1960 ../tin.5:2009 ../tin.5:2039 ../tin.5:2139 #, no-wrap msgid "3" msgstr "3" # type: Plain text -#: ../tin.1:1672 ../tin.1:1706 +#: ../tin.1:1682 ../tin.1:1716 #, no-wrap msgid " ''From:'' (ignore case)\n" msgstr " ''From:'' (ignore case)\n" # type: IP -#: ../tin.1:1672 ../tin.1:1706 ../tin.1:2007 ../tin.1:2239 ../tin.1:2270 -#: ../tin.1:2341 ../tin.1:2388 ../tin.5:1744 ../tin.5:1846 ../tin.5:2003 -#: ../tin.5:2033 ../tin.5:2133 +#: ../tin.1:1682 ../tin.1:1716 ../tin.1:2017 ../tin.1:2249 ../tin.1:2280 +#: ../tin.1:2351 ../tin.1:2398 ../tin.5:1752 ../tin.5:1854 ../tin.5:2011 +#: ../tin.5:2041 ../tin.5:2141 #, no-wrap msgid "4" msgstr "4" # type: Plain text -#: ../tin.1:1674 ../tin.1:1708 +#: ../tin.1:1684 ../tin.1:1718 #, no-wrap msgid " ''Message-ID:'' & full ''References:'' line\n" msgstr " ''Message-ID:'' & full ''References:'' line\n" # type: IP -#: ../tin.1:1674 ../tin.1:1708 ../tin.1:2241 ../tin.1:2343 ../tin.1:2391 -#: ../tin.5:2005 ../tin.5:2136 +#: ../tin.1:1684 ../tin.1:1718 ../tin.1:2251 ../tin.1:2353 ../tin.1:2401 +#: ../tin.5:2013 ../tin.5:2144 #, no-wrap msgid "5" msgstr "5" # type: Plain text -#: ../tin.1:1676 ../tin.1:1710 +#: ../tin.1:1686 ../tin.1:1720 #, no-wrap msgid " ''Message-ID:'' & last ''References:'' entry only\n" msgstr " ''Message-ID:'' & last ''References:'' entry only\n" # type: IP -#: ../tin.1:1676 ../tin.1:1710 ../tin.1:2243 ../tin.1:2393 ../tin.5:2007 -#: ../tin.5:2138 +#: ../tin.1:1686 ../tin.1:1720 ../tin.1:2253 ../tin.1:2403 ../tin.5:2015 +#: ../tin.5:2146 #, no-wrap msgid "6" msgstr "6" # type: Plain text -#: ../tin.1:1678 ../tin.1:1712 +#: ../tin.1:1688 ../tin.1:1722 #, no-wrap msgid " ''Message-ID:'' entry only\n" msgstr " ''Message-ID:'' entry only\n" # type: IP -#: ../tin.1:1678 ../tin.1:1712 ../tin.1:2246 ../tin.1:2395 ../tin.5:2010 -#: ../tin.5:2140 +#: ../tin.1:1688 ../tin.1:1722 ../tin.1:2256 ../tin.1:2405 ../tin.5:2018 +#: ../tin.5:2148 #, no-wrap msgid "7" msgstr "7" # type: Plain text -#: ../tin.1:1680 ../tin.1:1714 +#: ../tin.1:1690 ../tin.1:1724 #, no-wrap msgid " ''Lines:''\n" msgstr " ''Lines:''\n" # type: TP -#: ../tin.1:1681 +#: ../tin.1:1691 #, no-wrap msgid "B<(default_filter_select_case)>" msgstr "B<(default_filter_select_case)>" # type: Plain text -#: ../tin.1:1685 ../tin.5:1417 +#: ../tin.1:1695 ../tin.5:1419 msgid "" "Default for quick (1 key) auto-selection filter case. ON=filter case " "sensitive, OFF=ignore case. Default is OFF." @@ -4582,13 +4619,13 @@ msgstr "" "sensitive, OFF=ignore case. Default is OFF." # type: TP -#: ../tin.1:1685 +#: ../tin.1:1695 #, no-wrap msgid "B<(default_filter_select_expire)>" msgstr "B<(default_filter_select_expire)>" # type: Plain text -#: ../tin.1:1690 +#: ../tin.1:1700 msgid "" "Default for quick (1 key) auto-selection filter expire. ON = limit to " "B, OFF = don't ever expire. Default is OFF." @@ -4597,13 +4634,13 @@ msgstr "" "B, OFF = don't ever expire. Default is OFF." # type: TP -#: ../tin.1:1690 +#: ../tin.1:1700 #, no-wrap msgid "B<(default_filter_select_global)>" msgstr "B<(default_filter_select_global)>" # type: Plain text -#: ../tin.1:1694 +#: ../tin.1:1704 msgid "" "Default for quick (1 key) auto-selection filter global. ON=apply to all " "groups OFF=apply to current group. Default is ON." @@ -4612,126 +4649,126 @@ msgstr "" "groups OFF=apply to current group. Default is ON." # type: TP -#: ../tin.1:1694 +#: ../tin.1:1704 #, no-wrap msgid "B<(default_filter_select_header)>" msgstr "B<(default_filter_select_header)>" # type: Plain text -#: ../tin.1:1697 ../tin.5:1428 +#: ../tin.1:1707 ../tin.5:1430 msgid "Default for quick (1 key) auto-selection filter header." msgstr "Default for quick (1 key) auto-selection filter header." # type: TP -#: ../tin.1:1715 +#: ../tin.1:1725 #, no-wrap msgid "B<(default_goto_group)>" msgstr "B<(default_goto_group)>" # type: TP -#: ../tin.1:1717 +#: ../tin.1:1727 #, no-wrap msgid "B<(default_group_search)>" msgstr "B<(default_group_search)>" # type: TP -#: ../tin.1:1719 +#: ../tin.1:1729 #, no-wrap msgid "B<(default_mail_address)>" msgstr "B<(default_mail_address)>" # type: TP -#: ../tin.1:1721 +#: ../tin.1:1731 #, no-wrap msgid "B<(default_move_group)>" msgstr "B<(default_move_group)>" # type: TP -#: ../tin.1:1723 +#: ../tin.1:1733 #, no-wrap msgid "B<(default_pattern)>" msgstr "B<(default_pattern)>" # type: TP -#: ../tin.1:1725 +#: ../tin.1:1735 #, no-wrap msgid "B<(default_pipe_command)>" msgstr "B<(default_pipe_command)>" # type: TP -#: ../tin.1:1727 +#: ../tin.1:1737 #, no-wrap msgid "B<(default_post_newsgroups)>" msgstr "B<(default_post_newsgroups)>" # type: TP -#: ../tin.1:1729 +#: ../tin.1:1739 #, no-wrap msgid "B<(default_post_subject)>" msgstr "B<(default_post_subject)>" # type: TP -#: ../tin.1:1731 +#: ../tin.1:1741 #, no-wrap msgid "B<(default_range_group)>" msgstr "B<(default_range_group)>" # type: TP -#: ../tin.1:1733 +#: ../tin.1:1743 #, no-wrap msgid "B<(default_range_select)>" msgstr "B<(default_range_select)>" # type: TP -#: ../tin.1:1735 +#: ../tin.1:1745 #, no-wrap msgid "B<(default_range_thread)>" msgstr "B<(default_range_thread)>" # type: TP -#: ../tin.1:1737 +#: ../tin.1:1747 #, no-wrap msgid "B<(default_repost_group)>" msgstr "B<(default_repost_group)>" # type: TP -#: ../tin.1:1739 +#: ../tin.1:1749 #, no-wrap msgid "B<(default_save_file)>" msgstr "B<(default_save_file)>" # type: TP -#: ../tin.1:1741 +#: ../tin.1:1751 #, no-wrap msgid "B<(default_save_mode)>" msgstr "B<(default_save_mode)>" # type: TP -#: ../tin.1:1743 +#: ../tin.1:1753 #, no-wrap msgid "B<(default_select_pattern)>" msgstr "B<(default_select_pattern)>" # type: TP -#: ../tin.1:1745 +#: ../tin.1:1755 #, no-wrap msgid "B<(default_shell_command)>" msgstr "B<(default_shell_command)>" # type: TP -#: ../tin.1:1747 +#: ../tin.1:1757 #, no-wrap msgid "B<(default_subject_search)>" msgstr "B<(default_subject_search)>" # type: TP -#: ../tin.1:1749 +#: ../tin.1:1759 #, no-wrap msgid "B instead of highlighted bar (draw_arrow)>" msgstr "B instead of highlighted bar (draw_arrow)>" # type: Plain text -#: ../tin.1:1753 +#: ../tin.1:1763 msgid "" "Allows groups/articles to be selected by an arrow '-E' if set ON or by " "an highlighted bar if set OFF. Default is OFF." @@ -4740,13 +4777,13 @@ msgstr "" "an highlighted bar if set OFF. Default is OFF." # type: TP -#: ../tin.1:1753 +#: ../tin.1:1763 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1757 +#: ../tin.1:1767 msgid "" "The format string used to create the editor start command with parameters. " "Default is \"%E +%N %F\" (i.e., /bin/vi +7 .article)." @@ -4755,13 +4792,13 @@ msgstr "" "Default is \"%E +%N %F\" (i.e., /bin/vi +7 .article)." # type: TP -#: ../tin.1:1757 +#: ../tin.1:1767 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1761 ../tin.5:1488 +#: ../tin.1:1771 ../tin.5:1490 msgid "" "Specifies whether a screen redraw should always be done after certain " "external commands. Default is OFF." @@ -4770,13 +4807,13 @@ msgstr "" "external commands. Default is OFF." # type: TP -#: ../tin.1:1761 +#: ../tin.1:1771 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1767 +#: ../tin.1:1777 msgid "" "If B is E 0 not more than B articles/group " "are fetched from the server. If B is E 0 B will start " @@ -4789,26 +4826,26 @@ msgstr "" "B. Default is 0, which means no limit." # type: TP -#: ../tin.1:1767 +#: ../tin.1:1777 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1770 ../tin.5:1506 +#: ../tin.1:1780 ../tin.5:1508 msgid "" "If ON catchup group when leaving with the left arrow key. Default is ON." msgstr "" "If ON catchup group when leaving with the left arrow key. Default is ON." # type: TP -#: ../tin.1:1770 +#: ../tin.1:1780 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1778 ../tin.5:1503 +#: ../tin.1:1788 ../tin.5:1505 msgid "" "Which keys B should accept to jump to the next unread article. " "Possible is any combination of B and B. When " @@ -4825,13 +4862,13 @@ msgstr "" "Default is PageNextUnread." # type: TP -#: ../tin.1:1778 +#: ../tin.1:1788 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1782 ../tin.5:1510 +#: ../tin.1:1792 ../tin.5:1512 msgid "" "Maximum length of the names of newsgroups to be displayed so that more of " "the newsgroup description can be displayed. Default is 32." @@ -4840,13 +4877,13 @@ msgstr "" "the newsgroup description can be displayed. Default is 32." # type: TP -#: ../tin.1:1782 +#: ../tin.1:1792 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1791 +#: ../tin.1:1801 msgid "" "If set to 'No' then raw uuencoded data is displayed. If set to 'Yes' then " "sections of uuencoded data will be shown with a single tag line showing the " @@ -4865,13 +4902,13 @@ msgstr "" "toggled in the article viewer. Default is 'No'." # type: TP -#: ../tin.1:1791 +#: ../tin.1:1801 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1798 +#: ../tin.1:1808 msgid "" "Path, name and options of external B(1). If you are reading via NNTP " "the default value is --internal (use built-in NNTP inews), else it is " @@ -4884,14 +4921,14 @@ msgstr "" "article'." # type: TP -#: ../tin.1:1798 +#: ../tin.1:1808 #, no-wrap msgid "B<(info_in_last_line)>" msgstr "B<(info_in_last_line)>" # type: Plain text #. this is missing from the Menu -#: ../tin.1:1805 +#: ../tin.1:1815 msgid "" "If ON, show current group description or article subject in the last line " "(not in the pager and global menu) - B ('B') toggles " @@ -4904,13 +4941,13 @@ msgstr "" "available to display long subjects. Default is OFF." # type: TP -#: ../tin.1:1805 +#: ../tin.1:1815 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1812 +#: ../tin.1:1822 msgid "" "Interactive mailreader: if greater than 0 your mailreader will be invoked " "earlier for reply so you can use more of its features (e.g. MIME, pgp, ...). " @@ -4928,13 +4965,13 @@ msgstr "" #. TODO: fix menu description #. mono_mark* currently do allow "Reverse video" even if #. inverse_okay=FALSE -#: ../tin.1:1812 +#: ../tin.1:1822 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1819 ../tin.5:1543 +#: ../tin.1:1829 ../tin.5:1545 msgid "" "If ON use inverse video for page headers and URL highlighting. Default is " "ON." @@ -4943,13 +4980,13 @@ msgstr "" "ON." # type: TP -#: ../tin.1:1819 +#: ../tin.1:1829 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1824 ../tin.5:1548 +#: ../tin.1:1834 ../tin.5:1550 msgid "" "If ON keep all failed postings in I<${TIN_HOMEDIR:-\"$HOME\"}/dead.articles> " "besides keeping the last failed posting in I<${TIN_HOMEDIR:-\"$HOME\"}/dead." @@ -4960,13 +4997,13 @@ msgstr "" "article>. Default is ON." # type: TP -#: ../tin.1:1824 +#: ../tin.1:1834 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1828 +#: ../tin.1:1838 msgid "" "This option controls the processing and display of articles that are " "killed. There are 3 options:" @@ -4975,7 +5012,7 @@ msgstr "" "killed. There are 3 options:" # type: Plain text -#: ../tin.1:1835 +#: ../tin.1:1845 msgid "" "B is the 'traditional' behavior of B. Only " "unread articles are killed once only by marking them read. As filtering only " @@ -4990,7 +5027,7 @@ msgstr "" "group the mark will be gone." # type: Plain text -#: ../tin.1:1840 ../tin.5:1565 +#: ../tin.1:1850 ../tin.5:1567 msgid "" "B will process all articles in the group and " "therefore there is a processing overhead when using this option. Killed " @@ -5003,7 +5040,7 @@ msgstr "" "B." # type: Plain text -#: ../tin.1:1844 ../tin.5:1569 +#: ../tin.1:1854 ../tin.5:1571 msgid "" "B will process all articles in the group and " "therefore there is a processing overhead when using this option. Killed " @@ -5014,18 +5051,18 @@ msgstr "" "articles simply does not get displayed at all." # type: Plain text -#: ../tin.1:1846 +#: ../tin.1:1856 msgid "Default is 0 (B)." msgstr "Default is 0 (B)." # type: TP -#: ../tin.1:1846 +#: ../tin.1:1856 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1852 ../tin.5:1576 +#: ../tin.1:1862 ../tin.5:1578 msgid "" "Allows 8bit characters unencoded in the header of mail message. Default is " "OFF. Turning it ON is effective only if B is also set to " @@ -5038,13 +5075,13 @@ msgstr "" "Standard (B and B). Default is OFF." # type: TP -#: ../tin.1:1852 +#: ../tin.1:1862 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1858 ../tin.5:1582 +#: ../tin.1:1868 ../tin.5:1584 msgid "" "User's mail address (and full name), if not username@host. This is used when " "creating articles, sending mail and when B(1) signing." @@ -5053,13 +5090,13 @@ msgstr "" "creating articles, sending mail and when B(1) signing." # type: TP -#: ../tin.1:1858 +#: ../tin.1:1868 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1862 ../tin.5:1586 +#: ../tin.1:1872 ../tin.5:1588 msgid "" "MIME encoding of the body in mail message, if necessary (8bit, base64, " "quoted-printable, 7bit). Default is quoted-printable." @@ -5068,13 +5105,13 @@ msgstr "" "quoted-printable, 7bit). Default is quoted-printable." # type: TP -#: ../tin.1:1862 +#: ../tin.1:1872 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1867 ../tin.5:1591 +#: ../tin.1:1877 ../tin.5:1593 msgid "" "Format of quote line when replying (via mail) to an article (%A=Address, %" "D=Date, %F=Fullname+Address, %G=Groupname, %M=Message-ID, %N=Fullname, %" @@ -5085,13 +5122,13 @@ msgstr "" "C=Firstname, %I=Initials). Default is \"In article %M you wrote:\"" # type: TP -#: ../tin.1:1867 +#: ../tin.1:1877 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1875 +#: ../tin.1:1885 msgid "" "Select one of the following mailbox-formats: MBOXO (default, except for " "SCO), MBOXRD or MMDF (default on SCO). See B(5) for more details on " @@ -5102,13 +5139,13 @@ msgstr "" "MBOXO and MBOXRD and B(5) for more details about MMDF." # type: TP -#: ../tin.1:1875 +#: ../tin.1:1885 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1884 +#: ../tin.1:1894 msgid "" "The directory where articles/threads are to be saved in B(5) format. " "This feature is mainly for use with the B(1) mail program. It allows " @@ -5121,14 +5158,14 @@ msgstr "" "filename to save to. Default is I<${TIN_HOMEDIR:-\"$HOME\"}/Mail>." # type: TP -#: ../tin.1:1884 +#: ../tin.1:1894 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. TODO: document %S, %T, %M, %F, %U ... -#: ../tin.1:1893 +#: ../tin.1:1903 msgid "" "The format string used to create the mailer command with parameters that is " "used for mailing articles to other people. Default is '%M \"%T\" E %" @@ -5147,13 +5184,13 @@ msgstr "" "E .article)." # type: TP -#: ../tin.1:1893 +#: ../tin.1:1903 #, no-wrap msgid "B<'Mark as (un)read' ignores tags (mark_ignore_tags)>" msgstr "B<'Mark as (un)read' ignores tags (mark_ignore_tags)>" # type: Plain text -#: ../tin.1:1901 ../tin.5:1639 +#: ../tin.1:1911 ../tin.5:1647 msgid "" "When this is ON, the B ('B'), B " "('B'), B ('B') at Group level and B " @@ -5170,24 +5207,24 @@ msgstr "" "unread articles, or nothing." # type: TP -#: ../tin.1:1901 +#: ../tin.1:1911 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1904 ../tin.5:1631 +#: ../tin.1:1914 ../tin.5:1639 msgid "If ON mark articles that are saved as read. Default is ON." msgstr "If ON mark articles that are saved as read. Default is ON." # type: TP -#: ../tin.1:1904 +#: ../tin.1:1914 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1916 +#: ../tin.1:1926 msgid "" "Path, name and options of external B(1) program used to view non-" "textual parts of articles. To use the built-in viewer, set to --internal. " @@ -5204,13 +5241,13 @@ msgstr "" "also B." # type: TP -#: ../tin.1:1916 +#: ../tin.1:1926 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1929 +#: ../tin.1:1939 msgid "" "Charset supported locally, which is also used for MIME header (charset " "parameter and charset name in header encoding) in mail and news postings. If " @@ -5233,13 +5270,13 @@ msgstr "" "is disabled and you should use B instead." # type: TP -#: ../tin.1:1929 +#: ../tin.1:1939 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1940 +#: ../tin.1:1950 msgid "" "Charset used for posting and MIME headers; replaces B. " "Conversion between B and local charset (determined via " @@ -5256,7 +5293,7 @@ msgstr "" "following charsets:" # type: Plain text -#: ../tin.1:1943 ../tin.5:1678 +#: ../tin.1:1953 ../tin.5:1686 msgid "" "US-ASCII, ISO-8859-{1,2,3,4,5,7,9,10,13,14,15,16}, KOI8-{R,U,RU} EUC-{CN,JP," "KR,TW}, ISO-2022-{CN,CN-EXT,JP,JP-1,JP-2}, Big5, UTF-8" @@ -5265,7 +5302,7 @@ msgstr "" "KR,TW}, ISO-2022-{CN,CN-EXT,JP,JP-1,JP-2}, Big5, UTF-8" # type: Plain text -#: ../tin.1:1949 ../tin.5:1684 +#: ../tin.1:1959 ../tin.5:1692 msgid "" "Not all values might work on your system, see B(3) for more " "details. If it's not set, the value of the environment variable " @@ -5278,13 +5315,13 @@ msgstr "" "neither of them is defined." # type: TP -#: ../tin.1:1949 +#: ../tin.1:1959 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1954 +#: ../tin.1:1964 msgid "" "Character attribute of words emphasized like _this_. It depends on your " "terminal which attributes are usable. See also B and " @@ -5295,13 +5332,13 @@ msgstr "" "B." # type: TP -#: ../tin.1:1954 +#: ../tin.1:1964 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1959 +#: ../tin.1:1969 msgid "" "Character attribute of words emphasized like /this/. It depends on your " "terminal which attributes are usable. See also B and " @@ -5312,13 +5349,13 @@ msgstr "" "B." # type: TP -#: ../tin.1:1959 +#: ../tin.1:1969 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1964 +#: ../tin.1:1974 msgid "" "Character attribute of words emphasized like *this*. It depends on your " "terminal which attributes are usable. See also B and " @@ -5329,13 +5366,13 @@ msgstr "" "B." # type: TP -#: ../tin.1:1964 +#: ../tin.1:1974 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1969 +#: ../tin.1:1979 msgid "" "Character attribute of words emphasized like -this-. It depends on your " "terminal which attributes are usable. See also B and " @@ -5346,13 +5383,13 @@ msgstr "" "B." # type: TP -#: ../tin.1:1969 +#: ../tin.1:1979 #, no-wrap msgid "B<(newnews)>" msgstr "B<(newnews)>" # type: Plain text -#: ../tin.1:1973 +#: ../tin.1:1983 msgid "" "These are internal timers used by B to keep track of new newsgroups. " "Do not change them unless you understand what they are for." @@ -5361,13 +5398,13 @@ msgstr "" "Do not change them unless you understand what they are for." # type: TP -#: ../tin.1:1973 +#: ../tin.1:1983 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1980 +#: ../tin.1:1990 msgid "" "Which news headers you wish to see. If you want to see _all_ the headers, " "place an '*' as this value. This is the only way a wildcard can be used. If " @@ -5382,13 +5419,13 @@ msgstr "" "spaces. Not defining anything turns off this option." # type: TP -#: ../tin.1:1980 +#: ../tin.1:1990 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1989 +#: ../tin.1:1999 msgid "" "Same as B except it denotes the opposite. An " "example of using both options might be if you thought X- headers were A Good " @@ -5405,13 +5442,13 @@ msgstr "" "off this option." # type: TP -#: ../tin.1:1989 +#: ../tin.1:1999 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1994 ../tin.5:1731 +#: ../tin.1:2004 ../tin.5:1739 msgid "" "Format of quote line when posting/following up an article (%A=Address, %" "D=Date, %F=Fullname+Address, %G=Groupname, %M=Message-ID, %N=Fullname, %" @@ -5422,13 +5459,13 @@ msgstr "" "C=Firstname, %I=Initials). Default is \"%F wrote:\"." # type: TP -#: ../tin.1:1994 +#: ../tin.1:2004 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:1998 +#: ../tin.1:2008 msgid "" "The normalization form B should use to normalize unicode input. The " "possible values are:" @@ -5437,33 +5474,33 @@ msgstr "" "possible values are:" # type: Plain text -#: ../tin.1:2001 ../tin.5:1738 +#: ../tin.1:2011 ../tin.5:1746 msgid "B: no normalization" msgstr "B: no normalisation" # type: Plain text -#: ../tin.1:2003 ../tin.5:1740 +#: ../tin.1:2013 ../tin.5:1748 msgid "B: Compatibility Decomposition, followed by Canonical Composition" msgstr "" "B: Compatibility Decomposition, followed by Canonical Composition" # type: Plain text -#: ../tin.1:2005 ../tin.5:1742 +#: ../tin.1:2015 ../tin.5:1750 msgid "B: Compatibility Decomposition" msgstr "B: Compatibility Decomposition" # type: Plain text -#: ../tin.1:2007 ../tin.5:1744 +#: ../tin.1:2017 ../tin.5:1752 msgid "B: Canonical Decomposition, followed by Canonical Composition" msgstr "B: Canonical Decomposition, followed by Canonical Composition" # type: Plain text -#: ../tin.1:2009 ../tin.5:1746 +#: ../tin.1:2019 ../tin.5:1754 msgid "B: Canonical Decomposition" msgstr "B: Canonical Decomposition" # type: Plain text -#: ../tin.1:2012 +#: ../tin.1:2022 msgid "" "Some normalization modes are only available if they are supported by the " "library B uses to do the normalization. Default is NFKC." @@ -5472,13 +5509,13 @@ msgstr "" "library B uses to do the normalisation. Default is NFKC." # type: TP -#: ../tin.1:2012 +#: ../tin.1:2022 #, no-wrap -msgid "B" -msgstr "B" +msgid "B" +msgstr "B" # type: Plain text -#: ../tin.1:2016 +#: ../tin.1:2026 msgid "" "If ON put cursor at first unread article in group otherwise at last article. " "Default is ON." @@ -5487,13 +5524,13 @@ msgstr "" "Default is ON." # type: TP -#: ../tin.1:2016 +#: ../tin.1:2026 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2027 ../tin.5:1766 +#: ../tin.1:2037 ../tin.5:1774 msgid "" "Allows 8bit characters unencoded in the header of a news article, if set " "this also disables the generation of MIME-headers when they are usually " @@ -5514,13 +5551,13 @@ msgstr "" "B." # type: TP -#: ../tin.1:2027 +#: ../tin.1:2037 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2032 +#: ../tin.1:2042 msgid "" "MIME encoding of the body in news message, if necessary. (8bit, base64, " "quoted-printable, 7bit). Default is 8bit, which leads to no encoding. base64 " @@ -5531,13 +5568,13 @@ msgstr "" "and quoted-printable are usually undesired on usenet." # type: TP -#: ../tin.1:2032 +#: ../tin.1:2042 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2037 +#: ../tin.1:2047 msgid "" "If ON, then B will start an appropriate viewer program to display any " "files that were post processed and uudecoded. The program is determined " @@ -5548,13 +5585,13 @@ msgstr "" "using the mailcap file. Default is ON." # type: TP -#: ../tin.1:2037 +#: ../tin.1:2047 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2041 +#: ../tin.1:2051 msgid "" "This specifies whether to perform post processing on saved articles. The " "following values are allowed:" @@ -5563,28 +5600,28 @@ msgstr "" "following values are allowed:" # type: Plain text -#: ../tin.1:2044 ../tin.5:1787 +#: ../tin.1:2054 ../tin.5:1795 msgid "B (default), no post processing is done." msgstr "B (default), no post processing is done." # type: Plain text -#: ../tin.1:2048 +#: ../tin.1:2058 msgid "B, unpacking of multi-part B(1) files only." msgstr "B, unpacking of multi-part B(1) files only." # type: Plain text -#: ../tin.1:2050 ../tin.5:1794 +#: ../tin.1:2060 ../tin.5:1802 msgid "B, binary attachments and data will be decoded and saved." msgstr "B, binary attachments and data will be decoded and saved." # type: TP -#: ../tin.1:2051 +#: ../tin.1:2061 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2057 ../tin.5:1801 +#: ../tin.1:2067 ../tin.5:1809 msgid "" "Keep posted articles in I<${TIN_HOMEDIR:-\"$HOME\"}/Mail/" ">B. If no filename is set then postings will not be " @@ -5595,13 +5632,13 @@ msgstr "" "saved. Default is 'posted'." # type: TP -#: ../tin.1:2057 +#: ../tin.1:2067 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2061 ../tin.5:1805 +#: ../tin.1:2071 ../tin.5:1813 msgid "" "If ON, then the full article header is sent to the printer. Otherwise only " "the ''Subject:'' and ''From:'' fields are output. Default is OFF." @@ -5610,13 +5647,13 @@ msgstr "" "the ''Subject:'' and ''From:'' fields are output. Default is OFF." # type: TP -#: ../tin.1:2061 +#: ../tin.1:2071 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2070 +#: ../tin.1:2080 msgid "" "The printer program with options that is to be used to print articles. The " "default is B(1) for BSD machines and B(1) for SysV machines. " @@ -5627,13 +5664,13 @@ msgstr "" "Printing from B may have been disabled by the System Administrator." # type: TP -#: ../tin.1:2070 +#: ../tin.1:2080 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2074 ../tin.5:1819 +#: ../tin.1:2084 ../tin.5:1827 msgid "" "If ON only save/print/pipe/mail unread articles (tagged articles excepted). " "Default is OFF." @@ -5642,13 +5679,13 @@ msgstr "" "Default is OFF." # type: TP -#: ../tin.1:2074 +#: ../tin.1:2084 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2077 +#: ../tin.1:2087 msgid "" "If ON show empty ''Followup-To:'' header when editing an article. Default is " "OFF." @@ -5657,14 +5694,14 @@ msgstr "" "OFF." # type: TP -#: ../tin.1:2077 +#: ../tin.1:2087 #, no-wrap msgid "B" msgstr "B" # type: Plain text #. TODO: document %s -#: ../tin.1:2082 ../tin.5:1829 +#: ../tin.1:2092 ../tin.5:1837 msgid "" "The character used in quoting included text to article followups and mail " "replies. The '_' character represents a blank character and is replaced with " @@ -5675,13 +5712,13 @@ msgstr "" "' ' when read. Default is 'E_'." # type: TP -#: ../tin.1:2082 +#: ../tin.1:2092 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2089 +#: ../tin.1:2099 msgid "" "How articles should be quoted when following up or replying to them. There " "are a number of things that can be done: empty lines can be quoted, " @@ -5698,7 +5735,7 @@ msgstr "" "lines." # type: Plain text -#: ../tin.1:2093 +#: ../tin.1:2103 msgid "" "When you are viewing an article in raw mode ('B<^H>'), and follow up or " "reply to it, the signature will be quoted even if it would otherwise not " @@ -5709,13 +5746,13 @@ msgstr "" "be. If B is off, then the signature will never be quoted." # type: TP -#: ../tin.1:2093 +#: ../tin.1:2103 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2098 +#: ../tin.1:2108 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, then " @@ -5726,13 +5763,13 @@ msgstr "" "B uses a built-in default." # type: TP -#: ../tin.1:2098 +#: ../tin.1:2108 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2103 +#: ../tin.1:2113 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, then " @@ -5743,13 +5780,13 @@ msgstr "" "B uses a built-in default." # type: TP -#: ../tin.1:2103 +#: ../tin.1:2113 #, no-wrap msgid "B= 3 times q.l. (quote_regex3)>" msgstr "B= 3 times q.l. (quote_regex3)>" # type: Plain text -#: ../tin.1:2108 +#: ../tin.1:2118 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, then " @@ -5760,13 +5797,13 @@ msgstr "" "B uses a built-in default." # type: TP -#: ../tin.1:2108 +#: ../tin.1:2118 #, no-wrap msgid "B
" msgstr "B
" # type: Plain text -#: ../tin.1:2112 ../tin.5:1874 +#: ../tin.1:2122 ../tin.5:1882 msgid "" "If set to 0, this feature is deactivated, otherwise it means the number of " "days. Default is 2." @@ -5775,13 +5812,13 @@ msgstr "" "days. Default is 2." # type: TP -#: ../tin.1:2112 +#: ../tin.1:2122 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2116 ../tin.5:1878 +#: ../tin.1:2126 ../tin.5:1886 msgid "" "If ON B does the rendering of bi-directional text. If OFF B leaves " "the rendering of bi-directional text to the terminal. Default is OFF." @@ -5790,13 +5827,13 @@ msgstr "" "the rendering of bi-directional text to the terminal. Default is OFF." # type: TP -#: ../tin.1:2116 +#: ../tin.1:2126 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2121 ../tin.5:1883 +#: ../tin.1:2131 ../tin.5:1891 msgid "" "The news I<${TIN_LIBDIR:-NEWSLIBDIR}\"/\"${TIN_ACTIVEFILE:-active}> file is " "reread at regular intervals to show if any new news has arrived. Default is " @@ -5807,13 +5844,13 @@ msgstr "" "1200. Setting this to 0 will disable this feature." # type: TP -#: ../tin.1:2121 +#: ../tin.1:2131 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2125 ../tin.5:1887 +#: ../tin.1:2135 ../tin.5:1895 msgid "" "Directory where articles/threads are saved. Default is I<${TIN_HOMEDIR:-" "\"$HOME\"}/News>." @@ -5822,13 +5859,13 @@ msgstr "" "\"$HOME\"}/News>." # type: TP -#: ../tin.1:2125 +#: ../tin.1:2135 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2129 ../tin.5:1891 +#: ../tin.1:2139 ../tin.5:1899 msgid "" "If the score of an article is below or equal this value the article gets " "marked as killed." @@ -5837,13 +5874,13 @@ msgstr "" "marked as killed." # type: TP -#: ../tin.1:2129 +#: ../tin.1:2139 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2133 ../tin.5:1895 +#: ../tin.1:2143 ../tin.5:1903 msgid "" "If the score of an article is above or equal this value the article gets " "marked as hot." @@ -5852,13 +5889,13 @@ msgstr "" "marked as hot." # type: TP -#: ../tin.1:2133 +#: ../tin.1:2143 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2137 ../tin.5:1899 +#: ../tin.1:2147 ../tin.5:1907 msgid "" "Score of an article which should be killed, this must be E= " "B." @@ -5867,13 +5904,13 @@ msgstr "" "B." # type: TP -#: ../tin.1:2137 +#: ../tin.1:2147 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2141 ../tin.5:1903 +#: ../tin.1:2151 ../tin.5:1911 msgid "" "Score of an article which should be marked hot, this must be E= " "B." @@ -5882,13 +5919,13 @@ msgstr "" "B." # type: TP -#: ../tin.1:2141 +#: ../tin.1:2151 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2149 +#: ../tin.1:2159 msgid "" "The number of lines that will be scrolled up/down in the article pager when " "using cursor-up/down. The default is 1 (line-by-line). Set to 0 to get " @@ -5905,13 +5942,13 @@ msgstr "" "page scrolling. This setting supersedes full_page_scroll=OFF." # type: TP -#: ../tin.1:2149 +#: ../tin.1:2159 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2153 ../tin.5:1915 +#: ../tin.1:2163 ../tin.5:1923 msgid "" "Which information about the author should be shown. Default is 2, authors " "full name." @@ -5920,12 +5957,12 @@ msgstr "" "full name." # type: Plain text -#: ../tin.1:2156 ../tin.5:1918 +#: ../tin.1:2166 ../tin.5:1926 msgid "B, only the ''Subject:'' line will be displayed." msgstr "B, only the ''Subject:'' line will be displayed." # type: Plain text -#: ../tin.1:2159 ../tin.5:1921 +#: ../tin.1:2169 ../tin.5:1929 msgid "" "B
, ''Subject:'' line & the address part of the ''From:'' line are " "displayed." @@ -5934,7 +5971,7 @@ msgstr "" "displayed." # type: Plain text -#: ../tin.1:2162 ../tin.5:1924 +#: ../tin.1:2172 ../tin.5:1932 msgid "" "B, ''Subject:'' line & the authors full name part of the " "\\&''From:'' line are displayed (default)." @@ -5943,7 +5980,7 @@ msgstr "" "\\&''From:'' line are displayed (default)." # type: Plain text -#: ../tin.1:2165 ../tin.5:1927 +#: ../tin.1:2175 ../tin.5:1935 msgid "" "B
, ''Subject:'' line & all of the ''From:'' line are " "displayed." @@ -5952,13 +5989,13 @@ msgstr "" "displayed." # type: TP -#: ../tin.1:2166 +#: ../tin.1:2176 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2175 +#: ../tin.1:2185 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 " @@ -5975,13 +6012,13 @@ msgstr "" "mailgroups> for mailgroups. Default is ON." # type: TP -#: ../tin.1:2175 +#: ../tin.1:2185 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2179 ../tin.5:1941 +#: ../tin.1:2189 ../tin.5:1949 msgid "" "Which information about the thread or article should be shown. Default is 1, " "show only the line count." @@ -5990,12 +6027,12 @@ msgstr "" "show only the line count." # type: Plain text -#: ../tin.1:2182 ../tin.5:1944 +#: ../tin.1:2192 ../tin.5:1952 msgid "B, no information will be displayed." msgstr "B, no information will be displayed." # type: Plain text -#: ../tin.1:2186 +#: ../tin.1:2196 msgid "" "B, in article listing the line count of an article will be displayed " "and in thread listing the line count of first (unread) article will be " @@ -6006,7 +6043,7 @@ msgstr "" "displayed." # type: Plain text -#: ../tin.1:2190 ../tin.5:1952 +#: ../tin.1:2200 ../tin.5:1960 msgid "" "B, in article listing the score of an article will be displayed and " "in thread listing the score of the thread will be displayed - see also " @@ -6017,18 +6054,18 @@ msgstr "" "B." # type: Plain text -#: ../tin.1:2192 ../tin.5:1954 +#: ../tin.1:2202 ../tin.5:1962 msgid "B, display line count and score." msgstr "B, display line count and score." # type: TP -#: ../tin.1:2193 +#: ../tin.1:2203 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2197 +#: ../tin.1:2207 msgid "" "If ON show only new/unread articles otherwise show all articles. Default is " "ON." @@ -6037,13 +6074,13 @@ msgstr "" "ON." # type: TP -#: ../tin.1:2197 +#: ../tin.1:2207 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2201 ../tin.5:1963 +#: ../tin.1:2211 ../tin.5:1971 msgid "" "If ON show only subscribed groups that contain unread articles. Default is " "OFF." @@ -6052,35 +6089,35 @@ msgstr "" "OFF." # type: TP -#: ../tin.1:2201 +#: ../tin.1:2211 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2205 +#: ../tin.1:2215 msgid "If OFF don't show signatures when displaying articles. Default is ON." msgstr "If OFF don't show signatures when displaying articles. Default is ON." # type: TP -#: ../tin.1:2205 +#: ../tin.1:2215 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2208 ../tin.5:1969 +#: ../tin.1:2218 ../tin.5:1977 msgid "If ON prepend the signature with sigdashes. Default is ON." msgstr "If ON prepend the signature with sigdashes. Default is ON." # type: TP -#: ../tin.1:2208 +#: ../tin.1:2218 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2218 +#: ../tin.1:2228 msgid "" "The path that specifies the signature file to use when posting, following up " "to or replying to an article. If the path is a directory then the signature " @@ -6099,24 +6136,24 @@ msgstr "" "I<${TIN_HOMEDIR:-\"$HOME\"}/.Sig>." # type: TP -#: ../tin.1:2218 +#: ../tin.1:2228 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2221 ../tin.5:1983 +#: ../tin.1:2231 ../tin.5:1991 msgid "If ON add signature to reposted articles. Default is ON." msgstr "If ON add signature to reposted articles. Default is ON." # type: TP -#: ../tin.1:2221 +#: ../tin.1:2231 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2226 +#: ../tin.1:2236 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -6127,13 +6164,13 @@ msgstr "" "B is blank, then B uses a built-in default." # type: TP -#: ../tin.1:2226 +#: ../tin.1:2236 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2230 ../tin.5:1994 +#: ../tin.1:2240 ../tin.5:2002 msgid "" "This specifies how articles should be sorted. Sort by ascending Date (6) is " "the default. The following sort types are allowed:" @@ -6142,91 +6179,91 @@ msgstr "" "the default. The following sort types are allowed:" # type: Plain text -#: ../tin.1:2233 ../tin.5:1997 +#: ../tin.1:2243 ../tin.5:2005 msgid "B, don't sort articles." msgstr "B, don't sort articles." # type: Plain text -#: ../tin.1:2235 ../tin.5:1999 +#: ../tin.1:2245 ../tin.5:2007 msgid "" "B, sort articles by ''Subject:'' field descending." msgstr "" "B, sort articles by ''Subject:'' field descending." # type: Plain text -#: ../tin.1:2237 ../tin.5:2001 +#: ../tin.1:2247 ../tin.5:2009 msgid "B, sort articles by ''Subject:'' field ascending." msgstr "" "B, sort articles by ''Subject:'' field ascending." # type: Plain text -#: ../tin.1:2239 ../tin.5:2003 +#: ../tin.1:2249 ../tin.5:2011 msgid "B, sort articles by ''From:'' field descending." msgstr "B, sort articles by ''From:'' field descending." # type: Plain text -#: ../tin.1:2241 ../tin.5:2005 +#: ../tin.1:2251 ../tin.5:2013 msgid "B, sort articles by ''From:'' field ascending." msgstr "B, sort articles by ''From:'' field ascending." # type: Plain text -#: ../tin.1:2243 ../tin.5:2007 +#: ../tin.1:2253 ../tin.5:2015 msgid "B, sort articles by ''Date:'' field descending." msgstr "B, sort articles by ''Date:'' field descending." # type: Plain text -#: ../tin.1:2246 ../tin.5:2010 +#: ../tin.1:2256 ../tin.5:2018 msgid "" "B, sort articles by ''Date:'' field ascending (default)." msgstr "" "B, sort articles by ''Date:'' field ascending (default)." # type: Plain text -#: ../tin.1:2248 ../tin.5:2012 +#: ../tin.1:2258 ../tin.5:2020 msgid "B, sort articles by filtering score descending." msgstr "B, sort articles by filtering score descending." # type: IP -#: ../tin.1:2248 ../tin.5:2012 +#: ../tin.1:2258 ../tin.5:2020 #, no-wrap msgid "8" msgstr "8" # type: Plain text -#: ../tin.1:2250 ../tin.5:2014 +#: ../tin.1:2260 ../tin.5:2022 msgid "B, sort articles by filtering score ascending." msgstr "B, sort articles by filtering score ascending." # type: IP -#: ../tin.1:2250 ../tin.5:2014 +#: ../tin.1:2260 ../tin.5:2022 #, no-wrap msgid "9" msgstr "9" # type: Plain text -#: ../tin.1:2252 ../tin.5:2016 +#: ../tin.1:2262 ../tin.5:2024 msgid "B, sort articles by ''Lines:'' field descending." msgstr "B, sort articles by ''Lines:'' field descending." # type: IP -#: ../tin.1:2252 ../tin.5:2016 +#: ../tin.1:2262 ../tin.5:2024 #, no-wrap msgid "10" msgstr "10" # type: Plain text -#: ../tin.1:2254 ../tin.5:2018 +#: ../tin.1:2264 ../tin.5:2026 msgid "B, sort articles by ''Lines:'' field ascending." msgstr "B, sort articles by ''Lines:'' field ascending." # type: TP -#: ../tin.1:2255 +#: ../tin.1:2265 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2260 ../tin.5:2023 +#: ../tin.1:2270 ../tin.5:2031 msgid "" "This specifies how threads will be sorted. Sort by descending Score (1) is " "the default. The following sort types are allowed:" @@ -6235,24 +6272,24 @@ msgstr "" "the default. The following sort types are allowed:" # type: Plain text -#: ../tin.1:2263 ../tin.5:2026 +#: ../tin.1:2273 ../tin.5:2034 msgid "B, don't sort threads." msgstr "B, don't sort threads." # type: Plain text -#: ../tin.1:2266 ../tin.5:2029 +#: ../tin.1:2276 ../tin.5:2037 msgid "" "B, sort threads by filtering score descending (default)." msgstr "" "B, sort threads by filtering score descending (default)." # type: Plain text -#: ../tin.1:2268 ../tin.5:2031 +#: ../tin.1:2278 ../tin.5:2039 msgid "B, sort threads by filtering score ascending." msgstr "B, sort threads by filtering score ascending." # type: Plain text -#: ../tin.1:2270 ../tin.5:2033 +#: ../tin.1:2280 ../tin.5:2041 msgid "" "B, sort threads by date of last posting " "descending." @@ -6261,7 +6298,7 @@ msgstr "" "descending." # type: Plain text -#: ../tin.1:2272 ../tin.5:2035 +#: ../tin.1:2282 ../tin.5:2043 msgid "" "B, sort threads by date of last posting " "ascending." @@ -6270,13 +6307,13 @@ msgstr "" "ascending." # type: TP -#: ../tin.1:2273 +#: ../tin.1:2283 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2278 +#: ../tin.1:2288 msgid "" "Set this option to a list of comma-separated strings to be warned if you are " "replying to an article by mail where the e-mail address contains one of " @@ -6287,18 +6324,18 @@ msgstr "" "these strings. The matching is case-insensitive. Example:" # type: Plain text -#: ../tin.1:2280 +#: ../tin.1:2290 msgid "I" msgstr "I" # type: TP -#: ../tin.1:2280 +#: ../tin.1:2290 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2285 +#: ../tin.1:2295 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -6309,13 +6346,13 @@ msgstr "" "B is blank, then B uses a built-in default." # type: TP -#: ../tin.1:2285 +#: ../tin.1:2295 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2290 ../tin.5:2053 +#: ../tin.1:2300 ../tin.5:2061 msgid "" "Set ON if the editor used for posting, follow-ups and bug reports has the " "capability of starting and positioning the cursor at a specified line within " @@ -6326,13 +6363,13 @@ msgstr "" "a file. Default is ON." # type: TP -#: ../tin.1:2290 +#: ../tin.1:2300 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2296 ../tin.5:2057 +#: ../tin.1:2306 ../tin.5:2065 msgid "" "Strips the blanks from the end of each line therefore speeding up the " "display when reading on a slow terminal or via modem. Default is ON." @@ -6341,13 +6378,13 @@ msgstr "" "display when reading on a slow terminal or via modem. Default is ON." # type: TP -#: ../tin.1:2296 +#: ../tin.1:2306 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2305 ../tin.5:2065 +#: ../tin.1:2315 ../tin.5:2073 msgid "" "Bogus groups are groups that are present in your I<${TIN_HOMEDIR:-\"$HOME" "\"}/.newsrc> file that no longer exist on the news server. There are 3 " @@ -6364,13 +6401,13 @@ msgstr "" "unsubscribe from them as and when you wish. Default is 0 (Always Keep)." # type: TP -#: ../tin.1:2305 +#: ../tin.1:2315 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2309 ../tin.5:2069 +#: ../tin.1:2319 ../tin.5:2077 msgid "" "If ON, then unsubscribed groups will be permanently removed from your I<" "${TIN_HOMEDIR:-\"$HOME\"}/.newsrc> file. Default is OFF." @@ -6379,13 +6416,13 @@ msgstr "" "${TIN_HOMEDIR:-\"$HOME\"}/.newsrc> file. Default is OFF." # type: TP -#: ../tin.1:2309 +#: ../tin.1:2319 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2314 +#: ../tin.1:2324 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -6396,13 +6433,13 @@ msgstr "" "B is blank, then B uses a built-in default." # type: TP -#: ../tin.1:2314 +#: ../tin.1:2324 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2319 ../tin.5:2248 +#: ../tin.1:2329 ../tin.5:2260 msgid "" "If enabled a search for the next unread article will wrap around all " "articles to find also previous unread articles. If disabled the search stops " @@ -6413,13 +6450,13 @@ msgstr "" "at the end of the thread list. Default is ON." # type: TP -#: ../tin.1:2319 +#: ../tin.1:2329 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2323 +#: ../tin.1:2333 msgid "" "If ON, show \"a as Umlaut-a, etc. Default is OFF. This behavior can also be " "toggled in the article viewer via B ('B<\">')." @@ -6428,13 +6465,13 @@ msgstr "" "toggled in the article viewer via B ('B<\">')." # type: TP -#: ../tin.1:2323 +#: ../tin.1:2333 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2331 +#: ../tin.1:2341 msgid "" "Defines which threading method to use. It's possible to set the threading " "type on a per group basis by setting the group attribute variable " @@ -6449,22 +6486,22 @@ msgstr "" "and References. The choices are:" # type: Plain text -#: ../tin.1:2334 +#: ../tin.1:2344 msgid "B, don't thread." msgstr "B, don't thread." # type: Plain text -#: ../tin.1:2336 +#: ../tin.1:2346 msgid "B, thread on ''Subject:'' only." msgstr "B, thread on ''Subject:'' only." # type: Plain text -#: ../tin.1:2338 +#: ../tin.1:2348 msgid "B, thread on ''References:'' only." msgstr "B, thread on ''References:'' only." # type: Plain text -#: ../tin.1:2341 +#: ../tin.1:2351 msgid "" "B, thread on ''References:'' then " "\\&''Subject:'' (default)." @@ -6473,12 +6510,12 @@ msgstr "" "\\&''Subject:'' (default)." # type: Plain text -#: ../tin.1:2343 +#: ../tin.1:2353 msgid "B, thread multipart articles on ''Subject:''." msgstr "B, thread multipart articles on ''Subject:''." # type: Plain text -#: ../tin.1:2346 +#: ../tin.1:2356 msgid "" "B, thread base upon a partial character match on " "\\&''Subject:''." @@ -6487,13 +6524,13 @@ msgstr "" "\\&''Subject:''." # type: TP -#: ../tin.1:2347 +#: ../tin.1:2357 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2351 ../tin.5:2100 +#: ../tin.1:2361 ../tin.5:2108 msgid "" "If ON catchup group/thread when leaving with the left arrow key. Default is " "ON." @@ -6502,13 +6539,13 @@ msgstr "" "ON." # type: TP -#: ../tin.1:2351 +#: ../tin.1:2361 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2355 +#: ../tin.1:2365 msgid "" "How closely the subjects must match for two threads to be considered part of " "the same thread. This is a percentage and the default if 75%." @@ -6517,13 +6554,13 @@ msgstr "" "the same thread. This is a percentage and the default if 75%." # type: TP -#: ../tin.1:2355 +#: ../tin.1:2365 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2359 ../tin.5:2104 +#: ../tin.1:2369 ../tin.5:2112 msgid "" "How the total score of a thread is computed. Default is 0, the maximum score " "in this thread." @@ -6532,28 +6569,28 @@ msgstr "" "in this thread." # type: Plain text -#: ../tin.1:2362 ../tin.5:2107 +#: ../tin.1:2372 ../tin.5:2115 msgid "B, the maximum score in this thread." msgstr "B, the maximum score in this thread." # type: Plain text -#: ../tin.1:2364 ../tin.5:2109 +#: ../tin.1:2374 ../tin.5:2117 msgid "B, the sum of all scores in this thread." msgstr "B, the sum of all scores in this thread." # type: Plain text -#: ../tin.1:2366 ../tin.5:2111 +#: ../tin.1:2376 ../tin.5:2119 msgid "B, the average score in this thread." msgstr "B, the average score in this thread." # type: TP -#: ../tin.1:2367 +#: ../tin.1:2377 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2375 ../tin.5:2120 +#: ../tin.1:2385 ../tin.5:2128 msgid "" "If ON append //TRANSLIT to the first argument of B(3) to enable " "transliteration. This means that when a character cannot be represented in " @@ -6568,13 +6605,13 @@ msgstr "" "this option is disabled. Default is OFF." # type: TP -#: ../tin.1:2375 +#: ../tin.1:2385 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2379 ../tin.5:2124 +#: ../tin.1:2389 ../tin.5:2132 msgid "" "Allows you to select how B treats blank lines in article bodies. " "Default is 0. This option does not affect lines within verbatim blocks." @@ -6583,29 +6620,29 @@ msgstr "" "Default is 0. This option does not affect lines within verbatim blocks." # type: Plain text -#: ../tin.1:2382 ../tin.5:2127 +#: ../tin.1:2392 ../tin.5:2135 msgid "B, do nothing." msgstr "B, do nothing." # type: Plain text -#: ../tin.1:2384 ../tin.5:2129 +#: ../tin.1:2394 ../tin.5:2137 msgid "B." msgstr "B." # type: Plain text -#: ../tin.1:2386 ../tin.5:2131 +#: ../tin.1:2396 ../tin.5:2139 msgid "B." msgstr "B." # type: Plain text -#: ../tin.1:2388 ../tin.5:2133 +#: ../tin.1:2398 ../tin.5:2141 msgid "" "B, skip leading and trailing blank lines." msgstr "" "B, skip leading and trailing blank lines." # type: Plain text -#: ../tin.1:2391 ../tin.5:2136 +#: ../tin.1:2401 ../tin.5:2144 msgid "" "B, replace multiple blank lines between " "textblocks with one blank line." @@ -6614,28 +6651,28 @@ msgstr "" "textblocks with one blank line." # type: Plain text -#: ../tin.1:2393 ../tin.5:2138 +#: ../tin.1:2403 ../tin.5:2146 msgid "B, 4 + 1" msgstr "B, 4 + 1" # type: Plain text -#: ../tin.1:2395 ../tin.5:2140 +#: ../tin.1:2405 ../tin.5:2148 msgid "B, 4 + 2" msgstr "B, 4 + 2" # type: Plain text -#: ../tin.1:2397 ../tin.5:2142 +#: ../tin.1:2407 ../tin.5:2150 msgid "B, 4 + 3" msgstr "B, 4 + 3" # type: TP -#: ../tin.1:2398 +#: ../tin.1:2408 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2403 +#: ../tin.1:2413 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -6646,24 +6683,24 @@ msgstr "" "B is blank, then B uses a built-in default." # type: TP -#: ../tin.1:2403 +#: ../tin.1:2413 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2406 +#: ../tin.1:2416 msgid "If ON remove I<~/.article> after posting. Default is ON." msgstr "If ON remove I<~/.article> after posting. Default is ON." # type: TP -#: ../tin.1:2406 +#: ../tin.1:2416 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2411 +#: ../tin.1:2421 msgid "" "The program that will be run when launching URL's in the article viewer " "using B ('B'). The actual URL will be appended to this. " @@ -6674,41 +6711,41 @@ msgstr "" "Default is B." # type: TP -#: ../tin.1:2411 +#: ../tin.1:2421 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2414 ../tin.5:2162 +#: ../tin.1:2424 ../tin.5:2170 msgid "Enable highlighting URLs in message body. Default is ON." msgstr "Enable highlighting URLs in message body. Default is ON." # type: TP -#: ../tin.1:2414 +#: ../tin.1:2424 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2417 +#: ../tin.1:2427 msgid "If enabled B uses ANSI-colors. Default is OFF." msgstr "If enabled B uses ANSI-colours. Default is OFF." # type: TP -#: ../tin.1:2417 +#: ../tin.1:2427 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.1:2420 +#: ../tin.1:2430 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2426 ../tin.5:2176 +#: ../tin.1:2436 ../tin.5:2184 msgid "" "Allows the mouse button support in a B(1x) to be enabled/disabled. " "Default is OFF." @@ -6717,13 +6754,13 @@ msgstr "" "Default is OFF." # type: TP -#: ../tin.1:2426 +#: ../tin.1:2436 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2436 +#: ../tin.1:2446 msgid "" "If enabled B uses B(1) to interpret the ''X-Face:'' header. " "For this option to have any effect, B must be running in an B" @@ -6734,50 +6771,65 @@ msgstr "" "(1x) and B(1) must be in your $B. Default is OFF." # type: TP -#: ../tin.1:2436 +#: ../tin.1:2446 +#, no-wrap +msgid "B" +msgstr "B" + +# type: Plain text +#: ../tin.1:2450 ../tin.5:2200 +msgid "" +"If ON use UTF-8 characters for indicator ('-E'), thread/attachment tree " +"and ellipsis ('...'). Default is OFF." +msgstr "" +"If ON use UTF-8 characters for indicator ('-E'), thread/attachment tree " +"and ellipsis ('...'). Default is OFF." + +# type: TP +#: ../tin.1:2450 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2439 +#: ../tin.1:2453 msgid "" "A regular expression that tin will use to find the begin of a verbatim block." msgstr "" "A regular expression that tin will use to find the begin of a verbatim block." # type: TP -#: ../tin.1:2439 +#: ../tin.1:2453 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2442 +#: ../tin.1:2456 msgid "" "A regular expression that tin will use to find the end of a verbatim block." msgstr "" "A regular expression that tin will use to find the end of a verbatim block." # type: TP -#: ../tin.1:2442 +#: ../tin.1:2456 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2445 +#: ../tin.1:2459 msgid "If ON verbatim blocks will be detected. Default is ON." msgstr "If ON verbatim blocks will be detected. Default is ON." # type: TP -#: ../tin.1:2445 +#: ../tin.1:2459 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2459 +#: ../tin.1:2473 msgid "" "Allows you to select how B matches strings. The default is 0 and uses " "the wildmat notation, which is how this has traditionally been handled. " @@ -6794,13 +6846,13 @@ msgstr "" "NB: Newsgroup names will always be matched using the wildmat notation." # type: TP -#: ../tin.1:2459 +#: ../tin.1:2473 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2463 ../tin.5:2216 +#: ../tin.1:2477 ../tin.5:2228 msgid "" "Should the leading and ending stars, slashes, strokes and dashes also be " "displayed, even when they are highlighting marks?" @@ -6809,28 +6861,28 @@ msgstr "" "displayed, even when they are highlighting marks?" # type: Plain text -#: ../tin.1:2466 ../tin.5:2219 +#: ../tin.1:2480 ../tin.5:2231 msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2468 ../tin.5:2221 +#: ../tin.1:2482 ../tin.5:2233 msgid "yes, B" msgstr "yes, B" # type: Plain text -#: ../tin.1:2470 ../tin.5:2223 +#: ../tin.1:2484 ../tin.5:2235 msgid "print a B instead" msgstr "print a B instead" # type: TP -#: ../tin.1:2471 +#: ../tin.1:2485 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2479 +#: ../tin.1:2493 msgid "" "Enable word highlighting. See B for the options " "available. If B is enabled the colors specified in " @@ -6847,13 +6899,13 @@ msgstr "" "are used. Default is ON." # type: TP -#: ../tin.1:2479 +#: ../tin.1:2493 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2490 ../tin.5:2243 +#: ../tin.1:2504 ../tin.5:2255 msgid "" "Sets the column at which a displayed article body should be wrapped. If " "this value is equal to 0, it defaults to the current screen width. If this " @@ -6874,13 +6926,13 @@ msgstr "" "wrapping at the current screen width." # type: TP -#: ../tin.1:2490 +#: ../tin.1:2504 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2497 ../tin.5:2253 +#: ../tin.1:2511 ../tin.5:2265 msgid "" "Format is the same as for B, this is used when answering " "to a crossposting to several groups with no ''Followup-To:'' set." @@ -6889,13 +6941,13 @@ msgstr "" "to a crossposting to several groups with no ''Followup-To:'' set." # type: SS -#: ../tin.1:2497 +#: ../tin.1:2511 #, no-wrap msgid "ATTRIBUTES MENU AND GROUP ATTRIBUTES" msgstr "ATTRIBUTES MENU AND GROUP ATTRIBUTES" # type: Plain text -#: ../tin.1:2504 +#: ../tin.1:2518 msgid "" "B allows certain attributes to be set on a per group basis. If it " "exists, the global attributes file, I<${TIN_LIBDIR:-NEWSLIBDIR}/attributes> " @@ -6912,7 +6964,7 @@ msgstr "" "attributes file yet." # type: Plain text -#: ../tin.1:2512 +#: ../tin.1:2526 msgid "" "Note that the IgrouplistE> line has to be specified before " "the attributes are specified for that list. All attributes are set to a " @@ -6929,7 +6981,7 @@ msgstr "" "For more details see B(5)." # type: Plain text -#: ../tin.1:2519 +#: ../tin.1:2533 msgid "" "Attributes can also be changed from the attributes menu which can be " "accessed by B ('BTABE>') from the options menu " @@ -6946,7 +6998,7 @@ msgstr "" "marked with '\\+' to the left of the attributes number." # type: Plain text -#: ../tin.1:2526 +#: ../tin.1:2540 msgid "" "Besides the keys for moving around and changing values known from the " "options menu the attributes menu provides the following command: " @@ -6957,13 +7009,13 @@ msgstr "" "B ('B') which resets an attribute to a default value." # type: SS -#: ../tin.1:2526 +#: ../tin.1:2540 #, no-wrap msgid "SCOPES MENU" msgstr "SCOPES MENU" # type: Plain text -#: ../tin.1:2531 +#: ../tin.1:2545 msgid "" "The scopes menu (accessible from the options menu with B " "('B')) shows all scopes read from the global and local attributes file. " @@ -6976,7 +7028,7 @@ msgstr "" "the scope number. Delete/rename/move are not possible with those scopes." # type: Plain text -#: ../tin.1:2542 +#: ../tin.1:2556 msgid "" "In addition to the common moving keys the following commands are available: " "B ('B<^J>' or 'BCRE>') enter the attributes menu for " @@ -6997,14 +7049,14 @@ msgstr "" "the screen." # type: SS -#: ../tin.1:2542 +#: ../tin.1:2556 #, no-wrap msgid "FILTERING ARTICLES" msgstr "FILTERING ARTICLES" # type: Plain text #. FIXME - add scoring description -#: ../tin.1:2549 +#: ../tin.1:2563 msgid "" "When there is a subject or an author which you are either very interested " "in, or find completely uninteresting, you can easily instruct B to " @@ -7019,7 +7071,7 @@ msgstr "" "lines in an article." # type: Plain text -#: ../tin.1:2555 +#: ../tin.1:2569 msgid "" "When B starts up the user's kill-file I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/" "filter> (see also B(5)) is read. Each time a newsgroup is entered the " @@ -7032,7 +7084,7 @@ msgstr "" "criteria." # type: Plain text -#: ../tin.1:2560 +#: ../tin.1:2574 msgid "" "The degree to which rules are applied depend on the B tinrc " "setting. By default killed articles will only be marked read. Adjust " @@ -7045,7 +7097,7 @@ msgstr "" "selection rule are marked with a ''*''." # type: Plain text -#: ../tin.1:2565 +#: ../tin.1:2579 msgid "" "Filtering rules can be manually entered into I<${TIN_HOMEDIR:-\"$HOME\"}/." "tin/filter> (but don't do this whilst running B else you will lose your " @@ -7056,7 +7108,7 @@ msgstr "" "changes) or by using an on-screen menu within B." # type: Plain text -#: ../tin.1:2571 +#: ../tin.1:2585 msgid "" "The filtering capabilities of B have been significantly enhanced over " "previous versions to include scoring and better pattern matching. It is " @@ -7072,7 +7124,7 @@ msgstr "" # type: Plain text #. FIXME - Next paragraph is out of date -#: ../tin.1:2583 +#: ../tin.1:2597 msgid "" "The on-screen filtering menu is accessed by pressing 'B<^K>' at the Group " "and Article levels. It allows the user to kill or select an article that " @@ -7093,13 +7145,13 @@ msgstr "" "or save the kill description." # type: SS -#: ../tin.1:2583 +#: ../tin.1:2597 #, no-wrap msgid "POSTING ARTICLES" msgstr "POSTING ARTICLES" # type: Plain text -#: ../tin.1:2586 +#: ../tin.1:2600 msgid "" "B allows posting of articles, follow-up to already posted articles and " "replying direct through mail to the author of an article." @@ -7108,7 +7160,7 @@ msgstr "" "replying direct through mail to the author of an article." # type: Plain text -#: ../tin.1:2596 +#: ../tin.1:2610 msgid "" "Use the B ('B') command to post an article to a newsgroup. After " "entering the post subject the default editor (i.e., B(1)) or the editor " @@ -7129,7 +7181,7 @@ msgstr "" "again or p)ost the article to the specified newsgroup(s)." # type: Plain text -#: ../tin.1:2601 +#: ../tin.1:2615 msgid "" "Use the B ('B') command to display a history of the " "articles you have posted. The date the article was posted, which newsgroups " @@ -7140,7 +7192,7 @@ msgstr "" "the article was posted to and the articles subject line are displayed." # type: Plain text -#: ../tin.1:2609 +#: ../tin.1:2623 msgid "" "Use the B ('B'), B ('B') or " "B ('B<^W>') command to post a follow-up article to " @@ -7159,7 +7211,7 @@ msgstr "" "when posting an article with the B ('B') command." # type: Plain text -#: ../tin.1:2623 +#: ../tin.1:2637 msgid "" "Use the B ('B'), B ('B') or " "B ('B<^E>') command to reply direct through mail to " @@ -7184,13 +7236,13 @@ msgstr "" "or send the article to the author via B ('B')." # type: SS -#: ../tin.1:2623 +#: ../tin.1:2637 #, no-wrap msgid "CUSTOMIZING THE ARTICLE QUOTE STRING" msgstr "CUSTOMIZING THE ARTICLE QUOTE STRING" # type: Plain text -#: ../tin.1:2631 +#: ../tin.1:2645 msgid "" "When posting a followup to an article or replying direct to the author of an " "article via email the text of the article can be quoted. The beginning of " @@ -7209,13 +7261,13 @@ msgstr "" "B, B or B:" # type: ta -#: ../tin.1:2633 +#: ../tin.1:2647 #, no-wrap msgid "\\w'%A 'u +\\w'Address'u" msgstr "\\w'%A 'u +\\w'Address'u" # type: Plain text -#: ../tin.1:2642 +#: ../tin.1:2656 #, no-wrap msgid "" "B<%A>\tAddress (Email)\n" @@ -7237,12 +7289,12 @@ msgstr "" "B<%I>\tInitials of author\n" # type: Plain text -#: ../tin.1:2645 +#: ../tin.1:2659 msgid "e.g.," msgstr "e.g.," # type: Plain text -#: ../tin.1:2650 +#: ../tin.1:2664 #, no-wrap msgid "" "CW\n" # type: Plain text -#: ../tin.1:2654 +#: ../tin.1:2668 msgid "would expand to:" msgstr "would expand to:" # type: Plain text -#: ../tin.1:2659 +#: ../tin.1:2673 #, no-wrap msgid "" "CWabcINN123@example.orgE, Joe Bar Ejoe@example.orgE wrote:>\n" # type: Plain text -#: ../tin.1:2669 +#: ../tin.1:2683 msgid "" "The quoted text section of an article is marked by a preceding quote string " "at the beginning of each quoted line. The default quote string is set to " @@ -7282,13 +7334,13 @@ msgstr "" "represent a space)." # type: SS -#: ../tin.1:2669 +#: ../tin.1:2683 #, no-wrap msgid "MAILING PIPING PRINTING REPOSTING AND SAVING ARTICLES" msgstr "MAILING PIPING PRINTING REPOSTING AND SAVING ARTICLES" # type: Plain text -#: ../tin.1:2676 +#: ../tin.1:2690 msgid "" "The command interface to B, B, B or " "B ('B'), B ('B<|>'), B ('B'), B " @@ -7303,7 +7355,7 @@ msgstr "" "articles is the same for ease of use." # type: Plain text -#: ../tin.1:2681 +#: ../tin.1:2695 msgid "" "Auto-saving with B<*AutoSave> ('B') is a special case and operates only " "on marked articles. They will processed without any further prompting " @@ -7316,7 +7368,7 @@ msgstr "" "attributes set for the current group." # type: Plain text -#: ../tin.1:2685 +#: ../tin.1:2699 msgid "" "Otherwise, the initial prompt will ask you to select which article, thread, " "hot (auto-selected), regex pattern, tagged articles you wish to mail, pipe " @@ -7327,7 +7379,7 @@ msgstr "" "etc." # type: Plain text -#: ../tin.1:2689 +#: ../tin.1:2703 msgid "" "Tagged articles must have already been tagged with a B<*Tag> ('B') " "command. All tagged articles can be untagged by a B<*Untag> ('B') untag " @@ -7338,7 +7390,7 @@ msgstr "" "command." # type: Plain text -#: ../tin.1:2695 +#: ../tin.1:2709 msgid "" "If a regex pattern is selected you are asked to enter a pattern (e.g., to " "match all articles subject lines containing 'net News' you enter \"net News" @@ -7353,7 +7405,7 @@ msgstr "" "options." # type: Plain text -#: ../tin.1:2700 +#: ../tin.1:2714 msgid "" "Various expansion characters are recognized when entering the directory and " "file to save to. Environment variables (prefixed with '$') and user home " @@ -7366,7 +7418,7 @@ msgstr "" "variables can themselves contain other special characters." # type: Plain text -#: ../tin.1:2705 +#: ../tin.1:2719 msgid "" "To save articles to a mailbox enter '=Emailbox nameE' when asked for " "the save filename. If you enter just '=' then articles will be saved to a " @@ -7379,7 +7431,7 @@ msgstr "" "B." # type: Plain text -#: ../tin.1:2709 +#: ../tin.1:2723 msgid "" "To save in savedir/Enews.group.nameE/EfilenameE format enter " "'+EfilenameE'. Environment variables are allowed within a filename " @@ -7390,7 +7442,7 @@ msgstr "" "(e.g., I<$SOURCES/dir/filename>). See B." # type: Plain text -#: ../tin.1:2715 +#: ../tin.1:2729 msgid "" "When saving articles you can specify whether the saved files should be post " "processed. A default process type can be set via B." @@ -7399,13 +7451,13 @@ msgstr "" "processed. A default process type can be set via B." # type: SS -#: ../tin.1:2715 +#: ../tin.1:2729 #, no-wrap msgid "AUTOMATIC MAILING AND SAVING NEW NEWS" msgstr "AUTOMATIC MAILING AND SAVING NEW NEWS" # type: Plain text -#: ../tin.1:2727 +#: ../tin.1:2741 msgid "" "B allows new/unread news articles to be mailed (''B<-M>'' and \\&''B<-" "N>'' option) or saved (''B<-S>'' option) in batch mode for later reading. " @@ -7430,7 +7482,7 @@ msgstr "" "you could overflow your file system." # type: Plain text -#: ../tin.1:2731 +#: ../tin.1:2745 msgid "" "When using ''B<-S>'' together with a given directory to save to (''B<-s>'' " "option), the same directory must be specified when reading the articles by " @@ -7441,7 +7493,7 @@ msgstr "" "''B<-R>''." # type: Plain text -#: ../tin.1:2738 +#: ../tin.1:2752 msgid "" "If you only want to save some of your groups use the B tinrc " "variable. Set to ON or OFF in tinrc to enable/disable saving of all groups " @@ -7458,13 +7510,13 @@ msgstr "" "want using attributes." # type: TP -#: ../tin.1:2739 +#: ../tin.1:2753 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2743 +#: ../tin.1:2757 msgid "" "(mail any unread articles in newsgroups specified in file newsrc.mail to the " "local user iain and mark them as read)" @@ -7473,13 +7525,13 @@ msgstr "" "local user iain and mark them as read)" # type: TP -#: ../tin.1:2744 +#: ../tin.1:2758 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2748 +#: ../tin.1:2762 msgid "" "(save any unread articles in newsgroups specified in file newsrc.save and " "mark them as read)" @@ -7488,24 +7540,24 @@ msgstr "" "mark them as read)" # type: TP -#: ../tin.1:2749 +#: ../tin.1:2763 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:2754 +#: ../tin.1:2768 msgid "(read any articles saved by B)" msgstr "(read any articles saved by B)" # type: SS -#: ../tin.1:2754 +#: ../tin.1:2768 #, no-wrap msgid "RANGES" msgstr "RANGES" # type: Plain text -#: ../tin.1:2765 +#: ../tin.1:2779 msgid "" "A range is simply a group of items marked using the B (B<'#'>) " "key. Certain B commands will operate on a range if one exists rather " @@ -7528,13 +7580,13 @@ msgstr "" "B ('B')." # type: SS -#: ../tin.1:2766 +#: ../tin.1:2780 #, no-wrap msgid "NEWSGROUP LISTS & WILDCARDS" msgstr "NEWSGROUP LISTS & WILDCARDS" # type: Plain text -#: ../tin.1:2777 +#: ../tin.1:2791 msgid "" "Several places in B allow you to specify a list of newsgroups. These " "include command-line groups, (un)subscribe groups, the AUTO[UN]SUBSCRIBE " @@ -7555,32 +7607,32 @@ msgstr "" "examples:" # type: Plain text -#: ../tin.1:2779 +#: ../tin.1:2793 msgid "I" msgstr "I" # type: Plain text -#: ../tin.1:2781 +#: ../tin.1:2795 msgid "" "Matches alt.config and everything in the 'news' hierarchy except news.test" msgstr "" "Matches alt.config and everything in the 'news' hierarchy except news.test" # type: Plain text -#: ../tin.1:2786 +#: ../tin.1:2800 msgid "" "See the explanation for the $B variables for further examples." msgstr "" "See the explanation for the $B variables for further examples." # type: SS -#: ../tin.1:2786 +#: ../tin.1:2800 #, no-wrap msgid "SIGNATURES" msgstr "SIGNATURES" # type: Plain text -#: ../tin.1:2795 +#: ../tin.1:2809 msgid "" "B will recognize a signature in either I<${TIN_HOMEDIR:-\"$HOME\"}/." "signature> or I<${TIN_HOMEDIR:-\"$HOME\"}/.Sig>. If I<${TIN_HOMEDIR:-\"$HOME" @@ -7597,7 +7649,7 @@ msgstr "" "B(1) will append the signature itself." # type: Plain text -#: ../tin.1:2798 +#: ../tin.1:2812 msgid "" "A signature in I<${TIN_HOMEDIR:-\"$HOME\"}/.Sig> will be pulled into the " "editor for both posting and mailing commands." @@ -7606,12 +7658,12 @@ msgstr "" "editor for both posting and mailing commands." # type: Plain text -#: ../tin.1:2800 +#: ../tin.1:2814 msgid "The following is an example of a I<.Sig> file:" msgstr "The following is an example of a I<.Sig> file:" # type: Plain text -#: ../tin.1:2805 +#: ../tin.1:2819 #, no-wrap msgid "" "CWjoe@example.orgE\n" @@ -7621,7 +7673,7 @@ msgstr "" "SNAIL Musterweg 12, 99999 Notreal, Germany>\n" # type: Plain text -#: ../tin.1:2820 +#: ../tin.1:2834 msgid "" "B also has the capability to generate random signatures on a per " "newsgroup basis if so desired. The way to accomplish this is to specify the " @@ -7644,13 +7696,13 @@ msgstr "" "sig is read from the file I<$HOME/.sigfixed>." # type: SS -#: ../tin.1:2820 +#: ../tin.1:2834 #, no-wrap msgid "TIPS AND TRICKS" msgstr "TIPS AND TRICKS" # type: Plain text -#: ../tin.1:2824 +#: ../tin.1:2838 msgid "" "B can be pretty much be navigated by using the four cursor keys. The " "left arrow key goes up a level, the right arrow key goes down a level, the " @@ -7661,14 +7713,14 @@ msgstr "" "up arrow key goes up a line and the down arrow key goes down a line." # type: Plain text -#: ../tin.1:2826 +#: ../tin.1:2840 msgid "" "The following newsgroups provide useful information concerning news software:" msgstr "" "The following newsgroups provide useful information concerning news software:" # type: Plain text -#: ../tin.1:2829 +#: ../tin.1:2843 msgid "" "\\(emnews.software.readers (info. about news user agents tin, rn, nn, slrn " "etc.)" @@ -7677,12 +7729,12 @@ msgstr "" "etc.)" # type: Plain text -#: ../tin.1:2831 +#: ../tin.1:2845 msgid "\\(emnews.software.nntp (info. about NNTP)" msgstr "\\(emnews.software.nntp (info. about NNTP)" # type: Plain text -#: ../tin.1:2833 +#: ../tin.1:2847 msgid "" "\\(emnews.answers (Frequently Asked Questions (FAQ) about many different " "themes)" @@ -7691,7 +7743,7 @@ msgstr "" "themes)" # type: Plain text -#: ../tin.1:2837 +#: ../tin.1:2851 msgid "" "Many prompts within B offer a default choice that the cursor is " "positioned on. By pressing 'BCRE>' the default value is taken. " @@ -7702,7 +7754,7 @@ msgstr "" "Most prompts can be aborted by pressing 'BESCE>'." # type: Plain text -#: ../tin.1:2844 +#: ../tin.1:2858 msgid "" "When B is run in an B(1x) it will resize itself each time the " "B(1x) is resized." @@ -7711,7 +7763,7 @@ msgstr "" "B(1x) is resized." # type: Plain text -#: ../tin.1:2848 +#: ../tin.1:2862 msgid "" "B will reread the I<${TIN_LIBDIR:-NEWSLIBDIR}\"/\"${TIN_ACTIVEFILE:-" "active}> file at set intervals (B) to show any " @@ -7722,7 +7774,7 @@ msgstr "" "newly arrived news." # type: Plain text -#: ../tin.1:2853 +#: ../tin.1:2867 msgid "" "If you find large number of new newsgroups cluttering up your screen, " "pressing B ('B') will make them go away." @@ -7731,13 +7783,13 @@ msgstr "" "pressing B ('B') will make them go away." # type: SS -#: ../tin.1:2853 +#: ../tin.1:2867 #, no-wrap msgid "XTERM BUTTONS" msgstr "XTERM BUTTONS" # type: Plain text -#: ../tin.1:2859 +#: ../tin.1:2873 msgid "" "If the environment variable B<$TERM> is set to B(1x), then button " "pressing can be used to select groups and articles. In this discussion, the " @@ -7750,31 +7802,31 @@ msgstr "" "button)." # type: Plain text -#: ../tin.1:2861 +#: ../tin.1:2875 msgid "In general (i.e., for the group, thread and article menus)," msgstr "In general (i.e., for the group, thread and article menus)," # type: TP -#: ../tin.1:2861 +#: ../tin.1:2875 #, no-wrap msgid "Button1 (left)" msgstr "Button1 (left)" # type: Plain text -#: ../tin.1:2864 +#: ../tin.1:2878 msgid "" "enters next (lower) level if you click on an article, otherwise pages down." msgstr "" "enters next (lower) level if you click on an article, otherwise pages down." # type: TP -#: ../tin.1:2864 +#: ../tin.1:2878 #, no-wrap msgid "Button2 (center)" msgstr "Button2 (centre)" # type: Plain text -#: ../tin.1:2868 +#: ../tin.1:2882 msgid "" "returns to the previous (upper) level if you click on an article, otherwise " "pages up." @@ -7783,13 +7835,13 @@ msgstr "" "pages up." # type: TP -#: ../tin.1:2868 +#: ../tin.1:2882 #, no-wrap msgid "Button3 (right)" msgstr "Button3 (right)" # type: Plain text -#: ../tin.1:2872 +#: ../tin.1:2886 msgid "" "positions on the article line under mouse cursor, or pages down if you've " "clicked outside the list of articles." @@ -7798,18 +7850,18 @@ msgstr "" "clicked outside the list of articles." # type: Plain text -#: ../tin.1:2874 +#: ../tin.1:2888 msgid "In the group selection menu, if the mouse is pointing at a group then:" msgstr "In the group selection menu, if the mouse is pointing at a group then:" # type: TP -#: ../tin.1:2874 ../tin.1:2886 ../tin.1:2900 +#: ../tin.1:2888 ../tin.1:2900 ../tin.1:2914 #, no-wrap msgid "left button" msgstr "left button" # type: Plain text -#: ../tin.1:2878 +#: ../tin.1:2892 msgid "" "moves to and selects the group pointed at, just like B " "('BCRE>')." @@ -7818,36 +7870,36 @@ msgstr "" "('BCRE>')." # type: TP -#: ../tin.1:2878 ../tin.1:2890 ../tin.1:2903 +#: ../tin.1:2892 ../tin.1:2904 ../tin.1:2917 #, no-wrap msgid "center button" msgstr "centre button" # type: Plain text -#: ../tin.1:2881 +#: ../tin.1:2895 msgid "quits the program, just like B ('B')." msgstr "quits the program, just like B ('B')." # type: TP -#: ../tin.1:2881 ../tin.1:2895 ../tin.1:2908 +#: ../tin.1:2895 ../tin.1:2909 ../tin.1:2922 #, no-wrap msgid "right button" msgstr "right button" # type: Plain text -#: ../tin.1:2884 +#: ../tin.1:2898 msgid "moves to the group pointed at." msgstr "moves to the group pointed at." # type: Plain text -#: ../tin.1:2886 +#: ../tin.1:2900 msgid "" "In the article menu, if the mouse is pointing at an article (or thread) then:" msgstr "" "In the article menu, if the mouse is pointing at an article (or thread) then:" # type: Plain text -#: ../tin.1:2890 +#: ../tin.1:2904 msgid "" "reads the article pointed at, just like B " "('BCRE>'), or the thread, just like B ('B')." @@ -7856,7 +7908,7 @@ msgstr "" "('BCRE>'), or the thread, just like B ('B')." # type: Plain text -#: ../tin.1:2895 +#: ../tin.1:2909 msgid "" "exits the menu, catching up on the group if you have " "B set in your configuration, just like B " @@ -7867,24 +7919,24 @@ msgstr "" "('B')." # type: Plain text -#: ../tin.1:2898 +#: ../tin.1:2912 msgid "moves to the article (or thread) pointed at." msgstr "moves to the article (or thread) pointed at." # type: Plain text -#: ../tin.1:2900 +#: ../tin.1:2914 msgid "In the thread menu, if the mouse is pointing at an article then:" msgstr "In the thread menu, if the mouse is pointing at an article then:" # type: Plain text -#: ../tin.1:2903 +#: ../tin.1:2917 msgid "" "reads article pointed at, just like B ('BCRE>')." msgstr "" "reads article pointed at, just like B ('BCRE>')." # type: Plain text -#: ../tin.1:2908 +#: ../tin.1:2922 msgid "" "exits the menu, catching up on the thread if you have " "B set in your configuration, just like B " @@ -7895,12 +7947,12 @@ msgstr "" "('B')." # type: Plain text -#: ../tin.1:2911 +#: ../tin.1:2925 msgid "moves to the article pointed at." msgstr "moves to the article pointed at." # type: Plain text -#: ../tin.1:2918 +#: ../tin.1:2932 msgid "" "In other menus and areas button pressing reverts back to usual cut and paste " "of B(1x), but after one click of any button." @@ -7909,13 +7961,13 @@ msgstr "" "of B(1x), but after one click of any button." # type: SS -#: ../tin.1:2918 +#: ../tin.1:2932 #, no-wrap msgid "INDEX FILES" msgstr "INDEX FILES" # type: Plain text -#: ../tin.1:2923 +#: ../tin.1:2937 msgid "" "If your news server supports NOV index files (see B(5), most " "modern installations will) and you have a fast connection to your news " @@ -7926,7 +7978,7 @@ msgstr "" "server then this section can be ignored." # type: Plain text -#: ../tin.1:2929 +#: ../tin.1:2943 msgid "" "If your news server doesn't support NOV index files or you have a very slow " "connection to your news server then B can cache the index for each " @@ -7941,7 +7993,7 @@ msgstr "" "traffic groups." # type: Plain text -#: ../tin.1:2938 +#: ../tin.1:2952 msgid "" "Each user creates/updates his/her own index files that are stored in I<" "${TIN_INDEX_NEWSDIR:-\"${TIN_HOMEDIR:-\"$HOME\"}/.tin\"}/.news/>. If you are " @@ -7960,7 +8012,7 @@ msgstr "" "when reading via NNTP then turning on caching will have little or no effect." # type: Plain text -#: ../tin.1:2945 +#: ../tin.1:2959 msgid "" "Entering a group the first time tends to be slow because the index file must " "be built from scratch. To alleviate the slowness start B to create all " @@ -7977,7 +8029,7 @@ msgstr "" "need to be cached." # type: Plain text -#: ../tin.1:2950 +#: ../tin.1:2964 msgid "" "As indexing might take some time you may want to run B form the system " "batcher B(1) with the ''B<-u>'' option:" @@ -7986,13 +8038,13 @@ msgstr "" "batcher B(1) with the ''B<-u>'' option:" # type: Plain text -#: ../tin.1:2955 +#: ../tin.1:2969 #, no-wrap msgid "CW<30 6 * * * /usr/local/bin/tin -u>\n" msgstr "CW<30 6 * * * /usr/local/bin/tin -u>\n" # type: Plain text -#: ../tin.1:2963 +#: ../tin.1:2977 msgid "" "If you are low on local disk space you should consider using B " "to limit the size of cached indexes and also manually purge cached data for " @@ -8003,7 +8055,7 @@ msgstr "" "groups you are not reading anymore with something like:" # type: Plain text -#: ../tin.1:2969 +#: ../tin.1:2983 #, no-wrap msgid "" "CW\n" # type: SH -#: ../tin.1:2974 ../tin.5:20 +#: ../tin.1:2988 ../tin.5:20 #, no-wrap msgid "FILES" msgstr "FILES" @@ -8030,126 +8082,127 @@ msgstr "FILES" #. $TMPDIR/REFS.info (-D 8) #. $TMPDIR/MALLOC (-D 16) #. $TMPDIR/ATTRIBUTES (-D 32) -#. $TMPDIR/SCOPES (-D 32) +#. $TMPDIR/SCOPES-R (-D 32) +#. $TMPDIR/SCOPES-W (-D 32) #. $TMPDIR/ACTIVE (-D 64) -#: ../tin.1:2990 +#: ../tin.1:3005 msgid "For a detailed description see B(5)." msgstr "For a detailed description see B(5)." # type: Plain text -#: ../tin.1:2992 ../tin.5:40 +#: ../tin.1:3007 ../tin.5:41 msgid "I<$MAILCAPS>" msgstr "I<$MAILCAPS>" # type: Plain text -#: ../tin.1:2994 ../tin.5:42 +#: ../tin.1:3009 ../tin.5:43 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.mailcap>" msgstr "I<${TIN_HOMEDIR:-\"$HOME\"}/.mailcap>" # type: Plain text -#: ../tin.1:2996 ../tin.5:44 +#: ../tin.1:3011 ../tin.5:45 msgid "I" msgstr "I" # type: Plain text -#: ../tin.1:2998 ../tin.5:46 +#: ../tin.1:3013 ../tin.5:47 msgid "I" msgstr "I" # type: Plain text -#: ../tin.1:3000 ../tin.5:48 +#: ../tin.1:3015 ../tin.5:49 msgid "I" msgstr "I" # type: Plain text -#: ../tin.1:3002 ../tin.5:50 +#: ../tin.1:3017 ../tin.5:51 msgid "I" msgstr "I" # type: Plain text -#: ../tin.1:3005 ../tin.5:219 +#: ../tin.1:3020 ../tin.5:220 msgid "I" msgstr "I" # type: Plain text -#: ../tin.1:3008 ../tin.5:229 +#: ../tin.1:3023 ../tin.5:230 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.cancelsecret>" msgstr "I<${TIN_HOMEDIR:-\"$HOME\"}/.cancelsecret>" # type: Plain text -#: ../tin.1:3011 ../tin.5:236 +#: ../tin.1:3026 ../tin.5:237 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.mime.types>" msgstr "I<${TIN_HOMEDIR:-\"$HOME\"}/.mime.types>" # type: Plain text -#: ../tin.1:3013 ../tin.5:238 +#: ../tin.1:3028 ../tin.5:239 msgid "I" msgstr "I" # type: Plain text -#: ../tin.1:3015 ../tin.5:240 +#: ../tin.1:3030 ../tin.5:241 msgid "I" msgstr "I" # type: Plain text -#: ../tin.1:3018 ../tin.5:247 +#: ../tin.1:3033 ../tin.5:248 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.newsauth>" msgstr "I<${TIN_HOMEDIR:-\"$HOME\"}/.newsauth>" # type: Plain text -#: ../tin.1:3021 ../tin.5:280 +#: ../tin.1:3036 ../tin.5:281 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc>" msgstr "I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc>" # type: Plain text -#: ../tin.1:3025 ../tin.5:309 +#: ../tin.1:3040 ../tin.5:310 #, no-wrap msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/$NNTPSERVER${NNTPPORT:+\":$NNTPPORT\"}/.oldnewsrc>\n" msgstr "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/$NNTPSERVER${NNTPPORT:+\":$NNTPPORT\"}/.oldnewsrc>\n" # type: Plain text -#: ../tin.1:3029 ../tin.5:317 +#: ../tin.1:3044 ../tin.5:318 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.signature>" msgstr "I<${TIN_HOMEDIR:-\"$HOME\"}/.signature>" # type: Plain text -#: ../tin.1:3031 ../tin.5:319 +#: ../tin.1:3046 ../tin.5:320 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.Sig>" msgstr "I<${TIN_HOMEDIR:-\"$HOME\"}/.Sig>" # type: Plain text -#: ../tin.1:3034 ../tin.5:326 +#: ../tin.1:3049 ../tin.5:327 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.sigfixed>" msgstr "I<${TIN_HOMEDIR:-\"$HOME\"}/.sigfixed>" # type: Plain text -#: ../tin.1:3037 ../tin.5:333 +#: ../tin.1:3052 ../tin.5:334 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/.inputhistory>" msgstr "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/.inputhistory>" # type: Plain text -#: ../tin.1:3040 ../tin.5:340 +#: ../tin.1:3055 ../tin.5:341 msgid "I<${TIN_INDEX_MAILDIR:-\"${TIN_HOMEDIR:-\"$HOME\"}/.tin\"}/.mail/>" msgstr "I<${TIN_INDEX_MAILDIR:-\"${TIN_HOMEDIR:-\"$HOME\"}/.tin\"}/.mail/>" # type: Plain text -#: ../tin.1:3044 ../tin.5:348 +#: ../tin.1:3059 ../tin.5:349 #, no-wrap msgid "I<${TIN_INDEX_NEWSDIR:-\"${TIN_HOMEDIR:-\"$HOME\"}/.tin\"}/.news${NNTPSERVER:+\"-$NNTPSERVER\"}/>\n" msgstr "I<${TIN_INDEX_NEWSDIR:-\"${TIN_HOMEDIR:-\"$HOME\"}/.tin\"}/.news${NNTPSERVER:+\"-$NNTPSERVER\"}/>\n" # type: Plain text -#: ../tin.1:3048 ../tin.5:356 +#: ../tin.1:3063 ../tin.5:357 msgid "I<${TIN_INDEX_SAVEDIR:-\"${TIN_HOMEDIR:-\"$HOME\"}/.tin\"}/.save/>" msgstr "I<${TIN_INDEX_SAVEDIR:-\"${TIN_HOMEDIR:-\"$HOME\"}/.tin\"}/.save/>" # type: Plain text -#: ../tin.1:3051 ../tin.5:363 +#: ../tin.1:3066 ../tin.5:364 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/active.mail>" msgstr "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/active.mail>" # type: Plain text -#: ../tin.1:3054 ../tin.5:397 +#: ../tin.1:3069 ../tin.5:398 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/active.save>" msgstr "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/active.save>" @@ -8158,66 +8211,66 @@ msgstr "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin #. as with inn >= 2.2.x getting more and more popular #. we should think about checking for the new Paths (/news/etc/) #. ${TIN_LIBDIR\-/news/etc"}/attributes -#: ../tin.1:3058 ../tin.5:408 +#: ../tin.1:3073 ../tin.5:409 msgid "I" msgstr "I" # type: Plain text -#: ../tin.1:3060 ../tin.5:410 +#: ../tin.1:3075 ../tin.5:411 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/attributes>" msgstr "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/attributes>" # type: Plain text #. TODO: add missing descriptions and explain things in detail. -#: ../tin.1:3063 ../tin.5:735 +#: ../tin.1:3078 ../tin.5:736 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/filter>" msgstr "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/filter>" # type: Plain text -#: ../tin.1:3067 ../tin.5:817 +#: ../tin.1:3082 ../tin.5:818 #, no-wrap msgid "I\n" msgstr "I\n" # type: Plain text -#: ../tin.1:3069 ../tin.5:819 +#: ../tin.1:3084 ../tin.5:820 #, no-wrap msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/keymap${${LC_ALL:-\"${LC_CTYPE:-\"${LC_MESSAGES:-\"$LANG\"}\"}\"}:+\".${LC_ALL:-\"${LC_CTYPE:-\"${LC_MESSAGES:-\"$LANG\"}\"}\"}\"}>\n" msgstr "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/keymap${${LC_ALL:-\"${LC_CTYPE:-\"${LC_MESSAGES:-\"$LANG\"}\"}\"}:+\".${LC_ALL:-\"${LC_CTYPE:-\"${LC_MESSAGES:-\"$LANG\"}\"}\"}\"}>\n" # type: Plain text -#: ../tin.1:3073 ../tin.5:1051 +#: ../tin.1:3088 ../tin.5:1053 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/mailgroups>" msgstr "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/mailgroups>" # type: Plain text -#: ../tin.1:3076 ../tin.5:1067 +#: ../tin.1:3091 ../tin.5:1069 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/newsrctable>" msgstr "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/newsrctable>" # type: Plain text -#: ../tin.1:3079 ../tin.5:1093 +#: ../tin.1:3094 ../tin.5:1095 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/posted>" msgstr "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/posted>" # type: Plain text -#: ../tin.1:3082 ../tin.5:1100 +#: ../tin.1:3097 ../tin.5:1102 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/Mail/posted>" msgstr "I<${TIN_HOMEDIR:-\"$HOME\"}/Mail/posted>" # type: Plain text -#: ../tin.1:3085 ../tin.5:1110 +#: ../tin.1:3100 ../tin.5:1112 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/postponed.articles>" msgstr "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/postponed.articles>" # type: Plain text -#: ../tin.1:3089 +#: ../tin.1:3104 #, no-wrap msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/$NNTPSERVER:${NNTPPORT:+\":$NNTPPORT\"}/newsgroups>\n" msgstr "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/$NNTPSERVER:${NNTPPORT:+\":$NNTPPORT\"}/newsgroups>\n" # type: Plain text -#: ../tin.1:3094 +#: ../tin.1:3109 #, no-wrap msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/$NNTPSERVER:${NNTPPORT:+\":$NNTPPORT\"}/serverrc>\n" msgstr "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/$NNTPSERVER:${NNTPPORT:+\":$NNTPPORT\"}/serverrc>\n" @@ -8227,22 +8280,22 @@ msgstr "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin #. as with inn >= 2.2.x getting more and more popular #. we should think about checking for the new Paths (/news/etc/) #. .IR ${TIN_LIBDIR\-"/news/etc"}/tinrc -#: ../tin.1:3099 ../tin.5:1163 +#: ../tin.1:3114 ../tin.5:1165 msgid "I" msgstr "I" # type: Plain text -#: ../tin.1:3101 ../tin.5:1165 +#: ../tin.1:3116 ../tin.5:1167 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/tinrc>" msgstr "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/tinrc>" # type: Plain text -#: ../tin.1:3104 ../tin.5:2257 +#: ../tin.1:3119 ../tin.5:2269 msgid "I" msgstr "I" # type: Plain text -#: ../tin.1:3107 +#: ../tin.1:3122 msgid "I" msgstr "I" @@ -8251,51 +8304,51 @@ msgstr "I= 2.2.x getting more and more popular #. we should think about checking for the new Paths #. (described shown below). -#: ../tin.1:3110 ../tin.5:2364 +#: ../tin.1:3125 ../tin.5:2376 msgid "I<${TIN_LIBDIR:-NEWSLIBDIR}\"/\"${TIN_ACTIVEFILE:-active}>" msgstr "I<${TIN_LIBDIR:-NEWSLIBDIR}\"/\"${TIN_ACTIVEFILE:-active}>" # type: Plain text -#: ../tin.1:3113 ../tin.5:2424 +#: ../tin.1:3128 ../tin.5:2436 msgid "I<${TIN_LIBDIR:-NEWSLIBDIR}/active.times>" msgstr "I<${TIN_LIBDIR:-NEWSLIBDIR}/active.times>" # type: Plain text -#: ../tin.1:3116 ../tin.5:2451 +#: ../tin.1:3131 ../tin.5:2463 msgid "I<${TIN_LIBDIR:-NEWSLIBDIR}/newsgroups>" msgstr "I<${TIN_LIBDIR:-NEWSLIBDIR}/newsgroups>" # type: Plain text -#: ../tin.1:3119 ../tin.5:2474 +#: ../tin.1:3134 ../tin.5:2486 msgid "I<${TIN_LIBDIR:-NEWSLIBDIR}/organization>" msgstr "I<${TIN_LIBDIR:-NEWSLIBDIR}/organization>" # type: Plain text #. is the Path correct? or is it /news/etc/overview.fmt -#: ../tin.1:3122 ../tin.5:2484 +#: ../tin.1:3137 ../tin.5:2496 msgid "I<${TIN_LIBDIR:-NEWSLIBDIR}/overview.fmt>" msgstr "I<${TIN_LIBDIR:-NEWSLIBDIR}/overview.fmt>" # type: Plain text #. is the Path correct? or is it /news/etc/subscriptions -#: ../tin.1:3125 ../tin.5:2502 +#: ../tin.1:3140 ../tin.5:2514 msgid "I<${TIN_LIBDIR:-NEWSLIBDIR}/subscriptions>" msgstr "I<${TIN_LIBDIR:-NEWSLIBDIR}/subscriptions>" # type: SH -#: ../tin.1:3128 +#: ../tin.1:3143 #, no-wrap msgid "ENVIRONMENT" msgstr "ENVIRONMENT" # type: TP -#: ../tin.1:3142 +#: ../tin.1:3157 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3150 +#: ../tin.1:3165 msgid "" "Define this variable if you want to specify command-line options that B " "should be started with to save typing them each time it is started. The " @@ -8310,13 +8363,13 @@ msgstr "" "the command-line to override the same option specified in the environment." # type: TP -#: ../tin.1:3150 +#: ../tin.1:3165 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3155 +#: ../tin.1:3170 msgid "" "Define this variable if you do not want the I<.tin> directory in I<$HOME/>. " "E.g., if you want all B's private files in I you would set " @@ -8327,13 +8380,13 @@ msgstr "" "$B to I." # type: TP -#: ../tin.1:3155 +#: ../tin.1:3170 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3161 +#: ../tin.1:3176 msgid "" "Define this variable if you do not want the I<.news> directory in I<" "${TIN_HOMEDIR:-\"$HOME\"}/.tin/>. E.g., if you want all B's news index " @@ -8344,13 +8397,13 @@ msgstr "" "files in I you would set $B to I." # type: TP -#: ../tin.1:3161 +#: ../tin.1:3176 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3167 +#: ../tin.1:3182 msgid "" "Define this variable if you do not want the I<.mail> directory in I<" "${TIN_HOMEDIR:-\"$HOME\"}/.tin/>. E.g., if you want all B's mail index " @@ -8361,13 +8414,13 @@ msgstr "" "files in I you would set $B to I." # type: TP -#: ../tin.1:3167 +#: ../tin.1:3182 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3173 +#: ../tin.1:3188 msgid "" "Define this variable if you do not want the I<.save> directory in I<" "${TIN_HOMEDIR:-\"$HOME\"}/.tin/>. E.g., if you want all B's save index " @@ -8378,13 +8431,13 @@ msgstr "" "files in I you would set $B to I." # type: TP -#: ../tin.1:3173 +#: ../tin.1:3188 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3178 +#: ../tin.1:3193 msgid "" "Define this variable if you want to override the B path that was " "compiled into the B binary, default is I. If tin is " @@ -8395,13 +8448,13 @@ msgstr "" "running in NNTP mode setting this variable has no effect." # type: TP -#: ../tin.1:3178 +#: ../tin.1:3193 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3183 +#: ../tin.1:3198 msgid "" "Define this variable if you want to override the B path that was " "compiled into the B binary, default is I. If tin is " @@ -8412,13 +8465,13 @@ msgstr "" "running in NNTP mode setting this variable has no effect." # type: TP -#: ../tin.1:3183 +#: ../tin.1:3198 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3189 +#: ../tin.1:3204 msgid "" "Define this variable if you want to override the B path that was " "compiled into the B binary, default is B (see above). If tin " @@ -8429,13 +8482,13 @@ msgstr "" "is running in NNTP mode setting this variable has no effect." # type: TP -#: ../tin.1:3189 +#: ../tin.1:3204 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3195 +#: ../tin.1:3210 msgid "" "Define this variable if you want to override the B path " "that was compiled into the B binary. If tin is running in NNTP mode " @@ -8448,13 +8501,13 @@ msgstr "" "prepended to $B." # type: TP -#: ../tin.1:3195 +#: ../tin.1:3210 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3201 +#: ../tin.1:3216 msgid "" "The default NNTP server to remotely read news from. This variable only needs " "to be set if the ''B<-r>'' command-line option is specified and the file I." # type: TP -#: ../tin.1:3201 +#: ../tin.1:3216 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3206 +#: ../tin.1:3221 msgid "" "The NNTP TCP-port to read news from. This variable only needs to be set if " "the TCP-port is not 119 (the default). The ''B<-p>'' command-line option " @@ -8484,13 +8537,13 @@ msgstr "" "overrides $B." # type: TP -#: ../tin.1:3206 +#: ../tin.1:3221 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3210 +#: ../tin.1:3225 msgid "" "Set the article header field ''Distribution:'' to the contents of the " "variable instead of the system default." @@ -8499,14 +8552,13 @@ msgstr "" "variable instead of the system default." # type: TP -#: ../tin.1:3210 +#: ../tin.1:3225 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#. TODO: short document the different tables (doc/iso2asc.txt) here -#: ../tin.1:3215 +#: ../tin.1:3229 msgid "" "Set the ISO to ASCII charset decoding table character to use in decoding an " "article text. Values can range from 0 to 6." @@ -8514,14 +8566,60 @@ msgstr "" "Set the ISO to ASCII charset decoding table character to use in decoding an " "article text. Values can range from 0 to 6." +# type: Plain text +#: ../tin.1:3233 +msgid "universal table for many languages" +msgstr "universal table for many languages" + +# type: Plain text +#: ../tin.1:3236 +msgid "single-spacing universal table" +msgstr "single-spacing universal table" + +# type: Plain text +#: ../tin.1:3239 +msgid "table for Danish, Dutch, German, Norwegian and Swedish" +msgstr "table for Danish, Dutch, German, Norwegian and Swedish" + +# type: TP +#: ../tin.1:3239 +#, no-wrap +msgid "B<3>" +msgstr "B<3>" + +# type: Plain text +#: ../tin.1:3242 +msgid "" +"table for Danish, Finnish, Norwegian and Swedish using the appropriate ISO " +"646 variant" +msgstr "" +"table for Danish, Finnish, Norwegian and Swedish using the appropriate ISO " +"646 variant" + +# type: Plain text +#: ../tin.1:3245 +msgid "table with RFC 1345 codes in brackets" +msgstr "table with RFC 1345 codes in brackets" + +# type: TP +#: ../tin.1:3245 +#, no-wrap +msgid "B<5>" +msgstr "B<5>" + +# type: Plain text +#: ../tin.1:3248 +msgid "table for printers that allow overstriking with backspace" +msgstr "table for printers that allow overstriking with backspace" + # type: TP -#: ../tin.1:3215 +#: ../tin.1:3249 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3221 +#: ../tin.1:3255 msgid "" "Set the article header field ''Organization:'' to the contents of the " "variable instead of the system default. If reading news on an Apollo " @@ -8534,24 +8632,24 @@ msgstr "" "of $B." # type: TP -#: ../tin.1:3221 +#: ../tin.1:3255 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3224 +#: ../tin.1:3258 msgid "DomainOS specific, same as $B on other OSs (see above)." msgstr "DomainOS specific, same as $B on other OSs (see above)." # type: TP -#: ../tin.1:3224 +#: ../tin.1:3258 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3229 +#: ../tin.1:3263 msgid "" "Set the article header field ''Reply-To:'' to the return address specified " "by the variable. This is useful if you wish to receive replies at a " @@ -8562,13 +8660,13 @@ msgstr "" "different address." # type: TP -#: ../tin.1:3229 +#: ../tin.1:3263 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3233 +#: ../tin.1:3267 msgid "" "Overrides the full name given in the gecos-files in I, see also " "B." @@ -8577,37 +8675,37 @@ msgstr "" "B." # type: TP -#: ../tin.1:3233 +#: ../tin.1:3267 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3236 +#: ../tin.1:3270 msgid "Same as $B." msgstr "Same as $B." # type: TP -#: ../tin.1:3236 +#: ../tin.1:3270 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3241 +#: ../tin.1:3275 msgid "" "Pathname of the user's home directory. See B(5) for more info." msgstr "" "Pathname of the user's home directory. See B(5) for more info." # type: TP -#: ../tin.1:3241 +#: ../tin.1:3275 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3245 +#: ../tin.1:3279 msgid "" "This variable has precedence over the default mailer that is used in all " "mailing operations within B." @@ -8616,24 +8714,24 @@ msgstr "" "mailing operations within B." # type: TP -#: ../tin.1:3245 +#: ../tin.1:3279 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3248 -msgid "Full path to the users mailbox." -msgstr "Full path to the users mailbox." +#: ../tin.1:3282 +msgid "Full path to the user's mailbox." +msgstr "Full path to the user's mailbox." # type: TP -#: ../tin.1:3248 +#: ../tin.1:3282 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3257 +#: ../tin.1:3291 msgid "" "This variable has precedence over the default editor (i.e., B(1)) that " "is used in all editing operations within B (e.g., posting, replying, " @@ -8646,13 +8744,13 @@ msgstr "" "B(5) for more info." # type: TP -#: ../tin.1:3257 +#: ../tin.1:3291 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3266 +#: ../tin.1:3300 msgid "" "If $B is unset, then this variable is looked up for a default " "editor. If $B and $B are both unset, B uses the systems " @@ -8665,13 +8763,13 @@ msgstr "" "more info." # type: TP -#: ../tin.1:3266 +#: ../tin.1:3300 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3272 +#: ../tin.1:3306 msgid "" "A new group is checked against the list of patterns; if it matches, B " "subscribes the user to the group without further query. See the section " @@ -8684,12 +8782,12 @@ msgstr "" "example, setting" # type: Plain text -#: ../tin.1:3274 +#: ../tin.1:3308 msgid "I" msgstr "I" # type: Plain text -#: ../tin.1:3279 +#: ../tin.1:3313 msgid "" "will automatically subscribe the user to all new groups in the comp.os.unix " "hierarchy, and all talk groups other than talk.politics groups (which will " @@ -8702,13 +8800,13 @@ msgstr "" "with the ''B<-X>'' command-line switch." # type: TP -#: ../tin.1:3279 +#: ../tin.1:3313 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3283 +#: ../tin.1:3317 msgid "" "Is handled like the $B variable, but groups matching the list " "are unsubscribed from without further query. For example, setting" @@ -8717,12 +8815,12 @@ msgstr "" "are unsubscribed from without further query. For example, setting" # type: Plain text -#: ../tin.1:3285 +#: ../tin.1:3319 msgid "I" msgstr "I" # type: Plain text -#: ../tin.1:3289 +#: ../tin.1:3323 msgid "" "will automatically unsubscribe the user from all new alt.flame groups and " "all groups starting with u (university groups) other than UK groups (which " @@ -8733,13 +8831,13 @@ msgstr "" "will be queried for as usual)." # type: TP -#: ../tin.1:3289 +#: ../tin.1:3323 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3293 +#: ../tin.1:3327 msgid "" "A pathname of a directory made available for B to create temporary " "files." @@ -8748,13 +8846,13 @@ msgstr "" "files." # type: TP -#: ../tin.1:3293 +#: ../tin.1:3327 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3298 +#: ../tin.1:3332 msgid "" "This variable can be used to override the default path search for mailcap " "files. See also B(5)." @@ -8763,13 +8861,13 @@ msgstr "" "files. See also B(5)." # type: TP -#: ../tin.1:3298 +#: ../tin.1:3332 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3303 +#: ../tin.1:3337 msgid "" "Set this variable to disable the use of B(1) or a replacement (e." "g. metamutt)." @@ -8778,19 +8876,19 @@ msgstr "" "g. metamutt)." # type: TP -#: ../tin.1:3303 +#: ../tin.1:3337 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.1:3305 +#: ../tin.1:3339 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3310 +#: ../tin.1:3344 msgid "" "Set this variable to point to B(1) or a replacement and its cmd-" "line options." @@ -8799,13 +8897,13 @@ msgstr "" "line options." # type: TP -#: ../tin.1:3310 +#: ../tin.1:3344 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3317 +#: ../tin.1:3351 msgid "" "Define any additional options that you wish to pass to your B(1) or " "B(1) program." @@ -8814,13 +8912,13 @@ msgstr "" "B(1) program." # type: TP -#: ../tin.1:3317 +#: ../tin.1:3351 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3322 +#: ../tin.1:3356 msgid "" "Override the name of the B(1) directory in B<$HOME> that holds your " "keys etc.." @@ -8829,13 +8927,13 @@ msgstr "" "keys etc.." # type: TP -#: ../tin.1:3322 +#: ../tin.1:3356 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3327 +#: ../tin.1:3361 msgid "" "Override the name of the B(1) directory in B<$HOME> that holds your " "keys etc.." @@ -8844,7 +8942,7 @@ msgstr "" "keys etc.." # type: TP -#: ../tin.1:3327 +#: ../tin.1:3361 #, no-wrap msgid "B" msgstr "B" @@ -8852,7 +8950,7 @@ msgstr "B" # type: Plain text #. TODO: document LC_CTYPEs influence on #. ~/.tin/keymap.*, 8bit char display, ... -#: ../tin.1:3341 +#: ../tin.1:3375 msgid "" "This variable determines the B(5) category for character handling " "functions. Usually it determines the character classes for pattern matching " @@ -8871,13 +8969,13 @@ msgstr "" "information." # type: TP -#: ../tin.1:3341 +#: ../tin.1:3375 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3350 +#: ../tin.1:3384 msgid "" "Formats of informative and diagnostic messages and interactive responses. " "It's value should be of the form I[I<_territory>][I<.codeset>]" @@ -8888,13 +8986,13 @@ msgstr "" "[I<@modifier>]. See B(5) and B(5) for more information." # type: TP -#: ../tin.1:3350 +#: ../tin.1:3384 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3358 +#: ../tin.1:3392 msgid "" "Date and time formats. It's value should be of the form I" "[I<_territory>][I<.codeset>][I<@modifier>]. See B(5) and B" @@ -8905,13 +9003,13 @@ msgstr "" "(5) for more information." # type: TP -#: ../tin.1:3358 +#: ../tin.1:3392 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3367 +#: ../tin.1:3401 msgid "" "This variable overrides the value of the B<$LANG> variable and any other B<" "$LC_> variable. It's value should be of the form I[I<_territory>]" @@ -8922,13 +9020,13 @@ msgstr "" "[I<.codeset>]. See B(5) and B(5) for more information." # type: TP -#: ../tin.1:3367 +#: ../tin.1:3401 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3376 +#: ../tin.1:3410 msgid "" "This variable determines the B(5) category for any category not " "specifically selected with a variable starting with B<$LC_>. It's value " @@ -8941,13 +9039,13 @@ msgstr "" "(5) for more information." # type: TP -#: ../tin.1:3376 +#: ../tin.1:3410 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3384 +#: ../tin.1:3418 msgid "" "This variable defines a priority list for translations. Whenever a " "translation is not available in the language selected via B<$LC_ALL> or B<" @@ -8962,13 +9060,13 @@ msgstr "" "information." # type: TP -#: ../tin.1:3384 +#: ../tin.1:3418 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3394 +#: ../tin.1:3428 msgid "" "A decimal integer E 0 used to indicate the user's preferred width in " "column positions for the terminal screen or window. If this variable is " @@ -8989,13 +9087,13 @@ msgstr "" "characteristics." # type: TP -#: ../tin.1:3394 +#: ../tin.1:3428 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3404 +#: ../tin.1:3438 msgid "" "A decimal integer E 0 used to indicate the user's preferred number of " "lines on a page or the vertical screen or window size in lines. A line in " @@ -9016,7 +9114,7 @@ msgstr "" "B<$LINES> unless they wish to override the system selection." # type: TP -#: ../tin.1:3404 +#: ../tin.1:3438 #, no-wrap msgid "B" msgstr "B" @@ -9025,7 +9123,7 @@ msgstr "B" # # type: Plain text #. TODO: add missing, sort useful, document in detail -#: ../tin.1:3413 +#: ../tin.1:3447 msgid "" "The type of terminal in use. This is used when looking up termcap " "sequences. See B(5) for more information." @@ -9034,46 +9132,46 @@ msgstr "" "sequences. See B(5) for more information." # type: SH -#: ../tin.1:3413 +#: ../tin.1:3447 #, no-wrap msgid "SIGNALS" msgstr "SIGNALS" # type: Plain text -#: ../tin.1:3416 +#: ../tin.1:3450 msgid "B handles a couple of signals:" msgstr "B handles a couple of signals:" # type: TP -#: ../tin.1:3416 +#: ../tin.1:3450 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3419 ../tin.1:3422 +#: ../tin.1:3453 ../tin.1:3456 msgid "Terminate gracefully." msgstr "Terminate gracefully." # type: TP -#: ../tin.1:3419 +#: ../tin.1:3453 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.1:3422 +#: ../tin.1:3456 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.1:3425 +#: ../tin.1:3459 msgid "Terminate gracefully but do not restore tty." msgstr "Terminate gracefully but do not restore tty." # type: TP -#: ../tin.1:3425 +#: ../tin.1:3459 #, no-wrap msgid "B" msgstr "B" @@ -9084,18 +9182,18 @@ msgstr "B" #. .SH DIAGNOSTICS #. give an overview of the most common error messages and how to cope with #. them. -#: ../tin.1:3436 +#: ../tin.1:3470 msgid "Write out I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc>-file." msgstr "Write out I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc>-file." # type: SH -#: ../tin.1:3436 +#: ../tin.1:3470 #, no-wrap msgid "SECURITY" msgstr "SECURITY" # type: Plain text -#: ../tin.1:3444 +#: ../tin.1:3478 msgid "" "When B is started in debug mode (''B<-D n>'') it will create world " "readable files in B<$TMPDIR> which may contain the users NNTP password in " @@ -9108,7 +9206,7 @@ msgstr "" "before starting tin in debug mode (e.g. B)." # type: SH -#: ../tin.1:3444 +#: ../tin.1:3478 #, no-wrap msgid "CONFORMING TO" msgstr "CONFORMING TO" @@ -9116,7 +9214,7 @@ msgstr "CONFORMING TO" # type: Plain text #. - RFC2045, RFC2047, RFC2980, RFC3977, RFC4643, RFC5322 #. RFC5536, RFC5537, RFC6048 or whatever -#: ../tin.1:3452 +#: ../tin.1:3486 msgid "" "B does conform to the Base Definitions volume of IEEE Std 1003.1-2001, " "Section 12, Utility Conventions (Utility Argument Syntax, Utility Syntax " @@ -9127,13 +9225,13 @@ msgstr "" "Guidelines)." # type: SH -#: ../tin.1:3452 +#: ../tin.1:3486 #, no-wrap msgid "NOTES" msgstr "NOTES" # type: Plain text -#: ../tin.1:3457 +#: ../tin.1:3491 msgid "" "Regular expression support is provided by the PCRE library package B" "(3), which is open source software, written by Philip Hazel, and copyright " @@ -9144,18 +9242,18 @@ msgstr "" "by the University of Cambridge, England." # type: Plain text -#: ../tin.1:3461 +#: ../tin.1:3495 msgid "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/" msgstr "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/" # type: SH -#: ../tin.1:3461 +#: ../tin.1:3495 #, no-wrap msgid "BUGS" msgstr "BUGS" # type: Plain text -#: ../tin.1:3469 +#: ../tin.1:3503 msgid "" "B NNTPd, B(1) (E= V1.0-pre5) and B (E= " "V1.1.91) can't handle pipelined GROUP commands. If you run into trouble with " @@ -9168,7 +9266,7 @@ msgstr "" "and recompile." # type: Plain text -#: ../tin.1:3478 +#: ../tin.1:3512 msgid "" "Before mailing a bug-report to Etin-bugs@tin.orgE please check if " "you are using the latest (stable) release, and if not, please upgrade first! " @@ -9185,13 +9283,13 @@ msgstr "" "request it." # type: SH -#: ../tin.1:3478 +#: ../tin.1:3512 #, no-wrap msgid "HISTORY" msgstr "HISTORY" # type: Plain text -#: ../tin.1:3490 +#: ../tin.1:3524 msgid "" "B is based on the B(1) newsreader that was developed by Rich " "Skrenta and posted to alt.sources in March 1991; its first version was " @@ -9208,168 +9306,168 @@ msgstr "" "overview see Ehttp://www.tin.org/history.htmlE." # type: SH -#: ../tin.1:3490 +#: ../tin.1:3524 #, no-wrap msgid "CREDITS" msgstr "CREDITS" # type: IP -#: ../tin.1:3492 +#: ../tin.1:3526 #, no-wrap msgid "Rich Skrenta" msgstr "Rich Skrenta" # type: Plain text -#: ../tin.1:3496 +#: ../tin.1:3530 msgid "author of B(1) v3.2 which this newsreader used as its base." msgstr "author of B(1) v3.2 which this newsreader used as its base." # type: IP -#: ../tin.1:3496 +#: ../tin.1:3530 #, no-wrap msgid "Bill Davidsen" msgstr "Bill Davidsen" # type: Plain text -#: ../tin.1:3498 +#: ../tin.1:3532 msgid "author of envarg.c environment variable reading routine." msgstr "author of envarg.c environment variable reading routine." # type: IP -#: ../tin.1:3498 +#: ../tin.1:3532 #, no-wrap msgid "Mike Gleason" msgstr "Mike Gleason" # type: Plain text -#: ../tin.1:3500 +#: ../tin.1:3534 msgid "author of sigfile.c random signature generation routines." msgstr "author of sigfile.c random signature generation routines." # type: IP -#: ../tin.1:3500 +#: ../tin.1:3534 #, no-wrap msgid "Markus Kuhn EMarkus.Kuhn@cl.cam.ac.ukE" msgstr "Markus Kuhn EMarkus.Kuhn@cl.cam.ac.ukE" # type: Plain text -#: ../tin.1:3502 +#: ../tin.1:3536 msgid "" "author of langinfo.c, charset.c and iso2asc.txt ISO-8859-1 documentation." msgstr "" "author of langinfo.c, charset.c and iso2asc.txt ISO-8859-1 documentation." # type: IP -#: ../tin.1:3502 +#: ../tin.1:3536 #, no-wrap msgid "Arnold Robbins" msgstr "Arnold Robbins" # type: Plain text -#: ../tin.1:3504 +#: ../tin.1:3538 msgid "author of strftime.c date formatting routine." msgstr "author of strftime.c date formatting routine." # type: IP -#: ../tin.1:3504 +#: ../tin.1:3538 #, no-wrap msgid "Rich Salz" msgstr "Rich Salz" # type: Plain text -#: ../tin.1:3506 +#: ../tin.1:3540 msgid "" "author of wildmat.c pattern matching and parsdate.y date parsing routines." msgstr "" "author of wildmat.c pattern matching and parsdate.y date parsing routines." # type: IP -#: ../tin.1:3506 +#: ../tin.1:3540 #, no-wrap msgid "Dave Taylor" msgstr "Dave Taylor" # type: Plain text -#: ../tin.1:3510 +#: ../tin.1:3544 msgid "author of curses.c from the B(1) mailreader." msgstr "author of curses.c from the B(1) mailreader." # type: IP -#: ../tin.1:3510 +#: ../tin.1:3544 #, no-wrap msgid "Chris Thewalt" msgstr "Chris Thewalt" # type: Plain text -#: ../tin.1:3514 +#: ../tin.1:3548 msgid "author of getline.c B(1) style editing routine." msgstr "author of getline.c B(1) style editing routine." # type: IP -#: ../tin.1:3514 +#: ../tin.1:3548 #, no-wrap msgid "Steven Madsen" msgstr "Steven Madsen" # type: Plain text -#: ../tin.1:3518 +#: ../tin.1:3552 msgid "for adding B(1) (Pretty Good Privacy) support." msgstr "for adding B(1) (Pretty Good Privacy) support." # type: IP -#: ../tin.1:3518 +#: ../tin.1:3552 #, no-wrap msgid "Philip Hazel Eph10@cam.ac.ukE" msgstr "Philip Hazel Eph10@cam.ac.ukE" # type: Plain text -#: ../tin.1:3522 +#: ../tin.1:3556 msgid "for B(3) (Perl-compatible regular expression library)." msgstr "for B(3) (Perl-compatible regular expression library)." # type: IP -#: ../tin.1:3522 +#: ../tin.1:3556 #, no-wrap msgid "Patrick Powell Epapowell@astart.comE" msgstr "Patrick Powell Epapowell@astart.comE" # type: Plain text -#: ../tin.1:3530 +#: ../tin.1:3564 msgid "for B(3) and B(3) fallbacks." msgstr "for B(3) and B(3) fallbacks." # type: SH -#: ../tin.1:3530 +#: ../tin.1:3564 #, no-wrap msgid "AUTHOR" msgstr "AUTHOR" # type: TP -#: ../tin.1:3531 +#: ../tin.1:3565 #, no-wrap msgid "Iain Lea Eiain@bricbrac.deE" msgstr "Iain Lea Eiain@bricbrac.deE" # type: SH -#: ../tin.1:3535 +#: ../tin.1:3569 #, no-wrap msgid "MAINTAINER" msgstr "MAINTAINER" # type: TP -#: ../tin.1:3536 +#: ../tin.1:3570 #, no-wrap msgid "Urs Janssen Eurs@tin.orgE" msgstr "Urs Janssen Eurs@tin.orgE" # type: SH -#: ../tin.1:3540 ../tin.5:2515 +#: ../tin.1:3574 ../tin.5:2527 #, no-wrap msgid "SEE ALSO" msgstr "SEE ALSO" # type: Plain text -#: ../tin.1:3589 +#: ../tin.1:3623 msgid "" "B(1), B(1), B(1), B(1), B(1), B(1), " "B(1), B(1), B(1), B(1), B(1), B(1), " @@ -9408,7 +9506,7 @@ msgstr "" "aka LF) line endings." # type: Plain text -#: ../tin.5:59 +#: ../tin.5:60 msgid "" "B(4) files as defined in B. The Mailcap files are read by " "B(1) to determine how to display non-text messages at the local site. " @@ -9425,7 +9523,7 @@ msgstr "" "\"\\e\"." # type: Plain text -#: ../tin.5:62 +#: ../tin.5:63 msgid "" "Each individual mailcap entry consists of a content-type specification, a " "command to execute, and (possibly) a set of optional \"flag\" values." @@ -9434,7 +9532,7 @@ msgstr "" "command to execute, and (possibly) a set of optional \"flag\" values." # type: Plain text -#: ../tin.5:67 +#: ../tin.5:68 msgid "" "The \"type\" field is simply any legal content type name. It is the string " "that will be matched against the ''Content-Type:'' header to decide if this " @@ -9447,7 +9545,7 @@ msgstr "" "type field may specify a subtype or a wildcard to match all subtypes." # type: Plain text -#: ../tin.5:73 +#: ../tin.5:74 msgid "" "The \"command\" field is any UNIX command and is used to specify the " "interpreter for the given type of message. It will be passed to the shell " @@ -9464,7 +9562,7 @@ msgstr "" #. the number of parts within the multipart object. %F will be replaced by a #. series of arguments, two for each part, giving first the content-type and #. then the name of the temporary file where the decoded part has been stored. -#: ../tin.5:90 +#: ../tin.5:91 msgid "" "Semicolons and backslashes within the command or any flag field must be " "quoted with backslashes. If the field contains \"%s\", those two characters " @@ -9487,19 +9585,19 @@ msgstr "" "two characters will be replaced by a single \"%\" character." # type: Plain text -#: ../tin.5:92 +#: ../tin.5:93 msgid "Besides the type and command field the following \"flags\" are defined:" msgstr "" "Besides the type and command field the following \"flags\" are defined:" # type: TP -#: ../tin.5:92 +#: ../tin.5:93 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:102 +#: ../tin.5:103 msgid "" "The \"compose\" field may be used to specify a program that can be used to " "compose a new body or body part in the given format. Its intended use is to " @@ -9520,13 +9618,13 @@ msgstr "" "the data." # type: TP -#: ../tin.5:102 +#: ../tin.5:103 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:112 +#: ../tin.5:113 msgid "" "The \"composetyped\" field is similar to the \"compose\" field, but is to be " "used when the composing program needs to specify the ''Content-Type:'' " @@ -9547,13 +9645,13 @@ msgstr "" "formats to produce output that includes the mail type information." # type: TP -#: ../tin.5:112 +#: ../tin.5:113 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:118 +#: ../tin.5:119 msgid "" "The \"edit\" field may be used to specify a program that can be used to edit " "a body or body part in the given format. In many cases, it may be identical " @@ -9566,13 +9664,13 @@ msgstr "" "dependent semantics for program execution." # type: TP -#: ../tin.5:118 +#: ../tin.5:119 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:123 +#: ../tin.5:124 msgid "" "The \"print\" field may be used to specify a program that can be used to " "print a message or body part in the given format. As with the view-command, " @@ -9583,13 +9681,13 @@ msgstr "" "the semantics of program execution are operating system dependent." # type: TP -#: ../tin.5:123 +#: ../tin.5:124 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:132 +#: ../tin.5:133 msgid "" "The \"test\" field may be used to test some external condition (e.g., the " "machine architecture, or the window system in use) to determine whether or " @@ -9608,13 +9706,13 @@ msgstr "" "since a test can call a program, it can already be arbitrarily complex." # type: TP -#: ../tin.5:132 +#: ../tin.5:133 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:144 +#: ../tin.5:145 msgid "" "The \"needsterminal\" field indicates that the view-command must be run on " "an interactive terminal. This is needed to inform window-oriented user " @@ -9639,13 +9737,13 @@ msgstr "" "not executed on either a real terminal or a terminal window." # type: TP -#: ../tin.5:144 +#: ../tin.5:145 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:151 +#: ../tin.5:152 msgid "" "The \"copiousoutput\" field indicates that the output from the view-command " "will be an extended stream of output, and is to be interpreted as advice to " @@ -9660,13 +9758,13 @@ msgstr "" "needsterminal and copiousoutput are both specified." # type: TP -#: ../tin.5:151 ../tin.5:1060 +#: ../tin.5:152 ../tin.5:1062 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:156 +#: ../tin.5:157 msgid "" "The \"description\" field simply provides a textual description, optionally " "quoted, that describes the type of data, to be used optionally by mail " @@ -9677,13 +9775,13 @@ msgstr "" "readers that wish to describe the data before offering to display it." # type: TP -#: ../tin.5:156 +#: ../tin.5:157 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:164 +#: ../tin.5:165 msgid "" "The \"textualnewlines\" field, if set to any non-zero value, indicates that " "this type of data is line-oriented and that, if encoded in base64, all " @@ -9700,13 +9798,13 @@ msgstr "" "oriented data that is a subtype of text." # type: TP -#: ../tin.5:164 +#: ../tin.5:165 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:169 +#: ../tin.5:170 msgid "" "The \"x11-bitmap\" field names a file, in X11 bitmap (xbm) format, which " "points to an appropriate icon to be used to visually denote the presence of " @@ -9717,13 +9815,13 @@ msgstr "" "this kind of data." # type: TP -#: ../tin.5:169 +#: ../tin.5:170 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:177 +#: ../tin.5:178 msgid "" "The \"nametemplate\" field gives a file name format, in which %s will be " "replaced by a short unique string to give the name of the temporary file to " @@ -9740,7 +9838,7 @@ msgstr "" "ending in \".gif\" by using \"nametemplate=%s.gif\"" # type: Plain text -#: ../tin.5:182 +#: ../tin.5:183 msgid "" "B(1) currently only respects the \"test\", \"description\", " "\"nametemplate\" and partly the \"needsterminal\" flags, all other flags are " @@ -9753,86 +9851,86 @@ msgstr "" "yet." # type: TP -#: ../tin.5:182 ../tin.5:265 ../tin.5:293 ../tin.5:383 ../tin.5:692 -#: ../tin.5:799 ../tin.5:1080 +#: ../tin.5:183 ../tin.5:266 ../tin.5:294 ../tin.5:384 ../tin.5:693 +#: ../tin.5:800 ../tin.5:1082 #, no-wrap msgid "Example:" msgstr "Example:" # type: Plain text -#: ../tin.5:187 +#: ../tin.5:188 #, no-wrap msgid "# mailcap file example\n" msgstr "# mailcap file example\n" # type: Plain text -#: ../tin.5:189 +#: ../tin.5:190 #, no-wrap msgid "image/*;\\e\n" msgstr "image/*;\\e\n" # type: Plain text -#: ../tin.5:192 +#: ../tin.5:193 #, no-wrap msgid "xv -8 -geometry +0 '%s';\\e\n" msgstr "xv -8 -geometry +0 '%s';\\e\n" # type: Plain text -#: ../tin.5:194 +#: ../tin.5:195 #, no-wrap msgid "description=%{name} %t-Image;\\e\n" msgstr "description=%{name} %t-Image;\\e\n" # type: Plain text -#: ../tin.5:196 +#: ../tin.5:197 #, no-wrap msgid "test=test \"$DISPLAY\" != \"\";\\e\n" msgstr "test=test \"$DISPLAY\" != \"\";\\e\n" # type: Plain text -#: ../tin.5:198 +#: ../tin.5:199 #, no-wrap msgid "nametemplate=%s.IMAGE\n" msgstr "nametemplate=%s.IMAGE\n" # type: Plain text -#: ../tin.5:201 +#: ../tin.5:202 #, no-wrap msgid "message/rfc822;\\e\n" msgstr "message/rfc822;\\e\n" # type: Plain text -#: ../tin.5:204 +#: ../tin.5:205 #, no-wrap msgid "${PAGER:-\"more\"} '%s';\\e\n" msgstr "${PAGER:-\"more\"} '%s';\\e\n" # type: Plain text -#: ../tin.5:206 +#: ../tin.5:207 #, no-wrap msgid "edit=${EDITOR:-\"vi\"} '%s';\\e\n" msgstr "edit=${EDITOR:-\"vi\"} '%s';\\e\n" # type: Plain text -#: ../tin.5:208 +#: ../tin.5:209 #, no-wrap msgid "compose=${EDITOR:-\"vi\"} '%s';\\e\n" msgstr "compose=${EDITOR:-\"vi\"} '%s';\\e\n" # type: Plain text -#: ../tin.5:210 +#: ../tin.5:211 #, no-wrap msgid "print=a2ps '%s';\\e\n" msgstr "print=a2ps '%s';\\e\n" # type: Plain text -#: ../tin.5:212 +#: ../tin.5:213 #, no-wrap msgid "needsterminal\n" msgstr "needsterminal\n" # type: Plain text -#: ../tin.5:225 +#: ../tin.5:226 msgid "" "default NNTP-server to read news from if not reading from the local spool. " "\\&'B<-g> I', $B have higher priority (in that order), " @@ -9843,62 +9941,62 @@ msgstr "" "the default server given at compile time has lower priority." # type: Plain text -#: ../tin.5:232 +#: ../tin.5:233 msgid "secret to be used for canlocks" msgstr "secret to be used for canlocks" # type: Plain text -#: ../tin.5:243 +#: ../tin.5:244 msgid "mime type / filename extension pairs" msgstr "mime type / filename extension pairs" # type: Plain text -#: ../tin.5:255 +#: ../tin.5:256 msgid "" "\"I I [I]\" pairs for NNTP servers that require " "authorization. If the password contains a space or a tab it must be enclosed " "in doublequotes (\"). Usernames must not be enclosed in doublequotes and " "thus can't contain spaces or tabs. Any line that starts with \"#\" is a " "comment. Blank lines are ignored. This file should be readable only for the " -"user as it contains the users uncrypted password for reading news!" +"user as it contains the user's uncrypted password for reading news!" msgstr "" "\"I I [I]\" pairs for NNTP servers that require " "authorisation. If the password contains a space or a tab it must be enclosed " "in doublequotes (\"). Usernames must not be enclosed in doublequotes and " "thus can't contain spaces or tabs. Any line that starts with \"#\" is a " "comment. Blank lines are ignored. This file should be readable only for the " -"user as it contains the users uncrypted password for reading news!" +"user as it contains the user's uncrypted password for reading news!" # type: TP -#: ../tin.5:255 ../tin.5:1071 +#: ../tin.5:256 ../tin.5:1073 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:258 ../tin.5:1074 +#: ../tin.5:259 ../tin.5:1076 msgid "full qualified domain name of the newsserver." msgstr "full qualified domain name of the newsserver." # type: TP -#: ../tin.5:258 +#: ../tin.5:259 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:261 -msgid "users uncrypted password for reading news." -msgstr "users uncrypted password for reading news." +#: ../tin.5:262 +msgid "user's uncrypted password for reading news." +msgstr "user's uncrypted password for reading news." # type: TP -#: ../tin.5:261 +#: ../tin.5:262 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:265 +#: ../tin.5:266 msgid "" "username on the newsserver if it differs from the local login. This field is " "optional." @@ -9907,62 +10005,62 @@ msgstr "" "optional." # type: Plain text -#: ../tin.5:269 +#: ../tin.5:270 msgid "# sample .newsauth file" msgstr "# sample .newsauth file" # type: Plain text -#: ../tin.5:271 +#: ../tin.5:272 msgid "news.example.org secret" msgstr "news.example.org secret" # type: Plain text -#: ../tin.5:273 +#: ../tin.5:274 msgid "news.example.net arcane guest" msgstr "news.example.net arcane guest" # type: Plain text -#: ../tin.5:275 +#: ../tin.5:276 msgid "news.example.com \"top secret\" james.bond@example.com" msgstr "news.example.com \"top secret\" james.bond@example.com" # type: Plain text -#: ../tin.5:283 +#: ../tin.5:284 msgid "" "\"II [I
[,I
| -I
]...]\" lines." msgstr "" "\"II [I
[,I
| -I
]...]\" lines." # type: TP -#: ../tin.5:283 +#: ../tin.5:284 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:286 +#: ../tin.5:287 msgid "the name of the newsgroup." msgstr "the name of the newsgroup." # type: TP -#: ../tin.5:286 +#: ../tin.5:287 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:289 +#: ../tin.5:290 msgid "a flag indicating if the group is subscribed ':' or not '!'." msgstr "a flag indicating if the group is subscribed ':' or not '!'." # type: TP -#: ../tin.5:289 +#: ../tin.5:290 #, no-wrap msgid "B
" msgstr "B
" # type: Plain text -#: ../tin.5:293 +#: ../tin.5:294 msgid "" "range of already read articles from that group; numbers separated by commas " "with sequential numbers collapsed with hyphens." @@ -9971,62 +10069,62 @@ msgstr "" "with sequential numbers collapsed with hyphens." # type: Plain text -#: ../tin.5:297 +#: ../tin.5:298 msgid "# sample .newsrc file" msgstr "# sample .newsrc file" # type: Plain text -#: ../tin.5:299 +#: ../tin.5:300 msgid "news.software.b! 1-666,669" msgstr "news.software.b! 1-666,669" # type: Plain text -#: ../tin.5:301 +#: ../tin.5:302 msgid "news.software.nntp: 1-13245,13247,13249" msgstr "news.software.nntp: 1-13245,13247,13249" # type: Plain text -#: ../tin.5:303 +#: ../tin.5:304 msgid "news.software.readers: 1-19567,19571-19597" msgstr "news.software.readers: 1-19567,19571-19597" # type: Plain text -#: ../tin.5:313 +#: ../tin.5:314 msgid "backup of I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc>" msgstr "backup of I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc>" # type: Plain text -#: ../tin.5:322 +#: ../tin.5:323 msgid "signature" msgstr "signature" # type: Plain text -#: ../tin.5:329 +#: ../tin.5:330 msgid "fixed part of a randomly generated signature" msgstr "fixed part of a randomly generated signature" # type: Plain text -#: ../tin.5:336 +#: ../tin.5:337 msgid "history of last used strings" msgstr "history of last used strings" # type: Plain text -#: ../tin.5:343 +#: ../tin.5:344 msgid "mailgroups index files" msgstr "mailgroups index files" # type: Plain text -#: ../tin.5:352 +#: ../tin.5:353 msgid "newsgroups index files" msgstr "newsgroups index files" # type: Plain text -#: ../tin.5:359 +#: ../tin.5:360 msgid "saved newsgroups index files" msgstr "saved newsgroups index files" # type: Plain text -#: ../tin.5:369 +#: ../tin.5:370 msgid "" "active file (\"I I I I\" " "quadruples) of user's mailgroups (requires B(1) to be build with mh-" @@ -10037,26 +10135,26 @@ msgstr "" "mail-handling support)." # type: TP -#: ../tin.5:369 +#: ../tin.5:370 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:372 +#: ../tin.5:373 msgid "" "must be the pathname of the mailbox relative to field #4 with / changed to ." msgstr "" "must be the pathname of the mailbox relative to field #4 with / changed to ." # type: TP -#: ../tin.5:372 +#: ../tin.5:373 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:376 +#: ../tin.5:377 msgid "" "just put a large number here, something higher than the highest message in " "the mailbox" @@ -10065,24 +10163,24 @@ msgstr "" "the mailbox" # type: TP -#: ../tin.5:376 +#: ../tin.5:377 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:379 +#: ../tin.5:380 msgid "put 0 here" msgstr "put 0 here" # type: TP -#: ../tin.5:379 +#: ../tin.5:380 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:383 +#: ../tin.5:384 msgid "" "path of mail spool directory. This must be the full pathname to the root of " "the mail folder area." @@ -10091,17 +10189,17 @@ msgstr "" "the mail folder area." # type: Plain text -#: ../tin.5:387 +#: ../tin.5:388 msgid "Mail.inbox 12345 00000 /home/foo" msgstr "Mail.inbox 12345 00000 /home/foo" # type: Plain text -#: ../tin.5:389 +#: ../tin.5:390 msgid "Mail.outbox 23456 00000 /home/foo" msgstr "Mail.outbox 23456 00000 /home/foo" # type: Plain text -#: ../tin.5:393 +#: ../tin.5:394 msgid "" "This allows access to the 'inbox' and 'outbox' folders of user foo. They " "are accessed via /home/foo/Mail/inbox and /home/foo/Mail/outbox" @@ -10110,16 +10208,16 @@ msgstr "" "are accessed via /home/foo/Mail/inbox and /home/foo/Mail/outbox" # type: Plain text -#: ../tin.5:400 +#: ../tin.5:401 msgid "active file of user's saved newsgroups, used by B." msgstr "active file of user's saved newsgroups, used by B." # type: Plain text -#: ../tin.5:422 +#: ../tin.5:423 msgid "" "The group attributes files may be used to override some global settings from " "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/tinrc> on a per group basis. Order is " -"important as last match counts; this allows to refine attributes for " +"important as last match counts; this allows one to refine attributes for " "narrowed scopes. Note that the IgrouplistE> line has to be " "specified before the attributes are specified for that list and each " "attribute can only be set once per scope section. All attributes are set to " @@ -10130,7 +10228,7 @@ msgid "" msgstr "" "The group attributes files may be used to override some global settings from " "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/tinrc> on a per group basis. Order is " -"important as last match counts; this allows to refine attributes for " +"important as last match counts; this allows one to refine attributes for " "narrowed scopes. Note that the IgrouplistE> line has to be " "specified before the attributes are specified for that list and each " "attribute can only be set once per scope section. All attributes are set to " @@ -10140,13 +10238,13 @@ msgstr "" "attributes are available:" # type: TP -#: ../tin.5:422 +#: ../tin.5:423 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:428 +#: ../tin.5:429 msgid "" "This changes the list of groups to which the attributes that follow will be " "applied. See the section NEWSGROUP LISTS & WILDCARDS in B(1) for the " @@ -10157,68 +10255,68 @@ msgstr "" "types of pattern that can be used here." # type: TP -#: ../tin.5:428 ../tin.5:1183 +#: ../tin.5:429 ../tin.5:1185 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:431 ../tin.5:434 ../tin.5:437 ../tin.5:440 ../tin.5:443 -#: ../tin.5:446 ../tin.5:449 ../tin.5:462 ../tin.5:472 ../tin.5:485 -#: ../tin.5:488 ../tin.5:491 ../tin.5:494 ../tin.5:501 ../tin.5:504 -#: ../tin.5:531 ../tin.5:534 ../tin.5:537 ../tin.5:547 ../tin.5:550 -#: ../tin.5:553 ../tin.5:556 ../tin.5:559 ../tin.5:562 ../tin.5:565 -#: ../tin.5:568 ../tin.5:571 ../tin.5:574 ../tin.5:580 ../tin.5:583 -#: ../tin.5:586 ../tin.5:589 ../tin.5:592 ../tin.5:595 ../tin.5:598 -#: ../tin.5:604 ../tin.5:607 ../tin.5:610 ../tin.5:613 ../tin.5:616 -#: ../tin.5:619 ../tin.5:622 ../tin.5:625 ../tin.5:628 ../tin.5:682 +#: ../tin.5:432 ../tin.5:435 ../tin.5:438 ../tin.5:441 ../tin.5:444 +#: ../tin.5:447 ../tin.5:450 ../tin.5:463 ../tin.5:473 ../tin.5:486 +#: ../tin.5:489 ../tin.5:492 ../tin.5:495 ../tin.5:502 ../tin.5:505 +#: ../tin.5:532 ../tin.5:535 ../tin.5:538 ../tin.5:548 ../tin.5:551 +#: ../tin.5:554 ../tin.5:557 ../tin.5:560 ../tin.5:563 ../tin.5:566 +#: ../tin.5:569 ../tin.5:572 ../tin.5:575 ../tin.5:581 ../tin.5:584 +#: ../tin.5:587 ../tin.5:590 ../tin.5:593 ../tin.5:596 ../tin.5:599 +#: ../tin.5:605 ../tin.5:608 ../tin.5:611 ../tin.5:614 ../tin.5:617 +#: ../tin.5:620 ../tin.5:623 ../tin.5:626 ../tin.5:629 ../tin.5:683 msgid "Identical to the tinrc variable of the same name" msgstr "Identical to the tinrc variable of the same name" # type: TP -#: ../tin.5:431 ../tin.5:1187 +#: ../tin.5:432 ../tin.5:1189 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:434 ../tin.5:1190 +#: ../tin.5:435 ../tin.5:1192 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:437 +#: ../tin.5:438 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:440 ../tin.5:1233 +#: ../tin.5:441 ../tin.5:1235 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:443 ../tin.5:1237 +#: ../tin.5:444 ../tin.5:1239 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:446 ../tin.5:1244 +#: ../tin.5:447 ../tin.5:1246 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:449 +#: ../tin.5:450 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:453 +#: ../tin.5:454 msgid "" "Automatically perform the B ('B') command after " "entering the group." @@ -10227,13 +10325,13 @@ msgstr "" "entering the group." # type: TP -#: ../tin.5:453 ../tin.5:1250 +#: ../tin.5:454 ../tin.5:1252 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:459 +#: ../tin.5:460 msgid "" "Can be used to override the global setting in tinrc on a per group basis. " "For more information read section AUTOMATIC MAILING AND SAVING NEW NEWS in " @@ -10244,19 +10342,19 @@ msgstr "" "B(1)." # type: TP -#: ../tin.5:459 ../tin.5:1364 +#: ../tin.5:460 ../tin.5:1366 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:462 +#: ../tin.5:463 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:469 +#: ../tin.5:470 msgid "" "If this is set to ON, then saved article files that have been post-processed " "will be automatically deleted, otherwise the user will be asked whether to " @@ -10269,19 +10367,19 @@ msgstr "" "using B ('B') will suppress prompting." # type: TP -#: ../tin.5:469 ../tin.5:1479 +#: ../tin.5:470 ../tin.5:1481 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:472 +#: ../tin.5:473 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:476 +#: ../tin.5:477 msgid "" "Mailbox to save sent mails. The format of the mailbox is controlled via the " "tinrc B variable." @@ -10290,59 +10388,59 @@ msgstr "" "tinrc B variable." # type: TP -#: ../tin.5:476 +#: ../tin.5:477 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:479 +#: ../tin.5:480 msgid "Set ''Followup-To:'' header to the specified group(s)." msgstr "Set ''Followup-To:'' header to the specified group(s)." # type: TP -#: ../tin.5:479 ../tin.5:762 +#: ../tin.5:480 ../tin.5:763 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:482 +#: ../tin.5:483 msgid "Identical to the tinrc variable B" msgstr "Identical to the tinrc variable B" # type: TP -#: ../tin.5:482 ../tin.5:1503 +#: ../tin.5:483 ../tin.5:1505 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:485 ../tin.5:1570 +#: ../tin.5:486 ../tin.5:1572 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:488 ../tin.5:1582 ../tin.5:2294 +#: ../tin.5:489 ../tin.5:1584 ../tin.5:2306 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:491 ../tin.5:1599 +#: ../tin.5:492 ../tin.5:1601 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:494 +#: ../tin.5:495 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:498 +#: ../tin.5:499 msgid "" "Used when a group is a mailing list. All responses to the group will be " "directed to this email address instead" @@ -10351,25 +10449,25 @@ msgstr "" "directed to this email address instead" # type: TP -#: ../tin.5:498 ../tin.5:1631 +#: ../tin.5:499 ../tin.5:1639 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:501 ../tin.5:1628 +#: ../tin.5:502 ../tin.5:1636 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:504 +#: ../tin.5:505 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:521 +#: ../tin.5:522 msgid "" "Determines whether usenet articles are forwarded as attachment or inline. " "When set to OFF, the forwarded article will be included in the body of the " @@ -10402,13 +10500,13 @@ msgstr "" "B has to be set to 0 (which is the default)." # type: TP -#: ../tin.5:521 +#: ../tin.5:522 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:528 +#: ../tin.5:529 msgid "" "A comma separated list of MIME major/minor Content-Types that will be saved " "when using the view/save and save/autosave features. A single * can be used " @@ -10421,31 +10519,31 @@ msgstr "" "entry will negate it, eg: image/*,!image/bmp,!text/html. Default is */*" # type: TP -#: ../tin.5:528 ../tin.5:1710 +#: ../tin.5:529 ../tin.5:1718 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:531 ../tin.5:1717 +#: ../tin.5:532 ../tin.5:1725 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:534 ../tin.5:1726 +#: ../tin.5:535 ../tin.5:1734 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:537 ../tin.5:2267 +#: ../tin.5:538 ../tin.5:2279 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:544 +#: ../tin.5:545 msgid "" "This can be used to set the article header field ''Organization:''. It " "overrides the setting (if any) of organization in I " @@ -10458,187 +10556,187 @@ msgstr "" "newsserver might still overwrite the \\&''Organization:'' header." # type: TP -#: ../tin.5:544 ../tin.5:1751 +#: ../tin.5:545 ../tin.5:1759 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:547 ../tin.5:1755 +#: ../tin.5:548 ../tin.5:1763 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:550 ../tin.5:1766 ../tin.5:2291 +#: ../tin.5:551 ../tin.5:1774 ../tin.5:2303 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:553 ../tin.5:1778 +#: ../tin.5:554 ../tin.5:1786 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:556 ../tin.5:1771 +#: ../tin.5:557 ../tin.5:1779 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:559 ../tin.5:1801 +#: ../tin.5:560 ../tin.5:1809 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:562 ../tin.5:1815 +#: ../tin.5:563 ../tin.5:1823 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:565 ../tin.5:1819 +#: ../tin.5:566 ../tin.5:1827 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:568 ../tin.5:1823 +#: ../tin.5:569 ../tin.5:1831 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:571 ../tin.5:1883 +#: ../tin.5:572 ../tin.5:1891 #, no-wrap msgid "B" msgstr "B" # type: TP #. TODO: document option -#: ../tin.5:574 +#: ../tin.5:575 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:577 ../tin.5:1911 +#: ../tin.5:578 ../tin.5:1919 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:580 ../tin.5:1937 +#: ../tin.5:581 ../tin.5:1945 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:583 ../tin.5:1955 +#: ../tin.5:584 ../tin.5:1963 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:586 ../tin.5:1963 +#: ../tin.5:587 ../tin.5:1971 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:589 ../tin.5:1966 +#: ../tin.5:590 ../tin.5:1974 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:592 ../tin.5:1969 +#: ../tin.5:593 ../tin.5:1977 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:595 ../tin.5:1980 +#: ../tin.5:596 ../tin.5:1988 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:598 ../tin.5:1990 +#: ../tin.5:599 ../tin.5:1998 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:601 +#: ../tin.5:602 msgid "Identical to the tinrc variable B" msgstr "Identical to the tinrc variable B" # type: TP -#: ../tin.5:601 ../tin.5:2019 +#: ../tin.5:602 ../tin.5:2027 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:604 ../tin.5:2048 +#: ../tin.5:605 ../tin.5:2056 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:607 ../tin.5:2076 +#: ../tin.5:608 ../tin.5:2084 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:610 ../tin.5:2081 +#: ../tin.5:611 ../tin.5:2089 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:613 ../tin.5:2096 +#: ../tin.5:614 ../tin.5:2104 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:616 ../tin.5:2091 +#: ../tin.5:617 ../tin.5:2099 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:619 ../tin.5:2120 +#: ../tin.5:620 ../tin.5:2128 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:622 ../tin.5:2196 +#: ../tin.5:623 ../tin.5:2208 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:625 ../tin.5:2243 +#: ../tin.5:626 ../tin.5:2255 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:628 +#: ../tin.5:629 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:633 +#: ../tin.5:634 msgid "" "A piece of text that will be added at the start of a message body. If this " "string starts with a / or ~ then it is assumed to be the name of a file " @@ -10649,24 +10747,24 @@ msgstr "" "containing the text to insert." # type: TP -#: ../tin.5:633 +#: ../tin.5:634 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:636 +#: ../tin.5:637 msgid "Insert ''X-Comment-To:'' header, this is only useful in FIDO groups." msgstr "Insert ''X-Comment-To:'' header, this is only useful in FIDO groups." # type: TP -#: ../tin.5:636 +#: ../tin.5:637 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:644 +#: ../tin.5:645 msgid "" "A string including header-name and the contents of the header that will be " "automatically added when posting. If the string starts with a / or ~ then it " @@ -10683,13 +10781,13 @@ msgstr "" "content." # type: TP -#: ../tin.5:644 +#: ../tin.5:645 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:650 +#: ../tin.5:651 msgid "" "A comma-separated list of newsgroup patterns (wildmat-style) to which groups " "the filter rule added by B will be applied. If unset the " @@ -10700,46 +10798,46 @@ msgstr "" "default from the tinrc variable B will be used." # type: TP -#: ../tin.5:650 +#: ../tin.5:651 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:653 +#: ../tin.5:654 msgid "Identical to the tinrc variable B" msgstr "Identical to the tinrc variable B" # type: TP -#: ../tin.5:653 +#: ../tin.5:654 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:656 +#: ../tin.5:657 msgid "Identical to the tinrc variable B" msgstr "Identical to the tinrc variable B" # type: TP -#: ../tin.5:656 +#: ../tin.5:657 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:659 +#: ../tin.5:660 msgid "Identical to the tinrc variable B" msgstr "Identical to the tinrc variable B" # type: TP -#: ../tin.5:659 +#: ../tin.5:660 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:665 +#: ../tin.5:666 msgid "" "A comma-separated list of newsgroup patterns (wildmat-style) to which groups " "the filter rule added by B will be applied. If unset the " @@ -10750,46 +10848,46 @@ msgstr "" "default from the tinrc variable B will be used." # type: TP -#: ../tin.5:665 +#: ../tin.5:666 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:668 +#: ../tin.5:669 msgid "Identical to the tinrc variable B" msgstr "Identical to the tinrc variable B" # type: TP -#: ../tin.5:668 +#: ../tin.5:669 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:671 +#: ../tin.5:672 msgid "Identical to the tinrc variable B" msgstr "Identical to the tinrc variable B" # type: TP -#: ../tin.5:671 +#: ../tin.5:672 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:674 +#: ../tin.5:675 msgid "Identical to the tinrc variable B" msgstr "Identical to the tinrc variable B" # type: TP -#: ../tin.5:674 +#: ../tin.5:675 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:679 +#: ../tin.5:680 msgid "" "Path and options for B(1)-like spell-checker, e.g. \"aspell --" "mode=email --dont-backup check\"" @@ -10798,19 +10896,19 @@ msgstr "" "mode=email --dont-backup check\"" # type: TP -#: ../tin.5:679 ../tin.5:1664 +#: ../tin.5:680 ../tin.5:1672 #, no-wrap msgid "B" msgstr "B" # type: TP -#: ../tin.5:682 +#: ../tin.5:683 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:691 +#: ../tin.5:692 msgid "" "Assume (broken) articles without MIME charset declaration have this charset " "- default is US-ASCII. This attribute works only on systems with working " @@ -10823,7 +10921,7 @@ msgstr "" "strict-charset." # type: Plain text -#: ../tin.5:701 +#: ../tin.5:702 #, no-wrap msgid "" "# include extra headers\n" @@ -10839,7 +10937,7 @@ msgstr "" "undeclared_charset=ISO-8859-1\n" # type: Plain text -#: ../tin.5:705 +#: ../tin.5:706 #, no-wrap msgid "" "# in *sources* set post process type to shar only\n" @@ -10851,7 +10949,7 @@ msgstr "" "post_process_type=1\n" # type: Plain text -#: ../tin.5:712 +#: ../tin.5:713 #, no-wrap msgid "" "# in *binaries* turn on full post processing,\n" @@ -10869,7 +10967,7 @@ msgstr "" "followup_to=poster\n" # type: Plain text -#: ../tin.5:718 +#: ../tin.5:719 #, no-wrap msgid "" "# in fido.* newsgroups change quote_chars\n" @@ -10885,7 +10983,7 @@ msgstr "" "x_comment_to=ON\n" # type: Plain text -#: ../tin.5:724 +#: ../tin.5:725 #, no-wrap msgid "" "# in *.test newsgroups, don't append signature\n" @@ -10901,7 +10999,7 @@ msgstr "" "x_headers=Subject: test - ignore - no reply\n" # type: Plain text -#: ../tin.5:728 +#: ../tin.5:729 #, no-wrap msgid "" "# assume ISO-2022-JP-2 as charset\n" @@ -10913,7 +11011,7 @@ msgstr "" "undeclared_charset=ISO-2022-JP-2\n" # type: Plain text -#: ../tin.5:740 +#: ../tin.5:741 msgid "" "The filter file is used to assign scores to certain articles. Based on the " "score an article can be filtered out (hidden) or marked hot. Empty lines or " @@ -10924,13 +11022,13 @@ msgstr "" "lines beginning with a '#' are ignored." # type: TP -#: ../tin.5:740 +#: ../tin.5:741 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:749 +#: ../tin.5:750 msgid "" "Every entry (rule) in the filter file might get a comment. Multiple lines " "are allowed (but only for comments yet). Every line must start with the " @@ -10947,13 +11045,13 @@ msgstr "" "ignored and your comments will get lost on the next write of the file." # type: TP -#: ../tin.5:749 +#: ../tin.5:750 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:753 +#: ../tin.5:754 msgid "" "A comma-separated list of newsgroup patterns (wildmat-style) to which groups " "the filter rule will be applied. This line is mandatory!" @@ -10962,24 +11060,24 @@ msgstr "" "the filter rule will be applied. This line is mandatory!" # type: TP -#: ../tin.5:753 +#: ../tin.5:754 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:756 +#: ../tin.5:757 msgid "0=case-sensitive, 1=case-insensitive" msgstr "0=case-sensitive, 1=case-insensitive" # type: TP -#: ../tin.5:756 +#: ../tin.5:757 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:759 +#: ../tin.5:760 msgid "" "Score value of the rule; can also be one of the magic words \"kill\" or \"hot" "\"." @@ -10988,18 +11086,18 @@ msgstr "" "\"." # type: TP -#: ../tin.5:759 +#: ../tin.5:760 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:762 +#: ../tin.5:763 msgid "Match against ''Subject:''" msgstr "Match against ''Subject:''" # type: Plain text -#: ../tin.5:770 +#: ../tin.5:771 msgid "" "Match against ''From:''. B(1) converts the contents of the ''From:'' " "header to an old style e-mail address, e.g. ''some@body.example (John Doe)'' " @@ -11012,57 +11110,57 @@ msgstr "" "the patterns in the filter rule." # type: TP -#: ../tin.5:770 +#: ../tin.5:771 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:773 +#: ../tin.5:774 msgid "Match against ''Message-ID:'' and full ''References:''" msgstr "Match against ''Message-ID:'' and full ''References:''" # type: TP -#: ../tin.5:773 +#: ../tin.5:774 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:776 +#: ../tin.5:777 msgid "Match against ''Message-ID:'' and last ''References:'' entry only" msgstr "Match against ''Message-ID:'' and last ''References:'' entry only" # type: TP -#: ../tin.5:776 +#: ../tin.5:777 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:779 +#: ../tin.5:780 msgid "Match against ''Message-ID:''" msgstr "Match against ''Message-ID:''" # type: TP -#: ../tin.5:779 +#: ../tin.5:780 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:782 +#: ../tin.5:783 msgid "Match against ''References:''" msgstr "Match against ''References:''" # type: TP -#: ../tin.5:782 +#: ../tin.5:783 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:785 +#: ../tin.5:786 msgid "" "Match against ''Lines:'', Enum matches less than, Enum matches more " "than." @@ -11072,24 +11170,24 @@ msgstr "" # type: TP #. TODO: document option in detail -#: ../tin.5:785 +#: ../tin.5:786 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:789 +#: ../tin.5:790 msgid "Match against ''From:'' address parser return codes." msgstr "Match against ''From:'' address parser return codes." # type: TP -#: ../tin.5:789 +#: ../tin.5:790 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../tin.5:795 +#: ../tin.5:796 msgid "" "Match against ''Xref:'' line. Before any matching is done the line is turned " "into the same format ''Newsgroups:'' has that is it is turned into a comma " @@ -11102,18 +11200,18 @@ msgstr "" "counter) removed." # type: TP -#: ../tin.5:795 ../tin.5:2434 +#: ../tin.5:796 ../tin.5:2446 #, no-wrap msgid "B