[pkg-lynx-commits] [lynx-cur] 01/03: Imported Upstream version 2.8.9dev7
Axel Beckert
abe at deuxchevaux.org
Sun Dec 20 22:55:07 UTC 2015
This is an automated email from the git hooks/post-receive script.
abe pushed a commit to branch master
in repository lynx-cur.
commit a7ec6c825a9e474e2095260a6e37a5b0a6e6ef97
Author: Axel Beckert <abe at deuxchevaux.org>
Date: Sun Dec 20 17:34:56 2015 +0100
Imported Upstream version 2.8.9dev7
---
ABOUT-NLS | 7 +-
CHANGES | 64 +-
COPYHEADER | 8 +-
INSTALLATION | 5 +-
LYMessages_en.h | 30 +-
PACKAGE/debian/changelog | 4 +-
PACKAGE/debian/control | 2 +-
PACKAGE/debian/copyright | 14 +-
PACKAGE/debian/watch | 2 +-
PACKAGE/lynx.nsi | 8 +-
PACKAGE/lynx.spec | 6 +-
PACKAGE/version.iss | 4 +-
README | 12 +-
WWW/Library/Implementation/HTGopher.c | 14 +-
WWW/Library/Implementation/HTMIME.c | 4 +-
WWW/Library/Implementation/HTTP.c | 66 +-
WWW/Library/Implementation/dtd_util.c | 14 +-
WWW/Library/Implementation/hdr_HTMLDTD.h | 23 +-
WWW/Library/Implementation/makefile.in | 23 +-
WWW/Library/Implementation/src0_HTMLDTD.h | 50 +-
WWW/Library/Implementation/src0_HTMLDTD.txt | 477 +-
WWW/Library/Implementation/src1_HTMLDTD.h | 50 +-
WWW/Library/Implementation/src1_HTMLDTD.txt | 477 +-
WWW/Library/Implementation/tidy_tls.h | 12 +-
aclocal.m4 | 187 +-
config.guess | 14 +-
config.hin | 3 +-
config.sub | 11 +-
configure | 7449 ++++++++++++++-------------
configure.in | 9 +-
docs/OS-390.announce | 2 +-
lynx.cfg | 45 +-
lynx.man | 17 +-
lynx_help/Lynx_users_guide.html | 27 +-
lynx_help/about_lynx.html | 4 +-
lynx_help/lynx-dev.html | 15 +-
lynx_help/lynx_help_main.html | 12 +-
makefile.in | 6 +-
po/ca.po | 3165 ++++++------
po/et.po | 2 +-
po/lynx.pot | 1563 +++---
po/makefile.inn | 8 +-
po/sl.po | 4 +-
po/sv.po | 2422 ++++-----
samples/lynx-demo.cfg | 2 +-
samples/lynx_bookmarks.htm | 4 +-
scripts/cfg_edit.sh | 2 +-
src/GridText.c | 3 +-
src/HTML.c | 18 +-
src/LYCookie.c | 7 +-
src/LYEditmap.c | 1076 ++--
src/LYForms.c | 151 +-
src/LYGlobalDefs.h | 13 +-
src/LYHistory.c | 4 +-
src/LYIcon.rc | 12 +-
src/LYKeymap.c | 274 +-
src/LYKeymap.h | 7 +-
src/LYMain.c | 70 +-
src/LYOptions.c | 53 +-
src/LYReadCFG.c | 5 +-
src/LYSession.c | 4 +-
src/LYStrings.c | 72 +-
src/LYStrings.h | 3 +-
src/LYrcFile.c | 30 +-
src/LYrcFile.h | 6 +-
src/UCdomap.c | 9 +-
src/chrtrans/makefile.in | 4 +-
src/tidy_tls.c | 187 +-
userdefs.h | 16 +-
69 files changed, 9632 insertions(+), 8741 deletions(-)
diff --git a/ABOUT-NLS b/ABOUT-NLS
index 92e0eef..36bc78d 100644
--- a/ABOUT-NLS
+++ b/ABOUT-NLS
@@ -270,9 +270,10 @@ Using `gettext' in new packages
If you are writing a freely available program and want to
internationalize it you are welcome to use GNU `gettext' in your
-package. Of course the GNU Public License applies to your sources from
-then if you include `gettext' directly in your distribution on but
-since you are writing free software anyway this is no restriction.
+package. Of course the GNU General Public License applies to your
+sources from then if you include `gettext' directly in your distribution
+on but since you are writing free software anyway this is no
+restriction.
Once the sources are change appropriately and the setup can handle to
use of `gettext' the only thing missing are the translations. The Free
diff --git a/CHANGES b/CHANGES
index 033ffce..59b9aa7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,64 @@
--- $LynxId: CHANGES,v 1.797 2015/05/07 00:18:31 tom Exp $
+-- $LynxId: CHANGES,v 1.834 2015/12/18 10:24:31 tom Exp $
===============================================================================
Changes since Lynx 2.8 release
===============================================================================
+2015-12-18 (2.8.9dev.7)
+* make the HTTP version configurable, defaulting to "1.0" (HTTP/1.0) as
+ HTTP_PROTOCOL, and make it changeable in the options menu -TD
+* switch HTTP version to 1.1, adding an explicit "close" to work around
+ the pitfall of persistent connections. This is to work around a selective
+ reading of RFC 2068 by duckduckgo.com - see
+ http://lists.nongnu.org/archive/html/lynx-dev/2015-12/index.html
+ -Axel Beckert
+* fix a potential null dereference in tidy_tls.c reported by Coverity -TD
+* extend advanced mode by showing field names in forms in the status line
+ (suggested by TG) -TD
+* fix some typos found by lintian -Axel Beckert
+* correct buffer size in pretty_html() function of LYKeymap.c -TG
+* add support for some HTML5 elements -Kihara Hideto
+ Using this change, you can jump to <section id="speakers">.
+ (The addition in src{0,1}_HTMLDTD.txt is copied from DIV.)
+ <section>, <article>, <main>, <aside>, <header>, <footer>, <nav>, <figure>
+* improve configure check for extended curses functions, needed for compiling
+ with ncursesw on OSX, in particular when configuring with ncurses6 (report
+ by Tom Wyant) -TD
+* set SSL_MODE_AUTO_RETRY in OpenSSL configuration, completing work needed for
+ Debian #707059 -TD
+* correct description used for "K" vs "k" key binding in manpage -TD
+* adopt some of the patches from Debian lynx package:
+ + add Delete key usage to manpage (patch by Denis Briand, Debian #74358)
+ + add $(LDFLAGS) when building makeuctb (patch by Atsuhito Kohda).
+ + add NO_BUILDSTAMP symbol to appease
+ https://wiki.debian.org/ReproducibleBuilds/TimestampsFromCPPMacros
+ + add -n option to gzip when making gzip'd helpfiles (patch by Andreas
+ Metzler).
+ + add support for client certificates (patch by Simon Kainz, Debian #797901).
+* use POSIX locale when sorting entries in cfg_defs.h (patch by Reiner Hermann,
+ Debian #792770).
+* move homepage for Lynx from
+ http://lynx.isc.org
+ to
+ http://lynx.invisible-island.net
+ because ISC has ended support -TD
+* change "GNU Public License" to "GNU General Public License" for consistency
+ (report by Axel Beckert) -TD
+* free a use-after-free in scan_cookie_sublist (Redhat #1120925) -TG
+* updates for configure macros from ncurses and xterm -TD
+* fix for gnutls logic to support rehandshake on negotiation for optional
+ client certificate, e.g., for https://contributors.debian.org (patch by
+ Simon Kainz, Debian #797059).
+* update ca.po, sv.po, et.po from
+ http://translationproject.org/latest/lynx
+* use gnutls_set_default_priority() to simplify algorithm priorities in the
+ gnutls configuration as well as track occassional changes in that library
+ (patch by Andreas Metzler, Debian #789189, Debian #784430).
+* correct logic in LYsetRcValue() from 2.8.8dev.13, which would free the wrong
+ pointer if the input had leading blanks (patch by Ruda Moura).
+* fix CF_CHECK_SIZEOF autoconf macro to work when its working variables have
+ been preset to an empty value (report by Andrew Arensburger) -TD
+* update config.guess (2015-10-21), config.sub (2015-08-20)
+
2015-05-06 (2.8.9dev.6)
* add a note about OCSP to url-support documentation (Debian #745835) -TD
* change defaults for SSL prompts when a problem is detected to "no" (Debian
@@ -16,7 +72,7 @@ Changes since Lynx 2.8 release
* modify configure script to accept a release-number for the ncurses/ncursesw
values of the "--with-screen" option, e.g., "--with-screen=ncursesw6" -TD
* cosmetic fixes for autoconf macros to avoid vi-workaround -TD
-* da.po, et.po, fr.po, nl.po, vi.po from
+* update da.po, et.po, fr.po, nl.po, vi.po from
http://translationproject.org/latest/lynx
* regenerated lynx.pot, sent to translation project -TD
* update config.guess (2015-03-04), config.sub (2015-03-08)
@@ -138,7 +194,7 @@ Changes since Lynx 2.8 release
2014-02-04 (2.8.8pre.4)
* modify the LOCALE_CHARSET feature to provide a default value for the
- ASSUMED_CHARSET feature aka "display-charset" (Debian #737416) -TD
+ ASSUME_CHARSET feature aka "display-charset" (Debian #737416) -TD
* fix two bugs in print-to-file from 2.8.8dev.10 changes -TD
+ suggested filename suffix for text/html was ".html" rather than ".txt"
+ using ^U to clear the filename to print to did not cancel the prompt
@@ -4218,7 +4274,7 @@ recently, FreeBSD 4.1, NetBSD 1.5 and OpenBSD 2.8 (curses/ncurses).
not needed or wanted) -Victor Schneider
* fix Debian bug #65151: "<> in javascript causes premature </script>"
(reported by H Nanosecond <aldomel at ix.netcom.com>) -KW
-* replaced all occurences of 'black' with 'default' in /samples/mild-colors.lss
+* replaced all occurrences of 'black' with 'default' in /samples/mild-colors.lss
to make it more reasonable on terminals with non-black background -VH
* modify color-style initialization to avoid passing -1's as attribute codes
which would happen if the lynx.lss file was not found, or if not all styles
diff --git a/COPYHEADER b/COPYHEADER
index 063aaf6..1695fb6 100644
--- a/COPYHEADER
+++ b/COPYHEADER
@@ -6,9 +6,9 @@ override the guidelines given in the COPYING file.
Most of the content of the Lynx release (and corresponding copyright) is
the work of developers on the lynx-dev mailing list, who have agreed to
-distribute their work under the terms and conditions of the GNU Public
-License (Version 2). Note that the License text after the terms and
-conditions is advisory in nature, and contains neither terms nor
+distribute their work under the terms and conditions of the GNU General
+Public License (Version 2). Note that the License text after the terms
+and conditions is advisory in nature, and contains neither terms nor
conditions. You may choose to follow that advice.
The copyright owners and developers for Lynx grant their express
@@ -80,5 +80,5 @@ For reference, below is the original copyright notice for Lynx (2.4.2).
*/
------------------------------------------------------------------------------
-- vile:txtmode fc=72 noti
--- $LynxId: COPYHEADER,v 1.12 2015/01/02 12:26:47 tom Exp $
+-- $LynxId: COPYHEADER,v 1.13 2015/10/02 11:12:57 tom Exp $
------------------------------------------------------------------------------
diff --git a/INSTALLATION b/INSTALLATION
index 98c4d63..ed877b1 100644
--- a/INSTALLATION
+++ b/INSTALLATION
@@ -934,7 +934,8 @@ Simplified:
----------
Sources:
- Download the current sources (choose a zip-file) from http://lynx.isc.org
+ Download the current sources (choose a zip-file) from
+ http://lynx.invisible-island.net/
and unzip them into a directory where you will build Lynx.
Compiler:
@@ -1466,4 +1467,4 @@ VIII. Acknowledgment
-- 1999/04/24 - H. Nelson <lynx-admin at irm.nara.kindai.ac.jp>
-- vile:txtmode
--- $LynxId: INSTALLATION,v 1.124 2015/04/23 09:22:32 tom Exp $
+-- $LynxId: INSTALLATION,v 1.126 2015/09/19 17:40:20 tom Exp $
diff --git a/LYMessages_en.h b/LYMessages_en.h
index c44ad87..b0c7c44 100644
--- a/LYMessages_en.h
+++ b/LYMessages_en.h
@@ -1,9 +1,9 @@
/*
- * $LynxId: LYMessages_en.h,v 1.74 2013/10/19 13:02:24 tom Exp $
+ * $LynxId: LYMessages_en.h,v 1.79 2015/12/15 01:35:44 tom Exp $
*
* Lynx - Hypertext navigation system
*
- * Copyright 1997-2013 Thomas E. Dickey
+ * Copyright 1997-2015 Thomas E. Dickey
* Copyright 1992, 1993, 1994 University of Kansas
* Released 1995 using GNU General Public License
*/
@@ -53,10 +53,16 @@
/* Forms messages */
#ifdef TEXTFIELDS_MAY_NEED_ACTIVATION
/* Inactive input fields, messages used with -tna option - kw */
+#define FORM_LINK_TEXT_ADV_MSG_INA \
+ gettext("(Textfield \"%s\") Inactive. Press <return> to activate.")
#define FORM_LINK_TEXT_MESSAGE_INA \
gettext("(Text entry field) Inactive. Press <return> to activate.")
+#define FORM_LINK_TEXTAREA_ADV_MSG_INA \
+ gettext("(Textarea \"%s\") Inactive. Press <return> to activate.")
#define FORM_LINK_TEXTAREA_MESSAGE_INA \
gettext("(Textarea) Inactive. Press <return> to activate.")
+#define FORM_LINK_TEXTAREA_ADV_MSG_INA_E \
+ gettext("(Textarea \"%s\") Inactive. Press <return> to activate (%s for editor).")
#define FORM_LINK_TEXTAREA_MESSAGE_INA_E \
gettext("(Textarea) Inactive. Press <return> to activate (%s for editor).")
#define FORM_LINK_TEXT_SUBMIT_MESSAGE_INA \
@@ -74,10 +80,16 @@
gettext("UNMODIFIABLE file entry field. Use UP or DOWN arrows or tab to move off.")
#define FORM_LINK_FILE_MESSAGE \
gettext("(File entry field) Enter filename. Use UP or DOWN arrows or tab to move off.")
+#define FORM_LINK_TEXT_ADV_MSG \
+ gettext("(Textfield \"%s\") Enter text. Use UP or DOWN arrows or tab to move off.")
#define FORM_LINK_TEXT_MESSAGE \
- gettext("(Text entry field) Enter text. Use UP or DOWN arrows or tab to move off.")
+ gettext("(Textfield \"%s\") Enter text. Use UP or DOWN arrows or tab to move off.")
+#define FORM_LINK_TEXTAREA_ADV_MSG \
+ gettext("(Textarea \"%s\") Enter text. Use UP/DOWN arrows or TAB to move off.")
#define FORM_LINK_TEXTAREA_MESSAGE \
gettext("(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off.")
+#define FORM_LINK_TEXTAREA_ADV_MSG_E \
+ gettext("(Textarea \"%s\") Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor).")
#define FORM_LINK_TEXTAREA_MESSAGE_E \
gettext("(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor).")
#define FORM_LINK_TEXT_UNM_MSG \
@@ -98,10 +110,14 @@
gettext("(Password entry field) Enter text. Use UP or DOWN arrows or tab to move off.")
#define FORM_LINK_PASSWORD_UNM_MSG \
gettext("UNMODIFIABLE form password. Use UP or DOWN arrows or tab to move off.")
+#define FORM_LINK_CHECKBOX_ADV_MSG \
+ gettext("(Checkbox \"%s\") Use right-arrow or <return> to toggle.")
#define FORM_LINK_CHECKBOX_MESSAGE \
gettext("(Checkbox Field) Use right-arrow or <return> to toggle.")
#define FORM_LINK_CHECKBOX_UNM_MSG \
gettext("UNMODIFIABLE form checkbox. Use UP or DOWN arrows or tab to move off.")
+#define FORM_LINK_RADIO_ADV_MSG \
+ gettext("(Radio Button \"%s\") Use right-arrow or <return> to toggle.")
#define FORM_LINK_RADIO_MESSAGE \
gettext("(Radio Button) Use right-arrow or <return> to toggle.")
#define FORM_LINK_RADIO_UNM_MSG \
@@ -128,12 +144,20 @@
gettext("DISABLED form reset button. Use UP or DOWN arrows or tab to move off.")
#define FORM_LINK_BUTTON_MESSAGE \
gettext("(Script button) Use UP or DOWN arrows or tab to move off.")
+#define FORM_LINK_BUTTON_ADV_MSG \
+ gettext("(Script button \"%s\") Use UP or DOWN arrows or tab to move off.")
#define FORM_LINK_BUTTON_DIS_MSG \
gettext("DISABLED Script button. Use UP or DOWN arrows or tab to move off.")
+#define FORM_LINK_OPTION_LIST_ADV_MSG \
+ gettext("(Option list \"%s\") Hit return to select option.")
#define FORM_LINK_OPTION_LIST_MESSAGE \
gettext("(Option list) Hit return and use arrow keys and return to select option.")
+#define CHOICE_LIST_ADV_MSG \
+ gettext("(Choice entry \"%s\") Use arrow keys and return to select option.")
#define CHOICE_LIST_MESSAGE \
gettext("(Choice list) Hit return and use arrow keys and return to select option.")
+#define MOUSE_CHOICE_MESSAGE \
+ gettext("Left mouse button or return to select, arrow keys to scroll.")
#define FORM_LINK_OPTION_LIST_UNM_MSG \
gettext("UNMODIFIABLE option list. Use return or arrow keys to review or leave.")
#define CHOICE_LIST_UNM_MSG \
diff --git a/PACKAGE/debian/changelog b/PACKAGE/debian/changelog
index 1112860..2e34817 100644
--- a/PACKAGE/debian/changelog
+++ b/PACKAGE/debian/changelog
@@ -1,8 +1,8 @@
-lynx-dev (2.8.9dev.6) unstable; urgency=low
+lynx-dev (2.8.9dev.7) unstable; urgency=low
* maintenance updates
- -- Thomas E. Dickey <dickey at invisible-island.net> Tue, 14 Apr 2015 20:19:14 -0400
+ -- Thomas E. Dickey <dickey at invisible-island.net> Sat, 09 May 2015 11:06:15 -0400
lynx-dev (2.8.8dev.16) unstable; urgency=high
diff --git a/PACKAGE/debian/control b/PACKAGE/debian/control
index a8a99d1..653b975 100644
--- a/PACKAGE/debian/control
+++ b/PACKAGE/debian/control
@@ -2,7 +2,7 @@ Source: lynx-dev
Section: web
Priority: extra
Maintainer: Thomas E. Dickey <dickey at invisible-island.net>
-Homepage: http://lynx.isc.org/
+Homepage: http://invisible-island.net/lynx/
Build-Depends: debhelper (>= 7), dpatch, po-debconf, libncursesw5-dev, zlib1g-dev, gettext, libgnutls-dev, sharutils, telnet, openssh-client, libbsd-dev, libidn11-dev
Standards-Version: 3.8.2
diff --git a/PACKAGE/debian/copyright b/PACKAGE/debian/copyright
index 96e80cb..ce0023a 100644
--- a/PACKAGE/debian/copyright
+++ b/PACKAGE/debian/copyright
@@ -1,4 +1,4 @@
-Upstream source http://lynx.isc.org/current/
+Upstream source http://lynx.invisible-island.net/current/
Current maintainer: Thomas Dickey <dickey at invisible-island.net>
@@ -6,9 +6,9 @@ Current maintainer: Thomas Dickey <dickey at invisible-island.net>
Most of the content of the lynx release (and corresponding copyright) is
the work of developers on the lynx-dev mailing list, who have agreed to
-distribute their work under the terms and conditions of the GNU Public
-License (Version 2). Note that the License text after the terms and
-conditions is advisory in nature, and contains neither terms nor
+distribute their work under the terms and conditions of the GNU General
+Public License (Version 2). Note that the License text after the terms
+and conditions is advisory in nature, and contains neither terms nor
conditions. You may choose to follow that advice.
Any licensing questions should be directed to the mailing list:
@@ -46,7 +46,7 @@ For reference, below is the original copyright notice for Lynx (2.4.2).
-------------------------------------------------------------------------------
Files: aclocal.m4
-Licence: other-BSD
+License: other-BSD
Copyright: 1997-2014,2015 by Thomas E. Dickey
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
@@ -67,7 +67,7 @@ Copyright: 1997-2014,2015 by Thomas E. Dickey
Files: install-sh
Copyright: 1994 X Consortium
-Licence: other-BSD
+License: other-BSD
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
deal in the Software without restriction, including without limitation the
@@ -102,7 +102,7 @@ Licence: other-BSD
Files: debian/*
Copyright: 2010-2014,2015 Thomas E. Dickey
-Licence: other-BSD
+License: other-BSD
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
diff --git a/PACKAGE/debian/watch b/PACKAGE/debian/watch
index 4c0c7a8..e987985 100644
--- a/PACKAGE/debian/watch
+++ b/PACKAGE/debian/watch
@@ -1,4 +1,4 @@
version=3
-opts=passive ftp://lynx.isc.org/current/lynx-cur\.tgz \
+opts=passive ftp://invisible-island.net/lynx/archives/lynx-cur\.tgz \
debian uupdate
diff --git a/PACKAGE/lynx.nsi b/PACKAGE/lynx.nsi
index 9ba6c34..8366ba2 100644
--- a/PACKAGE/lynx.nsi
+++ b/PACKAGE/lynx.nsi
@@ -1,4 +1,4 @@
-; $LynxId: lynx.nsi,v 1.24 2015/04/15 00:19:14 tom Exp $
+; $LynxId: lynx.nsi,v 1.26 2015/09/17 22:43:49 tom Exp $
; Script originally generated with the Venis Install Wizard, but customized.
; The Inno Setup script is preferred; but this can be built via cross-compiling.
@@ -9,8 +9,8 @@
!define VERSION_EPOCH "2"
!define VERSION_MAJOR "8"
!define VERSION_MINOR "9"
-!define VERSION_LEVEL "1006"
-!define VERSION_PATCH "dev.6"
+!define VERSION_LEVEL "1007"
+!define VERSION_PATCH "dev.7"
!define SUBKEY "Lynx"
@@ -27,7 +27,7 @@ CRCCheck on
SetCompressor /SOLID lzma
VIAddVersionKey ProductName "${SUBKEY}"
-VIAddVersionKey CompanyName "http://lynx.isc.org"
+VIAddVersionKey CompanyName "http://invisible-island.net/lynx"
VIAddVersionKey LegalCopyright "� 1997-2014,2015, Thomas E. Dickey"
VIAddVersionKey FileDescription "Lynx Installer (MinGW)"
VIAddVersionKey FileVersion "${VERSION}"
diff --git a/PACKAGE/lynx.spec b/PACKAGE/lynx.spec
index 6a2ba0b..f4f3967 100644
--- a/PACKAGE/lynx.spec
+++ b/PACKAGE/lynx.spec
@@ -1,12 +1,12 @@
-# $LynxId: lynx.spec,v 1.32 2015/05/04 10:37:30 tom Exp $
+# $LynxId: lynx.spec,v 1.34 2015/09/17 22:43:49 tom Exp $
Summary: A text-based Web browser
Name: lynx
Version: 2.8.9
-Release: dev.6
+Release: dev.7
License: GPLv2
Group: Applications/Internet
Source: lynx%{version}%{release}.tgz
-# URL: http://lynx.isc.org/
+# URL: http://invisible-island.net/lynx/
Provides: webclient
Provides: text-www-browser
# BuildRequires: openssl-devel, pkgconfig, ncurses-devel >= 5.3-5,
diff --git a/PACKAGE/version.iss b/PACKAGE/version.iss
index 5274d3a..2b11d47 100644
--- a/PACKAGE/version.iss
+++ b/PACKAGE/version.iss
@@ -1,7 +1,7 @@
; version used for Inno Setup files.
; $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$
-#define LYNX_VERSION "2.8.9dev.6"
+#define LYNX_VERSION "2.8.9dev.7"
; most-recent full release and target
#define LYNX_RELEASE "2.8.9"
@@ -10,5 +10,5 @@
#define MyAppProg "Lynx"
#define MyAppName "Lynx - web browser"
#define MyAppPublisher "Thomas E Dickey"
-#define MyAppURL "http://lynx.isc.org"
+#define MyAppURL "http://invisible-island.net/lynx"
#define MyAppVerName "Lynx " + LYNX_VERSION
diff --git a/README b/README
index 0d8f5f9..f9b4c04 100644
--- a/README
+++ b/README
@@ -10,7 +10,7 @@ To use this package, you need a compiler & a bit of experience
at very simple programming. If you just want something which will work
`out-of-the-box', you can get pre-compiled versions of Lynx
by following the links from
- <URL: http://lynx.isc.org/> ;
+ <URL: http://lynx.invisible-island.net/resources.html/> ;
For DOS or Windows, go to
<URL: http://www.fdisk.com/doslynx/lynxport.htm>.
@@ -35,13 +35,13 @@ WHAT IS LYNX?
HOW TO GET LYNX
For the latest release of Lynx go to:
- <URL: http://lynx.isc.org/release>;
- <URL: ftp://lynx.isc.org/release>;
+ <URL: http://lynx.invisible-island.net/release>;
+ <URL: ftp://invisible-island.net/lynx/tarballs>;
The latest development version is at:
- <URL: http://lynx.isc.org/current>.
+ <URL: http://lynx.invisible-island.net/current/>.
- The Lynx homepage is <URL: http://lynx.isc.org/>.
+ The Lynx homepage is <URL: http://lynx.invisible-island.net/>.
The on-line help page (enter `h') has links to many useful things.
LICENSE
@@ -150,5 +150,5 @@ LYNX-DEV MAILING LIST
------------------------------------------------------------------------------
-- vile:txtmode fc=72 noti
--- $LynxId: README,v 1.30 2014/02/13 13:25:42 tom Exp $
+-- $LynxId: README,v 1.32 2015/09/19 17:36:28 tom Exp $
------------------------------------------------------------------------------
diff --git a/WWW/Library/Implementation/HTGopher.c b/WWW/Library/Implementation/HTGopher.c
index 665006a..30577a9 100644
--- a/WWW/Library/Implementation/HTGopher.c
+++ b/WWW/Library/Implementation/HTGopher.c
@@ -1,5 +1,5 @@
/*
- * $LynxId: HTGopher.c,v 1.61 2013/11/28 11:12:32 tom Exp $
+ * $LynxId: HTGopher.c,v 1.62 2015/12/16 01:17:53 tom Exp $
*
* GOPHER ACCESS HTGopher.c
* =============
@@ -1227,7 +1227,7 @@ static int generate_cso_report(HTStream *Target)
char line[BIG];
char *buf = 0;
char *p = line, *href = NULL;
- int len, i, prev_ndx, ndx;
+ int i, prev_ndx, ndx;
char *rcode, *ndx_str, *fname, *fvalue, *l;
CSOfield_info *fld;
BOOL stop = FALSE;
@@ -1263,16 +1263,14 @@ static int generate_cso_report(HTStream *Target)
}
rcode = (p[0] == '-') ? &p[1] : p;
ndx_str = fname = NULL;
- len = (int) strlen(p);
- for (i = 0; i < len; i++) {
+ for (i = 0; p[i] != '\0'; i++) {
if (p[i] == ':') {
p[i] = '\0';
- if (!ndx_str) {
- fname = ndx_str = &p[i + 1];
- } else {
- fname = &p[i + 1];
+ fname = &p[i + 1];
+ if (ndx_str) {
break;
}
+ ndx_str = fname;
}
}
if (ndx_str) {
diff --git a/WWW/Library/Implementation/HTMIME.c b/WWW/Library/Implementation/HTMIME.c
index 94dd7fb..6f6391c 100644
--- a/WWW/Library/Implementation/HTMIME.c
+++ b/WWW/Library/Implementation/HTMIME.c
@@ -1,5 +1,5 @@
/*
- * $LynxId: HTMIME.c,v 1.89 2014/07/24 22:08:24 tom Exp $
+ * $LynxId: HTMIME.c,v 1.90 2015/12/16 01:13:50 tom Exp $
*
* MIME Message Parse HTMIME.c
* ==================
@@ -2449,7 +2449,7 @@ void HTmmdecode(char **target,
HTmmdec_base64(&m2buf, mmbuf);
else
HTmmdec_quote(&m2buf, mmbuf);
- for (t = m2buf; *t;)
+ for (t = m2buf; non_empty(t);)
*u++ = *t++;
HTmmcont = 1;
} else {
diff --git a/WWW/Library/Implementation/HTTP.c b/WWW/Library/Implementation/HTTP.c
index 86846ad..61725f0 100644
--- a/WWW/Library/Implementation/HTTP.c
+++ b/WWW/Library/Implementation/HTTP.c
@@ -1,5 +1,5 @@
/*
- * $LynxId: HTTP.c,v 1.142 2015/05/06 23:34:07 tom Exp $
+ * $LynxId: HTTP.c,v 1.150 2015/12/18 01:20:22 tom Exp $
*
* HyperText Tranfer Protocol - Client implementation HTTP.c
* ==========================
@@ -17,8 +17,6 @@
#include <HTNews.h>
#endif
-#define HTTP_VERSION "HTTP/1.0"
-
#define HTTP_PORT 80
#define HTTPS_PORT 443
#define SNEWS_PORT 563
@@ -161,7 +159,9 @@ static int HTSSLCallback(int preverify_ok, X509_STORE_CTX * x509_ctx GCC_UNUSED)
SSL *HTGetSSLHandle(void)
{
#ifdef USE_GNUTLS_INCL
- static char *certfile = NULL;
+ char *certfile = NULL;
+ char *client_keyfile = NULL;
+ char *client_certfile = NULL;
#endif
if (ssl_ctx == NULL) {
@@ -182,6 +182,9 @@ SSL *HTGetSSLHandle(void)
#ifdef SSL_OP_NO_COMPRESSION
SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_COMPRESSION);
#endif
+#ifdef SSL_MODE_AUTO_RETRY
+ SSL_CTX_set_mode(ssl_ctx, SSL_MODE_AUTO_RETRY);
+#endif
#ifdef SSL_MODE_RELEASE_BUFFERS
SSL_CTX_set_mode(ssl_ctx, SSL_MODE_RELEASE_BUFFERS);
#endif
@@ -227,8 +230,26 @@ SSL *HTGetSSLHandle(void)
atexit(free_ssl_ctx);
}
#ifdef USE_GNUTLS_INCL
+ if (non_empty(SSL_client_key_file)) {
+ client_keyfile = SSL_client_key_file;
+ CTRACE((tfp,
+ "HTGetSSLHandle: client key file is set to %s by config SSL_CLIENT_KEY_FILE\n",
+ client_keyfile));
+ }
+
+ if (non_empty(SSL_client_cert_file)) {
+ client_certfile = SSL_client_cert_file;
+ CTRACE((tfp,
+ "HTGetSSLHandle: client cert file is set to %s by config SSL_CLIENT_CERT_FILE\n",
+ client_certfile));
+ }
+
ssl_ctx->certfile = certfile;
ssl_ctx->certfile_type = GNUTLS_X509_FMT_PEM;
+ ssl_ctx->client_keyfile = client_keyfile;
+ ssl_ctx->client_keyfile_type = GNUTLS_X509_FMT_PEM;
+ ssl_ctx->client_certfile = client_certfile;
+ ssl_ctx->client_certfile_type = GNUTLS_X509_FMT_PEM;
#endif
ssl_okay = 0;
return (SSL_new(ssl_ctx));
@@ -654,7 +675,7 @@ static int HTLoadHTTP(const char *arg,
unsigned tls_status;
#endif
-#if SSLEAY_VERSION_NUMBER >= 0x0900
+#if (SSLEAY_VERSION_NUMBER >= 0x0900) && !defined(USE_GNUTLS_FUNCS)
BOOL try_tls = TRUE;
#endif /* SSLEAY_VERSION_NUMBER >= 0x0900 */
SSL_handle = NULL;
@@ -780,28 +801,33 @@ static int HTLoadHTTP(const char *arg,
#ifndef USE_NSS_COMPAT_INCL
if (!try_tls) {
handle->options |= SSL_OP_NO_TLSv1;
+ CTRACE((tfp, "...adding SSL_OP_NO_TLSv1\n"));
+ }
#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
- } else {
+ else {
int ret = (int) SSL_set_tlsext_host_name(handle, ssl_host);
CTRACE((tfp, "...called SSL_set_tlsext_host_name(%s) ->%d\n",
ssl_host, ret));
-#endif
}
#endif
+#endif
#endif /* SSLEAY_VERSION_NUMBER >= 0x0900 */
HTSSLInitPRNG();
status = SSL_connect(handle);
if (status <= 0) {
-#if SSLEAY_VERSION_NUMBER >= 0x0900
+#if (SSLEAY_VERSION_NUMBER >= 0x0900)
+#if !defined(USE_GNUTLS_FUNCS)
if (try_tls) {
_HTProgress(gettext("Retrying connection without TLS."));
try_tls = FALSE;
if (did_connect)
HTTP_NETCLOSE(s, handle);
goto try_again;
- } else {
+ } else
+#endif
+ {
CTRACE((tfp,
"HTTP: Unable to complete SSL handshake for '%s', SSL_connect=%d, SSL error stack dump follows\n",
url, status));
@@ -849,9 +875,10 @@ static int HTLoadHTTP(const char *arg,
gettext("GnuTLS error when trying to verify certificate."));
} else {
type = gnutls_certificate_type_get(handle->gnutls_state);
- ret = gnutls_certificate_verification_status_print(tls_status,
- type, &out, 0);
- SSL_single_prompt(&msg, out.data);
+ (void) gnutls_certificate_verification_status_print(tls_status,
+ type,
+ &out, 0);
+ SSL_single_prompt(&msg, (const char *) out.data);
gnutls_free(out.data);
}
#else
@@ -887,7 +914,7 @@ static int HTLoadHTTP(const char *arg,
}
#endif
- peer_cert = SSL_get_peer_certificate(handle);
+ peer_cert = (X509 *) SSL_get_peer_certificate(handle);
#if defined(USE_OPENSSL_INCL) || defined(USE_GNUTLS_FUNCS)
X509_NAME_oneline(X509_get_subject_name(peer_cert),
ssl_dn, (int) sizeof(ssl_dn));
@@ -983,8 +1010,10 @@ static int HTLoadHTTP(const char *arg,
ret = 0;
for (i = 0; !(ret < 0); i++) {
size = sizeof(buf);
- ret = gnutls_x509_crt_get_subject_alt_name(cert, i, buf,
- &size, NULL);
+ ret = gnutls_x509_crt_get_subject_alt_name(cert,
+ (unsigned) i,
+ buf, &size,
+ NULL);
if (strcasecomp_asterisk(ssl_host, buf) == 0) {
status_sslcertcheck = 2;
@@ -1141,7 +1170,9 @@ static int HTLoadHTTP(const char *arg,
}
if (extensions) {
BStrCat0(command, " ");
- BStrCat0(command, HTTP_VERSION);
+ BStrCat0(command, ((HTprotocolLevel == HTTP_1_0)
+ ? "HTTP/1.0"
+ : "HTTP/1.1"));
}
BStrCat0(command, crlf); /* CR LF, as in rfc 977 */
@@ -1155,6 +1186,9 @@ static int HTLoadHTTP(const char *arg,
HTBprintf(&command, "Host: %s%c%c", host, CR, LF);
FREE(host);
}
+ if (HTprotocolLevel >= HTTP_1_1) {
+ HTBprintf(&command, "Connection: close%c%c", CR, LF);
+ }
if (!HTPresentations)
HTFormatInit();
diff --git a/WWW/Library/Implementation/dtd_util.c b/WWW/Library/Implementation/dtd_util.c
index 4e18fdf..0badcbd 100644
--- a/WWW/Library/Implementation/dtd_util.c
+++ b/WWW/Library/Implementation/dtd_util.c
@@ -1,5 +1,5 @@
/*
- * $LynxId: dtd_util.c,v 1.76 2010/09/25 00:30:23 tom Exp $
+ * $LynxId: dtd_util.c,v 1.78 2015/12/13 23:22:17 tom Exp $
*
* Given a SGML_dtd structure, write a corresponding flat file, or "C" source.
* Given the flat-file, write the "C" source.
@@ -267,6 +267,8 @@ static const char *NameOfAttrs(const SGML_dtd * dtd, int which)
/* special cases to match existing headers */
if (!strcmp(result, "ABBR"))
result = "GEN";
+ else if (!strcmp(result, "ARTICLE"))
+ result = "GEN5";
else if (!strcmp(result, "BLOCKQUOTE"))
result = "BQ";
else if (!strcmp(result, "BASEFONT"))
@@ -1300,8 +1302,8 @@ static SGML_dtd *load_flatfile(FILE *input)
AttrType *attr_types = 0;
SGML_dtd *result = 0;
size_t n;
- size_t number_of_attrs = 0;
- size_t number_of_tags = 0;
+ int number_of_attrs = 0;
+ int number_of_tags = 0;
HTTag *tag;
int code;
@@ -1309,7 +1311,7 @@ static SGML_dtd *load_flatfile(FILE *input)
if (code
&& number_of_attrs
&& (attr_types = typecallocn(AttrType, number_of_attrs + 1)) != 0) {
- for (n = 0; n < number_of_attrs; ++n) {
+ for (n = 0; n < (size_t) number_of_attrs; ++n) {
if (!load_flat_AttrType(input, attr_types + n, n)) {
break;
}
@@ -1320,7 +1322,7 @@ static SGML_dtd *load_flatfile(FILE *input)
if (code == 1) {
if ((result = typecalloc(SGML_dtd)) != 0
&& (result->tags = typecallocn(HTTag, (number_of_tags + 2))) != 0) {
- for (n = 0; n < number_of_tags; ++n) {
+ for (n = 0; n < (size_t) number_of_tags; ++n) {
if (load_flat_HTTag(input, n, &(result->tags[n]), attr_types)) {
result->number_of_tags = (n + 1);
} else {
@@ -1328,7 +1330,7 @@ static SGML_dtd *load_flatfile(FILE *input)
}
}
tag = 0;
- for (n = 0; n < number_of_tags; ++n) {
+ for (n = 0; n < (size_t) number_of_tags; ++n) {
if (result->tags[n].name != 0
&& !strcmp(result->tags[n].name, "OBJECT")) {
tag = result->tags + number_of_tags;
diff --git a/WWW/Library/Implementation/hdr_HTMLDTD.h b/WWW/Library/Implementation/hdr_HTMLDTD.h
index 9e4d47b..d00bf37 100644
--- a/WWW/Library/Implementation/hdr_HTMLDTD.h
+++ b/WWW/Library/Implementation/hdr_HTMLDTD.h
@@ -1,4 +1,4 @@
-/* $LynxId: hdr_HTMLDTD.h,v 1.22 2011/10/07 00:54:36 Kihara.Hideto Exp $ */
+/* $LynxId: hdr_HTMLDTD.h,v 1.23 2015/12/13 23:08:45 Kihara.Hideto Exp $ */
#ifndef hdr_HTMLDTD_H
#define hdr_HTMLDTD_H 1
@@ -21,6 +21,8 @@ extern "C" {
HTML_ADDRESS,
HTML_APPLET,
HTML_AREA,
+ HTML_ARTICLE,
+ HTML_ASIDE,
HTML_AU,
HTML_AUTHOR,
HTML_B,
@@ -57,8 +59,10 @@ extern "C" {
HTML_EMBED,
HTML_FIELDSET,
HTML_FIG,
+ HTML_FIGURE,
HTML_FN,
HTML_FONT,
+ HTML_FOOTER,
HTML_FORM,
HTML_FRAME,
HTML_FRAMESET,
@@ -69,6 +73,7 @@ extern "C" {
HTML_H5,
HTML_H6,
HTML_HEAD,
+ HTML_HEADER,
HTML_HR,
HTML_HTML,
HTML_HY,
@@ -86,11 +91,13 @@ extern "C" {
HTML_LI,
HTML_LINK,
HTML_LISTING,
+ HTML_MAIN,
HTML_MAP,
HTML_MARQUEE,
HTML_MATH,
HTML_MENU,
HTML_META,
+ HTML_NAV,
HTML_NEXTID,
HTML_NOFRAMES,
HTML_NOTE,
@@ -106,6 +113,7 @@ extern "C" {
HTML_S,
HTML_SAMP,
HTML_SCRIPT,
+ HTML_SECTION,
HTML_SELECT,
HTML_SHY,
HTML_SMALL,
@@ -148,10 +156,10 @@ extern "C" {
*/
/* # of elements generally visible to Lynx code */
-#define HTML_ELEMENTS 118
+#define HTML_ELEMENTS 126
/* # of elements visible to SGML parser */
-#define HTML_ALL_ELEMENTS 119
+#define HTML_ALL_ELEMENTS 127
/*
@@ -477,6 +485,15 @@ extern "C" {
#define HTML_GEN_TITLE 6
#define HTML_GEN_ATTRIBUTES 7
+#define HTML_GEN5_CLASS 0
+#define HTML_GEN5_DIR 1
+#define HTML_GEN5_ID 2
+#define HTML_GEN5_LANG 3
+#define HTML_GEN5_ROLE 4
+#define HTML_GEN5_STYLE 5
+#define HTML_GEN5_TITLE 6
+#define HTML_GEN5_ATTRIBUTES 7
+
#define HTML_H_ALIGN 0
#define HTML_H_CLASS 1
#define HTML_H_CLEAR 2
diff --git a/WWW/Library/Implementation/makefile.in b/WWW/Library/Implementation/makefile.in
index 3559ae9..50d3389 100644
--- a/WWW/Library/Implementation/makefile.in
+++ b/WWW/Library/Implementation/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.31 2012/08/12 23:55:17 tom Exp $
+# $LynxId: makefile.in,v 1.32 2015/12/13 23:20:11 tom Exp $
# Make WWW under unix for a.n.other unix system (bsd)
# Use this as a template
@@ -339,41 +339,42 @@ sources: dtd_util$x src0_HTMLDTD.txt src1_HTMLDTD.txt
dtd_util$x: $(DTD_UTIL)
$(CC) $(CC_OPTS) $(LDFLAGS) -o $@ $(DTD_UTIL) $(LIBS)
+DIFFC = diff -u -I LynxId
check: dtd_util$x
@echo "** comparing builtin src0_HTMLDTD.txt"
./dtd_util$x >HTMLDTD.log
- -diff -u src0_HTMLDTD.txt HTMLDTD.log
+ -$(DIFFC) src0_HTMLDTD.txt HTMLDTD.log
@echo "** comparing reloaded src0_HTMLDTD.txt"
./dtd_util$x -l src0_HTMLDTD.txt >HTMLDTD.log
- -diff -u src0_HTMLDTD.txt HTMLDTD.log
+ -$(DIFFC) src0_HTMLDTD.txt HTMLDTD.log
@echo "** comparing header generated from builtin"
./dtd_util$x -s -h -o HTMLDTD.log
- -diff -u hdr_HTMLDTD.h HTMLDTD.log
+ -$(DIFFC) hdr_HTMLDTD.h HTMLDTD.log
./dtd_util$x -t -h -o HTMLDTD.log
- -diff -u hdr_HTMLDTD.h HTMLDTD.log
+ -$(DIFFC) hdr_HTMLDTD.h HTMLDTD.log
@echo "** comparing header generated by load"
./dtd_util$x -s -h -o HTMLDTD.log -l src0_HTMLDTD.txt
- -diff -u hdr_HTMLDTD.h HTMLDTD.log
+ -$(DIFFC) hdr_HTMLDTD.h HTMLDTD.log
./dtd_util$x -t -h -o HTMLDTD.log -l src1_HTMLDTD.txt
- -diff -u hdr_HTMLDTD.h HTMLDTD.log
+ -$(DIFFC) hdr_HTMLDTD.h HTMLDTD.log
@echo "** comparing strict source generated from builtin"
./dtd_util$x -s -c -o HTMLDTD.log
- -diff -u src0_HTMLDTD.h HTMLDTD.log
+ -$(DIFFC) src0_HTMLDTD.h HTMLDTD.log
@echo "** comparing strict source generated by load"
./dtd_util$x -s -c -o HTMLDTD.log -l src0_HTMLDTD.txt
- -diff -u src0_HTMLDTD.h HTMLDTD.log
+ -$(DIFFC) src0_HTMLDTD.h HTMLDTD.log
@echo "** comparing tagsoup source generated from builtin"
./dtd_util$x -t -c -o HTMLDTD.log
- -diff -u src1_HTMLDTD.h HTMLDTD.log
+ -$(DIFFC) src1_HTMLDTD.h HTMLDTD.log
@echo "** comparing tagsoup source generated by load"
./dtd_util$x -t -c -o HTMLDTD.log -l src1_HTMLDTD.txt
- -diff -u src1_HTMLDTD.h HTMLDTD.log
+ -$(DIFFC) src1_HTMLDTD.h HTMLDTD.log
# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/WWW/Library/Implementation/src0_HTMLDTD.h b/WWW/Library/Implementation/src0_HTMLDTD.h
index 8388470..5ec3adb 100644
--- a/WWW/Library/Implementation/src0_HTMLDTD.h
+++ b/WWW/Library/Implementation/src0_HTMLDTD.h
@@ -1,4 +1,4 @@
-/* $LynxId: src0_HTMLDTD.h,v 1.45 2011/10/07 00:54:36 Kihara.Hideto Exp $ */
+/* $LynxId: src0_HTMLDTD.h,v 1.46 2015/12/13 23:08:45 Kihara.Hideto Exp $ */
#ifndef src_HTMLDTD_H0
#define src_HTMLDTD_H0 1
@@ -11,6 +11,8 @@
#define T_ADDRESS 0x00200,0x0F14F,0x8FFFF,0x36680,0xB6FAF,0x80317,0x00000
#define T_APPLET 0x02000,0x0B0CF,0x8FFFF,0x37F9F,0xB7FBF,0x8300F,0x00000
#define T_AREA 0x08000,0x00000,0x00000,0x08000,0x3FFFF,0x00F1F,0x00001
+#define T_ARTICLE 0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x8031F,0x00004
+#define T_ASIDE 0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x8031F,0x00004
#define T_AU 0x00002,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00003,0x00000
#define T_AUTHOR 0x00002,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00003,0x00000
#define T_B 0x00001,0x8B04F,0xAFFFF,0xA778F,0xF7FBF,0x00001,0x00014
@@ -47,8 +49,10 @@
#define T_EMBED 0x02000,0x8F107,0x8FFF7,0xB6FBF,0xB7FBF,0x1FF7F,0x00001
#define T_FIELDSET 0x00200,0x8FB4F,0x8FF7F,0x86787,0xB7FF7,0x8805F,0x00000
#define T_FIG 0x00200,0x0FB00,0x8FFFF,0x36680,0xB6FBF,0x8834F,0x00000
+#define T_FIGURE 0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x8031F,0x00004
#define T_FN 0x00200,0x8FBCF,0x8FFFF,0xB6680,0xB7EBF,0x8114F,0x00000
#define T_FONT 0x00001,0x8B04F,0x8FFFF,0xB778F,0xF7FBF,0x00001,0x00014
+#define T_FOOTER 0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x8031F,0x00004
#define T_FORM 0x00080,0x0FF6F,0x0FF7F,0x36E07,0x32F07,0x88DFF,0x00000
#define T_FRAME 0x10000,0x00000,0x00000,0x10000,0x10000,0x9FFFF,0x00001
#define T_FRAMESET 0x10000,0x90000,0x90000,0x90000,0x93000,0x9FFFF,0x00000
@@ -59,6 +63,7 @@
#define T_H5 0x00100,0x0B04F,0x0B05F,0x36680,0x37FAF,0x80117,0x00000
#define T_H6 0x00100,0x0B04F,0x0B05F,0x36680,0x37FAF,0x80117,0x00000
#define T_HEAD 0x40000,0x4F000,0x47000,0x10000,0x10000,0x9FF7F,0x00007
+#define T_HEADER 0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x8031F,0x00004
#define T_HR 0x04000,0x00000,0x00000,0x3FE80,0x3FFBF,0x87F37,0x00001
#define T_HTML 0x10000,0x7FB8F,0x7FFFF,0x00000,0x00000,0x1FFFF,0x00003
#define T_HY 0x01000,0x00000,0x00000,0x3779F,0x77FBF,0x8101F,0x00001
@@ -76,11 +81,13 @@
#define T_LI 0x00400,0x0BBFF,0x8FFFF,0x00800,0x97FFF,0x8071F,0x00001
#define T_LINK 0x08000,0x00000,0x00000,0x50000,0x50000,0x0FF7F,0x00001
#define T_LISTING 0x00800,0x00000,0x00000,0x36600,0x36F00,0x80F1F,0x00000
+#define T_MAIN 0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x8031F,0x00004
#define T_MAP 0x08000,0x08000,0x08000,0x37FCF,0x37FBF,0x0051F,0x00000
#define T_MARQUEE 0x04000,0x0000F,0x8F01F,0x37787,0xB7FA7,0x8301C,0x00000
#define T_MATH 0x00004,0x0B05F,0x8FFFF,0x2778F,0xF7FBF,0x0001F,0x00000
#define T_MENU 0x00800,0x0B400,0x0F75F,0x17680,0x36FB7,0x88F7F,0x00000
#define T_META 0x08000,0x00000,0x00000,0x50000,0x50000,0x0FF7F,0x00001
+#define T_NAV 0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x8031F,0x00004
#define T_NEXTID 0x01000,0x00000,0x00000,0x50000,0x1FFF7,0x00001,0x00001
#define T_NOFRAMES 0x20000,0x2FB8F,0x0FFFF,0x17000,0x17000,0x0CF5F,0x00000
#define T_NOTE 0x00200,0x0BBAF,0x8FFFF,0x376B0,0xB7FFF,0x8031F,0x00000
@@ -96,6 +103,7 @@
#define T_S 0x00001,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00001,0x00000
#define T_SAMP 0x00002,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00002,0x00010
#define T_SCRIPT 0x02000,0x00000,0x00000,0x77F9F,0x77FFF,0x87D5F,0x00000
+#define T_SECTION 0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x8031F,0x00004
#define T_SELECT 0x00040,0x08000,0x08000,0x03FAF,0x33FBF,0x80D5F,0x00008
#define T_SHY 0x01000,0x00000,0x00000,0x3779F,0x77FBF,0x8101F,0x00001
#define T_SMALL 0x00001,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00001,0x00014
@@ -610,6 +618,19 @@ static const AttrType GEN_attr_type[] = {
{ 0, 0 },
};
+static const attr GEN5_attr_list[] = {
+ { "ROLE" T(N) },
+ { 0 T(N) } /* Terminate list */
+};
+
+static const AttrType GEN5_attr_type[] = {
+ { ATTR_TYPE(core) },
+ { ATTR_TYPE(events) },
+ { ATTR_TYPE(i18n) },
+ { ATTR_TYPE(GEN5) },
+ { 0, 0 },
+};
+
static const attr H_attr_list[] = {
{ "CLEAR" T(N) },
{ "DINGBAT" T(N) },
@@ -1577,6 +1598,17 @@ static const attr GEN_attr[] = { /* ABBR attributes */
{ 0 T(N) } /* Terminate list */
};
+static const attr GEN5_attr[] = { /* ARTICLE attributes */
+ { "CLASS" T(c) },
+ { "DIR" T(N) },
+ { "ID" T(i) },
+ { "LANG" T(N) },
+ { "ROLE" T(N) },
+ { "STYLE" T(N) },
+ { "TITLE" T(N) },
+ { 0 T(N) } /* Terminate list */
+};
+
static const attr H_attr[] = { /* H1 attributes */
{ "ALIGN" T(N) },
{ "CLASS" T(c) },
@@ -2154,6 +2186,8 @@ static const attr UL_attr[] = { /* DIR attributes */
#undef ADDRESS
#undef APPLET
#undef AREA
+#undef ARTICLE
+#undef ASIDE
#undef AU
#undef AUTHOR
#undef B
@@ -2190,8 +2224,10 @@ static const attr UL_attr[] = { /* DIR attributes */
#undef EMBED
#undef FIELDSET
#undef FIG
+#undef FIGURE
#undef FN
#undef FONT
+#undef FOOTER
#undef FORM
#undef FRAME
#undef FRAMESET
@@ -2202,6 +2238,7 @@ static const attr UL_attr[] = { /* DIR attributes */
#undef H5
#undef H6
#undef HEAD
+#undef HEADER
#undef HR
#undef HTML
#undef HY
@@ -2219,11 +2256,13 @@ static const attr UL_attr[] = { /* DIR attributes */
#undef LI
#undef LINK
#undef LISTING
+#undef MAIN
#undef MAP
#undef MARQUEE
#undef MATH
#undef MENU
#undef META
+#undef NAV
#undef NEXTID
#undef NOFRAMES
#undef NOTE
@@ -2239,6 +2278,7 @@ static const attr UL_attr[] = { /* DIR attributes */
#undef S
#undef SAMP
#undef SCRIPT
+#undef SECTION
#undef SELECT
#undef SHY
#undef SMALL
@@ -2300,6 +2340,8 @@ static const HTTag tags_table0[HTML_ALL_ELEMENTS] = {
{ P(ADDRESS), ATTR_DATA(ADDRESS), SGML_MIXED, T_ADDRESS},
{ P(APPLET), ATTR_DATA(APPLET), SGML_MIXED, T_APPLET},
{ P(AREA), ATTR_DATA(AREA), SGML_EMPTY, T_AREA},
+ { P(ARTICLE), ATTR_DATA(GEN5), SGML_MIXED, T_ARTICLE},
+ { P(ASIDE), ATTR_DATA(GEN5), SGML_MIXED, T_ASIDE},
{ P(AU), ATTR_DATA(GEN), SGML_MIXED, T_AU},
{ P(AUTHOR), ATTR_DATA(GEN), SGML_MIXED, T_AUTHOR},
{ P(B), ATTR_DATA(GEN), SGML_EMPTY, T_B},
@@ -2336,8 +2378,10 @@ static const HTTag tags_table0[HTML_ALL_ELEMENTS] = {
{ P(EMBED), ATTR_DATA(EMBED), SGML_EMPTY, T_EMBED},
{ P(FIELDSET), ATTR_DATA(GEN), SGML_MIXED, T_FIELDSET},
{ P(FIG), ATTR_DATA(FIG), SGML_MIXED, T_FIG},
+ { P(FIGURE), ATTR_DATA(GEN5), SGML_MIXED, T_FIGURE},
{ P(FN), ATTR_DATA(GEN), SGML_MIXED, T_FN},
{ P(FONT), ATTR_DATA(FONT), SGML_EMPTY, T_FONT},
+ { P(FOOTER), ATTR_DATA(GEN5), SGML_MIXED, T_FOOTER},
{ P(FORM), ATTR_DATA(FORM), SGML_EMPTY, T_FORM},
{ P(FRAME), ATTR_DATA(FRAME), SGML_EMPTY, T_FRAME},
{ P(FRAMESET), ATTR_DATA(FRAMESET), SGML_MIXED, T_FRAMESET},
@@ -2348,6 +2392,7 @@ static const HTTag tags_table0[HTML_ALL_ELEMENTS] = {
{ P0(H5), ATTR_DATA(H), SGML_MIXED, T_H5},
{ P0(H6), ATTR_DATA(H), SGML_MIXED, T_H6},
{ P(HEAD), ATTR_DATA(GEN), SGML_MIXED, T_HEAD},
+ { P(HEADER), ATTR_DATA(GEN5), SGML_MIXED, T_HEADER},
{ P(HR), ATTR_DATA(HR), SGML_EMPTY, T_HR},
{ P(HTML), ATTR_DATA(GEN), SGML_MIXED, T_HTML},
{ P(HY), ATTR_DATA(GEN), SGML_EMPTY, T_HY},
@@ -2365,11 +2410,13 @@ static const HTTag tags_table0[HTML_ALL_ELEMENTS] = {
{ P(LI), ATTR_DATA(LI), SGML_EMPTY, T_LI},
{ P(LINK), ATTR_DATA(LINK), SGML_EMPTY, T_LINK},
{ P(LISTING), ATTR_DATA(GEN), SGML_LITTERAL,T_LISTING},
+ { P(MAIN), ATTR_DATA(GEN5), SGML_MIXED, T_MAIN},
{ P(MAP), ATTR_DATA(MAP), SGML_MIXED, T_MAP},
{ P(MARQUEE), ATTR_DATA(GEN), SGML_MIXED, T_MARQUEE},
{ P(MATH), ATTR_DATA(MATH), SGML_LITTERAL,T_MATH},
{ P(MENU), ATTR_DATA(UL), SGML_MIXED, T_MENU},
{ P(META), ATTR_DATA(META), SGML_EMPTY, T_META},
+ { P(NAV), ATTR_DATA(GEN5), SGML_MIXED, T_NAV},
{ P(NEXTID), ATTR_DATA(NEXTID), SGML_EMPTY, T_NEXTID},
{ P(NOFRAMES), ATTR_DATA(GEN), SGML_MIXED, T_NOFRAMES},
{ P(NOTE), ATTR_DATA(NOTE), SGML_MIXED, T_NOTE},
@@ -2385,6 +2432,7 @@ static const HTTag tags_table0[HTML_ALL_ELEMENTS] = {
{ P(S), ATTR_DATA(GEN), SGML_MIXED, T_S},
{ P(SAMP), ATTR_DATA(GEN), SGML_MIXED, T_SAMP},
{ P(SCRIPT), ATTR_DATA(SCRIPT), SGML_LITTERAL,T_SCRIPT},
+ { P(SECTION), ATTR_DATA(GEN5), SGML_MIXED, T_SECTION},
{ P(SELECT), ATTR_DATA(SELECT), SGML_MIXED, T_SELECT},
{ P(SHY), ATTR_DATA(GEN), SGML_EMPTY, T_SHY},
{ P(SMALL), ATTR_DATA(GEN), SGML_MIXED, T_SMALL},
diff --git a/WWW/Library/Implementation/src0_HTMLDTD.txt b/WWW/Library/Implementation/src0_HTMLDTD.txt
index 87bebee..5c7ec0a 100644
--- a/WWW/Library/Implementation/src0_HTMLDTD.txt
+++ b/WWW/Library/Implementation/src0_HTMLDTD.txt
@@ -1,4 +1,4 @@
-59 attr_types
+60 attr_types
0:align
1 attributes:
0:0:ALIGN
@@ -217,7 +217,10 @@
27:GEN
1 attributes:
0:0:CLEAR
- 28:H
+ 28:GEN5
+ 1 attributes:
+ 0:0:ROLE
+ 29:H
7 attributes:
0:0:CLEAR
1:0:DINGBAT
@@ -226,7 +229,7 @@
4:0:SEQNUM
5:0:SKIP
6:2:SRC
- 29:HR
+ 30:HR
6 attributes:
0:0:CLEAR
1:0:MD
@@ -234,7 +237,7 @@
3:0:SIZE
4:2:SRC
5:0:WIDTH
- 30:IFRAME
+ 31:IFRAME
9 attributes:
0:0:FRAMEBORDER
1:0:HEIGHT
@@ -245,7 +248,7 @@
6:0:SCROLLING
7:2:SRC
8:0:WIDTH
- 31:IMG
+ 32:IMG
15 attributes:
0:0:ALT
1:0:BORDER
@@ -262,7 +265,7 @@
12:2:USEMAP
13:0:VSPACE
14:0:WIDTH
- 32:INPUT
+ 33:INPUT
28 attributes:
0:0:ACCEPT
1:0:ACCEPT-CHARSET
@@ -292,23 +295,23 @@
25:0:USEMAP
26:0:VALUE
27:0:WIDTH
- 33:ISINDEX
+ 34:ISINDEX
3 attributes:
0:2:ACTION
1:2:HREF
2:0:PROMPT
- 34:KEYGEN
+ 35:KEYGEN
2 attributes:
0:0:CHALLENGE
1:0:NAME
- 35:LABEL
+ 36:LABEL
5 attributes:
0:0:ACCESSKEY
1:0:CLEAR
2:0:FOR
3:0:ONBLUR
4:0:ONFOCUS
- 36:LI
+ 37:LI
7 attributes:
0:0:CLEAR
1:0:DINGBAT
@@ -317,7 +320,7 @@
4:2:SRC
5:0:TYPE
6:0:VALUE
- 37:LINK
+ 38:LINK
8 attributes:
0:0:CHARSET
1:2:HREF
@@ -327,31 +330,31 @@
5:0:REV
6:0:TARGET
7:0:TYPE
- 38:MAP
+ 39:MAP
2 attributes:
0:0:CLEAR
1:1:NAME
- 39:MATH
+ 40:MATH
2 attributes:
0:0:BOX
1:0:CLEAR
- 40:META
+ 41:META
5 attributes:
0:0:CHARSET
1:0:CONTENT
2:0:HTTP-EQUIV
3:0:NAME
4:0:SCHEME
- 41:NEXTID
+ 42:NEXTID
1 attributes:
0:0:N
- 42:NOTE
+ 43:NOTE
4 attributes:
0:0:CLEAR
1:0:MD
2:8:ROLE
3:2:SRC
- 43:OBJECT
+ 44:OBJECT
19 attributes:
0:0:ARCHIVE
1:0:BORDER
@@ -372,7 +375,7 @@
16:2:USEMAP
17:0:VSPACE
18:0:WIDTH
- 44:OL
+ 45:OL
6 attributes:
0:0:CLEAR
1:0:COMPACT
@@ -380,7 +383,7 @@
3:0:SEQNUM
4:0:START
5:0:TYPE
- 45:OPTION
+ 46:OPTION
7 attributes:
0:0:CLEAR
1:0:DISABLED
@@ -389,7 +392,7 @@
4:0:SELECTED
5:0:SHAPE
6:0:VALUE
- 46:OVERLAY
+ 47:OVERLAY
8 attributes:
0:0:HEIGHT
1:0:IMAGEMAP
@@ -399,11 +402,11 @@
5:0:WIDTH
6:0:X
7:0:Y
- 47:P
+ 48:P
2 attributes:
0:0:CLEAR
1:0:NOWRAP
- 48:PARAM
+ 49:PARAM
12 attributes:
0:0:ACCEPT
1:0:ACCEPT-CHARSET
@@ -417,11 +420,11 @@
9:0:VALUE
10:0:VALUEREF
11:0:VALUETYPE
- 49:Q
+ 50:Q
2 attributes:
0:2:CITE
1:0:CLEAR
- 50:SCRIPT
+ 51:SCRIPT
10 attributes:
0:0:CHARSET
1:0:CLEAR
@@ -433,7 +436,7 @@
7:0:SCRIPTENGINE
8:2:SRC
9:0:TYPE
- 51:SELECT
+ 52:SELECT
15 attributes:
0:0:CLEAR
1:0:DISABLED
@@ -450,18 +453,18 @@
12:0:TABINDEX
13:0:UNITS
14:0:WIDTH
- 52:STYLE
+ 53:STYLE
3 attributes:
0:0:MEDIA
1:0:NOTATION
2:0:TYPE
- 53:TAB
+ 54:TAB
4 attributes:
0:0:CLEAR
1:0:DP
2:0:INDENT
3:0:TO
- 54:TABLE
+ 55:TABLE
15 attributes:
0:2:BACKGROUND
1:0:BORDER
@@ -478,7 +481,7 @@
12:0:SUMMARY
13:0:UNITS
14:0:WIDTH
- 55:TD
+ 56:TD
13 attributes:
0:0:ABBR
1:0:AXES
@@ -493,7 +496,7 @@
10:0:ROWSPAN
11:0:SCOPE
12:0:WIDTH
- 56:TEXTAREA
+ 57:TEXTAREA
15 attributes:
0:0:ACCEPT-CHARSET
1:0:ACCESSKEY
@@ -510,12 +513,12 @@
12:0:READONLY
13:0:ROWS
14:0:TABINDEX
- 57:TR
+ 58:TR
3 attributes:
0:0:CLEAR
1:0:DP
2:0:NOWRAP
- 58:UL
+ 59:UL
8 attributes:
0:0:CLEAR
1:0:COMPACT
@@ -525,7 +528,7 @@
5:2:SRC
6:0:TYPE
7:0:WRAP
-118 tags
+126 tags
0:A
justify
25 attributes:
@@ -703,7 +706,53 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer BODYlike
canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike LIlike ULlike
flags: endO
- 6:AU
+ 6:ARTICLE
+ justify
+ 7 attributes:
+ 0:4:CLASS
+ 1:0:DIR
+ 2:1:ID
+ 3:0:LANG
+ 4:0:ROLE
+ 5:0:STYLE
+ 6:0:TITLE
+ 4 attr_types
+ core
+ events
+ i18n
+ GEN5
+ contents: SGML_MIXED
+ tagclass: DIVlike
+ contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
+ icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
+ contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
+ icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+ canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
+ flags: mafse
+ 7:ASIDE
+ justify
+ 7 attributes:
+ 0:4:CLASS
+ 1:0:DIR
+ 2:1:ID
+ 3:0:LANG
+ 4:0:ROLE
+ 5:0:STYLE
+ 6:0:TITLE
+ 4 attr_types
+ core
+ events
+ i18n
+ GEN5
+ contents: SGML_MIXED
+ tagclass: DIVlike
+ contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
+ icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
+ contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
+ icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+ canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
+ flags: mafse
+ 8:AU
justify
7 attributes:
0:4:CLASS
@@ -726,7 +775,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike EMlike
flags:
- 7:AUTHOR
+ 9:AUTHOR
justify
7 attributes:
0:4:CLASS
@@ -749,7 +798,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike EMlike
flags:
- 8:B
+ 10:B
justify
7 attributes:
0:4:CLASS
@@ -772,7 +821,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike
flags: mafse nreie
- 9:BANNER
+ 11:BANNER
nojustify
7 attributes:
0:4:CLASS
@@ -795,7 +844,7 @@
icontained: outer BODYlike
canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
flags:
- 10:BASE
+ 12:BASE
justify
6 attributes:
0:4:CLASS
@@ -815,7 +864,7 @@
icontained: outer HEADstuff
canclose: FONTlike EMlike MATHlike Alike same
flags: endO
- 11:BASEFONT
+ 13:BASEFONT
justify
11 attributes:
0:4:CLASS
@@ -841,7 +890,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
canclose: BRlike APPLETlike HRlike MAPlike same
flags: endO
- 12:BDO
+ 14:BDO
justify
7 attributes:
0:4:CLASS
@@ -864,7 +913,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula TRlike Plike DIVlike
flags:
- 13:BGSOUND
+ 15:BGSOUND
justify
9 attributes:
0:4:CLASS
@@ -888,7 +937,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff
canclose: FONTlike EMlike MATHlike Alike Plike DIVlike BRlike APPLETlike HRlike same
flags: endO
- 14:BIG
+ 16:BIG
justify
7 attributes:
0:4:CLASS
@@ -911,7 +960,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike
flags: mafse nreie
- 15:BLINK
+ 17:BLINK
justify
7 attributes:
0:4:CLASS
@@ -934,7 +983,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike
flags: mafse nreie
- 16:BLOCKQUOTE
+ 18:BLOCKQUOTE
justify
9 attributes:
0:2:CITE
@@ -958,7 +1007,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
flags:
- 17:BODY
+ 19:BODY
justify
15 attributes:
0:0:ALINK
@@ -989,7 +1038,7 @@
icontained: outer BODYlike
canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer HEADstuff same
flags: endO startO
- 18:BODYTEXT
+ 20:BODYTEXT
justify
14 attributes:
0:4:CLASS
@@ -1018,7 +1067,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike BRlike APPLETlike HRlike MAPlike same
flags: endO startO
- 19:BQ
+ 21:BQ
justify
9 attributes:
0:2:CITE
@@ -1042,7 +1091,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
flags:
- 20:BR
+ 22:BR
justify
7 attributes:
0:4:CLASS
@@ -1065,7 +1114,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff
canclose: FONTlike EMlike MATHlike Alike formula BRlike same
flags: endO
- 21:BUTTON
+ 23:BUTTON
justify
16 attributes:
0:0:ACCESSKEY
@@ -1097,7 +1146,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike BRlike same
flags:
- 22:CAPTION
+ 24:CAPTION
justify
9 attributes:
0:0:ACCESSKEY
@@ -1123,7 +1172,7 @@
icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike same
flags:
- 23:CENTER
+ 25:CENTER
justify
8 attributes:
0:0:ALIGN
@@ -1147,7 +1196,7 @@
icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike LIlike same
flags:
- 24:CITE
+ 26:CITE
justify
7 attributes:
0:4:CLASS
@@ -1170,7 +1219,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: EMlike
flags: nreie
- 25:CODE
+ 27:CODE
justify
7 attributes:
0:4:CLASS
@@ -1193,7 +1242,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: EMlike
flags:
- 26:COL
+ 28:COL
justify
13 attributes:
0:0:ALIGN
@@ -1223,7 +1272,7 @@
icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike ULlike MAPlike same
flags: endO
- 27:COLGROUP
+ 29:COLGROUP
justify
13 attributes:
0:0:ALIGN
@@ -1253,7 +1302,7 @@
icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike MAPlike same
flags: endO
- 28:COMMENT
+ 30:COMMENT
justify
7 attributes:
0:4:CLASS
@@ -1276,7 +1325,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer BODYlike HEADstuff
canclose: FONTlike EMlike
flags:
- 29:CREDIT
+ 31:CREDIT
justify
7 attributes:
0:4:CLASS
@@ -1299,7 +1348,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike Plike DIVlike same
flags:
- 30:DD
+ 32:DD
justify
7 attributes:
0:4:CLASS
@@ -1322,7 +1371,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike LIlike same
flags: endO
- 31:DEL
+ 33:DEL
justify
8 attributes:
0:0:CITE
@@ -1346,7 +1395,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike EMlike
flags:
- 32:DFN
+ 34:DFN
justify
7 attributes:
0:4:CLASS
@@ -1369,7 +1418,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike EMlike
flags:
- 33:DIR
+ 35:DIR
justify
14 attributes:
0:4:CLASS
@@ -1398,7 +1447,7 @@
icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike HRlike same
flags:
- 34:DIV
+ 36:DIV
justify
8 attributes:
0:0:ALIGN
@@ -1422,7 +1471,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
flags: mafse
- 35:DL
+ 37:DL
justify
8 attributes:
0:4:CLASS
@@ -1445,7 +1494,7 @@
icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike
flags:
- 36:DLC
+ 38:DLC
justify
8 attributes:
0:4:CLASS
@@ -1468,7 +1517,7 @@
icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike
flags:
- 37:DT
+ 39:DT
justify
7 attributes:
0:4:CLASS
@@ -1491,7 +1540,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer
canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike LIlike same
flags: endO
- 38:EM
+ 40:EM
justify
7 attributes:
0:4:CLASS
@@ -1514,7 +1563,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike EMlike
flags: nreie
- 39:EMBED
+ 41:EMBED
justify
21 attributes:
0:0:ALIGN
@@ -1551,7 +1600,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer
flags: endO
- 40:FIELDSET
+ 42:FIELDSET
justify
7 attributes:
0:4:CLASS
@@ -1574,7 +1623,7 @@
icontained: FONTlike EMlike MATHlike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike MAPlike same
flags:
- 41:FIG
+ 43:FIG
justify
17 attributes:
0:0:ALIGN
@@ -1607,7 +1656,30 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike SELECTlike Plike DIVlike MAPlike same
flags:
- 42:FN
+ 44:FIGURE
+ justify
+ 7 attributes:
+ 0:4:CLASS
+ 1:0:DIR
+ 2:1:ID
+ 3:0:LANG
+ 4:0:ROLE
+ 5:0:STYLE
+ 6:0:TITLE
+ 4 attr_types
+ core
+ events
+ i18n
+ GEN5
+ contents: SGML_MIXED
+ tagclass: DIVlike
+ contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
+ icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
+ contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
+ icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+ canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
+ flags: mafse
+ 45:FN
justify
7 attributes:
0:4:CLASS
@@ -1630,7 +1702,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike SELECTlike Plike BRlike same
flags:
- 43:FONT
+ 46:FONT
justify
11 attributes:
0:4:CLASS
@@ -1656,7 +1728,30 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike
flags: mafse nreie
- 44:FORM
+ 47:FOOTER
+ justify
+ 7 attributes:
+ 0:4:CLASS
+ 1:0:DIR
+ 2:1:ID
+ 3:0:LANG
+ 4:0:ROLE
+ 5:0:STYLE
+ 6:0:TITLE
+ 4 attr_types
+ core
+ events
+ i18n
+ GEN5
+ contents: SGML_MIXED
+ tagclass: DIVlike
+ contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
+ icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
+ contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
+ icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+ canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
+ flags: mafse
+ 48:FORM
justify
17 attributes:
0:0:ACCEPT
@@ -1688,7 +1783,7 @@
icontained: FONTlike EMlike MATHlike Plike DIVlike LIlike ULlike APPLETlike outer BODYlike
canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike LIlike ULlike MAPlike same
flags:
- 45:FRAME
+ 49:FRAME
justify
12 attributes:
0:4:CLASS
@@ -1714,7 +1809,7 @@
icontained: outer
canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer same
flags: endO
- 46:FRAMESET
+ 50:FRAMESET
justify
4 attributes:
0:0:COLS
@@ -1731,7 +1826,7 @@
icontained: BRlike APPLETlike outer same
canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer same
flags:
- 47:H1
+ 51:H1
nojustify
14 attributes:
0:0:ALIGN
@@ -1762,7 +1857,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike formula Plike same
flags:
- 48:H2
+ 52:H2
nojustify
14 attributes:
0:0:ALIGN
@@ -1793,7 +1888,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike formula Plike same
flags:
- 49:H3
+ 53:H3
nojustify
14 attributes:
0:0:ALIGN
@@ -1824,7 +1919,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike formula Plike same
flags:
- 50:H4
+ 54:H4
nojustify
14 attributes:
0:0:ALIGN
@@ -1855,7 +1950,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike formula Plike same
flags:
- 51:H5
+ 55:H5
nojustify
14 attributes:
0:0:ALIGN
@@ -1886,7 +1981,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike formula Plike same
flags:
- 52:H6
+ 56:H6
nojustify
14 attributes:
0:0:ALIGN
@@ -1917,7 +2012,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike formula Plike same
flags:
- 53:HEAD
+ 57:HEAD
justify
7 attributes:
0:4:CLASS
@@ -1940,7 +2035,30 @@
icontained: outer
canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer same
flags: endO startO mafse
- 54:HR
+ 58:HEADER
+ justify
+ 7 attributes:
+ 0:4:CLASS
+ 1:0:DIR
+ 2:1:ID
+ 3:0:LANG
+ 4:0:ROLE
+ 5:0:STYLE
+ 6:0:TITLE
+ 4 attr_types
+ core
+ events
+ i18n
+ GEN5
+ contents: SGML_MIXED
+ tagclass: DIVlike
+ contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
+ icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
+ contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
+ icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+ canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
+ flags: mafse
+ 59:HR
justify
13 attributes:
0:0:ALIGN
@@ -1969,7 +2087,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer BODYlike
canclose: FONTlike EMlike MATHlike formula TRlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike same
flags: endO
- 55:HTML
+ 60:HTML
justify
7 attributes:
0:4:CLASS
@@ -1992,7 +2110,7 @@
icontained:
canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer
flags: endO startO
- 56:HY
+ 61:HY
justify
7 attributes:
0:4:CLASS
@@ -2015,7 +2133,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff
canclose: FONTlike EMlike MATHlike Alike formula BRlike same
flags: endO
- 57:I
+ 62:I
justify
7 attributes:
0:4:CLASS
@@ -2038,7 +2156,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike
flags: mafse nreie
- 58:IFRAME
+ 63:IFRAME
justify
14 attributes:
0:0:ALIGN
@@ -2067,7 +2185,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike BRlike APPLETlike outer HEADstuff same
flags:
- 59:IMG
+ 64:IMG
justify
22 attributes:
0:0:ALIGN
@@ -2106,7 +2224,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
canclose: same
flags: endO
- 60:INPUT
+ 65:INPUT
justify
35 attributes:
0:0:ACCEPT
@@ -2158,7 +2276,7 @@
icontained: FONTlike EMlike MATHlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike Alike SELECTlike BRlike MAPlike same
flags: endO
- 61:INS
+ 66:INS
justify
8 attributes:
0:0:CITE
@@ -2182,7 +2300,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike EMlike
flags:
- 62:ISINDEX
+ 67:ISINDEX
justify
9 attributes:
0:2:ACTION
@@ -2206,7 +2324,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer BODYlike HEADstuff
canclose: FONTlike EMlike MATHlike same
flags: endO
- 63:KBD
+ 68:KBD
justify
7 attributes:
0:4:CLASS
@@ -2229,7 +2347,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff
canclose: FONTlike EMlike
flags:
- 64:KEYGEN
+ 69:KEYGEN
justify
8 attributes:
0:0:CHALLENGE
@@ -2252,7 +2370,7 @@
icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
canclose: formula TRlike SELECTlike same
flags: endO
- 65:LABEL
+ 70:LABEL
justify
11 attributes:
0:0:ACCESSKEY
@@ -2279,7 +2397,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike
flags:
- 66:LEGEND
+ 71:LEGEND
justify
9 attributes:
0:0:ACCESSKEY
@@ -2305,7 +2423,7 @@
icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike
flags:
- 67:LH
+ 72:LH
justify
7 attributes:
0:4:CLASS
@@ -2328,7 +2446,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer same
canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike LIlike same
flags: endO
- 68:LI
+ 73:LI
justify
13 attributes:
0:4:CLASS
@@ -2357,7 +2475,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer same
canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike LIlike same
flags: endO
- 69:LINK
+ 74:LINK
justify
14 attributes:
0:0:CHARSET
@@ -2387,7 +2505,7 @@
icontained: outer HEADstuff
canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike
flags: endO
- 70:LISTING
+ 75:LISTING
justify
7 attributes:
0:4:CLASS
@@ -2410,7 +2528,30 @@
icontained: Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike LIlike ULlike same
flags:
- 71:MAP
+ 76:MAIN
+ justify
+ 7 attributes:
+ 0:4:CLASS
+ 1:0:DIR
+ 2:1:ID
+ 3:0:LANG
+ 4:0:ROLE
+ 5:0:STYLE
+ 6:0:TITLE
+ 4 attr_types
+ core
+ events
+ i18n
+ GEN5
+ contents: SGML_MIXED
+ tagclass: DIVlike
+ contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
+ icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
+ contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
+ icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+ canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
+ flags: mafse
+ 77:MAP
justify
8 attributes:
0:4:CLASS
@@ -2433,7 +2574,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike Alike formula Plike LIlike
flags:
- 72:MARQUEE
+ 78:MARQUEE
justify
7 attributes:
0:4:CLASS
@@ -2456,7 +2597,7 @@
icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: MATHlike Alike formula BRlike APPLETlike same
flags:
- 73:MATH
+ 79:MATH
justify
8 attributes:
0:0:BOX
@@ -2479,7 +2620,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike EMlike MATHlike Alike formula
flags:
- 74:MENU
+ 80:MENU
justify
14 attributes:
0:4:CLASS
@@ -2508,7 +2649,7 @@
icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike MAPlike same
flags:
- 75:META
+ 81:META
justify
5 attributes:
0:0:CHARSET
@@ -2526,7 +2667,30 @@
icontained: outer HEADstuff
canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike
flags: endO
- 76:NEXTID
+ 82:NAV
+ justify
+ 7 attributes:
+ 0:4:CLASS
+ 1:0:DIR
+ 2:1:ID
+ 3:0:LANG
+ 4:0:ROLE
+ 5:0:STYLE
+ 6:0:TITLE
+ 4 attr_types
+ core
+ events
+ i18n
+ GEN5
+ contents: SGML_MIXED
+ tagclass: DIVlike
+ contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
+ icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
+ contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
+ icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+ canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
+ flags: mafse
+ 83:NEXTID
justify
1 attributes:
0:0:N
@@ -2540,7 +2704,7 @@
icontained: FONTlike EMlike MATHlike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer
canclose: FONTlike
flags: endO
- 77:NOFRAMES
+ 84:NOFRAMES
justify
7 attributes:
0:4:CLASS
@@ -2563,7 +2727,7 @@
icontained: BRlike APPLETlike HRlike outer
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike ULlike HRlike MAPlike
flags:
- 78:NOTE
+ 85:NOTE
justify
10 attributes:
0:4:CLASS
@@ -2588,7 +2752,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
flags:
- 79:OBJECT
+ 86:OBJECT
justify
26 attributes:
0:0:ALIGN
@@ -2631,7 +2795,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike LIlike ULlike BRlike APPLETlike same
flags: frecyc
- 80:OL
+ 87:OL
justify
12 attributes:
0:4:CLASS
@@ -2658,7 +2822,7 @@
icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike MAPlike same
flags:
- 81:OPTION
+ 88:OPTION
justify
13 attributes:
0:4:CLASS
@@ -2687,7 +2851,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
flags: endO
- 82:OVERLAY
+ 89:OVERLAY
justify
12 attributes:
0:4:CLASS
@@ -2713,7 +2877,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike same
flags: endO
- 83:P
+ 90:P
justify
9 attributes:
0:0:ALIGN
@@ -2738,7 +2902,7 @@
icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike formula Plike same
flags: endO
- 84:PARAM
+ 91:PARAM
justify
18 attributes:
0:0:ACCEPT
@@ -2771,7 +2935,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
canclose: TRlike SELECTlike Plike LIlike BRlike same
flags: endO
- 85:PLAINTEXT
+ 92:PLAINTEXT
justify
7 attributes:
0:4:CLASS
@@ -2794,7 +2958,7 @@
icontained: outer same
canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer BODYlike
flags: endO
- 86:PRE
+ 93:PRE
nojustify
7 attributes:
0:4:CLASS
@@ -2817,7 +2981,7 @@
icontained: formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike
canclose: EMlike MATHlike Alike formula Plike DIVlike LIlike same
flags:
- 87:Q
+ 94:Q
justify
8 attributes:
0:2:CITE
@@ -2840,7 +3004,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike EMlike
flags:
- 88:S
+ 95:S
justify
7 attributes:
0:4:CLASS
@@ -2863,7 +3027,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike
flags:
- 89:SAMP
+ 96:SAMP
justify
7 attributes:
0:4:CLASS
@@ -2886,7 +3050,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: EMlike
flags: nreie
- 90:SCRIPT
+ 97:SCRIPT
justify
16 attributes:
0:0:CHARSET
@@ -2917,7 +3081,30 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike LIlike ULlike BRlike APPLETlike HRlike same
flags:
- 91:SELECT
+ 98:SECTION
+ justify
+ 7 attributes:
+ 0:4:CLASS
+ 1:0:DIR
+ 2:1:ID
+ 3:0:LANG
+ 4:0:ROLE
+ 5:0:STYLE
+ 6:0:TITLE
+ 4 attr_types
+ core
+ events
+ i18n
+ GEN5
+ contents: SGML_MIXED
+ tagclass: DIVlike
+ contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
+ icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
+ contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
+ icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+ canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
+ flags: mafse
+ 99:SELECT
justify
22 attributes:
0:0:ALIGN
@@ -2955,7 +3142,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike outer BODYlike
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike LIlike ULlike same
flags: strict
- 92:SHY
+ 100:SHY
justify
7 attributes:
0:4:CLASS
@@ -2978,7 +3165,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff
canclose: FONTlike EMlike MATHlike Alike formula BRlike same
flags: endO
- 93:SMALL
+ 101:SMALL
justify
7 attributes:
0:4:CLASS
@@ -3001,7 +3188,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike
flags: mafse nreie
- 94:SPAN
+ 102:SPAN
justify
7 attributes:
0:4:CLASS
@@ -3024,7 +3211,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike EMlike same
flags:
- 95:SPOT
+ 103:SPOT
justify
7 attributes:
0:4:CLASS
@@ -3047,7 +3234,7 @@
icontained: FONTlike EMlike MATHlike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer BODYlike
canclose: Alike
flags: endO
- 96:STRIKE
+ 104:STRIKE
justify
7 attributes:
0:4:CLASS
@@ -3070,7 +3257,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike
flags:
- 97:STRONG
+ 105:STRONG
justify
7 attributes:
0:4:CLASS
@@ -3093,7 +3280,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike EMlike
flags: nreie
- 98:STYLE
+ 106:STYLE
justify
9 attributes:
0:4:CLASS
@@ -3117,7 +3304,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike HEADstuff
canclose: FONTlike EMlike MATHlike Alike formula same
flags:
- 99:SUB
+ 107:SUB
justify
7 attributes:
0:4:CLASS
@@ -3140,7 +3327,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike EMlike MATHlike
flags:
- 100:SUP
+ 108:SUP
justify
7 attributes:
0:4:CLASS
@@ -3163,7 +3350,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike EMlike MATHlike
flags:
- 101:TAB
+ 109:TAB
justify
11 attributes:
0:0:ALIGN
@@ -3190,7 +3377,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer HEADstuff
canclose: FONTlike
flags: endO
- 102:TABLE
+ 110:TABLE
justify
22 attributes:
0:0:ALIGN
@@ -3229,7 +3416,7 @@
icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike LIlike HRlike MAPlike same
flags:
- 103:TBODY
+ 111:TBODY
justify
13 attributes:
0:0:ALIGN
@@ -3259,7 +3446,7 @@
icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike HRlike MAPlike same
flags: endO startO
- 104:TD
+ 112:TD
justify
23 attributes:
0:0:ABBR
@@ -3298,7 +3485,7 @@
icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike HRlike MAPlike same
flags: endO
- 105:TEXTAREA
+ 113:TEXTAREA
justify
22 attributes:
0:0:ACCEPT-CHARSET
@@ -3337,7 +3524,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike outer BODYlike
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike LIlike ULlike same
flags: nolyspcl
- 106:TEXTFLOW
+ 114:TEXTFLOW
justify
14 attributes:
0:4:CLASS
@@ -3366,7 +3553,7 @@
icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike BRlike APPLETlike MAPlike outer same
flags: endO startO
- 107:TFOOT
+ 115:TFOOT
justify
13 attributes:
0:0:ALIGN
@@ -3396,7 +3583,7 @@
icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike ULlike HRlike MAPlike same
flags: endO
- 108:TH
+ 116:TH
justify
23 attributes:
0:0:ABBR
@@ -3435,7 +3622,7 @@
icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike ULlike HRlike MAPlike same
flags: endO
- 109:THEAD
+ 117:THEAD
justify
13 attributes:
0:0:ALIGN
@@ -3465,7 +3652,7 @@
icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike ULlike HRlike MAPlike same
flags: endO
- 110:TITLE
+ 118:TITLE
justify
7 attributes:
0:4:CLASS
@@ -3488,7 +3675,7 @@
icontained: outer HEADstuff
canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike
flags: mafse strict
- 111:TR
+ 119:TR
justify
13 attributes:
0:0:ALIGN
@@ -3518,7 +3705,7 @@
icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike HRlike MAPlike same
flags: endO
- 112:TT
+ 120:TT
justify
7 attributes:
0:4:CLASS
@@ -3541,7 +3728,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike
flags: nreie
- 113:U
+ 121:U
justify
7 attributes:
0:4:CLASS
@@ -3564,7 +3751,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike
flags: mafse nreie
- 114:UL
+ 122:UL
justify
14 attributes:
0:4:CLASS
@@ -3593,7 +3780,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike same
flags:
- 115:VAR
+ 123:VAR
justify
7 attributes:
0:4:CLASS
@@ -3616,7 +3803,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike
flags:
- 116:WBR
+ 124:WBR
justify
7 attributes:
0:4:CLASS
@@ -3639,7 +3826,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff
canclose: FONTlike EMlike MATHlike Alike formula BRlike same
flags: endO
- 117:XMP
+ 125:XMP
nojustify
7 attributes:
0:4:CLASS
diff --git a/WWW/Library/Implementation/src1_HTMLDTD.h b/WWW/Library/Implementation/src1_HTMLDTD.h
index a56e4a0..a7e92a0 100644
--- a/WWW/Library/Implementation/src1_HTMLDTD.h
+++ b/WWW/Library/Implementation/src1_HTMLDTD.h
@@ -1,4 +1,4 @@
-/* $LynxId: src1_HTMLDTD.h,v 1.45 2011/10/07 00:54:36 Kihara.Hideto Exp $ */
+/* $LynxId: src1_HTMLDTD.h,v 1.46 2015/12/13 23:08:45 Kihara.Hideto Exp $ */
#ifndef src_HTMLDTD_H1
#define src_HTMLDTD_H1 1
@@ -11,6 +11,8 @@
#define T_ADDRESS 0x00200,0x0F14F,0x8FFFF,0x36680,0xB6FAF,0x80317,0x00000
#define T_APPLET 0x02000,0x0B0CF,0x8FFFF,0x37F9F,0xB7FBF,0x8300F,0x00000
#define T_AREA 0x08000,0x00000,0x00000,0x08000,0x3FFFF,0x00F1F,0x00001
+#define T_ARTICLE 0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x8031F,0x00004
+#define T_ASIDE 0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x8031F,0x00004
#define T_AU 0x00002,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00003,0x00000
#define T_AUTHOR 0x00002,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00003,0x00000
#define T_B 0x00001,0x8B04F,0xAFFFF,0xA778F,0xF7FBF,0x00001,0x00014
@@ -47,8 +49,10 @@
#define T_EMBED 0x02000,0x8F107,0x8FFF7,0xB6FBF,0xB7FBF,0x1FF7F,0x00001
#define T_FIELDSET 0x00200,0x8FB4F,0x8FF7F,0x86787,0xB7FF7,0x8805F,0x00000
#define T_FIG 0x00200,0x0FB00,0x8FFFF,0x36680,0xB6FBF,0x8834F,0x00000
+#define T_FIGURE 0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x8031F,0x00004
#define T_FN 0x00200,0x8FBCF,0x8FFFF,0xB6680,0xB7EBF,0x8114F,0x00000
#define T_FONT 0x00001,0x8B04F,0x8FFFF,0xB778F,0xF7FBF,0x00001,0x00014
+#define T_FOOTER 0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x8031F,0x00004
#define T_FORM 0x00080,0x0FF6F,0x0FF7F,0x36E07,0x32F07,0x88DFF,0x00000
#define T_FRAME 0x10000,0x00000,0x00000,0x10000,0x10000,0x9FFFF,0x00001
#define T_FRAMESET 0x10000,0x90000,0x90000,0x90000,0x93000,0x9FFFF,0x00000
@@ -59,6 +63,7 @@
#define T_H5 0x00100,0x0B04F,0x0B05F,0x36680,0x37FAF,0x80117,0x00000
#define T_H6 0x00100,0x0B04F,0x0B05F,0x36680,0x37FAF,0x80117,0x00000
#define T_HEAD 0x40000,0x4F000,0x47000,0x10000,0x10000,0x9FF7F,0x00007
+#define T_HEADER 0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x8031F,0x00004
#define T_HR 0x04000,0x00000,0x00000,0x3FE80,0x3FFBF,0x87F37,0x00001
#define T_HTML 0x10000,0x7FB8F,0x7FFFF,0x00000,0x00000,0x1FFFF,0x00003
#define T_HY 0x01000,0x00000,0x00000,0x3779F,0x77FBF,0x8101F,0x00001
@@ -76,11 +81,13 @@
#define T_LI 0x00400,0x0BBFF,0x8FFFF,0x00800,0x97FFF,0x8071F,0x00001
#define T_LINK 0x08000,0x00000,0x00000,0x50000,0x50000,0x0FF7F,0x00001
#define T_LISTING 0x00800,0x00000,0x00000,0x36600,0x36F00,0x80F1F,0x00000
+#define T_MAIN 0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x8031F,0x00004
#define T_MAP 0x08000,0x08000,0x08000,0x37FCF,0x37FBF,0x0051F,0x00000
#define T_MARQUEE 0x04000,0x0000F,0x8F01F,0x37787,0xB7FA7,0x8301C,0x00000
#define T_MATH 0x00004,0x0B05F,0x8FFFF,0x2778F,0xF7FBF,0x0001F,0x00000
#define T_MENU 0x00800,0x0B400,0x0F75F,0x17680,0x36FB7,0x88F7F,0x00000
#define T_META 0x08000,0x00000,0x00000,0x50000,0x50000,0x0FF7F,0x00001
+#define T_NAV 0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x8031F,0x00004
#define T_NEXTID 0x01000,0x00000,0x00000,0x50000,0x1FFF7,0x00001,0x00001
#define T_NOFRAMES 0x20000,0x2FB8F,0x0FFFF,0x17000,0x17000,0x0CF5F,0x00000
#define T_NOTE 0x00200,0x0BBAF,0x8FFFF,0x376B0,0xB7FFF,0x8031F,0x00000
@@ -96,6 +103,7 @@
#define T_S 0x00001,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00001,0x00000
#define T_SAMP 0x00002,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00002,0x00010
#define T_SCRIPT 0x02000,0x00000,0x00000,0x77F9F,0x77FFF,0x87D5F,0x00000
+#define T_SECTION 0x00200,0x8FBCF,0x8FFFF,0xB66A0,0xB7FFF,0x8031F,0x00004
#define T_SELECT 0x00040,0x08000,0x08000,0x03FAF,0x33FBF,0x80D5F,0x00008
#define T_SHY 0x01000,0x00000,0x00000,0x3779F,0x77FBF,0x8101F,0x00001
#define T_SMALL 0x00001,0x8B04F,0x8FFFF,0xA778F,0xF7FBF,0x00001,0x00014
@@ -610,6 +618,19 @@ static const AttrType GEN_attr_type[] = {
{ 0, 0 },
};
+static const attr GEN5_attr_list[] = {
+ { "ROLE" T(N) },
+ { 0 T(N) } /* Terminate list */
+};
+
+static const AttrType GEN5_attr_type[] = {
+ { ATTR_TYPE(core) },
+ { ATTR_TYPE(events) },
+ { ATTR_TYPE(i18n) },
+ { ATTR_TYPE(GEN5) },
+ { 0, 0 },
+};
+
static const attr H_attr_list[] = {
{ "CLEAR" T(N) },
{ "DINGBAT" T(N) },
@@ -1577,6 +1598,17 @@ static const attr GEN_attr[] = { /* ABBR attributes */
{ 0 T(N) } /* Terminate list */
};
+static const attr GEN5_attr[] = { /* ARTICLE attributes */
+ { "CLASS" T(c) },
+ { "DIR" T(N) },
+ { "ID" T(i) },
+ { "LANG" T(N) },
+ { "ROLE" T(N) },
+ { "STYLE" T(N) },
+ { "TITLE" T(N) },
+ { 0 T(N) } /* Terminate list */
+};
+
static const attr H_attr[] = { /* H1 attributes */
{ "ALIGN" T(N) },
{ "CLASS" T(c) },
@@ -2154,6 +2186,8 @@ static const attr UL_attr[] = { /* DIR attributes */
#undef ADDRESS
#undef APPLET
#undef AREA
+#undef ARTICLE
+#undef ASIDE
#undef AU
#undef AUTHOR
#undef B
@@ -2190,8 +2224,10 @@ static const attr UL_attr[] = { /* DIR attributes */
#undef EMBED
#undef FIELDSET
#undef FIG
+#undef FIGURE
#undef FN
#undef FONT
+#undef FOOTER
#undef FORM
#undef FRAME
#undef FRAMESET
@@ -2202,6 +2238,7 @@ static const attr UL_attr[] = { /* DIR attributes */
#undef H5
#undef H6
#undef HEAD
+#undef HEADER
#undef HR
#undef HTML
#undef HY
@@ -2219,11 +2256,13 @@ static const attr UL_attr[] = { /* DIR attributes */
#undef LI
#undef LINK
#undef LISTING
+#undef MAIN
#undef MAP
#undef MARQUEE
#undef MATH
#undef MENU
#undef META
+#undef NAV
#undef NEXTID
#undef NOFRAMES
#undef NOTE
@@ -2239,6 +2278,7 @@ static const attr UL_attr[] = { /* DIR attributes */
#undef S
#undef SAMP
#undef SCRIPT
+#undef SECTION
#undef SELECT
#undef SHY
#undef SMALL
@@ -2300,6 +2340,8 @@ static const HTTag tags_table1[HTML_ALL_ELEMENTS] = {
{ P(ADDRESS), ATTR_DATA(ADDRESS), SGML_MIXED, T_ADDRESS},
{ P(APPLET), ATTR_DATA(APPLET), SGML_MIXED, T_APPLET},
{ P(AREA), ATTR_DATA(AREA), SGML_EMPTY, T_AREA},
+ { P(ARTICLE), ATTR_DATA(GEN5), SGML_MIXED, T_ARTICLE},
+ { P(ASIDE), ATTR_DATA(GEN5), SGML_MIXED, T_ASIDE},
{ P(AU), ATTR_DATA(GEN), SGML_MIXED, T_AU},
{ P(AUTHOR), ATTR_DATA(GEN), SGML_MIXED, T_AUTHOR},
{ P(B), ATTR_DATA(GEN), SGML_MIXED, T_B},
@@ -2336,8 +2378,10 @@ static const HTTag tags_table1[HTML_ALL_ELEMENTS] = {
{ P(EMBED), ATTR_DATA(EMBED), SGML_EMPTY, T_EMBED},
{ P(FIELDSET), ATTR_DATA(GEN), SGML_MIXED, T_FIELDSET},
{ P(FIG), ATTR_DATA(FIG), SGML_MIXED, T_FIG},
+ { P(FIGURE), ATTR_DATA(GEN5), SGML_MIXED, T_FIGURE},
{ P(FN), ATTR_DATA(GEN), SGML_MIXED, T_FN},
{ P(FONT), ATTR_DATA(FONT), SGML_MIXED, T_FONT},
+ { P(FOOTER), ATTR_DATA(GEN5), SGML_MIXED, T_FOOTER},
{ P(FORM), ATTR_DATA(FORM), SGML_MIXED, T_FORM},
{ P(FRAME), ATTR_DATA(FRAME), SGML_EMPTY, T_FRAME},
{ P(FRAMESET), ATTR_DATA(FRAMESET), SGML_ELEMENT, T_FRAMESET},
@@ -2348,6 +2392,7 @@ static const HTTag tags_table1[HTML_ALL_ELEMENTS] = {
{ P0(H5), ATTR_DATA(H), SGML_MIXED, T_H5},
{ P0(H6), ATTR_DATA(H), SGML_MIXED, T_H6},
{ P(HEAD), ATTR_DATA(GEN), SGML_ELEMENT, T_HEAD},
+ { P(HEADER), ATTR_DATA(GEN5), SGML_MIXED, T_HEADER},
{ P(HR), ATTR_DATA(HR), SGML_EMPTY, T_HR},
{ P(HTML), ATTR_DATA(GEN), SGML_MIXED, T_HTML},
{ P(HY), ATTR_DATA(GEN), SGML_EMPTY, T_HY},
@@ -2365,11 +2410,13 @@ static const HTTag tags_table1[HTML_ALL_ELEMENTS] = {
{ P(LI), ATTR_DATA(LI), SGML_MIXED, T_LI},
{ P(LINK), ATTR_DATA(LINK), SGML_EMPTY, T_LINK},
{ P(LISTING), ATTR_DATA(GEN), SGML_LITTERAL,T_LISTING},
+ { P(MAIN), ATTR_DATA(GEN5), SGML_MIXED, T_MAIN},
{ P(MAP), ATTR_DATA(MAP), SGML_ELEMENT, T_MAP},
{ P(MARQUEE), ATTR_DATA(GEN), SGML_MIXED, T_MARQUEE},
{ P(MATH), ATTR_DATA(MATH), SGML_PCDATA, T_MATH},
{ P(MENU), ATTR_DATA(UL), SGML_MIXED, T_MENU},
{ P(META), ATTR_DATA(META), SGML_EMPTY, T_META},
+ { P(NAV), ATTR_DATA(GEN5), SGML_MIXED, T_NAV},
{ P(NEXTID), ATTR_DATA(NEXTID), SGML_EMPTY, T_NEXTID},
{ P(NOFRAMES), ATTR_DATA(GEN), SGML_MIXED, T_NOFRAMES},
{ P(NOTE), ATTR_DATA(NOTE), SGML_MIXED, T_NOTE},
@@ -2385,6 +2432,7 @@ static const HTTag tags_table1[HTML_ALL_ELEMENTS] = {
{ P(S), ATTR_DATA(GEN), SGML_MIXED, T_S},
{ P(SAMP), ATTR_DATA(GEN), SGML_MIXED, T_SAMP},
{ P(SCRIPT), ATTR_DATA(SCRIPT), SGML_SCRIPT, T_SCRIPT},
+ { P(SECTION), ATTR_DATA(GEN5), SGML_MIXED, T_SECTION},
{ P(SELECT), ATTR_DATA(SELECT), SGML_ELEMENT, T_SELECT},
{ P(SHY), ATTR_DATA(GEN), SGML_EMPTY, T_SHY},
{ P(SMALL), ATTR_DATA(GEN), SGML_MIXED, T_SMALL},
diff --git a/WWW/Library/Implementation/src1_HTMLDTD.txt b/WWW/Library/Implementation/src1_HTMLDTD.txt
index 6e7ac73..ef97601 100644
--- a/WWW/Library/Implementation/src1_HTMLDTD.txt
+++ b/WWW/Library/Implementation/src1_HTMLDTD.txt
@@ -1,4 +1,4 @@
-59 attr_types
+60 attr_types
0:align
1 attributes:
0:0:ALIGN
@@ -217,7 +217,10 @@
27:GEN
1 attributes:
0:0:CLEAR
- 28:H
+ 28:GEN5
+ 1 attributes:
+ 0:0:ROLE
+ 29:H
7 attributes:
0:0:CLEAR
1:0:DINGBAT
@@ -226,7 +229,7 @@
4:0:SEQNUM
5:0:SKIP
6:2:SRC
- 29:HR
+ 30:HR
6 attributes:
0:0:CLEAR
1:0:MD
@@ -234,7 +237,7 @@
3:0:SIZE
4:2:SRC
5:0:WIDTH
- 30:IFRAME
+ 31:IFRAME
9 attributes:
0:0:FRAMEBORDER
1:0:HEIGHT
@@ -245,7 +248,7 @@
6:0:SCROLLING
7:2:SRC
8:0:WIDTH
- 31:IMG
+ 32:IMG
15 attributes:
0:0:ALT
1:0:BORDER
@@ -262,7 +265,7 @@
12:2:USEMAP
13:0:VSPACE
14:0:WIDTH
- 32:INPUT
+ 33:INPUT
28 attributes:
0:0:ACCEPT
1:0:ACCEPT-CHARSET
@@ -292,23 +295,23 @@
25:0:USEMAP
26:0:VALUE
27:0:WIDTH
- 33:ISINDEX
+ 34:ISINDEX
3 attributes:
0:2:ACTION
1:2:HREF
2:0:PROMPT
- 34:KEYGEN
+ 35:KEYGEN
2 attributes:
0:0:CHALLENGE
1:0:NAME
- 35:LABEL
+ 36:LABEL
5 attributes:
0:0:ACCESSKEY
1:0:CLEAR
2:0:FOR
3:0:ONBLUR
4:0:ONFOCUS
- 36:LI
+ 37:LI
7 attributes:
0:0:CLEAR
1:0:DINGBAT
@@ -317,7 +320,7 @@
4:2:SRC
5:0:TYPE
6:0:VALUE
- 37:LINK
+ 38:LINK
8 attributes:
0:0:CHARSET
1:2:HREF
@@ -327,31 +330,31 @@
5:0:REV
6:0:TARGET
7:0:TYPE
- 38:MAP
+ 39:MAP
2 attributes:
0:0:CLEAR
1:1:NAME
- 39:MATH
+ 40:MATH
2 attributes:
0:0:BOX
1:0:CLEAR
- 40:META
+ 41:META
5 attributes:
0:0:CHARSET
1:0:CONTENT
2:0:HTTP-EQUIV
3:0:NAME
4:0:SCHEME
- 41:NEXTID
+ 42:NEXTID
1 attributes:
0:0:N
- 42:NOTE
+ 43:NOTE
4 attributes:
0:0:CLEAR
1:0:MD
2:8:ROLE
3:2:SRC
- 43:OBJECT
+ 44:OBJECT
19 attributes:
0:0:ARCHIVE
1:0:BORDER
@@ -372,7 +375,7 @@
16:2:USEMAP
17:0:VSPACE
18:0:WIDTH
- 44:OL
+ 45:OL
6 attributes:
0:0:CLEAR
1:0:COMPACT
@@ -380,7 +383,7 @@
3:0:SEQNUM
4:0:START
5:0:TYPE
- 45:OPTION
+ 46:OPTION
7 attributes:
0:0:CLEAR
1:0:DISABLED
@@ -389,7 +392,7 @@
4:0:SELECTED
5:0:SHAPE
6:0:VALUE
- 46:OVERLAY
+ 47:OVERLAY
8 attributes:
0:0:HEIGHT
1:0:IMAGEMAP
@@ -399,11 +402,11 @@
5:0:WIDTH
6:0:X
7:0:Y
- 47:P
+ 48:P
2 attributes:
0:0:CLEAR
1:0:NOWRAP
- 48:PARAM
+ 49:PARAM
12 attributes:
0:0:ACCEPT
1:0:ACCEPT-CHARSET
@@ -417,11 +420,11 @@
9:0:VALUE
10:0:VALUEREF
11:0:VALUETYPE
- 49:Q
+ 50:Q
2 attributes:
0:2:CITE
1:0:CLEAR
- 50:SCRIPT
+ 51:SCRIPT
10 attributes:
0:0:CHARSET
1:0:CLEAR
@@ -433,7 +436,7 @@
7:0:SCRIPTENGINE
8:2:SRC
9:0:TYPE
- 51:SELECT
+ 52:SELECT
15 attributes:
0:0:CLEAR
1:0:DISABLED
@@ -450,18 +453,18 @@
12:0:TABINDEX
13:0:UNITS
14:0:WIDTH
- 52:STYLE
+ 53:STYLE
3 attributes:
0:0:MEDIA
1:0:NOTATION
2:0:TYPE
- 53:TAB
+ 54:TAB
4 attributes:
0:0:CLEAR
1:0:DP
2:0:INDENT
3:0:TO
- 54:TABLE
+ 55:TABLE
15 attributes:
0:2:BACKGROUND
1:0:BORDER
@@ -478,7 +481,7 @@
12:0:SUMMARY
13:0:UNITS
14:0:WIDTH
- 55:TD
+ 56:TD
13 attributes:
0:0:ABBR
1:0:AXES
@@ -493,7 +496,7 @@
10:0:ROWSPAN
11:0:SCOPE
12:0:WIDTH
- 56:TEXTAREA
+ 57:TEXTAREA
15 attributes:
0:0:ACCEPT-CHARSET
1:0:ACCESSKEY
@@ -510,12 +513,12 @@
12:0:READONLY
13:0:ROWS
14:0:TABINDEX
- 57:TR
+ 58:TR
3 attributes:
0:0:CLEAR
1:0:DP
2:0:NOWRAP
- 58:UL
+ 59:UL
8 attributes:
0:0:CLEAR
1:0:COMPACT
@@ -525,7 +528,7 @@
5:2:SRC
6:0:TYPE
7:0:WRAP
-118 tags
+126 tags
0:A
justify
25 attributes:
@@ -703,7 +706,53 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer BODYlike
canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike LIlike ULlike
flags: endO
- 6:AU
+ 6:ARTICLE
+ justify
+ 7 attributes:
+ 0:4:CLASS
+ 1:0:DIR
+ 2:1:ID
+ 3:0:LANG
+ 4:0:ROLE
+ 5:0:STYLE
+ 6:0:TITLE
+ 4 attr_types
+ core
+ events
+ i18n
+ GEN5
+ contents: SGML_MIXED
+ tagclass: DIVlike
+ contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
+ icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
+ contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
+ icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+ canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
+ flags: mafse
+ 7:ASIDE
+ justify
+ 7 attributes:
+ 0:4:CLASS
+ 1:0:DIR
+ 2:1:ID
+ 3:0:LANG
+ 4:0:ROLE
+ 5:0:STYLE
+ 6:0:TITLE
+ 4 attr_types
+ core
+ events
+ i18n
+ GEN5
+ contents: SGML_MIXED
+ tagclass: DIVlike
+ contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
+ icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
+ contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
+ icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+ canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
+ flags: mafse
+ 8:AU
justify
7 attributes:
0:4:CLASS
@@ -726,7 +775,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike EMlike
flags:
- 7:AUTHOR
+ 9:AUTHOR
justify
7 attributes:
0:4:CLASS
@@ -749,7 +798,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike EMlike
flags:
- 8:B
+ 10:B
justify
7 attributes:
0:4:CLASS
@@ -772,7 +821,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike
flags: mafse nreie
- 9:BANNER
+ 11:BANNER
nojustify
7 attributes:
0:4:CLASS
@@ -795,7 +844,7 @@
icontained: outer BODYlike
canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
flags:
- 10:BASE
+ 12:BASE
justify
6 attributes:
0:4:CLASS
@@ -815,7 +864,7 @@
icontained: outer HEADstuff
canclose: FONTlike EMlike MATHlike Alike same
flags: endO
- 11:BASEFONT
+ 13:BASEFONT
justify
11 attributes:
0:4:CLASS
@@ -841,7 +890,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
canclose: BRlike APPLETlike HRlike MAPlike same
flags: endO
- 12:BDO
+ 14:BDO
justify
7 attributes:
0:4:CLASS
@@ -864,7 +913,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula TRlike Plike DIVlike
flags:
- 13:BGSOUND
+ 15:BGSOUND
justify
9 attributes:
0:4:CLASS
@@ -888,7 +937,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff
canclose: FONTlike EMlike MATHlike Alike Plike DIVlike BRlike APPLETlike HRlike same
flags: endO
- 14:BIG
+ 16:BIG
justify
7 attributes:
0:4:CLASS
@@ -911,7 +960,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike
flags: mafse nreie
- 15:BLINK
+ 17:BLINK
justify
7 attributes:
0:4:CLASS
@@ -934,7 +983,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike
flags: mafse nreie
- 16:BLOCKQUOTE
+ 18:BLOCKQUOTE
justify
9 attributes:
0:2:CITE
@@ -958,7 +1007,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
flags:
- 17:BODY
+ 19:BODY
justify
15 attributes:
0:0:ALINK
@@ -989,7 +1038,7 @@
icontained: outer BODYlike
canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer HEADstuff same
flags: endO startO
- 18:BODYTEXT
+ 20:BODYTEXT
justify
14 attributes:
0:4:CLASS
@@ -1018,7 +1067,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike BRlike APPLETlike HRlike MAPlike same
flags: endO startO
- 19:BQ
+ 21:BQ
justify
9 attributes:
0:2:CITE
@@ -1042,7 +1091,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
flags:
- 20:BR
+ 22:BR
justify
7 attributes:
0:4:CLASS
@@ -1065,7 +1114,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff
canclose: FONTlike EMlike MATHlike Alike formula BRlike same
flags: endO
- 21:BUTTON
+ 23:BUTTON
justify
16 attributes:
0:0:ACCESSKEY
@@ -1097,7 +1146,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike BRlike same
flags:
- 22:CAPTION
+ 24:CAPTION
justify
9 attributes:
0:0:ACCESSKEY
@@ -1123,7 +1172,7 @@
icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike same
flags:
- 23:CENTER
+ 25:CENTER
justify
8 attributes:
0:0:ALIGN
@@ -1147,7 +1196,7 @@
icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike LIlike same
flags:
- 24:CITE
+ 26:CITE
justify
7 attributes:
0:4:CLASS
@@ -1170,7 +1219,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: EMlike
flags: nreie
- 25:CODE
+ 27:CODE
justify
7 attributes:
0:4:CLASS
@@ -1193,7 +1242,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: EMlike
flags:
- 26:COL
+ 28:COL
justify
13 attributes:
0:0:ALIGN
@@ -1223,7 +1272,7 @@
icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike ULlike MAPlike same
flags: endO
- 27:COLGROUP
+ 29:COLGROUP
justify
13 attributes:
0:0:ALIGN
@@ -1253,7 +1302,7 @@
icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike MAPlike same
flags: endO
- 28:COMMENT
+ 30:COMMENT
justify
7 attributes:
0:4:CLASS
@@ -1276,7 +1325,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer BODYlike HEADstuff
canclose: FONTlike EMlike
flags:
- 29:CREDIT
+ 31:CREDIT
justify
7 attributes:
0:4:CLASS
@@ -1299,7 +1348,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike Plike DIVlike same
flags:
- 30:DD
+ 32:DD
justify
7 attributes:
0:4:CLASS
@@ -1322,7 +1371,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike LIlike same
flags: endO
- 31:DEL
+ 33:DEL
justify
8 attributes:
0:0:CITE
@@ -1346,7 +1395,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike EMlike
flags:
- 32:DFN
+ 34:DFN
justify
7 attributes:
0:4:CLASS
@@ -1369,7 +1418,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike EMlike
flags:
- 33:DIR
+ 35:DIR
justify
14 attributes:
0:4:CLASS
@@ -1398,7 +1447,7 @@
icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike HRlike same
flags:
- 34:DIV
+ 36:DIV
justify
8 attributes:
0:0:ALIGN
@@ -1422,7 +1471,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
flags: mafse
- 35:DL
+ 37:DL
justify
8 attributes:
0:4:CLASS
@@ -1445,7 +1494,7 @@
icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike
flags:
- 36:DLC
+ 38:DLC
justify
8 attributes:
0:4:CLASS
@@ -1468,7 +1517,7 @@
icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike
flags:
- 37:DT
+ 39:DT
justify
7 attributes:
0:4:CLASS
@@ -1491,7 +1540,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer
canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike LIlike same
flags: endO
- 38:EM
+ 40:EM
justify
7 attributes:
0:4:CLASS
@@ -1514,7 +1563,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike EMlike
flags: nreie
- 39:EMBED
+ 41:EMBED
justify
21 attributes:
0:0:ALIGN
@@ -1551,7 +1600,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer
flags: endO
- 40:FIELDSET
+ 42:FIELDSET
justify
7 attributes:
0:4:CLASS
@@ -1574,7 +1623,7 @@
icontained: FONTlike EMlike MATHlike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike MAPlike same
flags:
- 41:FIG
+ 43:FIG
justify
17 attributes:
0:0:ALIGN
@@ -1607,7 +1656,30 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike SELECTlike Plike DIVlike MAPlike same
flags:
- 42:FN
+ 44:FIGURE
+ justify
+ 7 attributes:
+ 0:4:CLASS
+ 1:0:DIR
+ 2:1:ID
+ 3:0:LANG
+ 4:0:ROLE
+ 5:0:STYLE
+ 6:0:TITLE
+ 4 attr_types
+ core
+ events
+ i18n
+ GEN5
+ contents: SGML_MIXED
+ tagclass: DIVlike
+ contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
+ icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
+ contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
+ icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+ canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
+ flags: mafse
+ 45:FN
justify
7 attributes:
0:4:CLASS
@@ -1630,7 +1702,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike SELECTlike Plike BRlike same
flags:
- 43:FONT
+ 46:FONT
justify
11 attributes:
0:4:CLASS
@@ -1656,7 +1728,30 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike
flags: mafse nreie
- 44:FORM
+ 47:FOOTER
+ justify
+ 7 attributes:
+ 0:4:CLASS
+ 1:0:DIR
+ 2:1:ID
+ 3:0:LANG
+ 4:0:ROLE
+ 5:0:STYLE
+ 6:0:TITLE
+ 4 attr_types
+ core
+ events
+ i18n
+ GEN5
+ contents: SGML_MIXED
+ tagclass: DIVlike
+ contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
+ icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
+ contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
+ icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+ canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
+ flags: mafse
+ 48:FORM
justify
17 attributes:
0:0:ACCEPT
@@ -1688,7 +1783,7 @@
icontained: FONTlike EMlike MATHlike Plike DIVlike LIlike ULlike APPLETlike outer BODYlike
canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike LIlike ULlike MAPlike same
flags:
- 45:FRAME
+ 49:FRAME
justify
12 attributes:
0:4:CLASS
@@ -1714,7 +1809,7 @@
icontained: outer
canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer same
flags: endO
- 46:FRAMESET
+ 50:FRAMESET
justify
4 attributes:
0:0:COLS
@@ -1731,7 +1826,7 @@
icontained: BRlike APPLETlike outer same
canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer same
flags:
- 47:H1
+ 51:H1
nojustify
14 attributes:
0:0:ALIGN
@@ -1762,7 +1857,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike formula Plike same
flags:
- 48:H2
+ 52:H2
nojustify
14 attributes:
0:0:ALIGN
@@ -1793,7 +1888,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike formula Plike same
flags:
- 49:H3
+ 53:H3
nojustify
14 attributes:
0:0:ALIGN
@@ -1824,7 +1919,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike formula Plike same
flags:
- 50:H4
+ 54:H4
nojustify
14 attributes:
0:0:ALIGN
@@ -1855,7 +1950,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike formula Plike same
flags:
- 51:H5
+ 55:H5
nojustify
14 attributes:
0:0:ALIGN
@@ -1886,7 +1981,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike formula Plike same
flags:
- 52:H6
+ 56:H6
nojustify
14 attributes:
0:0:ALIGN
@@ -1917,7 +2012,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike formula Plike same
flags:
- 53:HEAD
+ 57:HEAD
justify
7 attributes:
0:4:CLASS
@@ -1940,7 +2035,30 @@
icontained: outer
canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer same
flags: endO startO mafse
- 54:HR
+ 58:HEADER
+ justify
+ 7 attributes:
+ 0:4:CLASS
+ 1:0:DIR
+ 2:1:ID
+ 3:0:LANG
+ 4:0:ROLE
+ 5:0:STYLE
+ 6:0:TITLE
+ 4 attr_types
+ core
+ events
+ i18n
+ GEN5
+ contents: SGML_MIXED
+ tagclass: DIVlike
+ contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
+ icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
+ contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
+ icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+ canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
+ flags: mafse
+ 59:HR
justify
13 attributes:
0:0:ALIGN
@@ -1969,7 +2087,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer BODYlike
canclose: FONTlike EMlike MATHlike formula TRlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike same
flags: endO
- 55:HTML
+ 60:HTML
justify
7 attributes:
0:4:CLASS
@@ -1992,7 +2110,7 @@
icontained:
canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer
flags: endO startO
- 56:HY
+ 61:HY
justify
7 attributes:
0:4:CLASS
@@ -2015,7 +2133,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff
canclose: FONTlike EMlike MATHlike Alike formula BRlike same
flags: endO
- 57:I
+ 62:I
justify
7 attributes:
0:4:CLASS
@@ -2038,7 +2156,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike
flags: mafse nreie
- 58:IFRAME
+ 63:IFRAME
justify
14 attributes:
0:0:ALIGN
@@ -2067,7 +2185,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike BRlike APPLETlike outer HEADstuff same
flags:
- 59:IMG
+ 64:IMG
justify
22 attributes:
0:0:ALIGN
@@ -2106,7 +2224,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
canclose: same
flags: endO
- 60:INPUT
+ 65:INPUT
justify
35 attributes:
0:0:ACCEPT
@@ -2158,7 +2276,7 @@
icontained: FONTlike EMlike MATHlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike Alike SELECTlike BRlike MAPlike same
flags: endO
- 61:INS
+ 66:INS
justify
8 attributes:
0:0:CITE
@@ -2182,7 +2300,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike EMlike
flags:
- 62:ISINDEX
+ 67:ISINDEX
justify
9 attributes:
0:2:ACTION
@@ -2206,7 +2324,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer BODYlike HEADstuff
canclose: FONTlike EMlike MATHlike same
flags: endO
- 63:KBD
+ 68:KBD
justify
7 attributes:
0:4:CLASS
@@ -2229,7 +2347,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff
canclose: FONTlike EMlike
flags:
- 64:KEYGEN
+ 69:KEYGEN
justify
8 attributes:
0:0:CHALLENGE
@@ -2252,7 +2370,7 @@
icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
canclose: formula TRlike SELECTlike same
flags: endO
- 65:LABEL
+ 70:LABEL
justify
11 attributes:
0:0:ACCESSKEY
@@ -2279,7 +2397,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike
flags:
- 66:LEGEND
+ 71:LEGEND
justify
9 attributes:
0:0:ACCESSKEY
@@ -2305,7 +2423,7 @@
icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike
flags:
- 67:LH
+ 72:LH
justify
7 attributes:
0:4:CLASS
@@ -2328,7 +2446,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer same
canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike LIlike same
flags: endO
- 68:LI
+ 73:LI
justify
13 attributes:
0:4:CLASS
@@ -2357,7 +2475,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer same
canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike LIlike same
flags: endO
- 69:LINK
+ 74:LINK
justify
14 attributes:
0:0:CHARSET
@@ -2387,7 +2505,7 @@
icontained: outer HEADstuff
canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike
flags: endO
- 70:LISTING
+ 75:LISTING
justify
7 attributes:
0:4:CLASS
@@ -2410,7 +2528,30 @@
icontained: Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike LIlike ULlike same
flags:
- 71:MAP
+ 76:MAIN
+ justify
+ 7 attributes:
+ 0:4:CLASS
+ 1:0:DIR
+ 2:1:ID
+ 3:0:LANG
+ 4:0:ROLE
+ 5:0:STYLE
+ 6:0:TITLE
+ 4 attr_types
+ core
+ events
+ i18n
+ GEN5
+ contents: SGML_MIXED
+ tagclass: DIVlike
+ contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
+ icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
+ contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
+ icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+ canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
+ flags: mafse
+ 77:MAP
justify
8 attributes:
0:4:CLASS
@@ -2433,7 +2574,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike Alike formula Plike LIlike
flags:
- 72:MARQUEE
+ 78:MARQUEE
justify
7 attributes:
0:4:CLASS
@@ -2456,7 +2597,7 @@
icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: MATHlike Alike formula BRlike APPLETlike same
flags:
- 73:MATH
+ 79:MATH
justify
8 attributes:
0:0:BOX
@@ -2479,7 +2620,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike EMlike MATHlike Alike formula
flags:
- 74:MENU
+ 80:MENU
justify
14 attributes:
0:4:CLASS
@@ -2508,7 +2649,7 @@
icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike MAPlike same
flags:
- 75:META
+ 81:META
justify
5 attributes:
0:0:CHARSET
@@ -2526,7 +2667,30 @@
icontained: outer HEADstuff
canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike
flags: endO
- 76:NEXTID
+ 82:NAV
+ justify
+ 7 attributes:
+ 0:4:CLASS
+ 1:0:DIR
+ 2:1:ID
+ 3:0:LANG
+ 4:0:ROLE
+ 5:0:STYLE
+ 6:0:TITLE
+ 4 attr_types
+ core
+ events
+ i18n
+ GEN5
+ contents: SGML_MIXED
+ tagclass: DIVlike
+ contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
+ icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
+ contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
+ icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+ canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
+ flags: mafse
+ 83:NEXTID
justify
1 attributes:
0:0:N
@@ -2540,7 +2704,7 @@
icontained: FONTlike EMlike MATHlike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer
canclose: FONTlike
flags: endO
- 77:NOFRAMES
+ 84:NOFRAMES
justify
7 attributes:
0:4:CLASS
@@ -2563,7 +2727,7 @@
icontained: BRlike APPLETlike HRlike outer
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike ULlike HRlike MAPlike
flags:
- 78:NOTE
+ 85:NOTE
justify
10 attributes:
0:4:CLASS
@@ -2588,7 +2752,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
flags:
- 79:OBJECT
+ 86:OBJECT
justify
26 attributes:
0:0:ALIGN
@@ -2631,7 +2795,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike LIlike ULlike BRlike APPLETlike same
flags: frecyc
- 80:OL
+ 87:OL
justify
12 attributes:
0:4:CLASS
@@ -2658,7 +2822,7 @@
icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike MAPlike same
flags:
- 81:OPTION
+ 88:OPTION
justify
13 attributes:
0:4:CLASS
@@ -2687,7 +2851,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
flags: endO
- 82:OVERLAY
+ 89:OVERLAY
justify
12 attributes:
0:4:CLASS
@@ -2713,7 +2877,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike DIVlike LIlike ULlike BRlike APPLETlike same
flags: endO
- 83:P
+ 90:P
justify
9 attributes:
0:0:ALIGN
@@ -2738,7 +2902,7 @@
icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike formula Plike same
flags: endO
- 84:PARAM
+ 91:PARAM
justify
18 attributes:
0:0:ACCEPT
@@ -2771,7 +2935,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike
canclose: TRlike SELECTlike Plike LIlike BRlike same
flags: endO
- 85:PLAINTEXT
+ 92:PLAINTEXT
justify
7 attributes:
0:4:CLASS
@@ -2794,7 +2958,7 @@
icontained: outer same
canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer BODYlike
flags: endO
- 86:PRE
+ 93:PRE
nojustify
7 attributes:
0:4:CLASS
@@ -2817,7 +2981,7 @@
icontained: formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike
canclose: EMlike MATHlike Alike formula Plike DIVlike LIlike same
flags:
- 87:Q
+ 94:Q
justify
8 attributes:
0:2:CITE
@@ -2840,7 +3004,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike EMlike
flags:
- 88:S
+ 95:S
justify
7 attributes:
0:4:CLASS
@@ -2863,7 +3027,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike
flags:
- 89:SAMP
+ 96:SAMP
justify
7 attributes:
0:4:CLASS
@@ -2886,7 +3050,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: EMlike
flags: nreie
- 90:SCRIPT
+ 97:SCRIPT
justify
16 attributes:
0:0:CHARSET
@@ -2917,7 +3081,30 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike LIlike ULlike BRlike APPLETlike HRlike same
flags:
- 91:SELECT
+ 98:SECTION
+ justify
+ 7 attributes:
+ 0:4:CLASS
+ 1:0:DIR
+ 2:1:ID
+ 3:0:LANG
+ 4:0:ROLE
+ 5:0:STYLE
+ 6:0:TITLE
+ 4 attr_types
+ core
+ events
+ i18n
+ GEN5
+ contents: SGML_MIXED
+ tagclass: DIVlike
+ contains: FONTlike EMlike MATHlike Alike SELECTlike FORMlike Plike DIVlike ULlike BRlike APPLETlike HRlike MAPlike same
+ icontains: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike same
+ contained: TRlike FORMlike DIVlike LIlike APPLETlike HRlike outer BODYlike same
+ icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
+ canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike same
+ flags: mafse
+ 99:SELECT
justify
22 attributes:
0:0:ALIGN
@@ -2955,7 +3142,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike outer BODYlike
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike LIlike ULlike same
flags: strict
- 92:SHY
+ 100:SHY
justify
7 attributes:
0:4:CLASS
@@ -2978,7 +3165,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff
canclose: FONTlike EMlike MATHlike Alike formula BRlike same
flags: endO
- 93:SMALL
+ 101:SMALL
justify
7 attributes:
0:4:CLASS
@@ -3001,7 +3188,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike
flags: mafse nreie
- 94:SPAN
+ 102:SPAN
justify
7 attributes:
0:4:CLASS
@@ -3024,7 +3211,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike EMlike same
flags:
- 95:SPOT
+ 103:SPOT
justify
7 attributes:
0:4:CLASS
@@ -3047,7 +3234,7 @@
icontained: FONTlike EMlike MATHlike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike MAPlike outer BODYlike
canclose: Alike
flags: endO
- 96:STRIKE
+ 104:STRIKE
justify
7 attributes:
0:4:CLASS
@@ -3070,7 +3257,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike
flags:
- 97:STRONG
+ 105:STRONG
justify
7 attributes:
0:4:CLASS
@@ -3093,7 +3280,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike EMlike
flags: nreie
- 98:STYLE
+ 106:STYLE
justify
9 attributes:
0:4:CLASS
@@ -3117,7 +3304,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike HEADstuff
canclose: FONTlike EMlike MATHlike Alike formula same
flags:
- 99:SUB
+ 107:SUB
justify
7 attributes:
0:4:CLASS
@@ -3140,7 +3327,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike EMlike MATHlike
flags:
- 100:SUP
+ 108:SUP
justify
7 attributes:
0:4:CLASS
@@ -3163,7 +3350,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike EMlike MATHlike
flags:
- 101:TAB
+ 109:TAB
justify
11 attributes:
0:0:ALIGN
@@ -3190,7 +3377,7 @@
icontained: FONTlike EMlike MATHlike Alike TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer HEADstuff
canclose: FONTlike
flags: endO
- 102:TABLE
+ 110:TABLE
justify
22 attributes:
0:0:ALIGN
@@ -3229,7 +3416,7 @@
icontained: FONTlike EMlike MATHlike TRlike FORMlike Plike DIVlike LIlike ULlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike Plike LIlike HRlike MAPlike same
flags:
- 103:TBODY
+ 111:TBODY
justify
13 attributes:
0:0:ALIGN
@@ -3259,7 +3446,7 @@
icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike HRlike MAPlike same
flags: endO startO
- 104:TD
+ 112:TD
justify
23 attributes:
0:0:ABBR
@@ -3298,7 +3485,7 @@
icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike HRlike MAPlike same
flags: endO
- 105:TEXTAREA
+ 113:TEXTAREA
justify
22 attributes:
0:0:ACCEPT-CHARSET
@@ -3337,7 +3524,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike outer BODYlike
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike LIlike ULlike same
flags: nolyspcl
- 106:TEXTFLOW
+ 114:TEXTFLOW
justify
14 attributes:
0:4:CLASS
@@ -3366,7 +3553,7 @@
icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike BRlike APPLETlike MAPlike outer same
flags: endO startO
- 107:TFOOT
+ 115:TFOOT
justify
13 attributes:
0:0:ALIGN
@@ -3396,7 +3583,7 @@
icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike ULlike HRlike MAPlike same
flags: endO
- 108:TH
+ 116:TH
justify
23 attributes:
0:0:ABBR
@@ -3435,7 +3622,7 @@
icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike ULlike HRlike MAPlike same
flags: endO
- 109:THEAD
+ 117:THEAD
justify
13 attributes:
0:0:ALIGN
@@ -3465,7 +3652,7 @@
icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike ULlike HRlike MAPlike same
flags: endO
- 110:TITLE
+ 118:TITLE
justify
7 attributes:
0:4:CLASS
@@ -3488,7 +3675,7 @@
icontained: outer HEADstuff
canclose: FONTlike EMlike MATHlike Alike formula Plike DIVlike
flags: mafse strict
- 111:TR
+ 119:TR
justify
13 attributes:
0:0:ALIGN
@@ -3518,7 +3705,7 @@
icontained: FONTlike EMlike MATHlike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike HRlike MAPlike same
flags: endO
- 112:TT
+ 120:TT
justify
7 attributes:
0:4:CLASS
@@ -3541,7 +3728,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike
flags: nreie
- 113:U
+ 121:U
justify
7 attributes:
0:4:CLASS
@@ -3564,7 +3751,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike
flags: mafse nreie
- 114:UL
+ 122:UL
justify
14 attributes:
0:4:CLASS
@@ -3593,7 +3780,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike SELECTlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike same
canclose: FONTlike EMlike MATHlike Alike formula SELECTlike Plike DIVlike LIlike same
flags:
- 115:VAR
+ 123:VAR
justify
7 attributes:
0:4:CLASS
@@ -3616,7 +3803,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff same
canclose: FONTlike
flags:
- 116:WBR
+ 124:WBR
justify
7 attributes:
0:4:CLASS
@@ -3639,7 +3826,7 @@
icontained: FONTlike EMlike MATHlike Alike formula TRlike FORMlike Plike DIVlike LIlike ULlike BRlike APPLETlike HRlike outer BODYlike HEADstuff
canclose: FONTlike EMlike MATHlike Alike formula BRlike same
flags: endO
- 117:XMP
+ 125:XMP
nojustify
7 attributes:
0:4:CLASS
diff --git a/WWW/Library/Implementation/tidy_tls.h b/WWW/Library/Implementation/tidy_tls.h
index 040ed30..56b3636 100644
--- a/WWW/Library/Implementation/tidy_tls.h
+++ b/WWW/Library/Implementation/tidy_tls.h
@@ -1,6 +1,6 @@
/*
- * $LynxId: tidy_tls.h,v 1.4 2014/01/11 17:09:33 tom Exp $
- * Copyright 2008-2011,2014 Thomas E. Dickey
+ * $LynxId: tidy_tls.h,v 1.8 2015/10/12 00:28:18 tom Exp $
+ * Copyright 2008-2013,2015 Thomas E. Dickey
*/
#ifndef TIDY_TLS_H
#define TIDY_TLS_H
@@ -78,6 +78,11 @@ typedef struct _SSL_CTX {
int (*verify_callback) (int, X509_STORE_CTX *);
int verify_mode;
+ char *client_certfile;
+ int client_certfile_type;
+ char *client_keyfile;
+ int client_keyfile_type;
+
} SSL_CTX;
struct _SSL {
@@ -98,6 +103,9 @@ struct _SSL {
gnutls_transport_ptr_t rfd;
gnutls_transport_ptr_t wfd;
+
+ void *sendbuffer;
+ size_t bytes_sent;
};
/* use either SSL_VERIFY_NONE or SSL_VERIFY_PEER, the last 2 options
diff --git a/aclocal.m4 b/aclocal.m4
index 6cc3e77..1b596da 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $LynxId: aclocal.m4,v 1.225 2015/04/27 00:38:54 tom Exp $
+dnl $LynxId: aclocal.m4,v 1.231 2015/12/13 02:00:51 tom Exp $
dnl Macros for auto-configure script.
dnl by Thomas E. Dickey <dickey at invisible-island.net>
dnl and Jim Spath <jspath at mail.bcpl.lib.md.us>
@@ -196,7 +196,7 @@ AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl AM_LC_MESSAGES version: 4 updated: 2002/10/27 23:21:42
+dnl AM_LC_MESSAGES version: 5 updated: 2015/05/10 19:52:14
dnl --------------
dnl Inserted as requested by gettext 0.10.40
dnl File from /usr/share/aclocal
@@ -217,15 +217,15 @@ dnl
dnl serial 2
dnl
AC_DEFUN([AM_LC_MESSAGES],
- [if test $ac_cv_header_locale_h = yes; then
- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
- [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
- if test $am_cv_val_LC_MESSAGES = yes; then
- AC_DEFINE(HAVE_LC_MESSAGES, 1,
- [Define if your <locale.h> file defines LC_MESSAGES.])
- fi
- fi])dnl
+[if test $ac_cv_header_locale_h = yes; then
+ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
+ [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
+ if test $am_cv_val_LC_MESSAGES = yes; then
+ AC_DEFINE(HAVE_LC_MESSAGES, 1,
+ [Define if your <locale.h> file defines LC_MESSAGES.])
+ fi
+fi])dnl
dnl ---------------------------------------------------------------------------
dnl AM_PATH_PROG_WITH_TEST version: 9 updated: 2015/04/15 19:08:48
dnl ----------------------
@@ -711,7 +711,7 @@ AC_SUBST(EXTRA_CPPFLAGS)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_ADD_INCDIR version: 13 updated: 2010/05/26 16:44:57
+dnl CF_ADD_INCDIR version: 14 updated: 2015/05/25 20:53:04
dnl -------------
dnl Add an include-directory to $CPPFLAGS. Don't add /usr/include, since it's
dnl redundant. We don't normally need to add -I/usr/local/include for gcc,
@@ -762,6 +762,8 @@ if test -n "$1" ; then
else
break
fi
+ else
+ break
fi
done
done
@@ -851,7 +853,7 @@ LIBS=`echo "$LIBS" | sed -e "s/[[ ]][[ ]]*/ /g" -e "s%$1 %$1 $2 %" -e 's% % %
CF_VERBOSE(...after $LIBS)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_ADD_OPTIONAL_PATH version: 2 updated: 2015/04/15 19:08:48
+dnl CF_ADD_OPTIONAL_PATH version: 3 updated: 2015/05/10 19:52:14
dnl --------------------
dnl Add an optional search-path to the compile/link variables.
dnl See CF_WITH_PATH
@@ -859,15 +861,15 @@ dnl
dnl $1 = shell variable containing the result of --with-XXX=[DIR]
dnl $2 = module to look for.
AC_DEFUN([CF_ADD_OPTIONAL_PATH],[
- case "$1" in
- (no)
- ;;
- (yes)
- ;;
- (*)
- CF_ADD_SEARCHPATH([$1], [AC_MSG_ERROR(cannot find $2 under $1)])
- ;;
- esac
+case "$1" in
+(no)
+ ;;
+(yes)
+ ;;
+(*)
+ CF_ADD_SEARCHPATH([$1], [AC_MSG_ERROR(cannot find $2 under $1)])
+ ;;
+esac
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_ADD_SEARCHPATH version: 5 updated: 2009/01/11 20:40:21
@@ -1029,7 +1031,7 @@ dnl Allow user to enable a normally-off option.
AC_DEFUN([CF_ARG_ENABLE],
[CF_ARG_OPTION($1,[$2],[$3],[$4],no)])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_ARG_OPTION version: 4 updated: 2010/05/26 05:38:42
+dnl CF_ARG_OPTION version: 5 updated: 2015/05/10 19:52:14
dnl -------------
dnl Restricted form of AC_ARG_ENABLE that ensures user doesn't give bogus
dnl values.
@@ -1042,25 +1044,29 @@ 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)
- if test "$enableval" != "$5" ; then
+ if test "$enableval" != "$5" ; then
ifelse([$3],,[ :]dnl
,[ $3]) ifelse([$4],,,[
- else
- $4])
- fi],[enableval=$5 ifelse([$4],,,[
- $4
+ else
+ $4])
+ fi],[enableval=$5 ifelse([$4],,,[
+ $4
])dnl
- ])])dnl
+])])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_AR_FLAGS version: 5 updated: 2010/05/20 20:24:29
+dnl CF_AR_FLAGS version: 6 updated: 2015/10/10 15:25:05
dnl -----------
dnl Check for suitable "ar" (archiver) options for updating an archive.
+dnl
+dnl In particular, handle some obsolete cases where the "-" might be omitted,
+dnl as well as a workaround for breakage of make's archive rules by the GNU
+dnl binutils "ar" program.
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
+ for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv
do
# check if $ARFLAGS already contains this choice
@@ -1216,7 +1222,7 @@ AC_SUBST(BUILD_EXEEXT)
AC_SUBST(BUILD_OBJEXT)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_BUNDLED_INTL version: 17 updated: 2012/10/06 08:57:51
+dnl CF_BUNDLED_INTL version: 18 updated: 2015/05/10 19:52:14
dnl ---------------
dnl Top-level macro for configuring an application with a bundled copy of
dnl the intl and po directories for gettext.
@@ -1285,7 +1291,7 @@ dnl this updates SUB_MAKEFILE and MSG_DIR_MAKE:
CF_OUR_MESSAGES($1)
if test "$USE_INCLUDED_LIBINTL" = yes ; then
- if test "$nls_cv_force_use_gnu_gettext" = yes ; then
+ if test "$nls_cv_force_use_gnu_gettext" = yes ; then
:
elif test "$nls_cv_use_gnu_gettext" = yes ; then
:
@@ -1562,7 +1568,7 @@ fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_SIZEOF version: 1 updated: 2012/08/10 11:32:08
+dnl CF_CHECK_SIZEOF version: 2 updated: 2015/05/09 11:00:10
dnl ---------------
dnl Improve on AC_CHECK_SIZEOF for cases when the build-environment is
dnl deficient, e.g., if someone tries to build in busybox. Use the second
@@ -1573,8 +1579,8 @@ dnl can detect; the former includes only stdio.h for types while the latter
dnl includes several header files.
AC_DEFUN([CF_CHECK_SIZEOF],[
AC_CHECK_SIZEOF([$1],[$2])
-if test "${ac_cv_type_$1:+set}" = set; then
- if test "${ac_cv_sizeof_$1:+set}" != set; then
+if test "${ac_cv_type_$1+set}" = set; then
+ if test "${ac_cv_sizeof_$1+set}" != set; then
AC_MSG_WARN(using $2 for sizeof $1)
ac_cv_sizeof_$1=$2
elif test "x${ac_cv_sizeof_$1}" = x0; then
@@ -1836,7 +1842,7 @@ fi
AC_CHECK_HEADERS($cf_cv_ncurses_header)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_LIBS version: 38 updated: 2015/04/15 19:08:48
+dnl CF_CURSES_LIBS version: 39 updated: 2015/05/10 19:52:14
dnl --------------
dnl Look for the curses libraries. Older curses implementations may require
dnl termcap/termlib to be linked as well. Call CF_CURSES_CPPFLAGS first.
@@ -1845,16 +1851,16 @@ AC_DEFUN([CF_CURSES_LIBS],[
AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
AC_MSG_CHECKING(if we have identified curses libraries)
AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>],
- [initscr(); tgoto("?", 0,0)],
- cf_result=yes,
- cf_result=no)
+ [initscr(); tgoto("?", 0,0)],
+ cf_result=yes,
+ cf_result=no)
AC_MSG_RESULT($cf_result)
if test "$cf_result" = no ; then
case $host_os in
(freebsd*)
- AC_CHECK_LIB(mytinfo,tgoto,[CF_ADD_LIBS(-lmytinfo)])
- ;;
+ AC_CHECK_LIB(mytinfo,tgoto,[CF_ADD_LIBS(-lmytinfo)])
+ ;;
(hpux10.*)
# Looking at HPUX 10.20, the Hcurses library is the oldest (1997), cur_colr
# next (1998), and xcurses "newer" (2000). There is no header file for
@@ -1896,9 +1902,9 @@ case $host_os in
CF_ADD_LIBDIR(/usr/5lib)
CF_ADD_LIBS(-lcurses -ltermcap)
fi
- fi
- ac_cv_func_initscr=yes
- ;;
+ fi
+ ac_cv_func_initscr=yes
+ ;;
esac
if test ".$ac_cv_func_initscr" != .yes ; then
@@ -3517,7 +3523,7 @@ AC_MSG_RESULT($cf_cv_locale)
test $cf_cv_locale = yes && { ifelse($1,,AC_DEFINE(LOCALE,1,[Define to 1 if we have locale support]),[$1]) }
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_MAKEFLAGS version: 16 updated: 2015/04/15 19:08:48
+dnl CF_MAKEFLAGS version: 17 updated: 2015/08/05 20:44:28
dnl ------------
dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make'
dnl options to lower-levels. It's very useful for "make -n" -- if we have it.
@@ -3530,7 +3536,7 @@ AC_CACHE_CHECK(for makeflags variable, cf_cv_makeflags,[
for cf_option in '-${MAKEFLAGS}' '${MFLAGS}'
do
cat >cf_makeflags.tmp <<CF_EOF
-SHELL = /bin/sh
+SHELL = $SHELL
all :
@ echo '.$cf_option'
CF_EOF
@@ -3718,7 +3724,7 @@ printf("old\n");
,[$1=no])
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_CONFIG version: 13 updated: 2015/04/26 18:06:58
+dnl CF_NCURSES_CONFIG version: 17 updated: 2015/07/07 04:22:07
dnl -----------------
dnl Tie together the configure-script macros for ncurses, preferring these in
dnl order:
@@ -3732,7 +3738,7 @@ AC_REQUIRE([CF_PKG_CONFIG])
cf_ncuconfig_root=ifelse($1,,ncurses,$1)
cf_have_ncuconfig=no
-if test "x$PKG_CONFIG" != xnone; then
+if test "x${PKG_CONFIG:=none}" != xnone; then
AC_MSG_CHECKING(pkg-config for $cf_ncuconfig_root)
if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
AC_MSG_RESULT(yes)
@@ -3752,10 +3758,11 @@ if test "x$PKG_CONFIG" != xnone; then
int main(void)
{ char *xx = curses_version(); return (xx == 0); }],
[cf_have_ncuconfig=yes],
- [cf_have_ncuconfig=no])],
+ [cf_have_ncuconfig=no],
+ [cf_have_ncuconfig=maybe])],
[cf_have_ncuconfig=no])
-
AC_MSG_RESULT($cf_have_ncuconfig)
+ test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
if test "$cf_have_ncuconfig" != "yes"
then
CPPFLAGS="$cf_save_CPPFLAGS"
@@ -6477,7 +6484,7 @@ AC_CHECK_FUNCS( \
)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_CURSES version: 11 updated: 2011/01/18 18:15:30
+dnl CF_XOPEN_CURSES version: 13 updated: 2015/12/12 20:59:52
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.
@@ -6487,7 +6494,8 @@ dnl as getbegy(). The latter is better design, but the former is standard.
AC_DEFUN([CF_XOPEN_CURSES],
[
AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
-AC_CACHE_CHECK(if we must define _XOPEN_SOURCE_EXTENDED,cf_cv_need_xopen_extension,[
+AC_CACHE_CHECK(definition to turn on extended curses functions,cf_cv_need_xopen_extension,[
+cf_cv_need_xopen_extension=unknown
AC_TRY_LINK([
#include <stdlib.h>
#include <${cf_cv_ncurses_header:-curses.h}>],[
@@ -6496,14 +6504,6 @@ AC_TRY_LINK([
make an error
#endif
#endif
- long x = winnstr(stdscr, "", 0);
- int x1, y1;
- getbegyx(stdscr, y1, x1)],
- [cf_cv_need_xopen_extension=no],
- [AC_TRY_LINK([
-#define _XOPEN_SOURCE_EXTENDED
-#include <stdlib.h>
-#include <${cf_cv_ncurses_header:-curses.h}>],[
#ifdef NCURSES_VERSION
cchar_t check;
int check2 = curs_set((int)sizeof(check));
@@ -6511,12 +6511,35 @@ AC_TRY_LINK([
long x = winnstr(stdscr, "", 0);
int x1, y1;
getbegyx(stdscr, y1, x1)],
- [cf_cv_need_xopen_extension=yes],
- [cf_cv_need_xopen_extension=unknown])])])
-test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
+ [cf_cv_need_xopen_extension=none],
+ [
+ for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
+ do
+ AC_TRY_LINK([
+#define $cf_try_xopen_extension 1
+#include <stdlib.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)],
+ [cf_cv_need_xopen_extension=$cf_try_xopen_extension; break])
+ done
+ ])
+])
+
+case $cf_cv_need_xopen_extension in
+(*_*)
+ CPPFLAGS="$CPPFLAGS -D$cf_cv_need_xopen_extension"
+ ;;
+esac
+
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 49 updated: 2015/04/12 15:39:00
+dnl CF_XOPEN_SOURCE version: 50 updated: 2015/10/17 19:03:33
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,
@@ -6586,6 +6609,9 @@ case $host_os in
(openbsd*)
# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
;;
+(os2*)
+ cf_XOPEN_SOURCE=
+ ;;
(osf[[45]]*)
cf_xopen_source="-D_OSF_SOURCE"
;;
@@ -7039,15 +7065,15 @@ define([CF__INET_HEAD],[
#endif
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF__INTL_BODY version: 1 updated: 2007/07/26 17:35:47
+dnl CF__INTL_BODY version: 2 updated: 2015/05/10 19:52:14
dnl -------------
dnl Test-code needed for libintl compile-checks
dnl $1 = parameter 2 from AM_WITH_NLS
define([CF__INTL_BODY],[
- bindtextdomain ("", "");
- return (int) gettext ("")
- ifelse([$1], need-ngettext, [ + (int) ngettext ("", "", 0)], [])
- [ + _nl_msg_cat_cntr]
+ bindtextdomain ("", "");
+ return (int) gettext ("")
+ ifelse([$1], need-ngettext, [ + (int) ngettext ("", "", 0)], [])
+ [ + _nl_msg_cat_cntr]
])
dnl ---------------------------------------------------------------------------
dnl CF__INTL_HEAD version: 1 updated: 2007/07/26 17:35:47
@@ -7085,7 +7111,7 @@ define([CF__SSL_HEAD],[
#endif
])dnl
dnl ---------------------------------------------------------------------------
-dnl jm_GLIBC21 version: 3 updated: 2002/10/27 23:21:42
+dnl jm_GLIBC21 version: 4 updated: 2015/05/10 19:52:14
dnl ----------
dnl Inserted as requested by gettext 0.10.40
dnl File from /usr/share/aclocal
@@ -7096,10 +7122,10 @@ dnl
dnl Test for the GNU C Library, version 2.1 or newer.
dnl From Bruno Haible.
AC_DEFUN([jm_GLIBC21],
- [
- AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
- ac_cv_gnu_library_2_1,
- [AC_EGREP_CPP([Lucky GNU user],
+[
+AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
+ ac_cv_gnu_library_2_1,
+ [AC_EGREP_CPP([Lucky GNU user],
[
#include <features.h>
#ifdef __GNU_LIBRARY__
@@ -7109,10 +7135,7 @@ AC_DEFUN([jm_GLIBC21],
#endif
],
ac_cv_gnu_library_2_1=yes,
- ac_cv_gnu_library_2_1=no)
- ]
- )
- AC_SUBST(GLIBC21)
- GLIBC21="$ac_cv_gnu_library_2_1"
- ]
-)
+ ac_cv_gnu_library_2_1=no)])
+ AC_SUBST(GLIBC21)
+ GLIBC21="$ac_cv_gnu_library_2_1"
+])
diff --git a/config.guess b/config.guess
index f7eb141..b3f9053 100755
--- a/config.guess
+++ b/config.guess
@@ -2,7 +2,7 @@
# Attempt to guess a canonical system name.
# Copyright 1992-2015 Free Software Foundation, Inc.
-timestamp='2015-03-04'
+timestamp='2015-10-21'
# 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
@@ -221,7 +221,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
release='-gnu'
;;
*)
- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
;;
esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
@@ -249,6 +249,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:MirBSD:*:*)
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
exit ;;
+ *:Sortix:*:*)
+ echo ${UNAME_MACHINE}-unknown-sortix
+ exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
*4.0)
@@ -962,6 +965,9 @@ EOF
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
+ k1om:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
m32r*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
@@ -1038,7 +1044,7 @@ EOF
echo ${UNAME_MACHINE}-dec-linux-${LIBC}
exit ;;
x86_64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-pc-linux-${LIBC}
exit ;;
xtensa*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@@ -1117,7 +1123,7 @@ EOF
# uname -m prints for DJGPP always 'pc', but it prints nothing about
# the processor, so we play safe by assuming i586.
# Note: whatever this is, it MUST be the same as what config.sub
- # prints for the "djgpp" host, or else GDB configury will decide that
+ # prints for the "djgpp" host, or else GDB configure will decide that
# this is a cross-build.
echo i586-pc-msdosdjgpp
exit ;;
diff --git a/config.hin b/config.hin
index 25c38b6..85e4d01 100644
--- a/config.hin
+++ b/config.hin
@@ -1,5 +1,5 @@
/*
- * $LynxId: config.hin,v 1.137 2014/11/30 23:05:04 tom Exp $
+ * $LynxId: config.hin,v 1.138 2015/05/28 00:46:18 tom Exp $
* vile:cmode
*
* The configure script translates "config.hin" into "lynx_cfg.h"
@@ -80,7 +80,6 @@
#undef HAVE_GETTEXT /* defined if you want to use non-GNU gettext */
#undef HAVE_GETTIMEOFDAY
#undef HAVE_GETUID
-#undef HAVE_GNUTLS_PRIORITY_SET_DIRECT
#undef HAVE_GNUTLS_RND
#undef HAVE_H_ERRNO
#undef HAVE_ICONV /* AM_ICONV */
diff --git a/config.sub b/config.sub
index 8f1229c..1acc966 100755
--- a/config.sub
+++ b/config.sub
@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2015 Free Software Foundation, Inc.
-timestamp='2015-03-08'
+timestamp='2015-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
@@ -255,6 +255,7 @@ case $basic_machine in
| arc | arceb \
| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
| avr | avr32 \
+ | ba \
| be32 | be64 \
| bfin \
| c4x | c8051 | clipper \
@@ -305,7 +306,7 @@ case $basic_machine in
| riscv32 | riscv64 \
| rl78 | rx \
| score \
- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -376,6 +377,7 @@ case $basic_machine in
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
+ | ba-* \
| be32-* | be64-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
@@ -428,12 +430,13 @@ case $basic_machine in
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pyramid-* \
+ | riscv32-* | riscv64-* \
| rl78-* | romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
| tahoe-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tile*-* \
@@ -1376,7 +1379,7 @@ case $os in
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
| -sym* | -kopensolaris* | -plan9* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* | -aros* | -cloudabi* \
+ | -aos* | -aros* | -cloudabi* | -sortix* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
diff --git a/configure b/configure
index 26638fd..b276a5a 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
#! /bin/sh
-# From configure.in 2.8.9dev.6.
+# From configure.in 2.8.9dev.7.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52.20141204.
+# Generated by Autoconf 2.52.20150926.
#
# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
@@ -880,7 +880,7 @@ This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by $as_me, which was
-generated by GNU Autoconf 2.52.20141204. Invocation command line was
+generated by GNU Autoconf 2.52.20150926. Invocation command line was
$ $0 $@
@@ -1274,7 +1274,7 @@ rm conftest.sed
PACKAGE=lynx
# $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.9dev.6
+VERSION=2.8.9dev.7
echo "$as_me:1279: checking for DESTDIR" >&5
echo $ECHO_N "checking for DESTDIR... $ECHO_C" >&6
@@ -2638,7 +2638,7 @@ else
for cf_option in '-${MAKEFLAGS}' '${MFLAGS}'
do
cat >cf_makeflags.tmp <<CF_EOF
-SHELL = /bin/sh
+SHELL = $SHELL
all :
@ echo '.$cf_option'
CF_EOF
@@ -3235,7 +3235,7 @@ if test "${cf_cv_ar_flags+set}" = set; then
else
cf_cv_ar_flags=unknown
- for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv
+ for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv
do
# check if $ARFLAGS already contains this choice
@@ -3294,7 +3294,7 @@ echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&
if test "${enable_echo+set}" = set; then
enableval="$enable_echo"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
ECHO_LT='--silent'
ECHO_LD='@echo linking $@;'
@@ -3302,7 +3302,7 @@ if test "${enable_echo+set}" = set; then
SHOW_CC='@echo compiling $@'
ECHO_CC='@'
- else
+ else
ECHO_LT=''
ECHO_LD=''
@@ -3310,7 +3310,7 @@ if test "${enable_echo+set}" = set; then
SHOW_CC=''
ECHO_CC=''
- fi
+ fi
else
enableval=yes
@@ -3338,14 +3338,14 @@ echo $ECHO_N "checking if you want to check memory-leaks... $ECHO_C" >&6
if test "${enable_find_leaks+set}" = set; then
enableval="$enable_find_leaks"
test "$enableval" != yes && enableval=no
- if test "$enableval" != "no" ; then
+ if test "$enableval" != "no" ; then
with_leak_checks=yes
- else
- with_leak_checks=no
- fi
+ else
+ with_leak_checks=no
+ fi
else
enableval=no
- with_leak_checks=no
+ with_leak_checks=no
fi;
echo "$as_me:3351: result: $with_leak_checks" >&5
@@ -3365,14 +3365,14 @@ echo $ECHO_N "checking if you want to enable debug-code... $ECHO_C" >&6
if test "${enable_debug+set}" = set; then
enableval="$enable_debug"
test "$enableval" != yes && enableval=no
- if test "$enableval" != "no" ; then
+ if test "$enableval" != "no" ; then
with_debug=yes
- else
- with_debug=no
- fi
+ else
+ with_debug=no
+ fi
else
enableval=no
- with_debug=no
+ with_debug=no
fi;
echo "$as_me:3378: result: $with_debug" >&5
@@ -3407,14 +3407,14 @@ echo $ECHO_N "checking if you want to enable lynx trace code *recommended* ... $
if test "${enable_trace+set}" = set; then
enableval="$enable_trace"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
with_trace=$enableval
- else
- with_trace=yes
- fi
+ else
+ with_trace=yes
+ fi
else
enableval=yes
- with_trace=yes
+ with_trace=yes
fi;
echo "$as_me:3420: result: $with_trace" >&5
@@ -3431,14 +3431,14 @@ echo $ECHO_N "checking if you want verbose trace code... $ECHO_C" >&6
if test "${enable_vertrace+set}" = set; then
enableval="$enable_vertrace"
test "$enableval" != yes && enableval=no
- if test "$enableval" != "no" ; then
+ if test "$enableval" != "no" ; then
with_vertrace=yes
- else
- with_vertrace=no
- fi
+ else
+ with_vertrace=no
+ fi
else
enableval=no
- with_vertrace=no
+ with_vertrace=no
fi;
echo "$as_me:3444: result: $with_vertrace" >&5
@@ -3457,14 +3457,14 @@ echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6
if test "${enable_warnings+set}" = set; then
enableval="$enable_warnings"
test "$enableval" != yes && enableval=no
- if test "$enableval" != "no" ; then
+ if test "$enableval" != "no" ; then
with_warnings=yes
- else
- with_warnings=no
- fi
+ else
+ with_warnings=no
+ fi
else
enableval=no
- with_warnings=no
+ with_warnings=no
fi;
echo "$as_me:3470: result: $with_warnings" >&5
@@ -6541,7 +6541,7 @@ EOF
fi
rm -f conftest.mmap
- echo "$as_me:6544: checking whether we are using the GNU C Library 2.1 or newer" >&5
+echo "$as_me:6544: checking whether we are using the GNU C Library 2.1 or newer" >&5
echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6
if test "${ac_cv_gnu_library_2_1+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6570,7 +6570,7 @@ fi
echo "$as_me:6570: result: $ac_cv_gnu_library_2_1" >&5
echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6
- GLIBC21="$ac_cv_gnu_library_2_1"
+ GLIBC21="$ac_cv_gnu_library_2_1"
cf_makefile=makefile
@@ -6717,12 +6717,12 @@ done
if test "${with_libiconv_prefix+set}" = set; then
withval="$with_libiconv_prefix"
- case "$withval" in
- (no)
- ;;
- (yes)
- ;;
- (*)
+case "$withval" in
+(no)
+ ;;
+(yes)
+ ;;
+(*)
for cf_searchpath in `echo "$withval" | tr $PATH_SEPARATOR ' '`; do
if test -d $cf_searchpath/include; then
@@ -6799,6 +6799,8 @@ echo "${as_me:-configure}:6792: testing adding $cf_add_incdir to include-path ..
else
break
fi
+ else
+ break
fi
done
done
@@ -6830,7 +6832,7 @@ if test -n "$cf_searchpath/../include" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 6833 "configure"
+#line 6835 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -6842,16 +6844,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6845: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6847: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6848: \$? = $ac_status" >&5
+ echo "$as_me:6850: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6851: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6853: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6854: \$? = $ac_status" >&5
+ echo "$as_me:6856: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -6868,7 +6870,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:6871: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6873: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -6878,13 +6880,15 @@ echo "${as_me:-configure}:6871: testing adding $cf_add_incdir to include-path ..
else
break
fi
+ else
+ break
fi
done
done
fi
else
-{ { echo "$as_me:6887: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:6891: error: cannot find libiconv under $withval" >&5
echo "$as_me: error: cannot find libiconv under $withval" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -6909,7 +6913,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}:6912: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:6916: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -6938,7 +6942,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}:6941: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:6945: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -6947,18 +6951,18 @@ echo "${as_me:-configure}:6941: testing adding $cf_add_libdir to library-path ..
fi
else
-{ { echo "$as_me:6950: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:6954: error: cannot find libiconv under $withval" >&5
echo "$as_me: error: cannot find libiconv under $withval" >&2;}
{ (exit 1); exit 1; }; }
fi
done
- ;;
- esac
+ ;;
+esac
fi;
- echo "$as_me:6961: checking for iconv" >&5
+ echo "$as_me:6965: checking for iconv" >&5
echo $ECHO_N "checking for iconv... $ECHO_C" >&6
if test "${am_cv_func_iconv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6969,12 +6973,12 @@ else
cf_cv_header_path_iconv=
cf_cv_library_path_iconv=
-echo "${as_me:-configure}:6972: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:6976: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
cf_save_LIBS="$LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 6977 "configure"
+#line 6981 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -6993,16 +6997,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6996: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7000: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:6999: \$? = $ac_status" >&5
+ echo "$as_me:7003: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:7002: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7006: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7005: \$? = $ac_status" >&5
+ echo "$as_me:7009: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_iconv=yes
@@ -7016,7 +7020,7 @@ cat conftest.$ac_ext >&5
LIBS="-liconv $cf_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 7019 "configure"
+#line 7023 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -7035,16 +7039,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7038: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7042: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:7041: \$? = $ac_status" >&5
+ echo "$as_me:7045: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:7044: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7048: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7047: \$? = $ac_status" >&5
+ echo "$as_me:7051: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_iconv=yes
@@ -7061,9 +7065,9 @@ cat conftest.$ac_ext >&5
test -n "$verbose" && echo " find linkage for iconv library" 1>&6
-echo "${as_me:-configure}:7064: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:7068: testing find linkage for iconv library ..." 1>&5
-echo "${as_me:-configure}:7066: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:7070: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
cf_save_CPPFLAGS="$CPPFLAGS"
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7154,11 +7158,11 @@ cf_search="$cf_search $cf_header_path_list"
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}:7157: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:7161: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_iconv"
cat >conftest.$ac_ext <<_ACEOF
-#line 7161 "configure"
+#line 7165 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -7177,21 +7181,21 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7180: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7184: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:7183: \$? = $ac_status" >&5
+ echo "$as_me:7187: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:7186: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7190: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7189: \$? = $ac_status" >&5
+ echo "$as_me:7193: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test -n "$verbose" && echo " ... found iconv headers in $cf_cv_header_path_iconv" 1>&6
-echo "${as_me:-configure}:7194: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:7198: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
cf_cv_find_linkage_iconv=maybe
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7209,7 +7213,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_cv_find_linkage_iconv" = maybe ; then
-echo "${as_me:-configure}:7212: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:7216: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
cf_save_LIBS="$LIBS"
cf_save_LDFLAGS="$LDFLAGS"
@@ -7284,13 +7288,13 @@ cf_search="$cf_library_path_list $cf_search"
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}:7287: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:7291: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
CPPFLAGS="$cf_test_CPPFLAGS"
LIBS="-liconv $cf_save_LIBS"
LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_iconv"
cat >conftest.$ac_ext <<_ACEOF
-#line 7293 "configure"
+#line 7297 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -7309,21 +7313,21 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7312: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7316: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:7315: \$? = $ac_status" >&5
+ echo "$as_me:7319: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:7318: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7322: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7321: \$? = $ac_status" >&5
+ echo "$as_me:7325: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test -n "$verbose" && echo " ... found iconv library in $cf_cv_library_path_iconv" 1>&6
-echo "${as_me:-configure}:7326: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:7330: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
cf_cv_find_linkage_iconv=yes
cf_cv_library_file_iconv="-liconv"
@@ -7363,7 +7367,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
fi
fi
-echo "$as_me:7366: result: $am_cv_func_iconv" >&5
+echo "$as_me:7370: result: $am_cv_func_iconv" >&5
echo "${ECHO_T}$am_cv_func_iconv" >&6
if test "$am_cv_func_iconv" = yes; then
@@ -7372,14 +7376,14 @@ cat >>confdefs.h <<\EOF
#define HAVE_ICONV 1
EOF
- echo "$as_me:7375: checking if the declaration of iconv() needs const." >&5
+ echo "$as_me:7379: checking if the declaration of iconv() needs const." >&5
echo $ECHO_N "checking if the declaration of iconv() needs const.... $ECHO_C" >&6
if test "${am_cv_proto_iconv_const+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 7382 "configure"
+#line 7386 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -7404,16 +7408,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7407: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7411: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:7410: \$? = $ac_status" >&5
+ echo "$as_me:7414: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:7413: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7417: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7416: \$? = $ac_status" >&5
+ echo "$as_me:7420: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
am_cv_proto_iconv_const=no
else
@@ -7423,7 +7427,7 @@ am_cv_proto_iconv_const=yes
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:7426: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:7430: result: $am_cv_proto_iconv_const" >&5
echo "${ECHO_T}$am_cv_proto_iconv_const" >&6
if test "$am_cv_proto_iconv_const" = yes ; then
@@ -7465,7 +7469,7 @@ if test -n "$cf_cv_header_path_iconv" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 7468 "configure"
+#line 7472 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -7477,16 +7481,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7480: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7484: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:7483: \$? = $ac_status" >&5
+ echo "$as_me:7487: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:7486: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7490: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7489: \$? = $ac_status" >&5
+ echo "$as_me:7493: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -7503,7 +7507,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:7506: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:7510: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -7513,6 +7517,8 @@ echo "${as_me:-configure}:7506: testing adding $cf_add_incdir to include-path ..
else
break
fi
+ else
+ break
fi
done
done
@@ -7540,7 +7546,7 @@ if test -n "$cf_cv_library_path_iconv" ; 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}:7543: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7549: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -7551,13 +7557,13 @@ fi
fi
fi
-echo "$as_me:7554: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:7560: checking for nl_langinfo and CODESET" >&5
echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
if test "${am_cv_langinfo_codeset+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 7560 "configure"
+#line 7566 "configure"
#include "confdefs.h"
#include <langinfo.h>
int
@@ -7569,16 +7575,16 @@ char* cs = nl_langinfo(CODESET);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7572: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7578: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:7575: \$? = $ac_status" >&5
+ echo "$as_me:7581: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:7578: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7584: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7581: \$? = $ac_status" >&5
+ echo "$as_me:7587: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
am_cv_langinfo_codeset=yes
else
@@ -7589,7 +7595,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:7592: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:7598: result: $am_cv_langinfo_codeset" >&5
echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
if test $am_cv_langinfo_codeset = yes; then
@@ -7600,13 +7606,13 @@ EOF
fi
if test $ac_cv_header_locale_h = yes; then
- echo "$as_me:7603: checking for LC_MESSAGES" >&5
+ echo "$as_me:7609: checking for LC_MESSAGES" >&5
echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6
if test "${am_cv_val_LC_MESSAGES+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 7609 "configure"
+#line 7615 "configure"
#include "confdefs.h"
#include <locale.h>
int
@@ -7618,16 +7624,16 @@ return LC_MESSAGES
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7621: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7627: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:7624: \$? = $ac_status" >&5
+ echo "$as_me:7630: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:7627: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7633: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7630: \$? = $ac_status" >&5
+ echo "$as_me:7636: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
am_cv_val_LC_MESSAGES=yes
else
@@ -7637,17 +7643,17 @@ am_cv_val_LC_MESSAGES=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:7640: result: $am_cv_val_LC_MESSAGES" >&5
+echo "$as_me:7646: result: $am_cv_val_LC_MESSAGES" >&5
echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6
- if test $am_cv_val_LC_MESSAGES = yes; then
+ if test $am_cv_val_LC_MESSAGES = yes; then
cat >>confdefs.h <<\EOF
#define HAVE_LC_MESSAGES 1
EOF
- fi
- fi
- echo "$as_me:7650: checking whether NLS is requested" >&5
+ fi
+fi
+ echo "$as_me:7656: checking whether NLS is requested" >&5
echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
# Check whether --enable-nls or --disable-nls was given.
@@ -7657,7 +7663,7 @@ if test "${enable_nls+set}" = set; then
else
USE_NLS=no
fi;
- echo "$as_me:7660: result: $USE_NLS" >&5
+ echo "$as_me:7666: result: $USE_NLS" >&5
echo "${ECHO_T}$USE_NLS" >&6
BUILD_INCLUDED_LIBINTL=no
@@ -7670,7 +7676,7 @@ cat >>confdefs.h <<\EOF
#define ENABLE_NLS 1
EOF
- echo "$as_me:7673: checking whether included gettext is requested" >&5
+ echo "$as_me:7679: checking whether included gettext is requested" >&5
echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6
# Check whether --with-included-gettext or --without-included-gettext was given.
@@ -7680,7 +7686,7 @@ if test "${with_included_gettext+set}" = set; then
else
nls_cv_force_use_gnu_gettext=no
fi;
- echo "$as_me:7683: result: $nls_cv_force_use_gnu_gettext" >&5
+ echo "$as_me:7689: result: $nls_cv_force_use_gnu_gettext" >&5
echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6
nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
@@ -7705,7 +7711,7 @@ do
done
LIBS="$cf_add_libs"
- echo "$as_me:7708: checking for libintl.h and gettext()" >&5
+ echo "$as_me:7714: checking for libintl.h and gettext()" >&5
echo $ECHO_N "checking for libintl.h and gettext()... $ECHO_C" >&6
if test "${cf_cv_func_gettext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7716,12 +7722,12 @@ else
cf_cv_header_path_intl=
cf_cv_library_path_intl=
-echo "${as_me:-configure}:7719: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:7725: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
cf_save_LIBS="$LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 7724 "configure"
+#line 7730 "configure"
#include "confdefs.h"
#include <libintl.h>
@@ -7731,26 +7737,26 @@ int
main ()
{
- bindtextdomain ("", "");
- return (int) gettext ("")
+ bindtextdomain ("", "");
+ return (int) gettext ("")
- + _nl_msg_cat_cntr
+ + _nl_msg_cat_cntr
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7744: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7750: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:7747: \$? = $ac_status" >&5
+ echo "$as_me:7753: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:7750: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7756: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7753: \$? = $ac_status" >&5
+ echo "$as_me:7759: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_intl=yes
@@ -7764,7 +7770,7 @@ cat conftest.$ac_ext >&5
LIBS="-lintl $cf_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 7767 "configure"
+#line 7773 "configure"
#include "confdefs.h"
#include <libintl.h>
@@ -7774,26 +7780,26 @@ int
main ()
{
- bindtextdomain ("", "");
- return (int) gettext ("")
+ bindtextdomain ("", "");
+ return (int) gettext ("")
- + _nl_msg_cat_cntr
+ + _nl_msg_cat_cntr
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7787: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7793: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:7790: \$? = $ac_status" >&5
+ echo "$as_me:7796: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:7793: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7799: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7796: \$? = $ac_status" >&5
+ echo "$as_me:7802: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_intl=yes
@@ -7810,9 +7816,9 @@ cat conftest.$ac_ext >&5
test -n "$verbose" && echo " find linkage for intl library" 1>&6
-echo "${as_me:-configure}:7813: testing find linkage for intl library ..." 1>&5
+echo "${as_me:-configure}:7819: testing find linkage for intl library ..." 1>&5
-echo "${as_me:-configure}:7815: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:7821: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
cf_save_CPPFLAGS="$CPPFLAGS"
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7903,11 +7909,11 @@ cf_search="$cf_search $cf_header_path_list"
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}:7906: testing ... testing $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:7912: testing ... testing $cf_cv_header_path_intl ..." 1>&5
CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_intl"
cat >conftest.$ac_ext <<_ACEOF
-#line 7910 "configure"
+#line 7916 "configure"
#include "confdefs.h"
#include <libintl.h>
@@ -7917,31 +7923,31 @@ int
main ()
{
- bindtextdomain ("", "");
- return (int) gettext ("")
+ bindtextdomain ("", "");
+ return (int) gettext ("")
- + _nl_msg_cat_cntr
+ + _nl_msg_cat_cntr
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7930: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7936: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:7933: \$? = $ac_status" >&5
+ echo "$as_me:7939: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:7936: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7942: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7939: \$? = $ac_status" >&5
+ echo "$as_me:7945: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test -n "$verbose" && echo " ... found intl headers in $cf_cv_header_path_intl" 1>&6
-echo "${as_me:-configure}:7944: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:7950: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
cf_cv_find_linkage_intl=maybe
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7959,7 +7965,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_cv_find_linkage_intl" = maybe ; then
-echo "${as_me:-configure}:7962: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:7968: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
cf_save_LIBS="$LIBS"
cf_save_LDFLAGS="$LDFLAGS"
@@ -8034,13 +8040,13 @@ cf_search="$cf_library_path_list $cf_search"
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}:8037: testing ... testing $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:8043: testing ... testing $cf_cv_library_path_intl ..." 1>&5
CPPFLAGS="$cf_test_CPPFLAGS"
LIBS="-lintl $cf_save_LIBS"
LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_intl"
cat >conftest.$ac_ext <<_ACEOF
-#line 8043 "configure"
+#line 8049 "configure"
#include "confdefs.h"
#include <libintl.h>
@@ -8050,31 +8056,31 @@ int
main ()
{
- bindtextdomain ("", "");
- return (int) gettext ("")
+ bindtextdomain ("", "");
+ return (int) gettext ("")
- + _nl_msg_cat_cntr
+ + _nl_msg_cat_cntr
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8063: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8069: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:8066: \$? = $ac_status" >&5
+ echo "$as_me:8072: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:8069: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8075: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8072: \$? = $ac_status" >&5
+ echo "$as_me:8078: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test -n "$verbose" && echo " ... found intl library in $cf_cv_library_path_intl" 1>&6
-echo "${as_me:-configure}:8077: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:8083: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
cf_cv_find_linkage_intl=yes
cf_cv_library_file_intl="-lintl"
@@ -8114,7 +8120,7 @@ cf_cv_func_gettext=no
fi
fi
-echo "$as_me:8117: result: $cf_cv_func_gettext" >&5
+echo "$as_me:8123: result: $cf_cv_func_gettext" >&5
echo "${ECHO_T}$cf_cv_func_gettext" >&6
LIBS="$cf_save_LIBS_1"
@@ -8154,7 +8160,7 @@ if test -n "$cf_cv_header_path_intl" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 8157 "configure"
+#line 8163 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -8166,16 +8172,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8169: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8175: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:8172: \$? = $ac_status" >&5
+ echo "$as_me:8178: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:8175: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8181: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8178: \$? = $ac_status" >&5
+ echo "$as_me:8184: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -8192,7 +8198,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:8195: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8201: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -8202,6 +8208,8 @@ echo "${as_me:-configure}:8195: testing adding $cf_add_incdir to include-path ..
else
break
fi
+ else
+ break
fi
done
done
@@ -8229,7 +8237,7 @@ if test -n "$cf_cv_library_path_intl" ; 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}:8232: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:8240: testing adding $cf_add_libdir to library-path ..." 1>&5
INTLLIBS="-L$cf_add_libdir $INTLLIBS"
fi
@@ -8245,13 +8253,13 @@ fi
for ac_func in dcgettext
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8248: checking for $ac_func" >&5
+echo "$as_me:8256: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 8254 "configure"
+#line 8262 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -8282,16 +8290,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8285: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8293: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:8288: \$? = $ac_status" >&5
+ echo "$as_me:8296: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:8291: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8299: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8294: \$? = $ac_status" >&5
+ echo "$as_me:8302: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -8301,7 +8309,7 @@ eval "$as_ac_var=no"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:8304: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8312: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -8316,7 +8324,7 @@ done
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
-echo "$as_me:8319: checking for $ac_word" >&5
+echo "$as_me:8327: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_MSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8343,16 +8351,16 @@ esac
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != ":"; then
- echo "$as_me:8346: result: $MSGFMT" >&5
+ echo "$as_me:8354: result: $MSGFMT" >&5
echo "${ECHO_T}$MSGFMT" >&6
else
- echo "$as_me:8349: result: no" >&5
+ echo "$as_me:8357: result: no" >&5
echo "${ECHO_T}no" >&6
fi
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
-echo "$as_me:8355: checking for $ac_word" >&5
+echo "$as_me:8363: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_GMSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8369,7 +8377,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
- echo "$as_me:8372: found $ac_dir/$ac_word" >&5
+ echo "$as_me:8380: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -8381,17 +8389,17 @@ fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
- echo "$as_me:8384: result: $GMSGFMT" >&5
+ echo "$as_me:8392: result: $GMSGFMT" >&5
echo "${ECHO_T}$GMSGFMT" >&6
else
- echo "$as_me:8387: result: no" >&5
+ echo "$as_me:8395: result: no" >&5
echo "${ECHO_T}no" >&6
fi
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
-echo "$as_me:8394: checking for $ac_word" >&5
+echo "$as_me:8402: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_XGETTEXT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8418,10 +8426,10 @@ esac
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
- echo "$as_me:8421: result: $XGETTEXT" >&5
+ echo "$as_me:8429: result: $XGETTEXT" >&5
echo "${ECHO_T}$XGETTEXT" >&6
else
- echo "$as_me:8424: result: no" >&5
+ echo "$as_me:8432: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -8436,7 +8444,7 @@ fi
if test "$nls_cv_use_gnu_gettext" = "yes"; then
if test ! -d $srcdir/intl ; then
- { { echo "$as_me:8439: error: no NLS library is packaged with this application" >&5
+ { { echo "$as_me:8447: error: no NLS library is packaged with this application" >&5
echo "$as_me: error: no NLS library is packaged with this application" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -8444,7 +8452,7 @@ echo "$as_me: error: no NLS library is packaged with this application" >&2;}
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
-echo "$as_me:8447: checking for $ac_word" >&5
+echo "$as_me:8455: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_MSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8471,16 +8479,16 @@ esac
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != ":"; then
- echo "$as_me:8474: result: $MSGFMT" >&5
+ echo "$as_me:8482: result: $MSGFMT" >&5
echo "${ECHO_T}$MSGFMT" >&6
else
- echo "$as_me:8477: result: no" >&5
+ echo "$as_me:8485: result: no" >&5
echo "${ECHO_T}no" >&6
fi
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
-echo "$as_me:8483: checking for $ac_word" >&5
+echo "$as_me:8491: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_GMSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8497,7 +8505,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
- echo "$as_me:8500: found $ac_dir/$ac_word" >&5
+ echo "$as_me:8508: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -8509,17 +8517,17 @@ fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
- echo "$as_me:8512: result: $GMSGFMT" >&5
+ echo "$as_me:8520: result: $GMSGFMT" >&5
echo "${ECHO_T}$GMSGFMT" >&6
else
- echo "$as_me:8515: result: no" >&5
+ echo "$as_me:8523: result: no" >&5
echo "${ECHO_T}no" >&6
fi
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
-echo "$as_me:8522: checking for $ac_word" >&5
+echo "$as_me:8530: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_XGETTEXT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8546,10 +8554,10 @@ esac
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
- echo "$as_me:8549: result: $XGETTEXT" >&5
+ echo "$as_me:8557: result: $XGETTEXT" >&5
echo "${ECHO_T}$XGETTEXT" >&6
else
- echo "$as_me:8552: result: no" >&5
+ echo "$as_me:8560: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -8564,7 +8572,7 @@ fi
if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
: ;
else
- echo "$as_me:8567: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
+ echo "$as_me:8575: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6
GMSGFMT=":"
fi
@@ -8574,7 +8582,7 @@ echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6
if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
: ;
else
- echo "$as_me:8577: result: found xgettext program is not GNU xgettext; ignore it" >&5
+ echo "$as_me:8585: result: found xgettext program is not GNU xgettext; ignore it" >&5
echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
XGETTEXT=":"
fi
@@ -8594,7 +8602,7 @@ echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:8597: checking for $ac_word" >&5
+echo "$as_me:8605: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_INTLBISON+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8609,7 +8617,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_INTLBISON="$ac_prog"
-echo "$as_me:8612: found $ac_dir/$ac_word" >&5
+echo "$as_me:8620: found $ac_dir/$ac_word" >&5
break
done
@@ -8617,10 +8625,10 @@ fi
fi
INTLBISON=$ac_cv_prog_INTLBISON
if test -n "$INTLBISON"; then
- echo "$as_me:8620: result: $INTLBISON" >&5
+ echo "$as_me:8628: result: $INTLBISON" >&5
echo "${ECHO_T}$INTLBISON" >&6
else
- echo "$as_me:8623: result: no" >&5
+ echo "$as_me:8631: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -8630,7 +8638,7 @@ done
if test -z "$INTLBISON"; then
ac_verc_fail=yes
else
- echo "$as_me:8633: checking version of bison" >&5
+ echo "$as_me:8641: checking version of bison" >&5
echo $ECHO_N "checking version of bison... $ECHO_C" >&6
ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
case $ac_prog_version in
@@ -8639,7 +8647,7 @@ echo $ECHO_N "checking version of bison... $ECHO_C" >&6
ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
(*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
esac
- echo "$as_me:8642: result: $ac_prog_version" >&5
+ echo "$as_me:8650: result: $ac_prog_version" >&5
echo "${ECHO_T}$ac_prog_version" >&6
fi
if test $ac_verc_fail = yes; then
@@ -8665,7 +8673,7 @@ echo "${ECHO_T}$ac_prog_version" >&6
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
- echo "$as_me:8668: checking for catalogs to be installed" >&5
+ echo "$as_me:8676: checking for catalogs to be installed" >&5
echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
@@ -8685,7 +8693,7 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
fi
done
LINGUAS=$NEW_LINGUAS
- echo "$as_me:8688: result: $LINGUAS" >&5
+ echo "$as_me:8696: result: $LINGUAS" >&5
echo "${ECHO_T}$LINGUAS" >&6
fi
@@ -8721,7 +8729,7 @@ cf_makefile=makefile
use_our_messages=no
if test "$USE_NLS" = yes ; then
if test -d $srcdir/po ; then
-echo "$as_me:8724: checking if we should use included message-library" >&5
+echo "$as_me:8732: checking if we should use included message-library" >&5
echo $ECHO_N "checking if we should use included message-library... $ECHO_C" >&6
# Check whether --enable-included-msgs or --disable-included-msgs was given.
@@ -8732,7 +8740,7 @@ else
use_our_messages=yes
fi;
fi
-echo "$as_me:8735: result: $use_our_messages" >&5
+echo "$as_me:8743: result: $use_our_messages" >&5
echo "${ECHO_T}$use_our_messages" >&6
fi
@@ -8744,7 +8752,7 @@ then
fi
if test "$USE_INCLUDED_LIBINTL" = yes ; then
- if test "$nls_cv_force_use_gnu_gettext" = yes ; then
+ if test "$nls_cv_force_use_gnu_gettext" = yes ; then
:
elif test "$nls_cv_use_gnu_gettext" = yes ; then
:
@@ -8774,23 +8782,23 @@ else
for ac_header in libintl.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8777: checking for $ac_header" >&5
+echo "$as_me:8785: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 8783 "configure"
+#line 8791 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:8787: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8795: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:8793: \$? = $ac_status" >&5
+ echo "$as_me:8801: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8809,7 +8817,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:8812: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:8820: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -8895,7 +8903,7 @@ case ".$withval" in
withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
;;
(*)
- { { echo "$as_me:8898: error: expected a pathname, not \"$withval\"" >&5
+ { { echo "$as_me:8906: error: expected a pathname, not \"$withval\"" >&5
echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
{ (exit 1); exit 1; }; }
;;
@@ -8904,31 +8912,31 @@ esac
fi
eval NLS_DATADIR="$withval"
-echo "$as_me:8907: checking if you want full utility pathnames" >&5
+echo "$as_me:8915: checking if you want full utility pathnames" >&5
echo $ECHO_N "checking if you want full utility pathnames... $ECHO_C" >&6
# Check whether --enable-full-paths or --disable-full-paths was given.
if test "${enable_full_paths+set}" = set; then
enableval="$enable_full_paths"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
with_full_paths=no
- else
- with_full_paths=yes
- fi
+ else
+ with_full_paths=yes
+ fi
else
enableval=yes
- with_full_paths=yes
+ with_full_paths=yes
fi;
-echo "$as_me:8924: result: $with_full_paths" >&5
+echo "$as_me:8932: result: $with_full_paths" >&5
echo "${ECHO_T}$with_full_paths" >&6
test $with_full_paths = no &&
cat >>confdefs.h <<\EOF
#define USE_EXECVP 1
EOF
-echo "$as_me:8931: checking for system mailer" >&5
+echo "$as_me:8939: checking for system mailer" >&5
echo $ECHO_N "checking for system mailer... $ECHO_C" >&6
if test "${cf_cv_SYSTEM_MAIL+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8948,14 +8956,14 @@ else
fi
-echo "$as_me:8951: result: $cf_cv_SYSTEM_MAIL" >&5
+echo "$as_me:8959: result: $cf_cv_SYSTEM_MAIL" >&5
echo "${ECHO_T}$cf_cv_SYSTEM_MAIL" >&6
cat >>confdefs.h <<EOF
#define SYSTEM_MAIL "$cf_cv_SYSTEM_MAIL"
EOF
-echo "$as_me:8958: checking system mail flags" >&5
+echo "$as_me:8966: checking system mail flags" >&5
echo $ECHO_N "checking system mail flags... $ECHO_C" >&6
if test "${cf_cv_system_mail_flags+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8971,7 +8979,7 @@ else
fi
-echo "$as_me:8974: result: $cf_cv_system_mail_flags" >&5
+echo "$as_me:8982: result: $cf_cv_system_mail_flags" >&5
echo "${ECHO_T}$cf_cv_system_mail_flags" >&6
cat >>confdefs.h <<EOF
@@ -9022,14 +9030,14 @@ case $host_os in
;;
(linux*|gnu*|mint*|k*bsd*-gnu)
-echo "$as_me:9025: checking if we must define _GNU_SOURCE" >&5
+echo "$as_me:9033: checking if we must define _GNU_SOURCE" >&5
echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
if test "${cf_cv_gnu_source+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 9032 "configure"
+#line 9040 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -9044,16 +9052,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9047: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9055: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9050: \$? = $ac_status" >&5
+ echo "$as_me:9058: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:9053: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9061: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9056: \$? = $ac_status" >&5
+ echo "$as_me:9064: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_gnu_source=no
else
@@ -9062,7 +9070,7 @@ cat conftest.$ac_ext >&5
cf_save="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
cat >conftest.$ac_ext <<_ACEOF
-#line 9065 "configure"
+#line 9073 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -9077,16 +9085,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9080: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9088: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9083: \$? = $ac_status" >&5
+ echo "$as_me:9091: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:9086: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9094: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9089: \$? = $ac_status" >&5
+ echo "$as_me:9097: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_gnu_source=no
else
@@ -9101,7 +9109,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:9104: result: $cf_cv_gnu_source" >&5
+echo "$as_me:9112: result: $cf_cv_gnu_source" >&5
echo "${ECHO_T}$cf_cv_gnu_source" >&6
test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
@@ -9126,16 +9134,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
-echo "$as_me:9129: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:9137: checking if we should define _POSIX_C_SOURCE" >&5
echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
if test "${cf_cv_posix_c_source+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-echo "${as_me:-configure}:9135: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:9143: testing if the symbol is already defined go no further ..." 1>&5
cat >conftest.$ac_ext <<_ACEOF
-#line 9138 "configure"
+#line 9146 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -9150,16 +9158,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9153: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9161: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9156: \$? = $ac_status" >&5
+ echo "$as_me:9164: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:9159: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9167: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9162: \$? = $ac_status" >&5
+ echo "$as_me:9170: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_posix_c_source=no
else
@@ -9180,7 +9188,7 @@ cf_want_posix_source=no
esac
if test "$cf_want_posix_source" = yes ; then
cat >conftest.$ac_ext <<_ACEOF
-#line 9183 "configure"
+#line 9191 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -9195,16 +9203,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9198: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9206: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9201: \$? = $ac_status" >&5
+ echo "$as_me:9209: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:9204: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9212: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9207: \$? = $ac_status" >&5
+ echo "$as_me:9215: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -9215,15 +9223,15 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "${as_me:-configure}:9218: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:9226: 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}:9223: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:9231: testing if the second compile does not leave our definition intact error ..." 1>&5
cat >conftest.$ac_ext <<_ACEOF
-#line 9226 "configure"
+#line 9234 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -9238,16 +9246,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9241: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9249: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9244: \$? = $ac_status" >&5
+ echo "$as_me:9252: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:9247: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9255: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9250: \$? = $ac_status" >&5
+ echo "$as_me:9258: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -9263,7 +9271,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:9266: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:9274: result: $cf_cv_posix_c_source" >&5
echo "${ECHO_T}$cf_cv_posix_c_source" >&6
if test "$cf_cv_posix_c_source" != no ; then
@@ -9362,6 +9370,9 @@ fi
(openbsd*)
# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
;;
+(os2*)
+ cf_XOPEN_SOURCE=
+ ;;
(osf[45]*)
cf_xopen_source="-D_OSF_SOURCE"
;;
@@ -9381,14 +9392,14 @@ fi
;;
(*)
-echo "$as_me:9384: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:9395: checking if we should define _XOPEN_SOURCE" >&5
echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
if test "${cf_cv_xopen_source+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 9391 "configure"
+#line 9402 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -9407,16 +9418,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9410: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9421: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9413: \$? = $ac_status" >&5
+ echo "$as_me:9424: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:9416: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9427: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9419: \$? = $ac_status" >&5
+ echo "$as_me:9430: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_xopen_source=no
else
@@ -9425,7 +9436,7 @@ cat conftest.$ac_ext >&5
cf_save="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
cat >conftest.$ac_ext <<_ACEOF
-#line 9428 "configure"
+#line 9439 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -9444,16 +9455,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9447: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9458: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9450: \$? = $ac_status" >&5
+ echo "$as_me:9461: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:9453: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9464: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9456: \$? = $ac_status" >&5
+ echo "$as_me:9467: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_xopen_source=no
else
@@ -9468,7 +9479,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:9471: result: $cf_cv_xopen_source" >&5
+echo "$as_me:9482: result: $cf_cv_xopen_source" >&5
echo "${ECHO_T}$cf_cv_xopen_source" >&6
if test "$cf_cv_xopen_source" != no ; then
@@ -9576,16 +9587,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \
-e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'`
-echo "$as_me:9579: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:9590: checking if we should define _POSIX_C_SOURCE" >&5
echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
if test "${cf_cv_posix_c_source+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-echo "${as_me:-configure}:9585: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:9596: testing if the symbol is already defined go no further ..." 1>&5
cat >conftest.$ac_ext <<_ACEOF
-#line 9588 "configure"
+#line 9599 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -9600,16 +9611,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9603: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9614: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9606: \$? = $ac_status" >&5
+ echo "$as_me:9617: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:9609: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9620: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9612: \$? = $ac_status" >&5
+ echo "$as_me:9623: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_posix_c_source=no
else
@@ -9630,7 +9641,7 @@ cf_want_posix_source=no
esac
if test "$cf_want_posix_source" = yes ; then
cat >conftest.$ac_ext <<_ACEOF
-#line 9633 "configure"
+#line 9644 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -9645,16 +9656,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9648: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9659: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9651: \$? = $ac_status" >&5
+ echo "$as_me:9662: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:9654: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9665: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9657: \$? = $ac_status" >&5
+ echo "$as_me:9668: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -9665,15 +9676,15 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "${as_me:-configure}:9668: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:9679: 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}:9673: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:9684: testing if the second compile does not leave our definition intact error ..." 1>&5
cat >conftest.$ac_ext <<_ACEOF
-#line 9676 "configure"
+#line 9687 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -9688,16 +9699,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9691: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9702: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9694: \$? = $ac_status" >&5
+ echo "$as_me:9705: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:9697: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9708: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9700: \$? = $ac_status" >&5
+ echo "$as_me:9711: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -9713,7 +9724,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:9716: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:9727: result: $cf_cv_posix_c_source" >&5
echo "${ECHO_T}$cf_cv_posix_c_source" >&6
if test "$cf_cv_posix_c_source" != no ; then
@@ -9871,7 +9882,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}:9874: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:9885: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
CFLAGS="$CFLAGS $cf_new_cflags"
fi
@@ -9879,7 +9890,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}:9882: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:9893: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
fi
@@ -9887,7 +9898,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}:9890: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:9901: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
fi
@@ -9895,10 +9906,10 @@ fi
fi
if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
- echo "$as_me:9898: checking if _XOPEN_SOURCE really is set" >&5
+ echo "$as_me:9909: checking if _XOPEN_SOURCE really is set" >&5
echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 9901 "configure"
+#line 9912 "configure"
#include "confdefs.h"
#include <stdlib.h>
int
@@ -9913,16 +9924,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9916: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9927: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9919: \$? = $ac_status" >&5
+ echo "$as_me:9930: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:9922: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9933: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9925: \$? = $ac_status" >&5
+ echo "$as_me:9936: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_XOPEN_SOURCE_set=yes
else
@@ -9931,12 +9942,12 @@ cat conftest.$ac_ext >&5
cf_XOPEN_SOURCE_set=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:9934: result: $cf_XOPEN_SOURCE_set" >&5
+ echo "$as_me:9945: result: $cf_XOPEN_SOURCE_set" >&5
echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
if test $cf_XOPEN_SOURCE_set = yes
then
cat >conftest.$ac_ext <<_ACEOF
-#line 9939 "configure"
+#line 9950 "configure"
#include "confdefs.h"
#include <stdlib.h>
int
@@ -9951,16 +9962,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9954: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9965: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9957: \$? = $ac_status" >&5
+ echo "$as_me:9968: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:9960: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9971: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9963: \$? = $ac_status" >&5
+ echo "$as_me:9974: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_XOPEN_SOURCE_set_ok=yes
else
@@ -9971,19 +9982,19 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
if test $cf_XOPEN_SOURCE_set_ok = no
then
- { echo "$as_me:9974: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+ { echo "$as_me:9985: WARNING: _XOPEN_SOURCE is lower than requested" >&5
echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
fi
else
-echo "$as_me:9979: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:9990: checking if we should define _XOPEN_SOURCE" >&5
echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
if test "${cf_cv_xopen_source+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 9986 "configure"
+#line 9997 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -10002,16 +10013,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10005: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10016: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:10008: \$? = $ac_status" >&5
+ echo "$as_me:10019: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:10011: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10022: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10014: \$? = $ac_status" >&5
+ echo "$as_me:10025: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_xopen_source=no
else
@@ -10020,7 +10031,7 @@ cat conftest.$ac_ext >&5
cf_save="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
cat >conftest.$ac_ext <<_ACEOF
-#line 10023 "configure"
+#line 10034 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -10039,16 +10050,16 @@ make an error
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10042: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10053: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:10045: \$? = $ac_status" >&5
+ echo "$as_me:10056: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:10048: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10059: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10051: \$? = $ac_status" >&5
+ echo "$as_me:10062: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_xopen_source=no
else
@@ -10063,7 +10074,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:10066: result: $cf_cv_xopen_source" >&5
+echo "$as_me:10077: result: $cf_cv_xopen_source" >&5
echo "${ECHO_T}$cf_cv_xopen_source" >&6
if test "$cf_cv_xopen_source" != no ; then
@@ -10161,14 +10172,14 @@ fi
fi
fi
-echo "$as_me:10164: checking if SIGWINCH is defined" >&5
+echo "$as_me:10175: checking if SIGWINCH is defined" >&5
echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
if test "${cf_cv_define_sigwinch+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 10171 "configure"
+#line 10182 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -10183,23 +10194,23 @@ int x = SIGWINCH
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10186: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10197: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:10189: \$? = $ac_status" >&5
+ echo "$as_me:10200: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:10192: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10203: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10195: \$? = $ac_status" >&5
+ echo "$as_me:10206: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_define_sigwinch=yes
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 10202 "configure"
+#line 10213 "configure"
#include "confdefs.h"
#undef _XOPEN_SOURCE
@@ -10217,16 +10228,16 @@ int x = SIGWINCH
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10220: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10231: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:10223: \$? = $ac_status" >&5
+ echo "$as_me:10234: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:10226: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10237: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10229: \$? = $ac_status" >&5
+ echo "$as_me:10240: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_define_sigwinch=maybe
else
@@ -10240,11 +10251,11 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:10243: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:10254: result: $cf_cv_define_sigwinch" >&5
echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
if test "$cf_cv_define_sigwinch" = maybe ; then
-echo "$as_me:10247: checking for actual SIGWINCH definition" >&5
+echo "$as_me:10258: checking for actual SIGWINCH definition" >&5
echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
if test "${cf_cv_fixup_sigwinch+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10255,7 +10266,7 @@ cf_sigwinch=32
while test $cf_sigwinch != 1
do
cat >conftest.$ac_ext <<_ACEOF
-#line 10258 "configure"
+#line 10269 "configure"
#include "confdefs.h"
#undef _XOPEN_SOURCE
@@ -10277,16 +10288,16 @@ int x = SIGWINCH
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10280: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10291: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:10283: \$? = $ac_status" >&5
+ echo "$as_me:10294: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:10286: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10297: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10289: \$? = $ac_status" >&5
+ echo "$as_me:10300: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_fixup_sigwinch=$cf_sigwinch
break
@@ -10300,7 +10311,7 @@ cf_sigwinch=`expr $cf_sigwinch - 1`
done
fi
-echo "$as_me:10303: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:10314: result: $cf_cv_fixup_sigwinch" >&5
echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -10312,7 +10323,7 @@ if test -n "$TRY_CFLAGS" ; then
test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6
-echo "${as_me:-configure}:10315: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:10326: testing checking additions to CFLAGS ..." 1>&5
cf_check_cflags="$CFLAGS"
cf_check_cppflags="$CPPFLAGS"
@@ -10383,7 +10394,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}:10386: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:10397: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
CFLAGS="$CFLAGS $cf_new_cflags"
fi
@@ -10391,7 +10402,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}:10394: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:10405: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
fi
@@ -10399,14 +10410,14 @@ 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}:10402: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:10413: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
fi
if test "x$cf_check_cflags" != "x$CFLAGS" ; then
cat >conftest.$ac_ext <<_ACEOF
-#line 10409 "configure"
+#line 10420 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -10418,16 +10429,16 @@ printf("Hello world");
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10421: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10432: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10424: \$? = $ac_status" >&5
+ echo "$as_me:10435: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10427: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10438: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10430: \$? = $ac_status" >&5
+ echo "$as_me:10441: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -10435,12 +10446,12 @@ else
cat conftest.$ac_ext >&5
test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6
-echo "${as_me:-configure}:10438: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:10449: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5
if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6
-echo "${as_me:-configure}:10443: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:10454: testing but keeping change to \$CPPFLAGS ..." 1>&5
fi
CFLAGS="$cf_check_flags"
@@ -10452,7 +10463,7 @@ fi
### Look for network libraries first, since some functions (such as gethostname)
### are used in a lot of places.
-echo "$as_me:10455: checking if you want NSS compatible SSL libraries" >&5
+echo "$as_me:10466: checking if you want NSS compatible SSL libraries" >&5
echo $ECHO_N "checking if you want NSS compatible SSL libraries... $ECHO_C" >&6
if test "${cf_cv_use_libnss_compat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10467,10 +10478,10 @@ else
fi;
fi
-echo "$as_me:10470: result: $cf_cv_use_libnss_compat" >&5
+echo "$as_me:10481: result: $cf_cv_use_libnss_compat" >&5
echo "${ECHO_T}$cf_cv_use_libnss_compat" >&6
-echo "$as_me:10473: checking if you want ssl library" >&5
+echo "$as_me:10484: checking if you want ssl library" >&5
echo $ECHO_N "checking if you want ssl library... $ECHO_C" >&6
if test "${cf_cv_use_libssl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10485,10 +10496,10 @@ else
fi;
fi
-echo "$as_me:10488: result: $cf_cv_use_libssl" >&5
+echo "$as_me:10499: result: $cf_cv_use_libssl" >&5
echo "${ECHO_T}$cf_cv_use_libssl" >&6
-echo "$as_me:10491: checking if you want gnutls support" >&5
+echo "$as_me:10502: checking if you want gnutls support" >&5
echo $ECHO_N "checking if you want gnutls support... $ECHO_C" >&6
if test "${cf_cv_use_libgnutls+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10503,11 +10514,11 @@ else
fi;
fi
-echo "$as_me:10506: result: $cf_cv_use_libgnutls" >&5
+echo "$as_me:10517: result: $cf_cv_use_libgnutls" >&5
echo "${ECHO_T}$cf_cv_use_libgnutls" >&6
# this option is mainly for comparing with/without Lynx's wrapper for GNUTLS.
-echo "$as_me:10510: checking if you want gnutls-openssl compat" >&5
+echo "$as_me:10521: checking if you want gnutls-openssl compat" >&5
echo $ECHO_N "checking if you want gnutls-openssl compat... $ECHO_C" >&6
if test "${cf_cv_gnutls_compat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10522,10 +10533,10 @@ else
fi;
fi
-echo "$as_me:10525: result: $cf_cv_gnutls_compat" >&5
+echo "$as_me:10536: result: $cf_cv_gnutls_compat" >&5
echo "${ECHO_T}$cf_cv_gnutls_compat" >&6
-echo "$as_me:10528: checking if you want socks library" >&5
+echo "$as_me:10539: checking if you want socks library" >&5
echo $ECHO_N "checking if you want socks library... $ECHO_C" >&6
if test "${cf_cv_use_libsocks+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10540,10 +10551,10 @@ else
fi;
fi
-echo "$as_me:10543: result: $cf_cv_use_libsocks" >&5
+echo "$as_me:10554: result: $cf_cv_use_libsocks" >&5
echo "${ECHO_T}$cf_cv_use_libsocks" >&6
-echo "$as_me:10546: checking if you want socks5 library" >&5
+echo "$as_me:10557: checking if you want socks5 library" >&5
echo $ECHO_N "checking if you want socks5 library... $ECHO_C" >&6
if test "${cf_cv_use_libsocks5+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10558,17 +10569,17 @@ else
fi;
fi
-echo "$as_me:10561: result: $cf_cv_use_libsocks5" >&5
+echo "$as_me:10572: result: $cf_cv_use_libsocks5" >&5
echo "${ECHO_T}$cf_cv_use_libsocks5" >&6
if test "x$cf_cv_use_libsocks" != xno ; then
- case "$cf_cv_use_libsocks" in
- (no)
- ;;
- (yes)
- ;;
- (*)
+case "$cf_cv_use_libsocks" in
+(no)
+ ;;
+(yes)
+ ;;
+(*)
for cf_searchpath in `echo "$cf_cv_use_libsocks" | tr $PATH_SEPARATOR ' '`; do
if test -d $cf_searchpath/include; then
@@ -10597,7 +10608,7 @@ if test -n "$cf_searchpath/include" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 10600 "configure"
+#line 10611 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -10609,16 +10620,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10612: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10623: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:10615: \$? = $ac_status" >&5
+ echo "$as_me:10626: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:10618: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10629: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10621: \$? = $ac_status" >&5
+ echo "$as_me:10632: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -10635,7 +10646,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:10638: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10649: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -10645,6 +10656,8 @@ echo "${as_me:-configure}:10638: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
@@ -10676,7 +10689,7 @@ if test -n "$cf_searchpath/../include" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 10679 "configure"
+#line 10692 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -10688,16 +10701,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10691: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10704: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:10694: \$? = $ac_status" >&5
+ echo "$as_me:10707: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:10697: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10710: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10700: \$? = $ac_status" >&5
+ echo "$as_me:10713: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -10714,7 +10727,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:10717: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10730: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -10724,13 +10737,15 @@ echo "${as_me:-configure}:10717: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
fi
else
-{ { echo "$as_me:10733: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:10748: error: cannot find socks library under $cf_cv_use_libsocks" >&5
echo "$as_me: error: cannot find socks library under $cf_cv_use_libsocks" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -10755,7 +10770,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}:10758: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:10773: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -10784,7 +10799,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}:10787: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:10802: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -10793,26 +10808,26 @@ echo "${as_me:-configure}:10787: testing adding $cf_add_libdir to library-path .
fi
else
-{ { echo "$as_me:10796: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:10811: error: cannot find socks library under $cf_cv_use_libsocks" >&5
echo "$as_me: error: cannot find socks library under $cf_cv_use_libsocks" >&2;}
{ (exit 1); exit 1; }; }
fi
done
- ;;
- esac
+ ;;
+esac
# If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these
# will be set on completion of the AC_TRY_LINK below.
cf_cv_header_path_socks=
cf_cv_library_path_socks=
-echo "${as_me:-configure}:10810: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:10825: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
cf_save_LIBS="$LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10815 "configure"
+#line 10830 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -10828,16 +10843,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10831: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10846: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10834: \$? = $ac_status" >&5
+ echo "$as_me:10849: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10837: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10852: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10840: \$? = $ac_status" >&5
+ echo "$as_me:10855: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_socks=yes
@@ -10851,7 +10866,7 @@ cat conftest.$ac_ext >&5
LIBS="-lsocks $cf_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10854 "configure"
+#line 10869 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -10867,16 +10882,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10870: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10885: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10873: \$? = $ac_status" >&5
+ echo "$as_me:10888: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10876: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10891: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10879: \$? = $ac_status" >&5
+ echo "$as_me:10894: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_socks=yes
@@ -10893,9 +10908,9 @@ cat conftest.$ac_ext >&5
test -n "$verbose" && echo " find linkage for socks library" 1>&6
-echo "${as_me:-configure}:10896: testing find linkage for socks library ..." 1>&5
+echo "${as_me:-configure}:10911: testing find linkage for socks library ..." 1>&5
-echo "${as_me:-configure}:10898: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:10913: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
cf_save_CPPFLAGS="$CPPFLAGS"
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -10986,11 +11001,11 @@ cf_search="$cf_search $cf_header_path_list"
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}:10989: testing ... testing $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me:-configure}:11004: testing ... testing $cf_cv_header_path_socks ..." 1>&5
CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_socks"
cat >conftest.$ac_ext <<_ACEOF
-#line 10993 "configure"
+#line 11008 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -11006,21 +11021,21 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11009: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11024: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11012: \$? = $ac_status" >&5
+ echo "$as_me:11027: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11015: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11030: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11018: \$? = $ac_status" >&5
+ echo "$as_me:11033: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test -n "$verbose" && echo " ... found socks headers in $cf_cv_header_path_socks" 1>&6
-echo "${as_me:-configure}:11023: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me:-configure}:11038: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
cf_cv_find_linkage_socks=maybe
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -11038,7 +11053,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_cv_find_linkage_socks" = maybe ; then
-echo "${as_me:-configure}:11041: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:11056: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
cf_save_LIBS="$LIBS"
cf_save_LDFLAGS="$LDFLAGS"
@@ -11113,13 +11128,13 @@ cf_search="$cf_library_path_list $cf_search"
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}:11116: testing ... testing $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me:-configure}:11131: testing ... testing $cf_cv_library_path_socks ..." 1>&5
CPPFLAGS="$cf_test_CPPFLAGS"
LIBS="-lsocks $cf_save_LIBS"
LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_socks"
cat >conftest.$ac_ext <<_ACEOF
-#line 11122 "configure"
+#line 11137 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -11135,21 +11150,21 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11138: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11153: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11141: \$? = $ac_status" >&5
+ echo "$as_me:11156: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11144: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11159: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11147: \$? = $ac_status" >&5
+ echo "$as_me:11162: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test -n "$verbose" && echo " ... found socks library in $cf_cv_library_path_socks" 1>&6
-echo "${as_me:-configure}:11152: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me:-configure}:11167: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
cf_cv_find_linkage_socks=yes
cf_cv_library_file_socks="-lsocks"
@@ -11208,7 +11223,7 @@ if test -n "$cf_cv_header_path_socks" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 11211 "configure"
+#line 11226 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -11220,16 +11235,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11223: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11238: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11226: \$? = $ac_status" >&5
+ echo "$as_me:11241: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11229: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11244: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11232: \$? = $ac_status" >&5
+ echo "$as_me:11247: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -11246,7 +11261,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:11249: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11264: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -11256,6 +11271,8 @@ echo "${as_me:-configure}:11249: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
@@ -11280,7 +11297,7 @@ if test -n "$cf_cv_library_path_socks" ; 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}:11283: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11300: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -11305,7 +11322,7 @@ done
LIBS="$cf_add_libs"
else
-{ echo "$as_me:11308: WARNING: Cannot find socks library" >&5
+{ echo "$as_me:11325: WARNING: Cannot find socks library" >&5
echo "$as_me: WARNING: Cannot find socks library" >&2;}
fi
@@ -11348,19 +11365,19 @@ cat >>confdefs.h <<\EOF
EOF
else
- { { echo "$as_me:11351: error: cannot link with socks library" >&5
+ { { echo "$as_me:11368: error: cannot link with socks library" >&5
echo "$as_me: error: cannot link with socks library" >&2;}
{ (exit 1); exit 1; }; }
fi
elif test "x$cf_cv_use_libsocks5" != xno ; then
- case "$cf_cv_use_libsocks5" in
- (no)
- ;;
- (yes)
- ;;
- (*)
+case "$cf_cv_use_libsocks5" in
+(no)
+ ;;
+(yes)
+ ;;
+(*)
for cf_searchpath in `echo "$cf_cv_use_libsocks5" | tr $PATH_SEPARATOR ' '`; do
if test -d $cf_searchpath/include; then
@@ -11389,7 +11406,7 @@ if test -n "$cf_searchpath/include" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 11392 "configure"
+#line 11409 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -11401,16 +11418,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11404: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11421: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11407: \$? = $ac_status" >&5
+ echo "$as_me:11424: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11410: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11427: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11413: \$? = $ac_status" >&5
+ echo "$as_me:11430: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -11427,7 +11444,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:11430: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11447: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -11437,6 +11454,8 @@ echo "${as_me:-configure}:11430: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
@@ -11468,7 +11487,7 @@ if test -n "$cf_searchpath/../include" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 11471 "configure"
+#line 11490 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -11480,16 +11499,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11483: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11502: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11486: \$? = $ac_status" >&5
+ echo "$as_me:11505: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11489: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11508: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11492: \$? = $ac_status" >&5
+ echo "$as_me:11511: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -11506,7 +11525,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:11509: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11528: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -11516,13 +11535,15 @@ echo "${as_me:-configure}:11509: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
fi
else
-{ { echo "$as_me:11525: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:11546: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
echo "$as_me: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -11547,7 +11568,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}:11550: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11571: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -11576,7 +11597,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}:11579: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11600: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -11585,14 +11606,14 @@ echo "${as_me:-configure}:11579: testing adding $cf_add_libdir to library-path .
fi
else
-{ { echo "$as_me:11588: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:11609: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
echo "$as_me: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&2;}
{ (exit 1); exit 1; }; }
fi
done
- ;;
- esac
+ ;;
+esac
cf_add_libs="-lsocks5"
# Filter out duplicates - this happens with badly-designed ".pc" files...
@@ -11618,11 +11639,11 @@ cat >>confdefs.h <<\EOF
#define SOCKS 1
EOF
-echo "$as_me:11621: checking if the socks library uses socks4 prefix" >&5
+echo "$as_me:11642: checking if the socks library uses socks4 prefix" >&5
echo $ECHO_N "checking if the socks library uses socks4 prefix... $ECHO_C" >&6
cf_use_socks4=error
cat >conftest.$ac_ext <<_ACEOF
-#line 11625 "configure"
+#line 11646 "configure"
#include "confdefs.h"
#include <socks.h>
@@ -11636,16 +11657,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11639: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11660: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11642: \$? = $ac_status" >&5
+ echo "$as_me:11663: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11645: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11666: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11648: \$? = $ac_status" >&5
+ echo "$as_me:11669: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cat >>confdefs.h <<\EOF
@@ -11657,7 +11678,7 @@ else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 11660 "configure"
+#line 11681 "configure"
#include "confdefs.h"
#include <socks.h>
int
@@ -11669,29 +11690,29 @@ SOCKSinit((char *)0)
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11672: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11693: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11675: \$? = $ac_status" >&5
+ echo "$as_me:11696: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11678: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11699: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11681: \$? = $ac_status" >&5
+ echo "$as_me:11702: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_use_socks4=no
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-{ { echo "$as_me:11687: error: Cannot link with socks5 library" >&5
+{ { echo "$as_me:11708: error: Cannot link with socks5 library" >&5
echo "$as_me: error: Cannot link with socks5 library" >&2;}
{ (exit 1); exit 1; }; }
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:11694: result: $cf_use_socks4" >&5
+echo "$as_me:11715: result: $cf_use_socks4" >&5
echo "${ECHO_T}$cf_use_socks4" >&6
if test "$cf_use_socks4" = "yes" ; then
@@ -11746,10 +11767,10 @@ EOF
fi
-echo "$as_me:11749: checking if socks5p.h is available" >&5
+echo "$as_me:11770: checking if socks5p.h is available" >&5
echo $ECHO_N "checking if socks5p.h is available... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 11752 "configure"
+#line 11773 "configure"
#include "confdefs.h"
#define INCLUDE_PROTOTYPES
@@ -11764,16 +11785,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11767: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11788: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11770: \$? = $ac_status" >&5
+ echo "$as_me:11791: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11773: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11794: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11776: \$? = $ac_status" >&5
+ echo "$as_me:11797: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_use_socks5p_h=yes
else
@@ -11782,7 +11803,7 @@ cat conftest.$ac_ext >&5
cf_use_socks5p_h=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:11785: result: $cf_use_socks5p_h" >&5
+echo "$as_me:11806: result: $cf_use_socks5p_h" >&5
echo "${ECHO_T}$cf_use_socks5p_h" >&6
test "$cf_use_socks5p_h" = yes &&
@@ -11794,14 +11815,14 @@ else
cf_test_netlibs=no
-echo "$as_me:11797: checking for network libraries" >&5
+echo "$as_me:11818: checking for network libraries" >&5
echo $ECHO_N "checking for network libraries... $ECHO_C" >&6
if test "${cf_cv_netlibs+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-echo "$as_me:11804: result: working..." >&5
+echo "$as_me:11825: result: working..." >&5
echo "${ECHO_T}working..." >&6
cf_cv_netlibs=""
@@ -11813,23 +11834,23 @@ case $host_os in
for ac_header in windows.h winsock.h winsock2.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11816: checking for $ac_header" >&5
+echo "$as_me:11837: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 11822 "configure"
+#line 11843 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:11826: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:11847: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:11832: \$? = $ac_status" >&5
+ echo "$as_me:11853: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11848,7 +11869,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:11851: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:11872: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -11883,7 +11904,7 @@ done
LIBS="$cf_add_libs"
cat >conftest.$ac_ext <<_ACEOF
-#line 11886 "configure"
+#line 11907 "configure"
#include "confdefs.h"
#ifdef HAVE_WINDOWS_H
@@ -11910,22 +11931,22 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11913: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11934: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11916: \$? = $ac_status" >&5
+ echo "$as_me:11937: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11919: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11940: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11922: \$? = $ac_status" >&5
+ echo "$as_me:11943: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_netlibs="$cf_winsock_lib $cf_cv_netlibs"
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-{ { echo "$as_me:11928: error: Cannot link against winsock library" >&5
+{ { echo "$as_me:11949: error: Cannot link against winsock library" >&5
echo "$as_me: error: Cannot link against winsock library" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -11938,13 +11959,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
for ac_func in gethostname
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:11941: checking for $ac_func" >&5
+echo "$as_me:11962: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 11947 "configure"
+#line 11968 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -11975,16 +11996,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11978: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11999: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11981: \$? = $ac_status" >&5
+ echo "$as_me:12002: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11984: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12005: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11987: \$? = $ac_status" >&5
+ echo "$as_me:12008: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -11994,7 +12015,7 @@ eval "$as_ac_var=no"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:11997: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12018: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -12003,7 +12024,7 @@ EOF
else
-echo "$as_me:12006: checking for gethostname in -lnsl" >&5
+echo "$as_me:12027: checking for gethostname in -lnsl" >&5
echo $ECHO_N "checking for gethostname in -lnsl... $ECHO_C" >&6
if test "${ac_cv_lib_nsl_gethostname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12011,7 +12032,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lnsl $cf_cv_netlibs $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 12014 "configure"
+#line 12035 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -12030,16 +12051,16 @@ gethostname ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12033: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12054: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12036: \$? = $ac_status" >&5
+ echo "$as_me:12057: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12039: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12060: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12042: \$? = $ac_status" >&5
+ echo "$as_me:12063: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_nsl_gethostname=yes
else
@@ -12050,7 +12071,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:12053: result: $ac_cv_lib_nsl_gethostname" >&5
+echo "$as_me:12074: result: $ac_cv_lib_nsl_gethostname" >&5
echo "${ECHO_T}$ac_cv_lib_nsl_gethostname" >&6
if test $ac_cv_lib_nsl_gethostname = yes; then
@@ -12067,7 +12088,7 @@ else
ac_cv_func_gethostname=unknown
unset ac_cv_func_gethostname 2>/dev/null
-echo "$as_me:12070: checking for gethostname in -lsocket" >&5
+echo "$as_me:12091: checking for gethostname in -lsocket" >&5
echo $ECHO_N "checking for gethostname in -lsocket... $ECHO_C" >&6
if test "${ac_cv_lib_socket_gethostname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12075,7 +12096,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsocket $cf_cv_netlibs $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 12078 "configure"
+#line 12099 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -12094,16 +12115,16 @@ gethostname ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12097: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12118: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12100: \$? = $ac_status" >&5
+ echo "$as_me:12121: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12103: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12124: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12106: \$? = $ac_status" >&5
+ echo "$as_me:12127: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_socket_gethostname=yes
else
@@ -12114,7 +12135,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:12117: result: $ac_cv_lib_socket_gethostname" >&5
+echo "$as_me:12138: result: $ac_cv_lib_socket_gethostname" >&5
echo "${ECHO_T}$ac_cv_lib_socket_gethostname" >&6
if test $ac_cv_lib_socket_gethostname = yes; then
@@ -12138,7 +12159,7 @@ fi
fi
done
- echo "$as_me:12141: checking for main in -linet" >&5
+ echo "$as_me:12162: checking for main in -linet" >&5
echo $ECHO_N "checking for main in -linet... $ECHO_C" >&6
if test "${ac_cv_lib_inet_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12146,7 +12167,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-linet $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 12149 "configure"
+#line 12170 "configure"
#include "confdefs.h"
int
@@ -12158,16 +12179,16 @@ main ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12161: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12182: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12164: \$? = $ac_status" >&5
+ echo "$as_me:12185: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12167: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12188: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12170: \$? = $ac_status" >&5
+ echo "$as_me:12191: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_inet_main=yes
else
@@ -12178,7 +12199,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:12181: result: $ac_cv_lib_inet_main" >&5
+echo "$as_me:12202: result: $ac_cv_lib_inet_main" >&5
echo "${ECHO_T}$ac_cv_lib_inet_main" >&6
if test $ac_cv_lib_inet_main = yes; then
cf_cv_netlibs="-linet $cf_cv_netlibs"
@@ -12189,13 +12210,13 @@ fi
for ac_func in socket
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12192: checking for $ac_func" >&5
+echo "$as_me:12213: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12198 "configure"
+#line 12219 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -12226,16 +12247,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12229: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12250: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12232: \$? = $ac_status" >&5
+ echo "$as_me:12253: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12235: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12256: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12238: \$? = $ac_status" >&5
+ echo "$as_me:12259: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -12245,7 +12266,7 @@ eval "$as_ac_var=no"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:12248: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12269: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -12254,7 +12275,7 @@ EOF
else
-echo "$as_me:12257: checking for socket in -lsocket" >&5
+echo "$as_me:12278: checking for socket in -lsocket" >&5
echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
if test "${ac_cv_lib_socket_socket+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12262,7 +12283,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsocket $cf_cv_netlibs $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 12265 "configure"
+#line 12286 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -12281,16 +12302,16 @@ socket ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12284: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12305: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12287: \$? = $ac_status" >&5
+ echo "$as_me:12308: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12290: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12311: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12293: \$? = $ac_status" >&5
+ echo "$as_me:12314: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_socket_socket=yes
else
@@ -12301,7 +12322,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:12304: result: $ac_cv_lib_socket_socket" >&5
+echo "$as_me:12325: result: $ac_cv_lib_socket_socket" >&5
echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6
if test $ac_cv_lib_socket_socket = yes; then
@@ -12318,7 +12339,7 @@ else
ac_cv_func_socket=unknown
unset ac_cv_func_socket 2>/dev/null
-echo "$as_me:12321: checking for socket in -lbsd" >&5
+echo "$as_me:12342: checking for socket in -lbsd" >&5
echo $ECHO_N "checking for socket in -lbsd... $ECHO_C" >&6
if test "${ac_cv_lib_bsd_socket+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12326,7 +12347,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lbsd $cf_cv_netlibs $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 12329 "configure"
+#line 12350 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -12345,16 +12366,16 @@ socket ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12348: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12369: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12351: \$? = $ac_status" >&5
+ echo "$as_me:12372: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12354: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12375: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12357: \$? = $ac_status" >&5
+ echo "$as_me:12378: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_bsd_socket=yes
else
@@ -12365,7 +12386,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:12368: result: $ac_cv_lib_bsd_socket" >&5
+echo "$as_me:12389: result: $ac_cv_lib_bsd_socket" >&5
echo "${ECHO_T}$ac_cv_lib_bsd_socket" >&6
if test $ac_cv_lib_bsd_socket = yes; then
@@ -12394,13 +12415,13 @@ done
for ac_func in gethostbyname
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12397: checking for $ac_func" >&5
+echo "$as_me:12418: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12403 "configure"
+#line 12424 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -12431,16 +12452,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12434: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12455: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12437: \$? = $ac_status" >&5
+ echo "$as_me:12458: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12440: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12461: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12443: \$? = $ac_status" >&5
+ echo "$as_me:12464: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -12450,7 +12471,7 @@ eval "$as_ac_var=no"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:12453: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12474: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -12459,7 +12480,7 @@ EOF
else
-echo "$as_me:12462: checking for gethostbyname in -lnsl" >&5
+echo "$as_me:12483: checking for gethostbyname in -lnsl" >&5
echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12467,7 +12488,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lnsl $cf_cv_netlibs $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 12470 "configure"
+#line 12491 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -12486,16 +12507,16 @@ gethostbyname ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12489: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12510: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12492: \$? = $ac_status" >&5
+ echo "$as_me:12513: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12495: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12516: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12498: \$? = $ac_status" >&5
+ echo "$as_me:12519: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_nsl_gethostbyname=yes
else
@@ -12506,7 +12527,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:12509: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:12530: result: $ac_cv_lib_nsl_gethostbyname" >&5
echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
if test $ac_cv_lib_nsl_gethostbyname = yes; then
@@ -12531,13 +12552,13 @@ done
for ac_func in inet_ntoa
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12534: checking for $ac_func" >&5
+echo "$as_me:12555: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12540 "configure"
+#line 12561 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -12568,16 +12589,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12571: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12592: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12574: \$? = $ac_status" >&5
+ echo "$as_me:12595: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12577: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12598: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12580: \$? = $ac_status" >&5
+ echo "$as_me:12601: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -12587,7 +12608,7 @@ eval "$as_ac_var=no"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:12590: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12611: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -12596,7 +12617,7 @@ EOF
else
-echo "$as_me:12599: checking for inet_ntoa in -lnsl" >&5
+echo "$as_me:12620: checking for inet_ntoa in -lnsl" >&5
echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6
if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12604,7 +12625,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lnsl $cf_cv_netlibs $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 12607 "configure"
+#line 12628 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -12623,16 +12644,16 @@ inet_ntoa ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12626: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12647: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12629: \$? = $ac_status" >&5
+ echo "$as_me:12650: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12632: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12653: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12635: \$? = $ac_status" >&5
+ echo "$as_me:12656: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_nsl_inet_ntoa=yes
else
@@ -12643,7 +12664,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:12646: result: $ac_cv_lib_nsl_inet_ntoa" >&5
+echo "$as_me:12667: result: $ac_cv_lib_nsl_inet_ntoa" >&5
echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6
if test $ac_cv_lib_nsl_inet_ntoa = yes; then
@@ -12668,13 +12689,13 @@ done
for ac_func in gethostbyname
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12671: checking for $ac_func" >&5
+echo "$as_me:12692: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12677 "configure"
+#line 12698 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -12705,16 +12726,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12708: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12729: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12711: \$? = $ac_status" >&5
+ echo "$as_me:12732: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12714: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12735: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12717: \$? = $ac_status" >&5
+ echo "$as_me:12738: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -12724,7 +12745,7 @@ eval "$as_ac_var=no"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:12727: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12748: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -12733,7 +12754,7 @@ EOF
else
-echo "$as_me:12736: checking for gethostbyname in -lnetwork" >&5
+echo "$as_me:12757: checking for gethostbyname in -lnetwork" >&5
echo $ECHO_N "checking for gethostbyname in -lnetwork... $ECHO_C" >&6
if test "${ac_cv_lib_network_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12741,7 +12762,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lnetwork $cf_cv_netlibs $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 12744 "configure"
+#line 12765 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -12760,16 +12781,16 @@ gethostbyname ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12763: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12784: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12766: \$? = $ac_status" >&5
+ echo "$as_me:12787: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12769: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12790: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12772: \$? = $ac_status" >&5
+ echo "$as_me:12793: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_network_gethostbyname=yes
else
@@ -12780,7 +12801,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:12783: result: $ac_cv_lib_network_gethostbyname" >&5
+echo "$as_me:12804: result: $ac_cv_lib_network_gethostbyname" >&5
echo "${ECHO_T}$ac_cv_lib_network_gethostbyname" >&6
if test $ac_cv_lib_network_gethostbyname = yes; then
@@ -12805,13 +12826,13 @@ done
for ac_func in strcasecmp
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12808: checking for $ac_func" >&5
+echo "$as_me:12829: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12814 "configure"
+#line 12835 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -12842,16 +12863,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12845: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12866: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12848: \$? = $ac_status" >&5
+ echo "$as_me:12869: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12851: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12872: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12854: \$? = $ac_status" >&5
+ echo "$as_me:12875: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -12861,7 +12882,7 @@ eval "$as_ac_var=no"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:12864: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12885: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -12870,7 +12891,7 @@ EOF
else
-echo "$as_me:12873: checking for strcasecmp in -lresolv" >&5
+echo "$as_me:12894: checking for strcasecmp in -lresolv" >&5
echo $ECHO_N "checking for strcasecmp in -lresolv... $ECHO_C" >&6
if test "${ac_cv_lib_resolv_strcasecmp+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12878,7 +12899,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lresolv $cf_cv_netlibs $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 12881 "configure"
+#line 12902 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -12897,16 +12918,16 @@ strcasecmp ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12900: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12921: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12903: \$? = $ac_status" >&5
+ echo "$as_me:12924: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12906: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12927: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12909: \$? = $ac_status" >&5
+ echo "$as_me:12930: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_resolv_strcasecmp=yes
else
@@ -12917,7 +12938,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:12920: result: $ac_cv_lib_resolv_strcasecmp" >&5
+echo "$as_me:12941: result: $ac_cv_lib_resolv_strcasecmp" >&5
echo "${ECHO_T}$ac_cv_lib_resolv_strcasecmp" >&6
if test $ac_cv_lib_resolv_strcasecmp = yes; then
@@ -12974,14 +12995,14 @@ test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&6
fi
-echo "$as_me:12977: checking for inet_aton function" >&5
+echo "$as_me:12998: checking for inet_aton function" >&5
echo $ECHO_N "checking for inet_aton function... $ECHO_C" >&6
if test "${cf_cv_have_inet_aton+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12984 "configure"
+#line 13005 "configure"
#include "confdefs.h"
#if defined(__MINGW32__)
@@ -13016,16 +13037,16 @@ inet_aton(0, (struct in_addr *)0)
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13019: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13040: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13022: \$? = $ac_status" >&5
+ echo "$as_me:13043: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13025: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13046: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13028: \$? = $ac_status" >&5
+ echo "$as_me:13049: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_have_inet_aton=yes
else
@@ -13035,7 +13056,7 @@ cf_cv_have_inet_aton=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:13038: result: $cf_cv_have_inet_aton" >&5
+echo "$as_me:13059: result: $cf_cv_have_inet_aton" >&5
echo "${ECHO_T}$cf_cv_have_inet_aton" >&6
if test "$cf_cv_have_inet_aton" = yes ; then
@@ -13044,14 +13065,14 @@ cat >>confdefs.h <<\EOF
EOF
else
- echo "$as_me:13047: checking for inet_addr function" >&5
+ echo "$as_me:13068: checking for inet_addr function" >&5
echo $ECHO_N "checking for inet_addr function... $ECHO_C" >&6
if test "${cf_cv_have_inet_addr+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 13054 "configure"
+#line 13075 "configure"
#include "confdefs.h"
#if defined(__MINGW32__)
@@ -13086,16 +13107,16 @@ inet_addr(0)
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13089: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13110: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13092: \$? = $ac_status" >&5
+ echo "$as_me:13113: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13095: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13116: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13098: \$? = $ac_status" >&5
+ echo "$as_me:13119: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_have_inet_addr=yes
else
@@ -13105,10 +13126,10 @@ cf_cv_have_inet_addr=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:13108: result: $cf_cv_have_inet_addr" >&5
+echo "$as_me:13129: result: $cf_cv_have_inet_addr" >&5
echo "${ECHO_T}$cf_cv_have_inet_addr" >&6
if test "$cf_cv_have_inet_addr" = no ; then
- echo "$as_me:13111: checking for library with inet_addr" >&5
+ echo "$as_me:13132: checking for library with inet_addr" >&5
echo $ECHO_N "checking for library with inet_addr... $ECHO_C" >&6
if test "${cf_cv_lib_inet_addr+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13119,7 +13140,7 @@ else
do
LIBS="$cf_save_LIBS $cf_inetlib"
cat >conftest.$ac_ext <<_ACEOF
-#line 13122 "configure"
+#line 13143 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/socket.h>
@@ -13135,16 +13156,16 @@ inet_addr(0)
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13138: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13159: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13141: \$? = $ac_status" >&5
+ echo "$as_me:13162: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13144: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13165: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13147: \$? = $ac_status" >&5
+ echo "$as_me:13168: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_lib_inet_addr=$cf_inetlib
else
@@ -13158,7 +13179,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
done
fi
-echo "$as_me:13161: result: $cf_cv_lib_inet_addr" >&5
+echo "$as_me:13182: result: $cf_cv_lib_inet_addr" >&5
echo "${ECHO_T}$cf_cv_lib_inet_addr" >&6
if test "$cf_cv_lib_inet_addr" != no ; then
@@ -13179,13 +13200,13 @@ done
LIBS="$cf_add_libs"
else
- { echo "$as_me:13182: WARNING: Unable to find library for inet_addr function" >&5
+ { echo "$as_me:13203: WARNING: Unable to find library for inet_addr function" >&5
echo "$as_me: WARNING: Unable to find library for inet_addr function" >&2;}
fi
fi
fi
-echo "$as_me:13188: checking if you want to use pkg-config" >&5
+echo "$as_me:13209: checking if you want to use pkg-config" >&5
echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
# Check whether --with-pkg-config or --without-pkg-config was given.
@@ -13195,7 +13216,7 @@ if test "${with_pkg_config+set}" = set; then
else
cf_pkg_config=yes
fi;
-echo "$as_me:13198: result: $cf_pkg_config" >&5
+echo "$as_me:13219: result: $cf_pkg_config" >&5
echo "${ECHO_T}$cf_pkg_config" >&6
case $cf_pkg_config in
@@ -13207,7 +13228,7 @@ case $cf_pkg_config in
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:13210: checking for $ac_word" >&5
+echo "$as_me:13231: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13224,7 +13245,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
- echo "$as_me:13227: found $ac_dir/$ac_word" >&5
+ echo "$as_me:13248: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -13235,10 +13256,10 @@ fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
- echo "$as_me:13238: result: $PKG_CONFIG" >&5
+ echo "$as_me:13259: result: $PKG_CONFIG" >&5
echo "${ECHO_T}$PKG_CONFIG" >&6
else
- echo "$as_me:13241: result: no" >&5
+ echo "$as_me:13262: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -13247,7 +13268,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
ac_pt_PKG_CONFIG=$PKG_CONFIG
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
-echo "$as_me:13250: checking for $ac_word" >&5
+echo "$as_me:13271: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13264,7 +13285,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
- echo "$as_me:13267: found $ac_dir/$ac_word" >&5
+ echo "$as_me:13288: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -13276,10 +13297,10 @@ fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
- echo "$as_me:13279: result: $ac_pt_PKG_CONFIG" >&5
+ echo "$as_me:13300: result: $ac_pt_PKG_CONFIG" >&5
echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
else
- echo "$as_me:13282: result: no" >&5
+ echo "$as_me:13303: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -13322,14 +13343,14 @@ case ".$PKG_CONFIG" in
PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
;;
(*)
- { { echo "$as_me:13325: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+ { { echo "$as_me:13346: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
{ (exit 1); exit 1; }; }
;;
esac
elif test "x$cf_pkg_config" != xno ; then
- { echo "$as_me:13332: WARNING: pkg-config is not installed" >&5
+ { echo "$as_me:13353: WARNING: pkg-config is not installed" >&5
echo "$as_me: WARNING: pkg-config is not installed" >&2;}
fi
@@ -13340,12 +13361,12 @@ if test "x$cf_cv_use_libssl" != xno ; then
# command-line option, etc., override default behavior
- case "$cf_cv_use_libssl" in
- (no)
- ;;
- (yes)
- ;;
- (*)
+case "$cf_cv_use_libssl" in
+(no)
+ ;;
+(yes)
+ ;;
+(*)
for cf_searchpath in `echo "$cf_cv_use_libssl" | tr $PATH_SEPARATOR ' '`; do
if test -d $cf_searchpath/include; then
@@ -13374,7 +13395,7 @@ if test -n "$cf_searchpath/include" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 13377 "configure"
+#line 13398 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -13386,16 +13407,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13389: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13410: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:13392: \$? = $ac_status" >&5
+ echo "$as_me:13413: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:13395: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13416: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13398: \$? = $ac_status" >&5
+ echo "$as_me:13419: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -13412,7 +13433,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:13415: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13436: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -13422,6 +13443,8 @@ echo "${as_me:-configure}:13415: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
@@ -13453,7 +13476,7 @@ if test -n "$cf_searchpath/../include" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 13456 "configure"
+#line 13479 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -13465,16 +13488,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13468: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13491: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:13471: \$? = $ac_status" >&5
+ echo "$as_me:13494: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:13474: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13497: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13477: \$? = $ac_status" >&5
+ echo "$as_me:13500: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -13491,7 +13514,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:13494: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13517: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -13501,13 +13524,15 @@ echo "${as_me:-configure}:13494: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
fi
else
-{ { echo "$as_me:13510: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:13535: error: cannot find ssl library under $cf_cv_use_libssl" >&5
echo "$as_me: error: cannot find ssl library under $cf_cv_use_libssl" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -13532,7 +13557,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}:13535: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13560: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -13561,7 +13586,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}:13564: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13589: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -13570,14 +13595,14 @@ echo "${as_me:-configure}:13564: testing adding $cf_add_libdir to library-path .
fi
else
-{ { echo "$as_me:13573: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:13598: error: cannot find ssl library under $cf_cv_use_libssl" >&5
echo "$as_me: error: cannot find ssl library under $cf_cv_use_libssl" >&2;}
{ (exit 1); exit 1; }; }
fi
done
- ;;
- esac
+ ;;
+esac
if test "x$PKG_CONFIG" != xnone; then
case $cf_cv_use_libssl in
@@ -13587,15 +13612,15 @@ done
cf_cv_pkg_ssl=
for cf_try_package in openssl libssl
do
- echo "$as_me:13590: checking pkg-config for $cf_try_package" >&5
+ echo "$as_me:13615: checking pkg-config for $cf_try_package" >&5
echo $ECHO_N "checking pkg-config for $cf_try_package... $ECHO_C" >&6
if "$PKG_CONFIG" --exists $cf_try_package ; then
cf_cv_pkg_ssl=$cf_try_package
- echo "$as_me:13594: result: yes" >&5
+ echo "$as_me:13619: result: yes" >&5
echo "${ECHO_T}yes" >&6
break
else
- echo "$as_me:13598: result: no" >&5
+ echo "$as_me:13623: result: no" >&5
echo "${ECHO_T}no" >&6
fi
done
@@ -13719,7 +13744,7 @@ fi
esac
test -n "$verbose" && echo " adding $cf_libs_ssl to LIBS" 1>&6
-echo "${as_me:-configure}:13722: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:13747: testing adding $cf_libs_ssl to LIBS ..." 1>&5
cf_add_libs="$cf_libs_ssl"
# Filter out duplicates - this happens with badly-designed ".pc" files...
@@ -13755,7 +13780,7 @@ LIBS="$cf_add_libs"
(*-ldl)
;;
(*)
- echo "$as_me:13758: checking for dlsym in -ldl" >&5
+ echo "$as_me:13783: checking for dlsym in -ldl" >&5
echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
if test "${ac_cv_lib_dl_dlsym+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13763,7 +13788,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 13766 "configure"
+#line 13791 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -13782,16 +13807,16 @@ dlsym ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13785: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13810: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13788: \$? = $ac_status" >&5
+ echo "$as_me:13813: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13791: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13816: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13794: \$? = $ac_status" >&5
+ echo "$as_me:13819: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dl_dlsym=yes
else
@@ -13802,7 +13827,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:13805: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:13830: result: $ac_cv_lib_dl_dlsym" >&5
echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
if test $ac_cv_lib_dl_dlsym = yes; then
cf_extra_ssl_libs="$cf_extra_ssl_libs -ldl"
@@ -13818,12 +13843,12 @@ fi
cf_cv_header_path_ssl=
cf_cv_library_path_ssl=
-echo "${as_me:-configure}:13821: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:13846: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
cf_save_LIBS="$LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 13826 "configure"
+#line 13851 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -13852,16 +13877,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13855: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13880: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13858: \$? = $ac_status" >&5
+ echo "$as_me:13883: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13861: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13886: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13864: \$? = $ac_status" >&5
+ echo "$as_me:13889: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_ssl=yes
@@ -13875,7 +13900,7 @@ cat conftest.$ac_ext >&5
LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 13878 "configure"
+#line 13903 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -13904,16 +13929,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13907: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13932: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13910: \$? = $ac_status" >&5
+ echo "$as_me:13935: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13913: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13938: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13916: \$? = $ac_status" >&5
+ echo "$as_me:13941: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_ssl=yes
@@ -13930,9 +13955,9 @@ cat conftest.$ac_ext >&5
test -n "$verbose" && echo " find linkage for ssl library" 1>&6
-echo "${as_me:-configure}:13933: testing find linkage for ssl library ..." 1>&5
+echo "${as_me:-configure}:13958: testing find linkage for ssl library ..." 1>&5
-echo "${as_me:-configure}:13935: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:13960: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
cf_save_CPPFLAGS="$CPPFLAGS"
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -14023,11 +14048,11 @@ cf_search="$cf_search $cf_header_path_list"
if test -d $cf_cv_header_path_ssl ; then
test -n "$verbose" && echo " ... testing $cf_cv_header_path_ssl" 1>&6
-echo "${as_me:-configure}:14026: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:14051: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_ssl"
cat >conftest.$ac_ext <<_ACEOF
-#line 14030 "configure"
+#line 14055 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -14056,21 +14081,21 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14059: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14084: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:14062: \$? = $ac_status" >&5
+ echo "$as_me:14087: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:14065: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14090: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14068: \$? = $ac_status" >&5
+ echo "$as_me:14093: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test -n "$verbose" && echo " ... found ssl headers in $cf_cv_header_path_ssl" 1>&6
-echo "${as_me:-configure}:14073: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:14098: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
cf_cv_find_linkage_ssl=maybe
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -14088,7 +14113,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_cv_find_linkage_ssl" = maybe ; then
-echo "${as_me:-configure}:14091: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:14116: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
cf_save_LIBS="$LIBS"
cf_save_LDFLAGS="$LDFLAGS"
@@ -14096,7 +14121,7 @@ echo "${as_me:-configure}:14091: testing Searching for ssl library in FIND_LINKA
CPPFLAGS="$cf_test_CPPFLAGS"
LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 14099 "configure"
+#line 14124 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -14125,21 +14150,21 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14128: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14153: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:14131: \$? = $ac_status" >&5
+ echo "$as_me:14156: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:14134: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14159: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14137: \$? = $ac_status" >&5
+ echo "$as_me:14162: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test -n "$verbose" && echo " ... found ssl library in system" 1>&6
-echo "${as_me:-configure}:14142: testing ... found ssl library in system ..." 1>&5
+echo "${as_me:-configure}:14167: testing ... found ssl library in system ..." 1>&5
cf_cv_find_linkage_ssl=yes
else
@@ -14220,13 +14245,13 @@ cf_search="$cf_library_path_list $cf_search"
if test -d $cf_cv_library_path_ssl ; then
test -n "$verbose" && echo " ... testing $cf_cv_library_path_ssl" 1>&6
-echo "${as_me:-configure}:14223: testing ... testing $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me:-configure}:14248: testing ... testing $cf_cv_library_path_ssl ..." 1>&5
CPPFLAGS="$cf_test_CPPFLAGS"
LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS"
LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_ssl"
cat >conftest.$ac_ext <<_ACEOF
-#line 14229 "configure"
+#line 14254 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -14255,21 +14280,21 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14258: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14283: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:14261: \$? = $ac_status" >&5
+ echo "$as_me:14286: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:14264: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14289: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14267: \$? = $ac_status" >&5
+ echo "$as_me:14292: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test -n "$verbose" && echo " ... found ssl library in $cf_cv_library_path_ssl" 1>&6
-echo "${as_me:-configure}:14272: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me:-configure}:14297: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
cf_cv_find_linkage_ssl=yes
cf_cv_library_file_ssl="-lssl"
@@ -14331,7 +14356,7 @@ if test -n "$cf_cv_library_path_ssl" ; 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}:14334: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14359: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -14387,7 +14412,7 @@ if test -n "$cf_cv_header_path_ssl" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 14390 "configure"
+#line 14415 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -14399,16 +14424,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14402: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14427: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:14405: \$? = $ac_status" >&5
+ echo "$as_me:14430: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:14408: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14433: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14411: \$? = $ac_status" >&5
+ echo "$as_me:14436: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -14425,7 +14450,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:14428: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14453: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -14435,6 +14460,8 @@ echo "${as_me:-configure}:14428: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
@@ -14456,7 +14483,7 @@ EOF
if test -n "$cf_cv_header_path_ssl" ; then
test -n "$verbose" && echo " checking ssl header-path $cf_cv_header_path_ssl" 1>&6
-echo "${as_me:-configure}:14459: testing checking ssl header-path $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:14486: testing checking ssl header-path $cf_cv_header_path_ssl ..." 1>&5
case $cf_cv_header_path_ssl in
(*/openssl)
@@ -14469,10 +14496,10 @@ EOF
esac
fi
-echo "$as_me:14472: checking for X509 support" >&5
+echo "$as_me:14499: checking for X509 support" >&5
echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 14475 "configure"
+#line 14502 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -14501,16 +14528,16 @@ X509_verify_cert_error_string(X509_STORE_CTX_get_error(NULL))
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14504: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14531: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:14507: \$? = $ac_status" >&5
+ echo "$as_me:14534: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:14510: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14537: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14513: \$? = $ac_status" >&5
+ echo "$as_me:14540: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_x509_support=yes
else
@@ -14519,7 +14546,7 @@ cat conftest.$ac_ext >&5
cf_x509_support=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:14522: result: $cf_x509_support" >&5
+echo "$as_me:14549: result: $cf_x509_support" >&5
echo "${ECHO_T}$cf_x509_support" >&6
if test "$cf_x509_support" = yes ; then
@@ -14537,12 +14564,12 @@ elif test "x$cf_cv_use_libgnutls" != xno ; then
cf_cv_have_gnutls=no
cf_cv_pkg_config_ssl=no
- case "$cf_cv_use_libgnutls" in
- (no)
- ;;
- (yes)
- ;;
- (*)
+case "$cf_cv_use_libgnutls" in
+(no)
+ ;;
+(yes)
+ ;;
+(*)
for cf_searchpath in `echo "$cf_cv_use_libgnutls" | tr $PATH_SEPARATOR ' '`; do
if test -d $cf_searchpath/include; then
@@ -14571,7 +14598,7 @@ if test -n "$cf_searchpath/include" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 14574 "configure"
+#line 14601 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -14583,16 +14610,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14586: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14613: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:14589: \$? = $ac_status" >&5
+ echo "$as_me:14616: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:14592: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14619: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14595: \$? = $ac_status" >&5
+ echo "$as_me:14622: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -14609,7 +14636,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:14612: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14639: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -14619,6 +14646,8 @@ echo "${as_me:-configure}:14612: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
@@ -14650,7 +14679,7 @@ if test -n "$cf_searchpath/../include" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 14653 "configure"
+#line 14682 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -14662,16 +14691,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14665: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14694: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:14668: \$? = $ac_status" >&5
+ echo "$as_me:14697: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:14671: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14700: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14674: \$? = $ac_status" >&5
+ echo "$as_me:14703: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -14688,7 +14717,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:14691: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14720: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -14698,13 +14727,15 @@ echo "${as_me:-configure}:14691: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
fi
else
-{ { echo "$as_me:14707: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:14738: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
echo "$as_me: error: cannot find ssl library under $cf_cv_use_libgnutls" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -14729,7 +14760,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}:14732: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14763: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -14758,7 +14789,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}:14761: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14792: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -14767,14 +14798,14 @@ echo "${as_me:-configure}:14761: testing adding $cf_add_libdir to library-path .
fi
else
-{ { echo "$as_me:14770: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:14801: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
echo "$as_me: error: cannot find ssl library under $cf_cv_use_libgnutls" >&2;}
{ (exit 1); exit 1; }; }
fi
done
- ;;
- esac
+ ;;
+esac
cf_pkg_gnutls=none
if test "x$PKG_CONFIG" != xnone; then
@@ -14785,12 +14816,12 @@ done
(yes) # if no explicit directory given, try pkg-config
test -n "$verbose" && echo " checking pkg-config for $cf_pkg_gnutls" 1>&6
-echo "${as_me:-configure}:14788: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me:-configure}:14819: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
if "$PKG_CONFIG" --exists $cf_pkg_gnutls ; then
test -n "$verbose" && echo " ... found $cf_pkg_gnutls in pkg-config" 1>&6
-echo "${as_me:-configure}:14793: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:14824: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
cf_cv_have_gnutls=yes
cf_cv_pkg_config_ssl=yes
@@ -14902,7 +14933,7 @@ fi
esac
test -n "$verbose" && echo " adding $cf_libs_ssl to LIBS" 1>&6
-echo "${as_me:-configure}:14905: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:14936: testing adding $cf_libs_ssl to LIBS ..." 1>&5
cf_add_libs="$cf_libs_ssl"
# Filter out duplicates - this happens with badly-designed ".pc" files...
@@ -14924,7 +14955,7 @@ LIBS="$cf_add_libs"
else
test -n "$verbose" && echo " ... did not find $cf_pkg_gnutls in pkg-config" 1>&6
-echo "${as_me:-configure}:14927: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:14958: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
cf_pkg_gnutls=none
fi
@@ -14944,12 +14975,12 @@ EOF
cf_cv_header_path_gnutls=
cf_cv_library_path_gnutls=
-echo "${as_me:-configure}:14947: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:14978: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
cf_save_LIBS="$LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 14952 "configure"
+#line 14983 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -14978,16 +15009,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14981: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15012: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:14984: \$? = $ac_status" >&5
+ echo "$as_me:15015: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:14987: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15018: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14990: \$? = $ac_status" >&5
+ echo "$as_me:15021: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_gnutls=yes
@@ -15001,7 +15032,7 @@ cat conftest.$ac_ext >&5
LIBS="-lgnutls $cf_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 15004 "configure"
+#line 15035 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -15030,16 +15061,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15033: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15064: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:15036: \$? = $ac_status" >&5
+ echo "$as_me:15067: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:15039: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15070: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:15042: \$? = $ac_status" >&5
+ echo "$as_me:15073: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_gnutls=yes
@@ -15056,9 +15087,9 @@ cat conftest.$ac_ext >&5
test -n "$verbose" && echo " find linkage for gnutls library" 1>&6
-echo "${as_me:-configure}:15059: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me:-configure}:15090: testing find linkage for gnutls library ..." 1>&5
-echo "${as_me:-configure}:15061: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:15092: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
cf_save_CPPFLAGS="$CPPFLAGS"
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -15149,11 +15180,11 @@ cf_search="$cf_search $cf_header_path_list"
if test -d $cf_cv_header_path_gnutls ; then
test -n "$verbose" && echo " ... testing $cf_cv_header_path_gnutls" 1>&6
-echo "${as_me:-configure}:15152: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15183: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_gnutls"
cat >conftest.$ac_ext <<_ACEOF
-#line 15156 "configure"
+#line 15187 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -15182,21 +15213,21 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15185: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15216: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:15188: \$? = $ac_status" >&5
+ echo "$as_me:15219: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:15191: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15222: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:15194: \$? = $ac_status" >&5
+ echo "$as_me:15225: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test -n "$verbose" && echo " ... found gnutls headers in $cf_cv_header_path_gnutls" 1>&6
-echo "${as_me:-configure}:15199: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15230: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
cf_cv_find_linkage_gnutls=maybe
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -15214,7 +15245,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_cv_find_linkage_gnutls" = maybe ; then
-echo "${as_me:-configure}:15217: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:15248: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
cf_save_LIBS="$LIBS"
cf_save_LDFLAGS="$LDFLAGS"
@@ -15289,13 +15320,13 @@ cf_search="$cf_library_path_list $cf_search"
if test -d $cf_cv_library_path_gnutls ; then
test -n "$verbose" && echo " ... testing $cf_cv_library_path_gnutls" 1>&6
-echo "${as_me:-configure}:15292: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15323: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
CPPFLAGS="$cf_test_CPPFLAGS"
LIBS="-lgnutls $cf_save_LIBS"
LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_gnutls"
cat >conftest.$ac_ext <<_ACEOF
-#line 15298 "configure"
+#line 15329 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -15324,21 +15355,21 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15327: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15358: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:15330: \$? = $ac_status" >&5
+ echo "$as_me:15361: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:15333: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15364: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:15336: \$? = $ac_status" >&5
+ echo "$as_me:15367: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test -n "$verbose" && echo " ... found gnutls library in $cf_cv_library_path_gnutls" 1>&6
-echo "${as_me:-configure}:15341: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15372: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
cf_cv_find_linkage_gnutls=yes
cf_cv_library_file_gnutls="-lgnutls"
@@ -15415,7 +15446,7 @@ if test -n "$cf_cv_header_path_gnutls" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 15418 "configure"
+#line 15449 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -15427,16 +15458,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15430: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15461: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:15433: \$? = $ac_status" >&5
+ echo "$as_me:15464: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:15436: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15467: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:15439: \$? = $ac_status" >&5
+ echo "$as_me:15470: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -15453,7 +15484,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:15456: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:15487: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -15463,6 +15494,8 @@ echo "${as_me:-configure}:15456: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
@@ -15492,7 +15525,7 @@ if test -n "$cf_cv_library_path_gnutls" ; 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}:15495: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:15528: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -15518,13 +15551,13 @@ do
done
LIBS="$cf_add_libs"
- echo "$as_me:15521: checking for gnutls_rnd" >&5
+ echo "$as_me:15554: checking for gnutls_rnd" >&5
echo $ECHO_N "checking for gnutls_rnd... $ECHO_C" >&6
if test "${ac_cv_func_gnutls_rnd+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 15527 "configure"
+#line 15560 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gnutls_rnd (); below. */
@@ -15555,16 +15588,16 @@ f = gnutls_rnd; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15558: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15591: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:15561: \$? = $ac_status" >&5
+ echo "$as_me:15594: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:15564: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15597: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:15567: \$? = $ac_status" >&5
+ echo "$as_me:15600: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_gnutls_rnd=yes
else
@@ -15574,7 +15607,7 @@ ac_cv_func_gnutls_rnd=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:15577: result: $ac_cv_func_gnutls_rnd" >&5
+echo "$as_me:15610: result: $ac_cv_func_gnutls_rnd" >&5
echo "${ECHO_T}$ac_cv_func_gnutls_rnd" >&6
if test $ac_cv_func_gnutls_rnd = yes; then
cat >>confdefs.h <<\EOF
@@ -15603,10 +15636,10 @@ fi
EXTRA_OBJS="$EXTRA_OBJS tidy_tls\$o"
-echo "$as_me:15606: checking for X509 support" >&5
+echo "$as_me:15639: checking for X509 support" >&5
echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 15609 "configure"
+#line 15642 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -15635,16 +15668,16 @@ X509_verify_cert_error_string(X509_STORE_CTX_get_error(NULL))
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15638: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15671: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:15641: \$? = $ac_status" >&5
+ echo "$as_me:15674: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:15644: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15677: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:15647: \$? = $ac_status" >&5
+ echo "$as_me:15680: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_x509_support=yes
else
@@ -15653,7 +15686,7 @@ cat conftest.$ac_ext >&5
cf_x509_support=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:15656: result: $cf_x509_support" >&5
+echo "$as_me:15689: result: $cf_x509_support" >&5
echo "${ECHO_T}$cf_x509_support" >&6
if test "$cf_x509_support" = yes ; then
@@ -15665,86 +15698,17 @@ fi
fi
-for ac_func in gnutls_priority_set_direct
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15671: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-#line 15677 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char $ac_func ();
-char (*f) ();
-
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15708: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:15711: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:15714: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:15717: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- eval "$as_ac_var=yes"
-else
- echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_var=no"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:15727: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<EOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-EOF
-
-fi
-done
-
else
cf_cv_have_gnutls=no
cf_cv_pkg_config_ssl=no
- case "$cf_cv_use_libgnutls" in
- (no)
- ;;
- (yes)
- ;;
- (*)
+case "$cf_cv_use_libgnutls" in
+(no)
+ ;;
+(yes)
+ ;;
+(*)
for cf_searchpath in `echo "$cf_cv_use_libgnutls" | tr $PATH_SEPARATOR ' '`; do
if test -d $cf_searchpath/include; then
@@ -15773,7 +15737,7 @@ if test -n "$cf_searchpath/include" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 15776 "configure"
+#line 15740 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -15785,16 +15749,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15788: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15752: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:15791: \$? = $ac_status" >&5
+ echo "$as_me:15755: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:15794: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15758: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:15797: \$? = $ac_status" >&5
+ echo "$as_me:15761: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -15811,7 +15775,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:15814: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:15778: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -15821,6 +15785,8 @@ echo "${as_me:-configure}:15814: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
@@ -15852,7 +15818,7 @@ if test -n "$cf_searchpath/../include" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 15855 "configure"
+#line 15821 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -15864,16 +15830,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15867: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15833: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:15870: \$? = $ac_status" >&5
+ echo "$as_me:15836: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:15873: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15839: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:15876: \$? = $ac_status" >&5
+ echo "$as_me:15842: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -15890,7 +15856,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:15893: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:15859: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -15900,13 +15866,15 @@ echo "${as_me:-configure}:15893: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
fi
else
-{ { echo "$as_me:15909: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:15877: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
echo "$as_me: error: cannot find ssl library under $cf_cv_use_libgnutls" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -15931,7 +15899,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}:15934: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:15902: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -15960,7 +15928,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}:15963: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:15931: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -15969,14 +15937,14 @@ echo "${as_me:-configure}:15963: testing adding $cf_add_libdir to library-path .
fi
else
-{ { echo "$as_me:15972: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:15940: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
echo "$as_me: error: cannot find ssl library under $cf_cv_use_libgnutls" >&2;}
{ (exit 1); exit 1; }; }
fi
done
- ;;
- esac
+ ;;
+esac
cf_pkg_gnutls=none
if test "x$PKG_CONFIG" != xnone; then
@@ -15987,12 +15955,12 @@ done
(yes) # if no explicit directory given, try pkg-config
test -n "$verbose" && echo " checking pkg-config for $cf_pkg_gnutls" 1>&6
-echo "${as_me:-configure}:15990: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me:-configure}:15958: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
if "$PKG_CONFIG" --exists $cf_pkg_gnutls ; then
test -n "$verbose" && echo " ... found $cf_pkg_gnutls in pkg-config" 1>&6
-echo "${as_me:-configure}:15995: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:15963: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
cf_cv_have_gnutls=yes
cf_cv_pkg_config_ssl=yes
@@ -16104,7 +16072,7 @@ fi
esac
test -n "$verbose" && echo " adding $cf_libs_ssl to LIBS" 1>&6
-echo "${as_me:-configure}:16107: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:16075: testing adding $cf_libs_ssl to LIBS ..." 1>&5
cf_add_libs="$cf_libs_ssl"
# Filter out duplicates - this happens with badly-designed ".pc" files...
@@ -16126,7 +16094,7 @@ LIBS="$cf_add_libs"
else
test -n "$verbose" && echo " ... did not find $cf_pkg_gnutls in pkg-config" 1>&6
-echo "${as_me:-configure}:16129: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:16097: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
cf_pkg_gnutls=none
fi
@@ -16146,12 +16114,12 @@ EOF
cf_cv_header_path_gnutls=
cf_cv_library_path_gnutls=
-echo "${as_me:-configure}:16149: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:16117: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
cf_save_LIBS="$LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 16154 "configure"
+#line 16122 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -16180,16 +16148,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16183: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16151: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:16186: \$? = $ac_status" >&5
+ echo "$as_me:16154: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:16189: \"$ac_try\"") >&5
+ { (eval echo "$as_me:16157: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:16192: \$? = $ac_status" >&5
+ echo "$as_me:16160: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_gnutls=yes
@@ -16203,7 +16171,7 @@ cat conftest.$ac_ext >&5
LIBS="-lgnutls -lgnutls-openssl $cf_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 16206 "configure"
+#line 16174 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -16232,16 +16200,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16235: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16203: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:16238: \$? = $ac_status" >&5
+ echo "$as_me:16206: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:16241: \"$ac_try\"") >&5
+ { (eval echo "$as_me:16209: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:16244: \$? = $ac_status" >&5
+ echo "$as_me:16212: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_gnutls=yes
@@ -16258,9 +16226,9 @@ cat conftest.$ac_ext >&5
test -n "$verbose" && echo " find linkage for gnutls library" 1>&6
-echo "${as_me:-configure}:16261: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me:-configure}:16229: testing find linkage for gnutls library ..." 1>&5
-echo "${as_me:-configure}:16263: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:16231: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
cf_save_CPPFLAGS="$CPPFLAGS"
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -16351,11 +16319,11 @@ cf_search="$cf_search $cf_header_path_list"
if test -d $cf_cv_header_path_gnutls ; then
test -n "$verbose" && echo " ... testing $cf_cv_header_path_gnutls" 1>&6
-echo "${as_me:-configure}:16354: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16322: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_gnutls"
cat >conftest.$ac_ext <<_ACEOF
-#line 16358 "configure"
+#line 16326 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -16384,21 +16352,21 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16387: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16355: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:16390: \$? = $ac_status" >&5
+ echo "$as_me:16358: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:16393: \"$ac_try\"") >&5
+ { (eval echo "$as_me:16361: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:16396: \$? = $ac_status" >&5
+ echo "$as_me:16364: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test -n "$verbose" && echo " ... found gnutls headers in $cf_cv_header_path_gnutls" 1>&6
-echo "${as_me:-configure}:16401: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16369: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
cf_cv_find_linkage_gnutls=maybe
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -16416,7 +16384,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_cv_find_linkage_gnutls" = maybe ; then
-echo "${as_me:-configure}:16419: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:16387: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
cf_save_LIBS="$LIBS"
cf_save_LDFLAGS="$LDFLAGS"
@@ -16491,13 +16459,13 @@ cf_search="$cf_library_path_list $cf_search"
if test -d $cf_cv_library_path_gnutls ; then
test -n "$verbose" && echo " ... testing $cf_cv_library_path_gnutls" 1>&6
-echo "${as_me:-configure}:16494: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16462: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
CPPFLAGS="$cf_test_CPPFLAGS"
LIBS="-lgnutls -lgnutls-openssl $cf_save_LIBS"
LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_gnutls"
cat >conftest.$ac_ext <<_ACEOF
-#line 16500 "configure"
+#line 16468 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -16526,21 +16494,21 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16529: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16497: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:16532: \$? = $ac_status" >&5
+ echo "$as_me:16500: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:16535: \"$ac_try\"") >&5
+ { (eval echo "$as_me:16503: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:16538: \$? = $ac_status" >&5
+ echo "$as_me:16506: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test -n "$verbose" && echo " ... found gnutls library in $cf_cv_library_path_gnutls" 1>&6
-echo "${as_me:-configure}:16543: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16511: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
cf_cv_find_linkage_gnutls=yes
cf_cv_library_file_gnutls="-lgnutls"
@@ -16617,7 +16585,7 @@ if test -n "$cf_cv_header_path_gnutls" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 16620 "configure"
+#line 16588 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -16629,16 +16597,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16632: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16600: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:16635: \$? = $ac_status" >&5
+ echo "$as_me:16603: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:16638: \"$ac_try\"") >&5
+ { (eval echo "$as_me:16606: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:16641: \$? = $ac_status" >&5
+ echo "$as_me:16609: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -16655,7 +16623,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:16658: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:16626: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -16665,6 +16633,8 @@ echo "${as_me:-configure}:16658: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
@@ -16694,7 +16664,7 @@ if test -n "$cf_cv_library_path_gnutls" ; 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}:16697: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:16667: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -16720,13 +16690,13 @@ do
done
LIBS="$cf_add_libs"
- echo "$as_me:16723: checking for gnutls_rnd" >&5
+ echo "$as_me:16693: checking for gnutls_rnd" >&5
echo $ECHO_N "checking for gnutls_rnd... $ECHO_C" >&6
if test "${ac_cv_func_gnutls_rnd+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 16729 "configure"
+#line 16699 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gnutls_rnd (); below. */
@@ -16757,16 +16727,16 @@ f = gnutls_rnd; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16760: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16730: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:16763: \$? = $ac_status" >&5
+ echo "$as_me:16733: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:16766: \"$ac_try\"") >&5
+ { (eval echo "$as_me:16736: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:16769: \$? = $ac_status" >&5
+ echo "$as_me:16739: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_gnutls_rnd=yes
else
@@ -16776,7 +16746,7 @@ ac_cv_func_gnutls_rnd=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:16779: result: $ac_cv_func_gnutls_rnd" >&5
+echo "$as_me:16749: result: $ac_cv_func_gnutls_rnd" >&5
echo "${ECHO_T}$ac_cv_func_gnutls_rnd" >&6
if test $ac_cv_func_gnutls_rnd = yes; then
cat >>confdefs.h <<\EOF
@@ -16804,7 +16774,7 @@ LIBS="$cf_add_libs"
fi
if test "$cf_pkg_gnutls" = none ; then
- echo "$as_me:16807: checking for SSL_connect in -lgnutls-openssl" >&5
+ echo "$as_me:16777: checking for SSL_connect in -lgnutls-openssl" >&5
echo $ECHO_N "checking for SSL_connect in -lgnutls-openssl... $ECHO_C" >&6
if test "${ac_cv_lib_gnutls_openssl_SSL_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16812,7 +16782,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgnutls-openssl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 16815 "configure"
+#line 16785 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -16831,16 +16801,16 @@ SSL_connect ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16834: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16804: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:16837: \$? = $ac_status" >&5
+ echo "$as_me:16807: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:16840: \"$ac_try\"") >&5
+ { (eval echo "$as_me:16810: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:16843: \$? = $ac_status" >&5
+ echo "$as_me:16813: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_gnutls_openssl_SSL_connect=yes
else
@@ -16851,7 +16821,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:16854: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5
+echo "$as_me:16824: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5
echo "${ECHO_T}$ac_cv_lib_gnutls_openssl_SSL_connect" >&6
if test $ac_cv_lib_gnutls_openssl_SSL_connect = yes; then
@@ -16872,7 +16842,7 @@ done
LIBS="$cf_add_libs"
else
- echo "$as_me:16875: checking for SSL_connect in -lgnutls-extra" >&5
+ echo "$as_me:16845: checking for SSL_connect in -lgnutls-extra" >&5
echo $ECHO_N "checking for SSL_connect in -lgnutls-extra... $ECHO_C" >&6
if test "${ac_cv_lib_gnutls_extra_SSL_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16880,7 +16850,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgnutls-extra $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 16883 "configure"
+#line 16853 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -16899,16 +16869,16 @@ SSL_connect ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16902: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16872: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:16905: \$? = $ac_status" >&5
+ echo "$as_me:16875: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:16908: \"$ac_try\"") >&5
+ { (eval echo "$as_me:16878: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:16911: \$? = $ac_status" >&5
+ echo "$as_me:16881: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_gnutls_extra_SSL_connect=yes
else
@@ -16919,7 +16889,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:16922: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5
+echo "$as_me:16892: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5
echo "${ECHO_T}$ac_cv_lib_gnutls_extra_SSL_connect" >&6
if test $ac_cv_lib_gnutls_extra_SSL_connect = yes; then
@@ -16940,7 +16910,7 @@ done
LIBS="$cf_add_libs"
else
- { { echo "$as_me:16943: error: cannot find gnutls openssl functions" >&5
+ { { echo "$as_me:16913: error: cannot find gnutls openssl functions" >&5
echo "$as_me: error: cannot find gnutls openssl functions" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -16949,10 +16919,10 @@ fi
fi
-echo "$as_me:16952: checking for X509 support" >&5
+echo "$as_me:16922: checking for X509 support" >&5
echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 16955 "configure"
+#line 16925 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -16981,16 +16951,16 @@ X509_verify_cert_error_string(X509_STORE_CTX_get_error(NULL))
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16984: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16954: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:16987: \$? = $ac_status" >&5
+ echo "$as_me:16957: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:16990: \"$ac_try\"") >&5
+ { (eval echo "$as_me:16960: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:16993: \$? = $ac_status" >&5
+ echo "$as_me:16963: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_x509_support=yes
else
@@ -16999,7 +16969,7 @@ cat conftest.$ac_ext >&5
cf_x509_support=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:17002: result: $cf_x509_support" >&5
+echo "$as_me:16972: result: $cf_x509_support" >&5
echo "${ECHO_T}$cf_x509_support" >&6
if test "$cf_x509_support" = yes ; then
@@ -17031,7 +17001,7 @@ case "$cf_cv_use_libnss_compat" in
;;
(yes)
-echo "$as_me:17034: checking for SSL_get_version in -lnss_compat_ossl" >&5
+echo "$as_me:17004: checking for SSL_get_version in -lnss_compat_ossl" >&5
echo $ECHO_N "checking for SSL_get_version in -lnss_compat_ossl... $ECHO_C" >&6
if test "${ac_cv_lib_nss_compat_ossl_SSL_get_version+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17039,7 +17009,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lnss_compat_ossl -lnss_compat_ossl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 17042 "configure"
+#line 17012 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -17058,16 +17028,16 @@ SSL_get_version ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17061: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17031: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:17064: \$? = $ac_status" >&5
+ echo "$as_me:17034: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:17067: \"$ac_try\"") >&5
+ { (eval echo "$as_me:17037: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:17070: \$? = $ac_status" >&5
+ echo "$as_me:17040: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_nss_compat_ossl_SSL_get_version=yes
else
@@ -17078,7 +17048,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:17081: result: $ac_cv_lib_nss_compat_ossl_SSL_get_version" >&5
+echo "$as_me:17051: result: $ac_cv_lib_nss_compat_ossl_SSL_get_version" >&5
echo "${ECHO_T}$ac_cv_lib_nss_compat_ossl_SSL_get_version" >&6
if test $ac_cv_lib_nss_compat_ossl_SSL_get_version = yes; then
cat >>confdefs.h <<EOF
@@ -17093,11 +17063,11 @@ else
if test -d $cf_ssl_root ; then
test -n "$verbose" && echo " assume it is in $cf_ssl_root" 1>&6
-echo "${as_me:-configure}:17096: testing assume it is in $cf_ssl_root ..." 1>&5
+echo "${as_me:-configure}:17066: testing assume it is in $cf_ssl_root ..." 1>&5
cf_ssl_library="-L$cf_ssl_root/lib $cf_ssl_library"
else
- { { echo "$as_me:17100: error: cannot find NSS compilant libraries" >&5
+ { { echo "$as_me:17070: error: cannot find NSS compilant libraries" >&5
echo "$as_me: error: cannot find NSS compilant libraries" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -17112,13 +17082,13 @@ fi
elif test -d $cf_cv_use_libnss_compat/../include ; then
cf_ssl_root=$cf_cv_use_libnss_compat/..
else
- { { echo "$as_me:17115: error: cannot find NSS compilant library under $cf_cv_use_libnss_compat" >&5
+ { { echo "$as_me:17085: error: cannot find NSS compilant library under $cf_cv_use_libnss_compat" >&5
echo "$as_me: error: cannot find NSS compilant library under $cf_cv_use_libnss_compat" >&2;}
{ (exit 1); exit 1; }; }
fi
cf_ssl_library="-L$cf_ssl_root/lib $cf_ssl_library"
else
- { echo "$as_me:17121: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
+ { echo "$as_me:17091: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
echo "$as_me: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&2;}
fi
;;
@@ -17227,10 +17197,10 @@ if test -n "$cf_new_extra_cppflags" ; then
fi
if test "$cf_ssl_subincs" = yes ; then
-echo "$as_me:17230: checking for NSS compilant include directory" >&5
+echo "$as_me:17200: checking for NSS compilant include directory" >&5
echo $ECHO_N "checking for NSS compilant include directory... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 17233 "configure"
+#line 17203 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -17244,16 +17214,16 @@ SSL_shutdown((SSL *)0)
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17247: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17217: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:17250: \$? = $ac_status" >&5
+ echo "$as_me:17220: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:17253: \"$ac_try\"") >&5
+ { (eval echo "$as_me:17223: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:17256: \$? = $ac_status" >&5
+ echo "$as_me:17226: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_ssl_incl=yes
else
@@ -17262,7 +17232,7 @@ cat conftest.$ac_ext >&5
cf_ssl_incl=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:17265: result: $cf_ssl_incl" >&5
+echo "$as_me:17235: result: $cf_ssl_incl" >&5
echo "${ECHO_T}$cf_ssl_incl" >&6
test "$cf_ssl_incl" = yes &&
cat >>confdefs.h <<\EOF
@@ -17271,10 +17241,10 @@ EOF
fi
-echo "$as_me:17274: checking if we can link to NSS compilant library" >&5
+echo "$as_me:17244: checking if we can link to NSS compilant library" >&5
echo $ECHO_N "checking if we can link to NSS compilant library... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 17277 "configure"
+#line 17247 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -17293,16 +17263,16 @@ SSL_shutdown((SSL *)0)
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17296: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17266: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:17299: \$? = $ac_status" >&5
+ echo "$as_me:17269: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:17302: \"$ac_try\"") >&5
+ { (eval echo "$as_me:17272: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:17305: \$? = $ac_status" >&5
+ echo "$as_me:17275: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_ssl_library=yes
else
@@ -17311,7 +17281,7 @@ cat conftest.$ac_ext >&5
cf_ssl_library=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:17314: result: $cf_ssl_library" >&5
+echo "$as_me:17284: result: $cf_ssl_library" >&5
echo "${ECHO_T}$cf_ssl_library" >&6
if test "$cf_ssl_library" = yes ; then
@@ -17324,7 +17294,7 @@ cat >>confdefs.h <<\EOF
EOF
else
- { { echo "$as_me:17327: error: Cannot link with NSS compilant libraries" >&5
+ { { echo "$as_me:17297: error: Cannot link with NSS compilant libraries" >&5
echo "$as_me: error: Cannot link with NSS compilant libraries" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -17332,28 +17302,28 @@ fi
fi
### check for ipv6 support
-echo "$as_me:17335: checking whether to enable ipv6" >&5
+echo "$as_me:17305: checking whether to enable ipv6" >&5
echo $ECHO_N "checking whether to enable ipv6... $ECHO_C" >&6
# Check whether --enable-ipv6 or --disable-ipv6 was given.
if test "${enable_ipv6+set}" = set; then
enableval="$enable_ipv6"
test "$enableval" != yes && enableval=no
- if test "$enableval" != "no" ; then
+ if test "$enableval" != "no" ; then
cat >>confdefs.h <<\EOF
#define ENABLE_IPV6 1
EOF
- fi
+ fi
else
enableval=no
fi;
-echo "$as_me:17352: result: $enableval" >&5
+echo "$as_me:17322: result: $enableval" >&5
echo "${ECHO_T}$enableval" >&6
if test "$enableval" = "yes"; then
-echo "$as_me:17356: checking ipv6 stack type" >&5
+echo "$as_me:17326: checking ipv6 stack type" >&5
echo $ECHO_N "checking ipv6 stack type... $ECHO_C" >&6
if test "${cf_cv_ipv6type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17374,7 +17344,7 @@ do
;;
(inria)
cat >conftest.$ac_ext <<_ACEOF
-#line 17377 "configure"
+#line 17347 "configure"
#include "confdefs.h"
#include <netinet/in.h>
@@ -17391,7 +17361,7 @@ rm -rf conftest*
;;
(kame)
cat >conftest.$ac_ext <<_ACEOF
-#line 17394 "configure"
+#line 17364 "configure"
#include "confdefs.h"
#include <netinet/in.h>
@@ -17408,7 +17378,7 @@ rm -rf conftest*
;;
(linux-glibc)
cat >conftest.$ac_ext <<_ACEOF
-#line 17411 "configure"
+#line 17381 "configure"
#include "confdefs.h"
#include <features.h>
@@ -17434,7 +17404,7 @@ rm -rf conftest*
;;
(toshiba)
cat >conftest.$ac_ext <<_ACEOF
-#line 17437 "configure"
+#line 17407 "configure"
#include "confdefs.h"
#include <sys/param.h>
@@ -17451,7 +17421,7 @@ rm -rf conftest*
;;
(v6d)
cat >conftest.$ac_ext <<_ACEOF
-#line 17454 "configure"
+#line 17424 "configure"
#include "confdefs.h"
#include </usr/local/v6/include/sys/v6config.h>
@@ -17468,7 +17438,7 @@ rm -rf conftest*
;;
(zeta)
cat >conftest.$ac_ext <<_ACEOF
-#line 17471 "configure"
+#line 17441 "configure"
#include "confdefs.h"
#include <sys/param.h>
@@ -17490,13 +17460,13 @@ rm -rf conftest*
done
fi
-echo "$as_me:17493: result: $cf_cv_ipv6type" >&5
+echo "$as_me:17463: result: $cf_cv_ipv6type" >&5
echo "${ECHO_T}$cf_cv_ipv6type" >&6
cf_ipv6lib=none
cf_ipv6dir=none
-echo "$as_me:17499: checking for IPv6 library if required" >&5
+echo "$as_me:17469: checking for IPv6 library if required" >&5
echo $ECHO_N "checking for IPv6 library if required... $ECHO_C" >&6
case $cf_cv_ipv6type in
(solaris)
@@ -17526,13 +17496,13 @@ case $cf_cv_ipv6type in
cf_ipv6dir=v6
;;
esac
-echo "$as_me:17529: result: $cf_ipv6lib" >&5
+echo "$as_me:17499: result: $cf_ipv6lib" >&5
echo "${ECHO_T}$cf_ipv6lib" >&6
if test "$cf_ipv6lib" != "none"; then
cat >conftest.$ac_ext <<_ACEOF
-#line 17535 "configure"
+#line 17505 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -17548,16 +17518,16 @@ getaddrinfo(0, 0, 0, 0)
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17551: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17521: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:17554: \$? = $ac_status" >&5
+ echo "$as_me:17524: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:17557: \"$ac_try\"") >&5
+ { (eval echo "$as_me:17527: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:17560: \$? = $ac_status" >&5
+ echo "$as_me:17530: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -17675,7 +17645,7 @@ if test -n "$cf_incdir" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 17678 "configure"
+#line 17648 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -17687,16 +17657,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17690: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17660: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:17693: \$? = $ac_status" >&5
+ echo "$as_me:17663: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:17696: \"$ac_try\"") >&5
+ { (eval echo "$as_me:17666: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:17699: \$? = $ac_status" >&5
+ echo "$as_me:17669: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -17713,7 +17683,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:17716: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:17686: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -17723,6 +17693,8 @@ echo "${as_me:-configure}:17716: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
@@ -17739,13 +17711,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
eval 'cf_cv_have_lib_'$cf_ipv6lib'=no'
cf_libdir=""
- echo "$as_me:17742: checking for getaddrinfo" >&5
+ echo "$as_me:17714: checking for getaddrinfo" >&5
echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6
if test "${ac_cv_func_getaddrinfo+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 17748 "configure"
+#line 17720 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char getaddrinfo (); below. */
@@ -17776,16 +17748,16 @@ f = getaddrinfo; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17779: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17751: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:17782: \$? = $ac_status" >&5
+ echo "$as_me:17754: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:17785: \"$ac_try\"") >&5
+ { (eval echo "$as_me:17757: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:17788: \$? = $ac_status" >&5
+ echo "$as_me:17760: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_getaddrinfo=yes
else
@@ -17795,18 +17767,18 @@ ac_cv_func_getaddrinfo=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:17798: result: $ac_cv_func_getaddrinfo" >&5
+echo "$as_me:17770: result: $ac_cv_func_getaddrinfo" >&5
echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6
if test $ac_cv_func_getaddrinfo = yes; then
eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes'
else
cf_save_LIBS="$LIBS"
- echo "$as_me:17805: checking for getaddrinfo in -l$cf_ipv6lib" >&5
+ echo "$as_me:17777: checking for getaddrinfo in -l$cf_ipv6lib" >&5
echo $ECHO_N "checking for getaddrinfo in -l$cf_ipv6lib... $ECHO_C" >&6
LIBS="-l$cf_ipv6lib $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 17809 "configure"
+#line 17781 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -17822,25 +17794,25 @@ getaddrinfo(0, 0, 0, 0)
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17825: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17797: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:17828: \$? = $ac_status" >&5
+ echo "$as_me:17800: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:17831: \"$ac_try\"") >&5
+ { (eval echo "$as_me:17803: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:17834: \$? = $ac_status" >&5
+ echo "$as_me:17806: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:17836: result: yes" >&5
+ echo "$as_me:17808: result: yes" >&5
echo "${ECHO_T}yes" >&6
eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes'
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "$as_me:17843: result: no" >&5
+echo "$as_me:17815: result: no" >&5
echo "${ECHO_T}no" >&6
cf_search=
@@ -17908,11 +17880,11 @@ cf_search="$cf_library_path_list $cf_search"
for cf_libdir in $cf_search
do
- echo "$as_me:17911: checking for -l$cf_ipv6lib in $cf_libdir" >&5
+ echo "$as_me:17883: checking for -l$cf_ipv6lib in $cf_libdir" >&5
echo $ECHO_N "checking for -l$cf_ipv6lib in $cf_libdir... $ECHO_C" >&6
LIBS="-L$cf_libdir -l$cf_ipv6lib $cf_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 17915 "configure"
+#line 17887 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -17928,25 +17900,25 @@ getaddrinfo(0, 0, 0, 0)
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17931: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17903: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:17934: \$? = $ac_status" >&5
+ echo "$as_me:17906: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:17937: \"$ac_try\"") >&5
+ { (eval echo "$as_me:17909: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:17940: \$? = $ac_status" >&5
+ echo "$as_me:17912: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:17942: result: yes" >&5
+ echo "$as_me:17914: result: yes" >&5
echo "${ECHO_T}yes" >&6
eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes'
break
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "$as_me:17949: result: no" >&5
+echo "$as_me:17921: result: no" >&5
echo "${ECHO_T}no" >&6
LIBS="$cf_save_LIBS"
fi
@@ -17961,7 +17933,7 @@ fi
eval 'cf_found_library=$cf_cv_have_lib_'$cf_ipv6lib
if test $cf_found_library = no ; then
- { { echo "$as_me:17964: error: No $cf_ipv6lib library found, cannot continue. You must fetch lib$cf_ipv6lib.a
+ { { echo "$as_me:17936: error: No $cf_ipv6lib library found, cannot continue. You must fetch lib$cf_ipv6lib.a
from an appropriate IPv6 kit and compile beforehand." >&5
echo "$as_me: error: No $cf_ipv6lib library found, cannot continue. You must fetch lib$cf_ipv6lib.a
from an appropriate IPv6 kit and compile beforehand." >&2;}
@@ -17969,7 +17941,7 @@ from an appropriate IPv6 kit and compile beforehand." >&2;}
fi
fi
-echo "$as_me:17972: checking working getaddrinfo" >&5
+echo "$as_me:17944: checking working getaddrinfo" >&5
echo $ECHO_N "checking working getaddrinfo... $ECHO_C" >&6
if test "${cf_cv_getaddrinfo+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17979,7 +17951,7 @@ if test "$cross_compiling" = yes; then
cf_cv_getaddrinfo=unknown
else
cat >conftest.$ac_ext <<_ACEOF
-#line 17982 "configure"
+#line 17954 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -18059,15 +18031,15 @@ int main()
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:18062: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18034: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:18065: \$? = $ac_status" >&5
+ echo "$as_me:18037: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:18067: \"$ac_try\"") >&5
+ { (eval echo "$as_me:18039: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:18070: \$? = $ac_status" >&5
+ echo "$as_me:18042: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_getaddrinfo=yes
else
@@ -18080,7 +18052,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
-echo "$as_me:18083: result: $cf_cv_getaddrinfo" >&5
+echo "$as_me:18055: result: $cf_cv_getaddrinfo" >&5
echo "${ECHO_T}$cf_cv_getaddrinfo" >&6
if test "$cf_cv_getaddrinfo" = yes ; then
@@ -18096,12 +18068,12 @@ fi
if test "$cf_cv_getaddrinfo" != "yes"; then
if test "$cf_cv_ipv6type" != "linux"; then
- { echo "$as_me:18099: WARNING: You must get working getaddrinfo() function,
+ { echo "$as_me:18071: WARNING: You must get working getaddrinfo() function,
or you can specify \"--disable-ipv6\"" >&5
echo "$as_me: WARNING: You must get working getaddrinfo() function,
or you can specify \"--disable-ipv6\"" >&2;}
else
- { echo "$as_me:18104: WARNING: The getaddrinfo() implementation on your system seems be buggy.
+ { echo "$as_me:18076: WARNING: The getaddrinfo() implementation on your system seems be buggy.
You should upgrade your system library to the newest version
of GNU C library (aka glibc)." >&5
echo "$as_me: WARNING: The getaddrinfo() implementation on your system seems be buggy.
@@ -18112,7 +18084,7 @@ fi
fi
-echo "$as_me:18115: checking for screen type" >&5
+echo "$as_me:18087: checking for screen type" >&5
echo $ECHO_N "checking for screen type... $ECHO_C" >&6
if test "${cf_cv_screen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18126,7 +18098,7 @@ case $withval in
(curses|ncurses*|pdcurses|slang)
cf_cv_screen=$withval
;;
-(*) { { echo "$as_me:18129: error: Unexpected value $withval" >&5
+(*) { { echo "$as_me:18101: error: Unexpected value $withval" >&5
echo "$as_me: error: Unexpected value $withval" >&2;}
{ (exit 1); exit 1; }; }
;;
@@ -18135,13 +18107,13 @@ else
cf_cv_screen=curses
fi;
fi
-echo "$as_me:18138: result: $cf_cv_screen" >&5
+echo "$as_me:18110: result: $cf_cv_screen" >&5
echo "${ECHO_T}$cf_cv_screen" >&6
case $cf_cv_screen in
(curses|ncurses*)
-echo "$as_me:18144: checking for specific curses-directory" >&5
+echo "$as_me:18116: checking for specific curses-directory" >&5
echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6
# Check whether --with-curses-dir or --without-curses-dir was given.
@@ -18151,7 +18123,7 @@ if test "${with_curses_dir+set}" = set; then
else
cf_cv_curses_dir=no
fi;
-echo "$as_me:18154: result: $cf_cv_curses_dir" >&5
+echo "$as_me:18126: result: $cf_cv_curses_dir" >&5
echo "${ECHO_T}$cf_cv_curses_dir" >&6
if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
@@ -18182,7 +18154,7 @@ case ".$withval" in
withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
;;
(*)
- { { echo "$as_me:18185: error: expected a pathname, not \"$withval\"" >&5
+ { { echo "$as_me:18157: error: expected a pathname, not \"$withval\"" >&5
echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
{ (exit 1); exit 1; }; }
;;
@@ -18215,7 +18187,7 @@ if test -n "$cf_cv_curses_dir/include" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 18218 "configure"
+#line 18190 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -18227,16 +18199,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18230: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18202: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:18233: \$? = $ac_status" >&5
+ echo "$as_me:18205: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:18236: \"$ac_try\"") >&5
+ { (eval echo "$as_me:18208: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:18239: \$? = $ac_status" >&5
+ echo "$as_me:18211: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -18253,7 +18225,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:18256: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:18228: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -18263,6 +18235,8 @@ echo "${as_me:-configure}:18256: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
@@ -18287,7 +18261,7 @@ if test -n "$cf_cv_curses_dir/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}:18290: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18264: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -18306,7 +18280,7 @@ dft_color_style=yes
case $cf_cv_screen in
(curses)
-echo "$as_me:18309: checking for extra include directories" >&5
+echo "$as_me:18283: checking for extra include directories" >&5
echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6
if test "${cf_cv_curses_incdir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18332,11 +18306,11 @@ case $host_os in
esac
fi
-echo "$as_me:18335: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:18309: result: $cf_cv_curses_incdir" >&5
echo "${ECHO_T}$cf_cv_curses_incdir" >&6
test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir"
-echo "$as_me:18339: checking if we have identified curses headers" >&5
+echo "$as_me:18313: checking if we have identified curses headers" >&5
echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
if test "${cf_cv_ncurses_header+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18348,7 +18322,7 @@ for cf_header in \
curses.h ncurses/ncurses.h ncurses/curses.h
do
cat >conftest.$ac_ext <<_ACEOF
-#line 18351 "configure"
+#line 18325 "configure"
#include "confdefs.h"
#include <${cf_header}>
int
@@ -18360,16 +18334,16 @@ initscr(); tgoto("?", 0,0)
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18363: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18337: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:18366: \$? = $ac_status" >&5
+ echo "$as_me:18340: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:18369: \"$ac_try\"") >&5
+ { (eval echo "$as_me:18343: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:18372: \$? = $ac_status" >&5
+ echo "$as_me:18346: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_header=$cf_header; break
else
@@ -18380,11 +18354,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
done
fi
-echo "$as_me:18383: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:18357: result: $cf_cv_ncurses_header" >&5
echo "${ECHO_T}$cf_cv_ncurses_header" >&6
if test "$cf_cv_ncurses_header" = none ; then
- { { echo "$as_me:18387: error: No curses header-files found" >&5
+ { { echo "$as_me:18361: error: No curses header-files found" >&5
echo "$as_me: error: No curses header-files found" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -18394,23 +18368,23 @@ fi
for ac_header in $cf_cv_ncurses_header
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:18397: checking for $ac_header" >&5
+echo "$as_me:18371: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 18403 "configure"
+#line 18377 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:18407: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:18381: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:18413: \$? = $ac_status" >&5
+ echo "$as_me:18387: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18429,7 +18403,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:18432: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:18406: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -18439,7 +18413,7 @@ EOF
fi
done
-echo "$as_me:18442: checking for terminfo header" >&5
+echo "$as_me:18416: checking for terminfo header" >&5
echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
if test "${cf_cv_term_header+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18457,7 +18431,7 @@ esac
for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
do
cat >conftest.$ac_ext <<_ACEOF
-#line 18460 "configure"
+#line 18434 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <${cf_cv_ncurses_header:-curses.h}>
@@ -18472,16 +18446,16 @@ int x = auto_left_margin
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18475: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18449: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:18478: \$? = $ac_status" >&5
+ echo "$as_me:18452: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:18481: \"$ac_try\"") >&5
+ { (eval echo "$as_me:18455: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:18484: \$? = $ac_status" >&5
+ echo "$as_me:18458: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_term_header="$cf_test"
@@ -18497,7 +18471,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
done
fi
-echo "$as_me:18500: result: $cf_cv_term_header" >&5
+echo "$as_me:18474: result: $cf_cv_term_header" >&5
echo "${ECHO_T}$cf_cv_term_header" >&6
# Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -18529,7 +18503,7 @@ EOF
;;
esac
-echo "$as_me:18532: checking for ncurses version" >&5
+echo "$as_me:18506: checking for ncurses version" >&5
echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
if test "${cf_cv_ncurses_version+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18555,10 +18529,10 @@ Autoconf "old"
#endif
EOF
cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
- { (eval echo "$as_me:18558: \"$cf_try\"") >&5
+ { (eval echo "$as_me:18532: \"$cf_try\"") >&5
(eval $cf_try) 2>&5
ac_status=$?
- echo "$as_me:18561: \$? = $ac_status" >&5
+ echo "$as_me:18535: \$? = $ac_status" >&5
(exit $ac_status); }
if test -f conftest.out ; then
cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -18568,7 +18542,7 @@ EOF
else
cat >conftest.$ac_ext <<_ACEOF
-#line 18571 "configure"
+#line 18545 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
@@ -18593,15 +18567,15 @@ int main()
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:18596: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18570: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:18599: \$? = $ac_status" >&5
+ echo "$as_me:18573: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:18601: \"$ac_try\"") >&5
+ { (eval echo "$as_me:18575: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:18604: \$? = $ac_status" >&5
+ echo "$as_me:18578: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -18615,17 +18589,17 @@ fi
rm -f $cf_tempfile
fi
-echo "$as_me:18618: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:18592: result: $cf_cv_ncurses_version" >&5
echo "${ECHO_T}$cf_cv_ncurses_version" >&6
test "$cf_cv_ncurses_version" = no ||
cat >>confdefs.h <<\EOF
#define NCURSES 1
EOF
-echo "$as_me:18625: checking if we have identified curses libraries" >&5
+echo "$as_me:18599: checking if we have identified curses libraries" >&5
echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 18628 "configure"
+#line 18602 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -18637,16 +18611,16 @@ initscr(); tgoto("?", 0,0)
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18640: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18614: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:18643: \$? = $ac_status" >&5
+ echo "$as_me:18617: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:18646: \"$ac_try\"") >&5
+ { (eval echo "$as_me:18620: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:18649: \$? = $ac_status" >&5
+ echo "$as_me:18623: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
@@ -18655,13 +18629,13 @@ cat conftest.$ac_ext >&5
cf_result=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:18658: result: $cf_result" >&5
+echo "$as_me:18632: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
if test "$cf_result" = no ; then
case $host_os in
(freebsd*)
- echo "$as_me:18664: checking for tgoto in -lmytinfo" >&5
+ echo "$as_me:18638: checking for tgoto in -lmytinfo" >&5
echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18669,7 +18643,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lmytinfo $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 18672 "configure"
+#line 18646 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -18688,16 +18662,16 @@ tgoto ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18691: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18665: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:18694: \$? = $ac_status" >&5
+ echo "$as_me:18668: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:18697: \"$ac_try\"") >&5
+ { (eval echo "$as_me:18671: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:18700: \$? = $ac_status" >&5
+ echo "$as_me:18674: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_mytinfo_tgoto=yes
else
@@ -18708,7 +18682,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:18711: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:18685: result: $ac_cv_lib_mytinfo_tgoto" >&5
echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
if test $ac_cv_lib_mytinfo_tgoto = yes; then
@@ -18730,7 +18704,7 @@ LIBS="$cf_add_libs"
fi
- ;;
+ ;;
(hpux10.*)
# Looking at HPUX 10.20, the Hcurses library is the oldest (1997), cur_colr
# next (1998), and xcurses "newer" (2000). There is no header file for
@@ -18738,7 +18712,7 @@ fi
# term.h) for cur_colr
if test "x$cf_cv_screen" = "xcurses_colr"
then
- echo "$as_me:18741: checking for initscr in -lcur_colr" >&5
+ echo "$as_me:18715: checking for initscr in -lcur_colr" >&5
echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6
if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18746,7 +18720,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcur_colr $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 18749 "configure"
+#line 18723 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -18765,16 +18739,16 @@ initscr ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18768: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18742: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:18771: \$? = $ac_status" >&5
+ echo "$as_me:18745: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:18774: \"$ac_try\"") >&5
+ { (eval echo "$as_me:18748: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:18777: \$? = $ac_status" >&5
+ echo "$as_me:18751: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_cur_colr_initscr=yes
else
@@ -18785,7 +18759,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:18788: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:18762: result: $ac_cv_lib_cur_colr_initscr" >&5
echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
if test $ac_cv_lib_cur_colr_initscr = yes; then
@@ -18809,7 +18783,7 @@ LIBS="$cf_add_libs"
else
- echo "$as_me:18812: checking for initscr in -lHcurses" >&5
+ echo "$as_me:18786: checking for initscr in -lHcurses" >&5
echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6
if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18817,7 +18791,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lHcurses $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 18820 "configure"
+#line 18794 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -18836,16 +18810,16 @@ initscr ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18839: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18813: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:18842: \$? = $ac_status" >&5
+ echo "$as_me:18816: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:18845: \"$ac_try\"") >&5
+ { (eval echo "$as_me:18819: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:18848: \$? = $ac_status" >&5
+ echo "$as_me:18822: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_Hcurses_initscr=yes
else
@@ -18856,7 +18830,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:18859: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:18833: result: $ac_cv_lib_Hcurses_initscr" >&5
echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6
if test $ac_cv_lib_Hcurses_initscr = yes; then
@@ -18912,7 +18886,7 @@ if test -n "/lib64" ; then
if test "$cf_have_libdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6
-echo "${as_me:-configure}:18915: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18889: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -18941,7 +18915,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}:18944: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18918: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -18972,7 +18946,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}:18975: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18949: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -19007,7 +18981,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}:19010: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18984: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -19032,9 +19006,9 @@ done
LIBS="$cf_add_libs"
fi
- fi
- ac_cv_func_initscr=yes
- ;;
+ fi
+ ac_cv_func_initscr=yes
+ ;;
esac
if test ".$ac_cv_func_initscr" != .yes ; then
@@ -19051,13 +19025,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then
# because it may be needed to link the test-case for initscr.
if test "x$cf_term_lib" = x
then
- echo "$as_me:19054: checking for tgoto" >&5
+ echo "$as_me:19028: checking for tgoto" >&5
echo $ECHO_N "checking for tgoto... $ECHO_C" >&6
if test "${ac_cv_func_tgoto+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 19060 "configure"
+#line 19034 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char tgoto (); below. */
@@ -19088,16 +19062,16 @@ f = tgoto; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19091: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19065: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:19094: \$? = $ac_status" >&5
+ echo "$as_me:19068: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:19097: \"$ac_try\"") >&5
+ { (eval echo "$as_me:19071: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:19100: \$? = $ac_status" >&5
+ echo "$as_me:19074: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_tgoto=yes
else
@@ -19107,7 +19081,7 @@ ac_cv_func_tgoto=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:19110: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:19084: result: $ac_cv_func_tgoto" >&5
echo "${ECHO_T}$ac_cv_func_tgoto" >&6
if test $ac_cv_func_tgoto = yes; then
cf_term_lib=predefined
@@ -19116,7 +19090,7 @@ else
for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
do
as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
-echo "$as_me:19119: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:19093: checking for tgoto in -l$cf_term_lib" >&5
echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6
if eval "test \"\${$as_ac_Lib+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19124,7 +19098,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-l$cf_term_lib $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 19127 "configure"
+#line 19101 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -19143,16 +19117,16 @@ tgoto ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19146: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19120: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:19149: \$? = $ac_status" >&5
+ echo "$as_me:19123: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:19152: \"$ac_try\"") >&5
+ { (eval echo "$as_me:19126: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:19155: \$? = $ac_status" >&5
+ echo "$as_me:19129: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_Lib=yes"
else
@@ -19163,7 +19137,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:19166: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:19140: result: `eval echo '${'$as_ac_Lib'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
break
@@ -19182,7 +19156,7 @@ fi
for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown
do
as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh`
-echo "$as_me:19185: checking for initscr in -l$cf_curs_lib" >&5
+echo "$as_me:19159: checking for initscr in -l$cf_curs_lib" >&5
echo $ECHO_N "checking for initscr in -l$cf_curs_lib... $ECHO_C" >&6
if eval "test \"\${$as_ac_Lib+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19190,7 +19164,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-l$cf_curs_lib $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 19193 "configure"
+#line 19167 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -19209,16 +19183,16 @@ initscr ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19212: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19186: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:19215: \$? = $ac_status" >&5
+ echo "$as_me:19189: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:19218: \"$ac_try\"") >&5
+ { (eval echo "$as_me:19192: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:19221: \$? = $ac_status" >&5
+ echo "$as_me:19195: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_Lib=yes"
else
@@ -19229,7 +19203,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:19232: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:19206: result: `eval echo '${'$as_ac_Lib'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
break
@@ -19237,16 +19211,16 @@ fi
done
fi
- test $cf_curs_lib = unknown && { { echo "$as_me:19240: error: no curses library found" >&5
+ test $cf_curs_lib = unknown && { { echo "$as_me:19214: error: no curses library found" >&5
echo "$as_me: error: no curses library found" >&2;}
{ (exit 1); exit 1; }; }
LIBS="-l$cf_curs_lib $cf_save_LIBS"
if test "$cf_term_lib" = unknown ; then
- echo "$as_me:19246: checking if we can link with $cf_curs_lib library" >&5
+ echo "$as_me:19220: checking if we can link with $cf_curs_lib library" >&5
echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 19249 "configure"
+#line 19223 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -19258,16 +19232,16 @@ initscr()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19261: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19235: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:19264: \$? = $ac_status" >&5
+ echo "$as_me:19238: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:19267: \"$ac_try\"") >&5
+ { (eval echo "$as_me:19241: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:19270: \$? = $ac_status" >&5
+ echo "$as_me:19244: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
@@ -19276,18 +19250,18 @@ cat conftest.$ac_ext >&5
cf_result=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- echo "$as_me:19279: result: $cf_result" >&5
+ echo "$as_me:19253: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
- test $cf_result = no && { { echo "$as_me:19281: error: Cannot link curses library" >&5
+ test $cf_result = no && { { echo "$as_me:19255: error: Cannot link curses library" >&5
echo "$as_me: error: Cannot link curses library" >&2;}
{ (exit 1); exit 1; }; }
elif test "$cf_curs_lib" = "$cf_term_lib" ; then
:
elif test "$cf_term_lib" != predefined ; then
- echo "$as_me:19287: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+ echo "$as_me:19261: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 19290 "configure"
+#line 19264 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -19299,16 +19273,16 @@ initscr(); tgoto((char *)0, 0, 0);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19302: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19276: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:19305: \$? = $ac_status" >&5
+ echo "$as_me:19279: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:19308: \"$ac_try\"") >&5
+ { (eval echo "$as_me:19282: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:19311: \$? = $ac_status" >&5
+ echo "$as_me:19285: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=no
else
@@ -19317,7 +19291,7 @@ cat conftest.$ac_ext >&5
LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 19320 "configure"
+#line 19294 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -19329,16 +19303,16 @@ initscr()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19332: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19306: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:19335: \$? = $ac_status" >&5
+ echo "$as_me:19309: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:19338: \"$ac_try\"") >&5
+ { (eval echo "$as_me:19312: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:19341: \$? = $ac_status" >&5
+ echo "$as_me:19315: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
@@ -19350,13 +19324,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- echo "$as_me:19353: result: $cf_result" >&5
+ echo "$as_me:19327: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
fi
fi
fi
-echo "$as_me:19359: checking for curses performance tradeoff" >&5
+echo "$as_me:19333: checking for curses performance tradeoff" >&5
echo $ECHO_N "checking for curses performance tradeoff... $ECHO_C" >&6
if test "${cf_cv_curs_performance+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19364,7 +19338,7 @@ else
cf_cv_curs_performance=no
cat >conftest.$ac_ext <<_ACEOF
-#line 19367 "configure"
+#line 19341 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
@@ -19383,20 +19357,20 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19386: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19360: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:19389: \$? = $ac_status" >&5
+ echo "$as_me:19363: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:19392: \"$ac_try\"") >&5
+ { (eval echo "$as_me:19366: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:19395: \$? = $ac_status" >&5
+ echo "$as_me:19369: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cat >conftest.$ac_ext <<_ACEOF
-#line 19399 "configure"
+#line 19373 "configure"
#include "confdefs.h"
#define CURS_PERFORMANCE
@@ -19416,16 +19390,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19419: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19393: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:19422: \$? = $ac_status" >&5
+ echo "$as_me:19396: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:19425: \"$ac_try\"") >&5
+ { (eval echo "$as_me:19399: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:19428: \$? = $ac_status" >&5
+ echo "$as_me:19402: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_curs_performance=yes
else
@@ -19440,21 +19414,21 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:19443: result: $cf_cv_curs_performance" >&5
+echo "$as_me:19417: result: $cf_cv_curs_performance" >&5
echo "${ECHO_T}$cf_cv_curs_performance" >&6
test $cf_cv_curs_performance = yes &&
cat >>confdefs.h <<\EOF
#define CURS_PERFORMANCE 1
EOF
-echo "$as_me:19450: checking for curses touchline function" >&5
+echo "$as_me:19424: checking for curses touchline function" >&5
echo $ECHO_N "checking for curses touchline function... $ECHO_C" >&6
if test "${cf_cv_curs_touchline+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 19457 "configure"
+#line 19431 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
@@ -19467,23 +19441,23 @@ touchline(stdscr, 1,2,3);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19470: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19444: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:19473: \$? = $ac_status" >&5
+ echo "$as_me:19447: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:19476: \"$ac_try\"") >&5
+ { (eval echo "$as_me:19450: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:19479: \$? = $ac_status" >&5
+ echo "$as_me:19453: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_curs_touchline=bsd
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 19486 "configure"
+#line 19460 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
@@ -19496,16 +19470,16 @@ touchline(stdscr, 1,2);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19499: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19473: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:19502: \$? = $ac_status" >&5
+ echo "$as_me:19476: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:19505: \"$ac_try\"") >&5
+ { (eval echo "$as_me:19479: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:19508: \$? = $ac_status" >&5
+ echo "$as_me:19482: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_curs_touchline=sysv
else
@@ -19517,7 +19491,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:19520: result: $cf_cv_curs_touchline" >&5
+echo "$as_me:19494: result: $cf_cv_curs_touchline" >&5
echo "${ECHO_T}$cf_cv_curs_touchline" >&6
case "$cf_cv_curs_touchline" in
(bsd)
@@ -19539,7 +19513,7 @@ esac
;;
(ncursesw*)
-echo "$as_me:19542: checking for multibyte character support" >&5
+echo "$as_me:19516: checking for multibyte character support" >&5
echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
if test "${cf_cv_utf8_lib+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19547,7 +19521,7 @@ else
cf_save_LIBS="$LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 19550 "configure"
+#line 19524 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -19560,16 +19534,16 @@ putwc(0,0);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19563: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19537: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:19566: \$? = $ac_status" >&5
+ echo "$as_me:19540: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:19569: \"$ac_try\"") >&5
+ { (eval echo "$as_me:19543: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:19572: \$? = $ac_status" >&5
+ echo "$as_me:19546: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_utf8_lib=yes
else
@@ -19581,12 +19555,12 @@ cat conftest.$ac_ext >&5
cf_cv_header_path_utf8=
cf_cv_library_path_utf8=
-echo "${as_me:-configure}:19584: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:19558: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
cf_save_LIBS="$LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 19589 "configure"
+#line 19563 "configure"
#include "confdefs.h"
#include <libutf8.h>
@@ -19599,16 +19573,16 @@ putwc(0,0);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19602: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19576: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:19605: \$? = $ac_status" >&5
+ echo "$as_me:19579: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:19608: \"$ac_try\"") >&5
+ { (eval echo "$as_me:19582: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:19611: \$? = $ac_status" >&5
+ echo "$as_me:19585: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_utf8=yes
@@ -19622,7 +19596,7 @@ cat conftest.$ac_ext >&5
LIBS="-lutf8 $cf_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 19625 "configure"
+#line 19599 "configure"
#include "confdefs.h"
#include <libutf8.h>
@@ -19635,16 +19609,16 @@ putwc(0,0);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19638: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19612: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:19641: \$? = $ac_status" >&5
+ echo "$as_me:19615: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:19644: \"$ac_try\"") >&5
+ { (eval echo "$as_me:19618: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:19647: \$? = $ac_status" >&5
+ echo "$as_me:19621: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_utf8=yes
@@ -19661,9 +19635,9 @@ cat conftest.$ac_ext >&5
test -n "$verbose" && echo " find linkage for utf8 library" 1>&6
-echo "${as_me:-configure}:19664: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:19638: testing find linkage for utf8 library ..." 1>&5
-echo "${as_me:-configure}:19666: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:19640: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
cf_save_CPPFLAGS="$CPPFLAGS"
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -19754,11 +19728,11 @@ cf_search="$cf_search $cf_header_path_list"
if test -d $cf_cv_header_path_utf8 ; then
test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6
-echo "${as_me:-configure}:19757: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:19731: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
cat >conftest.$ac_ext <<_ACEOF
-#line 19761 "configure"
+#line 19735 "configure"
#include "confdefs.h"
#include <libutf8.h>
@@ -19771,21 +19745,21 @@ putwc(0,0);
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19774: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19748: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:19777: \$? = $ac_status" >&5
+ echo "$as_me:19751: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:19780: \"$ac_try\"") >&5
+ { (eval echo "$as_me:19754: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:19783: \$? = $ac_status" >&5
+ echo "$as_me:19757: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test -n "$verbose" && echo " ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
-echo "${as_me:-configure}:19788: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:19762: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
cf_cv_find_linkage_utf8=maybe
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -19803,7 +19777,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_cv_find_linkage_utf8" = maybe ; then
-echo "${as_me:-configure}:19806: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:19780: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
cf_save_LIBS="$LIBS"
cf_save_LDFLAGS="$LDFLAGS"
@@ -19878,13 +19852,13 @@ cf_search="$cf_library_path_list $cf_search"
if test -d $cf_cv_library_path_utf8 ; then
test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6
-echo "${as_me:-configure}:19881: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:19855: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
CPPFLAGS="$cf_test_CPPFLAGS"
LIBS="-lutf8 $cf_save_LIBS"
LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
cat >conftest.$ac_ext <<_ACEOF
-#line 19887 "configure"
+#line 19861 "configure"
#include "confdefs.h"
#include <libutf8.h>
@@ -19897,21 +19871,21 @@ putwc(0,0);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19900: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19874: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:19903: \$? = $ac_status" >&5
+ echo "$as_me:19877: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:19906: \"$ac_try\"") >&5
+ { (eval echo "$as_me:19880: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:19909: \$? = $ac_status" >&5
+ echo "$as_me:19883: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test -n "$verbose" && echo " ... found utf8 library in $cf_cv_library_path_utf8" 1>&6
-echo "${as_me:-configure}:19914: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:19888: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
cf_cv_find_linkage_utf8=yes
cf_cv_library_file_utf8="-lutf8"
@@ -19953,7 +19927,7 @@ fi
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:19956: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:19930: result: $cf_cv_utf8_lib" >&5
echo "${ECHO_T}$cf_cv_utf8_lib" >&6
# HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
@@ -19988,7 +19962,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 19991 "configure"
+#line 19965 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -20000,16 +19974,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20003: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19977: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:20006: \$? = $ac_status" >&5
+ echo "$as_me:19980: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:20009: \"$ac_try\"") >&5
+ { (eval echo "$as_me:19983: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:20012: \$? = $ac_status" >&5
+ echo "$as_me:19986: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -20026,7 +20000,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:20029: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:20003: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -20036,6 +20010,8 @@ echo "${as_me:-configure}:20029: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
@@ -20060,7 +20036,7 @@ if test -n "$cf_cv_library_path_utf8" ; 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}:20063: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:20039: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -20089,14 +20065,14 @@ fi
cf_ncuconfig_root=$cf_cv_screen
cf_have_ncuconfig=no
-if test "x$PKG_CONFIG" != xnone; then
- echo "$as_me:20093: checking pkg-config for $cf_ncuconfig_root" >&5
+if test "x${PKG_CONFIG:=none}" != xnone; then
+ echo "$as_me:20069: checking pkg-config for $cf_ncuconfig_root" >&5
echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
- echo "$as_me:20096: result: yes" >&5
+ echo "$as_me:20072: result: yes" >&5
echo "${ECHO_T}yes" >&6
- echo "$as_me:20099: checking if the $cf_ncuconfig_root package files work" >&5
+ echo "$as_me:20075: checking if the $cf_ncuconfig_root package files work" >&5
echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
cf_have_ncuconfig=unknown
@@ -20122,7 +20098,7 @@ done
LIBS="$cf_add_libs"
cat >conftest.$ac_ext <<_ACEOF
-#line 20125 "configure"
+#line 20101 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -20134,39 +20110,37 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20137: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20113: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:20140: \$? = $ac_status" >&5
+ echo "$as_me:20116: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:20143: \"$ac_try\"") >&5
+ { (eval echo "$as_me:20119: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:20146: \$? = $ac_status" >&5
+ echo "$as_me:20122: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
if test "$cross_compiling" = yes; then
- { { echo "$as_me:20149: error: cannot run test program while cross compiling" >&5
-echo "$as_me: error: cannot run test program while cross compiling" >&2;}
- { (exit 1); exit 1; }; }
+ cf_have_ncuconfig=maybe
else
cat >conftest.$ac_ext <<_ACEOF
-#line 20154 "configure"
+#line 20128 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int main(void)
{ char *xx = curses_version(); return (xx == 0); }
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:20161: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20135: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:20164: \$? = $ac_status" >&5
+ echo "$as_me:20138: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:20166: \"$ac_try\"") >&5
+ { (eval echo "$as_me:20140: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:20169: \$? = $ac_status" >&5
+ echo "$as_me:20143: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_have_ncuconfig=yes
else
@@ -20183,9 +20157,9 @@ cat conftest.$ac_ext >&5
cf_have_ncuconfig=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-
- echo "$as_me:20187: result: $cf_have_ncuconfig" >&5
+ echo "$as_me:20160: result: $cf_have_ncuconfig" >&5
echo "${ECHO_T}$cf_have_ncuconfig" >&6
+ test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
if test "$cf_have_ncuconfig" != "yes"
then
CPPFLAGS="$cf_save_CPPFLAGS"
@@ -20201,7 +20175,7 @@ EOF
fi
else
- echo "$as_me:20204: result: no" >&5
+ echo "$as_me:20178: result: no" >&5
echo "${ECHO_T}no" >&6
NCURSES_CONFIG_PKG=none
fi
@@ -20217,7 +20191,7 @@ if test -n "$ac_tool_prefix"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:20220: checking for $ac_word" >&5
+echo "$as_me:20194: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20232,7 +20206,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:20235: found $ac_dir/$ac_word" >&5
+echo "$as_me:20209: found $ac_dir/$ac_word" >&5
break
done
@@ -20240,10 +20214,10 @@ fi
fi
NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
if test -n "$NCURSES_CONFIG"; then
- echo "$as_me:20243: result: $NCURSES_CONFIG" >&5
+ echo "$as_me:20217: result: $NCURSES_CONFIG" >&5
echo "${ECHO_T}$NCURSES_CONFIG" >&6
else
- echo "$as_me:20246: result: no" >&5
+ echo "$as_me:20220: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -20256,7 +20230,7 @@ if test -z "$NCURSES_CONFIG"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:20259: checking for $ac_word" >&5
+echo "$as_me:20233: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20271,7 +20245,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:20274: found $ac_dir/$ac_word" >&5
+echo "$as_me:20248: found $ac_dir/$ac_word" >&5
break
done
@@ -20279,10 +20253,10 @@ fi
fi
ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
if test -n "$ac_ct_NCURSES_CONFIG"; then
- echo "$as_me:20282: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "$as_me:20256: result: $ac_ct_NCURSES_CONFIG" >&5
echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
else
- echo "$as_me:20285: result: no" >&5
+ echo "$as_me:20259: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -20315,7 +20289,7 @@ LIBS="$cf_add_libs"
# even with config script, some packages use no-override for curses.h
-echo "$as_me:20318: checking if we have identified curses headers" >&5
+echo "$as_me:20292: checking if we have identified curses headers" >&5
echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
if test "${cf_cv_ncurses_header+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20327,7 +20301,7 @@ for cf_header in \
curses.h $cf_cv_screen/curses.h
do
cat >conftest.$ac_ext <<_ACEOF
-#line 20330 "configure"
+#line 20304 "configure"
#include "confdefs.h"
#include <${cf_header}>
int
@@ -20339,16 +20313,16 @@ initscr(); tgoto("?", 0,0)
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20342: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20316: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:20345: \$? = $ac_status" >&5
+ echo "$as_me:20319: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:20348: \"$ac_try\"") >&5
+ { (eval echo "$as_me:20322: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:20351: \$? = $ac_status" >&5
+ echo "$as_me:20325: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_header=$cf_header; break
else
@@ -20359,11 +20333,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
done
fi
-echo "$as_me:20362: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:20336: result: $cf_cv_ncurses_header" >&5
echo "${ECHO_T}$cf_cv_ncurses_header" >&6
if test "$cf_cv_ncurses_header" = none ; then
- { { echo "$as_me:20366: error: No curses header-files found" >&5
+ { { echo "$as_me:20340: error: No curses header-files found" >&5
echo "$as_me: error: No curses header-files found" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -20373,23 +20347,23 @@ fi
for ac_header in $cf_cv_ncurses_header
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20376: checking for $ac_header" >&5
+echo "$as_me:20350: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 20382 "configure"
+#line 20356 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:20386: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:20360: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:20392: \$? = $ac_status" >&5
+ echo "$as_me:20366: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20408,7 +20382,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:20411: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:20385: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -20461,7 +20435,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 20464 "configure"
+#line 20438 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -20473,16 +20447,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20476: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20450: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:20479: \$? = $ac_status" >&5
+ echo "$as_me:20453: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:20482: \"$ac_try\"") >&5
+ { (eval echo "$as_me:20456: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:20485: \$? = $ac_status" >&5
+ echo "$as_me:20459: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -20499,7 +20473,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:20502: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:20476: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -20509,6 +20483,8 @@ echo "${as_me:-configure}:20502: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
@@ -20516,7 +20492,7 @@ fi
}
-echo "$as_me:20519: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:20495: checking for $cf_ncuhdr_root header in include-path" >&5
echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
if test "${cf_cv_ncurses_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20528,7 +20504,7 @@ else
do
cat >conftest.$ac_ext <<_ACEOF
-#line 20531 "configure"
+#line 20507 "configure"
#include "confdefs.h"
#include <$cf_header>
@@ -20552,16 +20528,16 @@ printf("old\n");
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20555: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20531: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:20558: \$? = $ac_status" >&5
+ echo "$as_me:20534: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:20561: \"$ac_try\"") >&5
+ { (eval echo "$as_me:20537: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:20564: \$? = $ac_status" >&5
+ echo "$as_me:20540: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_h=$cf_header
@@ -20576,14 +20552,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
done
fi
-echo "$as_me:20579: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:20555: result: $cf_cv_ncurses_h" >&5
echo "${ECHO_T}$cf_cv_ncurses_h" >&6
if test "$cf_cv_ncurses_h" != no ; then
cf_cv_ncurses_header=$cf_cv_ncurses_h
else
-echo "$as_me:20586: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:20562: checking for $cf_ncuhdr_root include-path" >&5
echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
if test "${cf_cv_ncurses_h2+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20701,7 +20677,7 @@ if test -n "$cf_incdir" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 20704 "configure"
+#line 20680 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -20713,16 +20689,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20716: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20692: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:20719: \$? = $ac_status" >&5
+ echo "$as_me:20695: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:20722: \"$ac_try\"") >&5
+ { (eval echo "$as_me:20698: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:20725: \$? = $ac_status" >&5
+ echo "$as_me:20701: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -20739,7 +20715,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:20742: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:20718: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -20749,6 +20725,8 @@ echo "${as_me:-configure}:20742: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
@@ -20760,7 +20738,7 @@ fi
do
cat >conftest.$ac_ext <<_ACEOF
-#line 20763 "configure"
+#line 20741 "configure"
#include "confdefs.h"
#include <$cf_header>
@@ -20784,16 +20762,16 @@ printf("old\n");
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20787: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20765: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:20790: \$? = $ac_status" >&5
+ echo "$as_me:20768: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:20793: \"$ac_try\"") >&5
+ { (eval echo "$as_me:20771: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:20796: \$? = $ac_status" >&5
+ echo "$as_me:20774: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_h2=$cf_header
@@ -20814,12 +20792,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
CPPFLAGS="$cf_save2_CPPFLAGS"
test "$cf_cv_ncurses_h2" != no && break
done
- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:20817: error: not found" >&5
+ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:20795: error: not found" >&5
echo "$as_me: error: not found" >&2;}
{ (exit 1); exit 1; }; }
fi
-echo "$as_me:20822: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:20800: result: $cf_cv_ncurses_h2" >&5
echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
@@ -20852,7 +20830,7 @@ if test -n "$cf_1st_incdir" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 20855 "configure"
+#line 20833 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -20864,16 +20842,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20867: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20845: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:20870: \$? = $ac_status" >&5
+ echo "$as_me:20848: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:20873: \"$ac_try\"") >&5
+ { (eval echo "$as_me:20851: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:20876: \$? = $ac_status" >&5
+ echo "$as_me:20854: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -20890,7 +20868,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:20893: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:20871: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -20900,6 +20878,8 @@ echo "${as_me:-configure}:20893: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
@@ -20936,7 +20916,7 @@ EOF
;;
esac
-echo "$as_me:20939: checking for terminfo header" >&5
+echo "$as_me:20919: checking for terminfo header" >&5
echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
if test "${cf_cv_term_header+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20954,7 +20934,7 @@ esac
for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
do
cat >conftest.$ac_ext <<_ACEOF
-#line 20957 "configure"
+#line 20937 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <${cf_cv_ncurses_header:-curses.h}>
@@ -20969,16 +20949,16 @@ int x = auto_left_margin
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20972: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20952: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:20975: \$? = $ac_status" >&5
+ echo "$as_me:20955: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:20978: \"$ac_try\"") >&5
+ { (eval echo "$as_me:20958: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:20981: \$? = $ac_status" >&5
+ echo "$as_me:20961: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_term_header="$cf_test"
@@ -20994,7 +20974,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
done
fi
-echo "$as_me:20997: result: $cf_cv_term_header" >&5
+echo "$as_me:20977: result: $cf_cv_term_header" >&5
echo "${ECHO_T}$cf_cv_term_header" >&6
# Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -21032,7 +21012,7 @@ cat >>confdefs.h <<\EOF
#define NCURSES 1
EOF
-echo "$as_me:21035: checking for ncurses version" >&5
+echo "$as_me:21015: checking for ncurses version" >&5
echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
if test "${cf_cv_ncurses_version+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21058,10 +21038,10 @@ Autoconf "old"
#endif
EOF
cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
- { (eval echo "$as_me:21061: \"$cf_try\"") >&5
+ { (eval echo "$as_me:21041: \"$cf_try\"") >&5
(eval $cf_try) 2>&5
ac_status=$?
- echo "$as_me:21064: \$? = $ac_status" >&5
+ echo "$as_me:21044: \$? = $ac_status" >&5
(exit $ac_status); }
if test -f conftest.out ; then
cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -21071,7 +21051,7 @@ EOF
else
cat >conftest.$ac_ext <<_ACEOF
-#line 21074 "configure"
+#line 21054 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
@@ -21096,15 +21076,15 @@ int main()
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:21099: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21079: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:21102: \$? = $ac_status" >&5
+ echo "$as_me:21082: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:21104: \"$ac_try\"") >&5
+ { (eval echo "$as_me:21084: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:21107: \$? = $ac_status" >&5
+ echo "$as_me:21087: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -21118,7 +21098,7 @@ fi
rm -f $cf_tempfile
fi
-echo "$as_me:21121: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:21101: result: $cf_cv_ncurses_version" >&5
echo "${ECHO_T}$cf_cv_ncurses_version" >&6
test "$cf_cv_ncurses_version" = no ||
cat >>confdefs.h <<\EOF
@@ -21131,7 +21111,7 @@ cf_nculib_root=$cf_cv_screen
# to link gpm.
cf_ncurses_LIBS=""
cf_ncurses_SAVE="$LIBS"
-echo "$as_me:21134: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:21114: checking for Gpm_Open in -lgpm" >&5
echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21139,7 +21119,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgpm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 21142 "configure"
+#line 21122 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -21158,16 +21138,16 @@ Gpm_Open ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21161: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21141: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:21164: \$? = $ac_status" >&5
+ echo "$as_me:21144: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:21167: \"$ac_try\"") >&5
+ { (eval echo "$as_me:21147: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:21170: \$? = $ac_status" >&5
+ echo "$as_me:21150: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_gpm_Gpm_Open=yes
else
@@ -21178,10 +21158,10 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:21181: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:21161: result: $ac_cv_lib_gpm_Gpm_Open" >&5
echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
if test $ac_cv_lib_gpm_Gpm_Open = yes; then
- echo "$as_me:21184: checking for initscr in -lgpm" >&5
+ echo "$as_me:21164: checking for initscr in -lgpm" >&5
echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
if test "${ac_cv_lib_gpm_initscr+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21189,7 +21169,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgpm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 21192 "configure"
+#line 21172 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -21208,16 +21188,16 @@ initscr ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21211: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21191: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:21214: \$? = $ac_status" >&5
+ echo "$as_me:21194: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:21217: \"$ac_try\"") >&5
+ { (eval echo "$as_me:21197: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:21220: \$? = $ac_status" >&5
+ echo "$as_me:21200: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_gpm_initscr=yes
else
@@ -21228,7 +21208,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:21231: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:21211: result: $ac_cv_lib_gpm_initscr" >&5
echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
if test $ac_cv_lib_gpm_initscr = yes; then
LIBS="$cf_ncurses_SAVE"
@@ -21243,7 +21223,7 @@ case $host_os in
# This is only necessary if you are linking against an obsolete
# version of ncurses (but it should do no harm, since it's static).
if test "$cf_nculib_root" = ncurses ; then
- echo "$as_me:21246: checking for tgoto in -lmytinfo" >&5
+ echo "$as_me:21226: checking for tgoto in -lmytinfo" >&5
echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21251,7 +21231,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lmytinfo $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 21254 "configure"
+#line 21234 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -21270,16 +21250,16 @@ tgoto ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21273: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21253: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:21276: \$? = $ac_status" >&5
+ echo "$as_me:21256: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:21279: \"$ac_try\"") >&5
+ { (eval echo "$as_me:21259: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:21282: \$? = $ac_status" >&5
+ echo "$as_me:21262: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_mytinfo_tgoto=yes
else
@@ -21290,7 +21270,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:21293: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:21273: result: $ac_cv_lib_mytinfo_tgoto" >&5
echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
if test $ac_cv_lib_mytinfo_tgoto = yes; then
cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
@@ -21339,13 +21319,13 @@ else
eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
cf_libdir=""
- echo "$as_me:21342: checking for initscr" >&5
+ echo "$as_me:21322: checking for initscr" >&5
echo $ECHO_N "checking for initscr... $ECHO_C" >&6
if test "${ac_cv_func_initscr+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 21348 "configure"
+#line 21328 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char initscr (); below. */
@@ -21376,16 +21356,16 @@ f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21379: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21359: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:21382: \$? = $ac_status" >&5
+ echo "$as_me:21362: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:21385: \"$ac_try\"") >&5
+ { (eval echo "$as_me:21365: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:21388: \$? = $ac_status" >&5
+ echo "$as_me:21368: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_initscr=yes
else
@@ -21395,18 +21375,18 @@ ac_cv_func_initscr=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:21398: result: $ac_cv_func_initscr" >&5
+echo "$as_me:21378: result: $ac_cv_func_initscr" >&5
echo "${ECHO_T}$ac_cv_func_initscr" >&6
if test $ac_cv_func_initscr = yes; then
eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
else
cf_save_LIBS="$LIBS"
- echo "$as_me:21405: checking for initscr in -l$cf_nculib_root" >&5
+ echo "$as_me:21385: checking for initscr in -l$cf_nculib_root" >&5
echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
LIBS="-l$cf_nculib_root $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 21409 "configure"
+#line 21389 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -21418,25 +21398,25 @@ initscr()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21421: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21401: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:21424: \$? = $ac_status" >&5
+ echo "$as_me:21404: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:21427: \"$ac_try\"") >&5
+ { (eval echo "$as_me:21407: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:21430: \$? = $ac_status" >&5
+ echo "$as_me:21410: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:21432: result: yes" >&5
+ echo "$as_me:21412: result: yes" >&5
echo "${ECHO_T}yes" >&6
eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "$as_me:21439: result: no" >&5
+echo "$as_me:21419: result: no" >&5
echo "${ECHO_T}no" >&6
cf_search=
@@ -21504,11 +21484,11 @@ cf_search="$cf_library_path_list $cf_search"
for cf_libdir in $cf_search
do
- echo "$as_me:21507: checking for -l$cf_nculib_root in $cf_libdir" >&5
+ echo "$as_me:21487: checking for -l$cf_nculib_root in $cf_libdir" >&5
echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 21511 "configure"
+#line 21491 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -21520,25 +21500,25 @@ initscr()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21523: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21503: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:21526: \$? = $ac_status" >&5
+ echo "$as_me:21506: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:21529: \"$ac_try\"") >&5
+ { (eval echo "$as_me:21509: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:21532: \$? = $ac_status" >&5
+ echo "$as_me:21512: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:21534: result: yes" >&5
+ echo "$as_me:21514: result: yes" >&5
echo "${ECHO_T}yes" >&6
eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
break
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "$as_me:21541: result: no" >&5
+echo "$as_me:21521: result: no" >&5
echo "${ECHO_T}no" >&6
LIBS="$cf_save_LIBS"
fi
@@ -21553,7 +21533,7 @@ fi
eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
if test $cf_found_library = no ; then
- { { echo "$as_me:21556: error: Cannot link $cf_nculib_root library" >&5
+ { { echo "$as_me:21536: error: Cannot link $cf_nculib_root library" >&5
echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -21561,7 +21541,7 @@ fi
fi
if test -n "$cf_ncurses_LIBS" ; then
- echo "$as_me:21564: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+ echo "$as_me:21544: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
cf_ncurses_SAVE="$LIBS"
for p in $cf_ncurses_LIBS ; do
@@ -21571,7 +21551,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
fi
done
cat >conftest.$ac_ext <<_ACEOF
-#line 21574 "configure"
+#line 21554 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -21583,23 +21563,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21586: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21566: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:21589: \$? = $ac_status" >&5
+ echo "$as_me:21569: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:21592: \"$ac_try\"") >&5
+ { (eval echo "$as_me:21572: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:21595: \$? = $ac_status" >&5
+ echo "$as_me:21575: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:21597: result: yes" >&5
+ echo "$as_me:21577: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "$as_me:21602: result: no" >&5
+echo "$as_me:21582: result: no" >&5
echo "${ECHO_T}no" >&6
LIBS="$cf_ncurses_SAVE"
fi
@@ -21624,14 +21604,14 @@ fi
cf_ncuconfig_root=$cf_cv_screen
cf_have_ncuconfig=no
-if test "x$PKG_CONFIG" != xnone; then
- echo "$as_me:21628: checking pkg-config for $cf_ncuconfig_root" >&5
+if test "x${PKG_CONFIG:=none}" != xnone; then
+ echo "$as_me:21608: checking pkg-config for $cf_ncuconfig_root" >&5
echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
- echo "$as_me:21631: result: yes" >&5
+ echo "$as_me:21611: result: yes" >&5
echo "${ECHO_T}yes" >&6
- echo "$as_me:21634: checking if the $cf_ncuconfig_root package files work" >&5
+ echo "$as_me:21614: checking if the $cf_ncuconfig_root package files work" >&5
echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
cf_have_ncuconfig=unknown
@@ -21657,7 +21637,7 @@ done
LIBS="$cf_add_libs"
cat >conftest.$ac_ext <<_ACEOF
-#line 21660 "configure"
+#line 21640 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -21669,39 +21649,37 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21672: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21652: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:21675: \$? = $ac_status" >&5
+ echo "$as_me:21655: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:21678: \"$ac_try\"") >&5
+ { (eval echo "$as_me:21658: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:21681: \$? = $ac_status" >&5
+ echo "$as_me:21661: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
if test "$cross_compiling" = yes; then
- { { echo "$as_me:21684: error: cannot run test program while cross compiling" >&5
-echo "$as_me: error: cannot run test program while cross compiling" >&2;}
- { (exit 1); exit 1; }; }
+ cf_have_ncuconfig=maybe
else
cat >conftest.$ac_ext <<_ACEOF
-#line 21689 "configure"
+#line 21667 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int main(void)
{ char *xx = curses_version(); return (xx == 0); }
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:21696: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21674: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:21699: \$? = $ac_status" >&5
+ echo "$as_me:21677: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:21701: \"$ac_try\"") >&5
+ { (eval echo "$as_me:21679: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:21704: \$? = $ac_status" >&5
+ echo "$as_me:21682: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_have_ncuconfig=yes
else
@@ -21718,9 +21696,9 @@ cat conftest.$ac_ext >&5
cf_have_ncuconfig=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-
- echo "$as_me:21722: result: $cf_have_ncuconfig" >&5
+ echo "$as_me:21699: result: $cf_have_ncuconfig" >&5
echo "${ECHO_T}$cf_have_ncuconfig" >&6
+ test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
if test "$cf_have_ncuconfig" != "yes"
then
CPPFLAGS="$cf_save_CPPFLAGS"
@@ -21736,7 +21714,7 @@ EOF
fi
else
- echo "$as_me:21739: result: no" >&5
+ echo "$as_me:21717: result: no" >&5
echo "${ECHO_T}no" >&6
NCURSES_CONFIG_PKG=none
fi
@@ -21752,7 +21730,7 @@ if test -n "$ac_tool_prefix"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:21755: checking for $ac_word" >&5
+echo "$as_me:21733: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21767,7 +21745,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:21770: found $ac_dir/$ac_word" >&5
+echo "$as_me:21748: found $ac_dir/$ac_word" >&5
break
done
@@ -21775,10 +21753,10 @@ fi
fi
NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
if test -n "$NCURSES_CONFIG"; then
- echo "$as_me:21778: result: $NCURSES_CONFIG" >&5
+ echo "$as_me:21756: result: $NCURSES_CONFIG" >&5
echo "${ECHO_T}$NCURSES_CONFIG" >&6
else
- echo "$as_me:21781: result: no" >&5
+ echo "$as_me:21759: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -21791,7 +21769,7 @@ if test -z "$NCURSES_CONFIG"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:21794: checking for $ac_word" >&5
+echo "$as_me:21772: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21806,7 +21784,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:21809: found $ac_dir/$ac_word" >&5
+echo "$as_me:21787: found $ac_dir/$ac_word" >&5
break
done
@@ -21814,10 +21792,10 @@ fi
fi
ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
if test -n "$ac_ct_NCURSES_CONFIG"; then
- echo "$as_me:21817: result: $ac_ct_NCURSES_CONFIG" >&5
+ echo "$as_me:21795: result: $ac_ct_NCURSES_CONFIG" >&5
echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
else
- echo "$as_me:21820: result: no" >&5
+ echo "$as_me:21798: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -21850,7 +21828,7 @@ LIBS="$cf_add_libs"
# even with config script, some packages use no-override for curses.h
-echo "$as_me:21853: checking if we have identified curses headers" >&5
+echo "$as_me:21831: checking if we have identified curses headers" >&5
echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
if test "${cf_cv_ncurses_header+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21862,7 +21840,7 @@ for cf_header in \
curses.h $cf_cv_screen/curses.h
do
cat >conftest.$ac_ext <<_ACEOF
-#line 21865 "configure"
+#line 21843 "configure"
#include "confdefs.h"
#include <${cf_header}>
int
@@ -21874,16 +21852,16 @@ initscr(); tgoto("?", 0,0)
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21877: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21855: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:21880: \$? = $ac_status" >&5
+ echo "$as_me:21858: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:21883: \"$ac_try\"") >&5
+ { (eval echo "$as_me:21861: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:21886: \$? = $ac_status" >&5
+ echo "$as_me:21864: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_header=$cf_header; break
else
@@ -21894,11 +21872,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
done
fi
-echo "$as_me:21897: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:21875: result: $cf_cv_ncurses_header" >&5
echo "${ECHO_T}$cf_cv_ncurses_header" >&6
if test "$cf_cv_ncurses_header" = none ; then
- { { echo "$as_me:21901: error: No curses header-files found" >&5
+ { { echo "$as_me:21879: error: No curses header-files found" >&5
echo "$as_me: error: No curses header-files found" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -21908,23 +21886,23 @@ fi
for ac_header in $cf_cv_ncurses_header
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:21911: checking for $ac_header" >&5
+echo "$as_me:21889: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 21917 "configure"
+#line 21895 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:21921: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:21899: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:21927: \$? = $ac_status" >&5
+ echo "$as_me:21905: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21943,7 +21921,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:21946: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:21924: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -21996,7 +21974,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 21999 "configure"
+#line 21977 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -22008,16 +21986,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22011: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21989: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:22014: \$? = $ac_status" >&5
+ echo "$as_me:21992: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:22017: \"$ac_try\"") >&5
+ { (eval echo "$as_me:21995: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:22020: \$? = $ac_status" >&5
+ echo "$as_me:21998: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -22034,7 +22012,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:22037: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:22015: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -22044,6 +22022,8 @@ echo "${as_me:-configure}:22037: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
@@ -22051,7 +22031,7 @@ fi
}
-echo "$as_me:22054: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:22034: checking for $cf_ncuhdr_root header in include-path" >&5
echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
if test "${cf_cv_ncurses_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22063,7 +22043,7 @@ else
do
cat >conftest.$ac_ext <<_ACEOF
-#line 22066 "configure"
+#line 22046 "configure"
#include "confdefs.h"
#include <$cf_header>
@@ -22087,16 +22067,16 @@ printf("old\n");
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22090: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22070: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:22093: \$? = $ac_status" >&5
+ echo "$as_me:22073: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:22096: \"$ac_try\"") >&5
+ { (eval echo "$as_me:22076: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:22099: \$? = $ac_status" >&5
+ echo "$as_me:22079: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_h=$cf_header
@@ -22111,14 +22091,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
done
fi
-echo "$as_me:22114: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:22094: result: $cf_cv_ncurses_h" >&5
echo "${ECHO_T}$cf_cv_ncurses_h" >&6
if test "$cf_cv_ncurses_h" != no ; then
cf_cv_ncurses_header=$cf_cv_ncurses_h
else
-echo "$as_me:22121: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:22101: checking for $cf_ncuhdr_root include-path" >&5
echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
if test "${cf_cv_ncurses_h2+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22236,7 +22216,7 @@ if test -n "$cf_incdir" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 22239 "configure"
+#line 22219 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -22248,16 +22228,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22251: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22231: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:22254: \$? = $ac_status" >&5
+ echo "$as_me:22234: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:22257: \"$ac_try\"") >&5
+ { (eval echo "$as_me:22237: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:22260: \$? = $ac_status" >&5
+ echo "$as_me:22240: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -22274,7 +22254,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:22277: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:22257: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -22284,6 +22264,8 @@ echo "${as_me:-configure}:22277: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
@@ -22295,7 +22277,7 @@ fi
do
cat >conftest.$ac_ext <<_ACEOF
-#line 22298 "configure"
+#line 22280 "configure"
#include "confdefs.h"
#include <$cf_header>
@@ -22319,16 +22301,16 @@ printf("old\n");
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22322: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22304: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:22325: \$? = $ac_status" >&5
+ echo "$as_me:22307: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:22328: \"$ac_try\"") >&5
+ { (eval echo "$as_me:22310: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:22331: \$? = $ac_status" >&5
+ echo "$as_me:22313: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_h2=$cf_header
@@ -22349,12 +22331,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
CPPFLAGS="$cf_save2_CPPFLAGS"
test "$cf_cv_ncurses_h2" != no && break
done
- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:22352: error: not found" >&5
+ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:22334: error: not found" >&5
echo "$as_me: error: not found" >&2;}
{ (exit 1); exit 1; }; }
fi
-echo "$as_me:22357: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:22339: result: $cf_cv_ncurses_h2" >&5
echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
@@ -22387,7 +22369,7 @@ if test -n "$cf_1st_incdir" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 22390 "configure"
+#line 22372 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -22399,16 +22381,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22402: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22384: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:22405: \$? = $ac_status" >&5
+ echo "$as_me:22387: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:22408: \"$ac_try\"") >&5
+ { (eval echo "$as_me:22390: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:22411: \$? = $ac_status" >&5
+ echo "$as_me:22393: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -22425,7 +22407,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:22428: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:22410: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -22435,6 +22417,8 @@ echo "${as_me:-configure}:22428: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
@@ -22471,7 +22455,7 @@ EOF
;;
esac
-echo "$as_me:22474: checking for terminfo header" >&5
+echo "$as_me:22458: checking for terminfo header" >&5
echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
if test "${cf_cv_term_header+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22489,7 +22473,7 @@ esac
for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
do
cat >conftest.$ac_ext <<_ACEOF
-#line 22492 "configure"
+#line 22476 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <${cf_cv_ncurses_header:-curses.h}>
@@ -22504,16 +22488,16 @@ int x = auto_left_margin
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22507: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22491: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:22510: \$? = $ac_status" >&5
+ echo "$as_me:22494: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:22513: \"$ac_try\"") >&5
+ { (eval echo "$as_me:22497: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:22516: \$? = $ac_status" >&5
+ echo "$as_me:22500: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_term_header="$cf_test"
@@ -22529,7 +22513,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
done
fi
-echo "$as_me:22532: result: $cf_cv_term_header" >&5
+echo "$as_me:22516: result: $cf_cv_term_header" >&5
echo "${ECHO_T}$cf_cv_term_header" >&6
# Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -22567,7 +22551,7 @@ cat >>confdefs.h <<\EOF
#define NCURSES 1
EOF
-echo "$as_me:22570: checking for ncurses version" >&5
+echo "$as_me:22554: checking for ncurses version" >&5
echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
if test "${cf_cv_ncurses_version+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22593,10 +22577,10 @@ Autoconf "old"
#endif
EOF
cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
- { (eval echo "$as_me:22596: \"$cf_try\"") >&5
+ { (eval echo "$as_me:22580: \"$cf_try\"") >&5
(eval $cf_try) 2>&5
ac_status=$?
- echo "$as_me:22599: \$? = $ac_status" >&5
+ echo "$as_me:22583: \$? = $ac_status" >&5
(exit $ac_status); }
if test -f conftest.out ; then
cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -22606,7 +22590,7 @@ EOF
else
cat >conftest.$ac_ext <<_ACEOF
-#line 22609 "configure"
+#line 22593 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
@@ -22631,15 +22615,15 @@ int main()
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:22634: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22618: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:22637: \$? = $ac_status" >&5
+ echo "$as_me:22621: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:22639: \"$ac_try\"") >&5
+ { (eval echo "$as_me:22623: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:22642: \$? = $ac_status" >&5
+ echo "$as_me:22626: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -22653,7 +22637,7 @@ fi
rm -f $cf_tempfile
fi
-echo "$as_me:22656: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:22640: result: $cf_cv_ncurses_version" >&5
echo "${ECHO_T}$cf_cv_ncurses_version" >&6
test "$cf_cv_ncurses_version" = no ||
cat >>confdefs.h <<\EOF
@@ -22666,7 +22650,7 @@ cf_nculib_root=$cf_cv_screen
# to link gpm.
cf_ncurses_LIBS=""
cf_ncurses_SAVE="$LIBS"
-echo "$as_me:22669: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:22653: checking for Gpm_Open in -lgpm" >&5
echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22674,7 +22658,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgpm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 22677 "configure"
+#line 22661 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -22693,16 +22677,16 @@ Gpm_Open ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22696: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22680: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:22699: \$? = $ac_status" >&5
+ echo "$as_me:22683: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:22702: \"$ac_try\"") >&5
+ { (eval echo "$as_me:22686: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:22705: \$? = $ac_status" >&5
+ echo "$as_me:22689: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_gpm_Gpm_Open=yes
else
@@ -22713,10 +22697,10 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:22716: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:22700: result: $ac_cv_lib_gpm_Gpm_Open" >&5
echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
if test $ac_cv_lib_gpm_Gpm_Open = yes; then
- echo "$as_me:22719: checking for initscr in -lgpm" >&5
+ echo "$as_me:22703: checking for initscr in -lgpm" >&5
echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
if test "${ac_cv_lib_gpm_initscr+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22724,7 +22708,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgpm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 22727 "configure"
+#line 22711 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -22743,16 +22727,16 @@ initscr ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22746: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22730: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:22749: \$? = $ac_status" >&5
+ echo "$as_me:22733: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:22752: \"$ac_try\"") >&5
+ { (eval echo "$as_me:22736: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:22755: \$? = $ac_status" >&5
+ echo "$as_me:22739: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_gpm_initscr=yes
else
@@ -22763,7 +22747,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:22766: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:22750: result: $ac_cv_lib_gpm_initscr" >&5
echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
if test $ac_cv_lib_gpm_initscr = yes; then
LIBS="$cf_ncurses_SAVE"
@@ -22778,7 +22762,7 @@ case $host_os in
# This is only necessary if you are linking against an obsolete
# version of ncurses (but it should do no harm, since it's static).
if test "$cf_nculib_root" = ncurses ; then
- echo "$as_me:22781: checking for tgoto in -lmytinfo" >&5
+ echo "$as_me:22765: checking for tgoto in -lmytinfo" >&5
echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -22786,7 +22770,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lmytinfo $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 22789 "configure"
+#line 22773 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -22805,16 +22789,16 @@ tgoto ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22808: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22792: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:22811: \$? = $ac_status" >&5
+ echo "$as_me:22795: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:22814: \"$ac_try\"") >&5
+ { (eval echo "$as_me:22798: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:22817: \$? = $ac_status" >&5
+ echo "$as_me:22801: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_mytinfo_tgoto=yes
else
@@ -22825,7 +22809,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:22828: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:22812: result: $ac_cv_lib_mytinfo_tgoto" >&5
echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
if test $ac_cv_lib_mytinfo_tgoto = yes; then
cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
@@ -22874,13 +22858,13 @@ else
eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
cf_libdir=""
- echo "$as_me:22877: checking for initscr" >&5
+ echo "$as_me:22861: checking for initscr" >&5
echo $ECHO_N "checking for initscr... $ECHO_C" >&6
if test "${ac_cv_func_initscr+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 22883 "configure"
+#line 22867 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char initscr (); below. */
@@ -22911,16 +22895,16 @@ f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22914: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22898: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:22917: \$? = $ac_status" >&5
+ echo "$as_me:22901: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:22920: \"$ac_try\"") >&5
+ { (eval echo "$as_me:22904: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:22923: \$? = $ac_status" >&5
+ echo "$as_me:22907: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_initscr=yes
else
@@ -22930,18 +22914,18 @@ ac_cv_func_initscr=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:22933: result: $ac_cv_func_initscr" >&5
+echo "$as_me:22917: result: $ac_cv_func_initscr" >&5
echo "${ECHO_T}$ac_cv_func_initscr" >&6
if test $ac_cv_func_initscr = yes; then
eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
else
cf_save_LIBS="$LIBS"
- echo "$as_me:22940: checking for initscr in -l$cf_nculib_root" >&5
+ echo "$as_me:22924: checking for initscr in -l$cf_nculib_root" >&5
echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
LIBS="-l$cf_nculib_root $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 22944 "configure"
+#line 22928 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -22953,25 +22937,25 @@ initscr()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22956: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22940: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:22959: \$? = $ac_status" >&5
+ echo "$as_me:22943: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:22962: \"$ac_try\"") >&5
+ { (eval echo "$as_me:22946: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:22965: \$? = $ac_status" >&5
+ echo "$as_me:22949: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:22967: result: yes" >&5
+ echo "$as_me:22951: result: yes" >&5
echo "${ECHO_T}yes" >&6
eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "$as_me:22974: result: no" >&5
+echo "$as_me:22958: result: no" >&5
echo "${ECHO_T}no" >&6
cf_search=
@@ -23039,11 +23023,11 @@ cf_search="$cf_library_path_list $cf_search"
for cf_libdir in $cf_search
do
- echo "$as_me:23042: checking for -l$cf_nculib_root in $cf_libdir" >&5
+ echo "$as_me:23026: checking for -l$cf_nculib_root in $cf_libdir" >&5
echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 23046 "configure"
+#line 23030 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -23055,25 +23039,25 @@ initscr()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23058: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23042: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:23061: \$? = $ac_status" >&5
+ echo "$as_me:23045: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:23064: \"$ac_try\"") >&5
+ { (eval echo "$as_me:23048: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:23067: \$? = $ac_status" >&5
+ echo "$as_me:23051: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:23069: result: yes" >&5
+ echo "$as_me:23053: result: yes" >&5
echo "${ECHO_T}yes" >&6
eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
break
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "$as_me:23076: result: no" >&5
+echo "$as_me:23060: result: no" >&5
echo "${ECHO_T}no" >&6
LIBS="$cf_save_LIBS"
fi
@@ -23088,7 +23072,7 @@ fi
eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
if test $cf_found_library = no ; then
- { { echo "$as_me:23091: error: Cannot link $cf_nculib_root library" >&5
+ { { echo "$as_me:23075: error: Cannot link $cf_nculib_root library" >&5
echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -23096,7 +23080,7 @@ fi
fi
if test -n "$cf_ncurses_LIBS" ; then
- echo "$as_me:23099: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+ echo "$as_me:23083: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
cf_ncurses_SAVE="$LIBS"
for p in $cf_ncurses_LIBS ; do
@@ -23106,7 +23090,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
fi
done
cat >conftest.$ac_ext <<_ACEOF
-#line 23109 "configure"
+#line 23093 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -23118,23 +23102,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23121: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23105: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:23124: \$? = $ac_status" >&5
+ echo "$as_me:23108: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:23127: \"$ac_try\"") >&5
+ { (eval echo "$as_me:23111: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:23130: \$? = $ac_status" >&5
+ echo "$as_me:23114: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:23132: result: yes" >&5
+ echo "$as_me:23116: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "$as_me:23137: result: no" >&5
+echo "$as_me:23121: result: no" >&5
echo "${ECHO_T}no" >&6
LIBS="$cf_ncurses_SAVE"
fi
@@ -23166,7 +23150,7 @@ fi
;;
(slang)
-echo "$as_me:23169: checking for slang header file" >&5
+echo "$as_me:23153: checking for slang header file" >&5
echo $ECHO_N "checking for slang header file... $ECHO_C" >&6
if test "${cf_cv_slang_header+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23174,7 +23158,7 @@ else
cf_cv_slang_header=no
cat >conftest.$ac_ext <<_ACEOF
-#line 23177 "configure"
+#line 23161 "configure"
#include "confdefs.h"
#include <slang.h>
int
@@ -23186,16 +23170,16 @@ printf("%s\n", SLANG_VERSION)
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23189: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23173: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:23192: \$? = $ac_status" >&5
+ echo "$as_me:23176: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:23195: \"$ac_try\"") >&5
+ { (eval echo "$as_me:23179: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:23198: \$? = $ac_status" >&5
+ echo "$as_me:23182: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_slang_header=predefined
else
@@ -23300,7 +23284,7 @@ cf_search="$cf_search $cf_header_path_list"
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:23303: result: $cf_cv_slang_header" >&5
+echo "$as_me:23287: result: $cf_cv_slang_header" >&5
echo "${ECHO_T}$cf_cv_slang_header" >&6
if test "x$cf_cv_slang_header" != xno
@@ -23341,7 +23325,7 @@ if test -n "$cf_incdir" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 23344 "configure"
+#line 23328 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -23353,16 +23337,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23356: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23340: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:23359: \$? = $ac_status" >&5
+ echo "$as_me:23343: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:23362: \"$ac_try\"") >&5
+ { (eval echo "$as_me:23346: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:23365: \$? = $ac_status" >&5
+ echo "$as_me:23349: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -23379,7 +23363,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:23382: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:23366: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -23389,6 +23373,8 @@ echo "${as_me:-configure}:23382: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
@@ -23409,7 +23395,7 @@ else
cf_cv_termlib=none
cat >conftest.$ac_ext <<_ACEOF
-#line 23412 "configure"
+#line 23398 "configure"
#include "confdefs.h"
int
@@ -23421,19 +23407,19 @@ char *x=(char*)tgoto("",0,0)
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23424: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23410: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:23427: \$? = $ac_status" >&5
+ echo "$as_me:23413: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:23430: \"$ac_try\"") >&5
+ { (eval echo "$as_me:23416: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:23433: \$? = $ac_status" >&5
+ echo "$as_me:23419: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cat >conftest.$ac_ext <<_ACEOF
-#line 23436 "configure"
+#line 23422 "configure"
#include "confdefs.h"
int
@@ -23445,16 +23431,16 @@ int x=tigetstr("")
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23448: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23434: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:23451: \$? = $ac_status" >&5
+ echo "$as_me:23437: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:23454: \"$ac_try\"") >&5
+ { (eval echo "$as_me:23440: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:23457: \$? = $ac_status" >&5
+ echo "$as_me:23443: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_termlib=terminfo
else
@@ -23465,7 +23451,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
test -n "$verbose" && echo " using functions in predefined $cf_cv_termlib LIBS" 1>&6
-echo "${as_me:-configure}:23468: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:23454: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
else
echo "$as_me: failed program was:" >&5
@@ -23480,10 +23466,10 @@ if test "$cf_cv_termlib" = none; then
LIBS="-l$cf_lib $cf_save_LIBS"
for cf_func in tigetstr tgetstr
do
- echo "$as_me:23483: checking for $cf_func in -l$cf_lib" >&5
+ echo "$as_me:23469: checking for $cf_func in -l$cf_lib" >&5
echo $ECHO_N "checking for $cf_func in -l$cf_lib... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 23486 "configure"
+#line 23472 "configure"
#include "confdefs.h"
int
@@ -23495,16 +23481,16 @@ int x=$cf_func("")
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23498: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23484: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:23501: \$? = $ac_status" >&5
+ echo "$as_me:23487: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:23504: \"$ac_try\"") >&5
+ { (eval echo "$as_me:23490: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:23507: \$? = $ac_status" >&5
+ echo "$as_me:23493: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
@@ -23513,7 +23499,7 @@ cat conftest.$ac_ext >&5
cf_result=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- echo "$as_me:23516: result: $cf_result" >&5
+ echo "$as_me:23502: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
if test "$cf_result" = yes ; then
if test "$cf_func" = tigetstr ; then
@@ -23530,7 +23516,7 @@ echo "${ECHO_T}$cf_result" >&6
fi
if test "$cf_cv_termlib" = none; then
# allow curses library for broken AIX system.
- echo "$as_me:23533: checking for initscr in -lcurses" >&5
+ echo "$as_me:23519: checking for initscr in -lcurses" >&5
echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6
if test "${ac_cv_lib_curses_initscr+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23538,7 +23524,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcurses $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 23541 "configure"
+#line 23527 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -23557,16 +23543,16 @@ initscr ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23560: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23546: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:23563: \$? = $ac_status" >&5
+ echo "$as_me:23549: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:23566: \"$ac_try\"") >&5
+ { (eval echo "$as_me:23552: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:23569: \$? = $ac_status" >&5
+ echo "$as_me:23555: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_curses_initscr=yes
else
@@ -23577,7 +23563,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:23580: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:23566: result: $ac_cv_lib_curses_initscr" >&5
echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6
if test $ac_cv_lib_curses_initscr = yes; then
@@ -23599,7 +23585,7 @@ LIBS="$cf_add_libs"
fi
- echo "$as_me:23602: checking for tgoto in -ltermcap" >&5
+ echo "$as_me:23588: checking for tgoto in -ltermcap" >&5
echo $ECHO_N "checking for tgoto in -ltermcap... $ECHO_C" >&6
if test "${ac_cv_lib_termcap_tgoto+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23607,7 +23593,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ltermcap $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 23610 "configure"
+#line 23596 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -23626,16 +23612,16 @@ tgoto ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23629: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23615: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:23632: \$? = $ac_status" >&5
+ echo "$as_me:23618: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:23635: \"$ac_try\"") >&5
+ { (eval echo "$as_me:23621: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:23638: \$? = $ac_status" >&5
+ echo "$as_me:23624: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_termcap_tgoto=yes
else
@@ -23646,7 +23632,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:23649: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:23635: result: $ac_cv_lib_termcap_tgoto" >&5
echo "${ECHO_T}$ac_cv_lib_termcap_tgoto" >&6
if test $ac_cv_lib_termcap_tgoto = yes; then
@@ -23673,20 +23659,20 @@ fi
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
if test "$cf_cv_termlib" = none; then
- { echo "$as_me:23676: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+ { echo "$as_me:23662: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;}
fi
fi
cf_slang_LIBS2="$LIBS"
-echo "$as_me:23683: checking for acos" >&5
+echo "$as_me:23669: checking for acos" >&5
echo $ECHO_N "checking for acos... $ECHO_C" >&6
if test "${ac_cv_func_acos+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 23689 "configure"
+#line 23675 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char acos (); below. */
@@ -23717,16 +23703,16 @@ f = acos; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23720: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23706: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:23723: \$? = $ac_status" >&5
+ echo "$as_me:23709: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:23726: \"$ac_try\"") >&5
+ { (eval echo "$as_me:23712: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:23729: \$? = $ac_status" >&5
+ echo "$as_me:23715: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_acos=yes
else
@@ -23736,13 +23722,13 @@ ac_cv_func_acos=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:23739: result: $ac_cv_func_acos" >&5
+echo "$as_me:23725: result: $ac_cv_func_acos" >&5
echo "${ECHO_T}$ac_cv_func_acos" >&6
if test $ac_cv_func_acos = yes; then
:
else
-echo "$as_me:23745: checking for acos in -lm" >&5
+echo "$as_me:23731: checking for acos in -lm" >&5
echo $ECHO_N "checking for acos in -lm... $ECHO_C" >&6
if test "${ac_cv_lib_m_acos+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23750,7 +23736,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lm $LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 23753 "configure"
+#line 23739 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -23769,16 +23755,16 @@ acos ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23772: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23758: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:23775: \$? = $ac_status" >&5
+ echo "$as_me:23761: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:23778: \"$ac_try\"") >&5
+ { (eval echo "$as_me:23764: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:23781: \$? = $ac_status" >&5
+ echo "$as_me:23767: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_m_acos=yes
else
@@ -23789,7 +23775,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:23792: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:23778: result: $ac_cv_lib_m_acos" >&5
echo "${ECHO_T}$ac_cv_lib_m_acos" >&6
if test $ac_cv_lib_m_acos = yes; then
@@ -23815,13 +23801,13 @@ case $host_os in
eval 'cf_cv_have_lib_'video'=no'
cf_libdir=""
- echo "$as_me:23818: checking for v_init" >&5
+ echo "$as_me:23804: checking for v_init" >&5
echo $ECHO_N "checking for v_init... $ECHO_C" >&6
if test "${ac_cv_func_v_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 23824 "configure"
+#line 23810 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char v_init (); below. */
@@ -23852,16 +23838,16 @@ f = v_init; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23855: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23841: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:23858: \$? = $ac_status" >&5
+ echo "$as_me:23844: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:23861: \"$ac_try\"") >&5
+ { (eval echo "$as_me:23847: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:23864: \$? = $ac_status" >&5
+ echo "$as_me:23850: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_v_init=yes
else
@@ -23871,18 +23857,18 @@ ac_cv_func_v_init=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:23874: result: $ac_cv_func_v_init" >&5
+echo "$as_me:23860: result: $ac_cv_func_v_init" >&5
echo "${ECHO_T}$ac_cv_func_v_init" >&6
if test $ac_cv_func_v_init = yes; then
eval 'cf_cv_have_lib_'video'=yes'
else
cf_save_LIBS="$LIBS"
- echo "$as_me:23881: checking for v_init in -lvideo" >&5
+ echo "$as_me:23867: checking for v_init in -lvideo" >&5
echo $ECHO_N "checking for v_init in -lvideo... $ECHO_C" >&6
LIBS="-lvideo $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 23885 "configure"
+#line 23871 "configure"
#include "confdefs.h"
#include <sys/video.h>
int
@@ -23894,25 +23880,25 @@ v_init()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23897: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23883: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:23900: \$? = $ac_status" >&5
+ echo "$as_me:23886: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:23903: \"$ac_try\"") >&5
+ { (eval echo "$as_me:23889: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:23906: \$? = $ac_status" >&5
+ echo "$as_me:23892: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:23908: result: yes" >&5
+ echo "$as_me:23894: result: yes" >&5
echo "${ECHO_T}yes" >&6
eval 'cf_cv_have_lib_'video'=yes'
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "$as_me:23915: result: no" >&5
+echo "$as_me:23901: result: no" >&5
echo "${ECHO_T}no" >&6
cf_search=
@@ -23980,11 +23966,11 @@ cf_search="$cf_library_path_list $cf_search"
for cf_libdir in $cf_search
do
- echo "$as_me:23983: checking for -lvideo in $cf_libdir" >&5
+ echo "$as_me:23969: checking for -lvideo in $cf_libdir" >&5
echo $ECHO_N "checking for -lvideo in $cf_libdir... $ECHO_C" >&6
LIBS="-L$cf_libdir -lvideo $cf_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 23987 "configure"
+#line 23973 "configure"
#include "confdefs.h"
#include <sys/video.h>
int
@@ -23996,25 +23982,25 @@ v_init()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23999: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23985: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:24002: \$? = $ac_status" >&5
+ echo "$as_me:23988: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:24005: \"$ac_try\"") >&5
+ { (eval echo "$as_me:23991: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:24008: \$? = $ac_status" >&5
+ echo "$as_me:23994: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:24010: result: yes" >&5
+ echo "$as_me:23996: result: yes" >&5
echo "${ECHO_T}yes" >&6
eval 'cf_cv_have_lib_'video'=yes'
break
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "$as_me:24017: result: no" >&5
+echo "$as_me:24003: result: no" >&5
echo "${ECHO_T}no" >&6
LIBS="$cf_save_LIBS"
fi
@@ -24029,7 +24015,7 @@ fi
eval 'cf_found_library=$cf_cv_have_lib_'video
if test $cf_found_library = no ; then
- { { echo "$as_me:24032: error: Cannot link video library" >&5
+ { { echo "$as_me:24018: error: Cannot link video library" >&5
echo "$as_me: error: Cannot link video library" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -24039,13 +24025,13 @@ esac
eval 'cf_cv_have_lib_'slang'=no'
cf_libdir=""
- echo "$as_me:24042: checking for SLtt_get_screen_size" >&5
+ echo "$as_me:24028: checking for SLtt_get_screen_size" >&5
echo $ECHO_N "checking for SLtt_get_screen_size... $ECHO_C" >&6
if test "${ac_cv_func_SLtt_get_screen_size+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 24048 "configure"
+#line 24034 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char SLtt_get_screen_size (); below. */
@@ -24076,16 +24062,16 @@ f = SLtt_get_screen_size; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24079: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24065: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:24082: \$? = $ac_status" >&5
+ echo "$as_me:24068: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:24085: \"$ac_try\"") >&5
+ { (eval echo "$as_me:24071: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:24088: \$? = $ac_status" >&5
+ echo "$as_me:24074: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_SLtt_get_screen_size=yes
else
@@ -24095,18 +24081,18 @@ ac_cv_func_SLtt_get_screen_size=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:24098: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:24084: result: $ac_cv_func_SLtt_get_screen_size" >&5
echo "${ECHO_T}$ac_cv_func_SLtt_get_screen_size" >&6
if test $ac_cv_func_SLtt_get_screen_size = yes; then
eval 'cf_cv_have_lib_'slang'=yes'
else
cf_save_LIBS="$LIBS"
- echo "$as_me:24105: checking for SLtt_get_screen_size in -lslang" >&5
+ echo "$as_me:24091: checking for SLtt_get_screen_size in -lslang" >&5
echo $ECHO_N "checking for SLtt_get_screen_size in -lslang... $ECHO_C" >&6
LIBS="-lslang $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 24109 "configure"
+#line 24095 "configure"
#include "confdefs.h"
#include <slang.h>
int
@@ -24118,25 +24104,25 @@ SLtt_get_screen_size()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24121: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24107: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:24124: \$? = $ac_status" >&5
+ echo "$as_me:24110: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:24127: \"$ac_try\"") >&5
+ { (eval echo "$as_me:24113: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:24130: \$? = $ac_status" >&5
+ echo "$as_me:24116: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:24132: result: yes" >&5
+ echo "$as_me:24118: result: yes" >&5
echo "${ECHO_T}yes" >&6
eval 'cf_cv_have_lib_'slang'=yes'
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "$as_me:24139: result: no" >&5
+echo "$as_me:24125: result: no" >&5
echo "${ECHO_T}no" >&6
cf_search=
@@ -24204,11 +24190,11 @@ cf_search="$cf_library_path_list $cf_search"
for cf_libdir in $cf_search
do
- echo "$as_me:24207: checking for -lslang in $cf_libdir" >&5
+ echo "$as_me:24193: checking for -lslang in $cf_libdir" >&5
echo $ECHO_N "checking for -lslang in $cf_libdir... $ECHO_C" >&6
LIBS="-L$cf_libdir -lslang $cf_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 24211 "configure"
+#line 24197 "configure"
#include "confdefs.h"
#include <slang.h>
int
@@ -24220,25 +24206,25 @@ SLtt_get_screen_size()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24223: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24209: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:24226: \$? = $ac_status" >&5
+ echo "$as_me:24212: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:24229: \"$ac_try\"") >&5
+ { (eval echo "$as_me:24215: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:24232: \$? = $ac_status" >&5
+ echo "$as_me:24218: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:24234: result: yes" >&5
+ echo "$as_me:24220: result: yes" >&5
echo "${ECHO_T}yes" >&6
eval 'cf_cv_have_lib_'slang'=yes'
break
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "$as_me:24241: result: no" >&5
+echo "$as_me:24227: result: no" >&5
echo "${ECHO_T}no" >&6
LIBS="$cf_save_LIBS"
fi
@@ -24253,13 +24239,13 @@ fi
eval 'cf_found_library=$cf_cv_have_lib_'slang
if test $cf_found_library = no ; then
- { { echo "$as_me:24256: error: Cannot link slang library" >&5
+ { { echo "$as_me:24242: error: Cannot link slang library" >&5
echo "$as_me: error: Cannot link slang library" >&2;}
{ (exit 1); exit 1; }; }
fi
cf_slang_LIBS3="$LIBS"
-echo "$as_me:24262: checking if we can link slang without termcap" >&5
+echo "$as_me:24248: checking if we can link slang without termcap" >&5
echo $ECHO_N "checking if we can link slang without termcap... $ECHO_C" >&6
if test -n "`echo $cf_slang_LIBS1 | sed -e 's/ //g'`" ; then
cf_exclude=`echo ".$cf_slang_LIBS2" | sed -e "s%$cf_slang_LIBS1%%" -e 's%^.%%'`
@@ -24268,7 +24254,7 @@ else
fi
LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
cat >conftest.$ac_ext <<_ACEOF
-#line 24271 "configure"
+#line 24257 "configure"
#include "confdefs.h"
#include <slang.h>
int
@@ -24280,16 +24266,16 @@ SLtt_get_screen_size()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24283: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24269: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:24286: \$? = $ac_status" >&5
+ echo "$as_me:24272: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:24289: \"$ac_try\"") >&5
+ { (eval echo "$as_me:24275: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:24292: \$? = $ac_status" >&5
+ echo "$as_me:24278: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
@@ -24298,13 +24284,13 @@ cat conftest.$ac_ext >&5
cf_result=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:24301: result: $cf_result" >&5
+echo "$as_me:24287: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
test $cf_result = no && LIBS="$cf_slang_LIBS3"
else
-echo "$as_me:24307: checking for slang2 header file" >&5
+echo "$as_me:24293: checking for slang2 header file" >&5
echo $ECHO_N "checking for slang2 header file... $ECHO_C" >&6
if test "${cf_cv_slang2_header+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -24312,7 +24298,7 @@ else
cf_cv_slang2_header=no
cat >conftest.$ac_ext <<_ACEOF
-#line 24315 "configure"
+#line 24301 "configure"
#include "confdefs.h"
#include <slang.h>
int
@@ -24324,16 +24310,16 @@ printf("%s\n", SLANG_VERSION)
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24327: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24313: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:24330: \$? = $ac_status" >&5
+ echo "$as_me:24316: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:24333: \"$ac_try\"") >&5
+ { (eval echo "$as_me:24319: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:24336: \$? = $ac_status" >&5
+ echo "$as_me:24322: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_slang2_header=predefined
else
@@ -24438,7 +24424,7 @@ cf_search="$cf_search $cf_header_path_list"
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:24441: result: $cf_cv_slang2_header" >&5
+echo "$as_me:24427: result: $cf_cv_slang2_header" >&5
echo "${ECHO_T}$cf_cv_slang2_header" >&6
if test "x$cf_cv_slang2_header" != xno
@@ -24479,7 +24465,7 @@ if test -n "$cf_incdir" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 24482 "configure"
+#line 24468 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -24491,16 +24477,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24494: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24480: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:24497: \$? = $ac_status" >&5
+ echo "$as_me:24483: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:24500: \"$ac_try\"") >&5
+ { (eval echo "$as_me:24486: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:24503: \$? = $ac_status" >&5
+ echo "$as_me:24489: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -24517,7 +24503,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:24520: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24506: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -24527,6 +24513,8 @@ echo "${as_me:-configure}:24520: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
@@ -24547,7 +24535,7 @@ else
cf_cv_termlib=none
cat >conftest.$ac_ext <<_ACEOF
-#line 24550 "configure"
+#line 24538 "configure"
#include "confdefs.h"
int
@@ -24559,19 +24547,19 @@ char *x=(char*)tgoto("",0,0)
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24562: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24550: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:24565: \$? = $ac_status" >&5
+ echo "$as_me:24553: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:24568: \"$ac_try\"") >&5
+ { (eval echo "$as_me:24556: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:24571: \$? = $ac_status" >&5
+ echo "$as_me:24559: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cat >conftest.$ac_ext <<_ACEOF
-#line 24574 "configure"
+#line 24562 "configure"
#include "confdefs.h"
int
@@ -24583,16 +24571,16 @@ int x=tigetstr("")
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24586: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24574: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:24589: \$? = $ac_status" >&5
+ echo "$as_me:24577: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:24592: \"$ac_try\"") >&5
+ { (eval echo "$as_me:24580: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:24595: \$? = $ac_status" >&5
+ echo "$as_me:24583: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_termlib=terminfo
else
@@ -24603,7 +24591,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
test -n "$verbose" && echo " using functions in predefined $cf_cv_termlib LIBS" 1>&6
-echo "${as_me:-configure}:24606: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:24594: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
else
echo "$as_me: failed program was:" >&5
@@ -24618,10 +24606,10 @@ if test "$cf_cv_termlib" = none; then
LIBS="-l$cf_lib $cf_save_LIBS"
for cf_func in tigetstr tgetstr
do
- echo "$as_me:24621: checking for $cf_func in -l$cf_lib" >&5
+ echo "$as_me:24609: checking for $cf_func in -l$cf_lib" >&5
echo $ECHO_N "checking for $cf_func in -l$cf_lib... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 24624 "configure"
+#line 24612 "configure"
#include "confdefs.h"
int
@@ -24633,16 +24621,16 @@ int x=$cf_func("")
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24636: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24624: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:24639: \$? = $ac_status" >&5
+ echo "$as_me:24627: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:24642: \"$ac_try\"") >&5
+ { (eval echo "$as_me:24630: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:24645: \$? = $ac_status" >&5
+ echo "$as_me:24633: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
@@ -24651,7 +24639,7 @@ cat conftest.$ac_ext >&5
cf_result=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- echo "$as_me:24654: result: $cf_result" >&5
+ echo "$as_me:24642: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
if test "$cf_result" = yes ; then
if test "$cf_func" = tigetstr ; then
@@ -24668,7 +24656,7 @@ echo "${ECHO_T}$cf_result" >&6
fi
if test "$cf_cv_termlib" = none; then
# allow curses library for broken AIX system.
- echo "$as_me:24671: checking for initscr in -lcurses" >&5
+ echo "$as_me:24659: checking for initscr in -lcurses" >&5
echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6
if test "${ac_cv_lib_curses_initscr+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -24676,7 +24664,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcurses $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 24679 "configure"
+#line 24667 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -24695,16 +24683,16 @@ initscr ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24698: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24686: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:24701: \$? = $ac_status" >&5
+ echo "$as_me:24689: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:24704: \"$ac_try\"") >&5
+ { (eval echo "$as_me:24692: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:24707: \$? = $ac_status" >&5
+ echo "$as_me:24695: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_curses_initscr=yes
else
@@ -24715,7 +24703,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:24718: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:24706: result: $ac_cv_lib_curses_initscr" >&5
echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6
if test $ac_cv_lib_curses_initscr = yes; then
@@ -24737,7 +24725,7 @@ LIBS="$cf_add_libs"
fi
- echo "$as_me:24740: checking for tgoto in -ltermcap" >&5
+ echo "$as_me:24728: checking for tgoto in -ltermcap" >&5
echo $ECHO_N "checking for tgoto in -ltermcap... $ECHO_C" >&6
if test "${ac_cv_lib_termcap_tgoto+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -24745,7 +24733,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ltermcap $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 24748 "configure"
+#line 24736 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -24764,16 +24752,16 @@ tgoto ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24767: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24755: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:24770: \$? = $ac_status" >&5
+ echo "$as_me:24758: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:24773: \"$ac_try\"") >&5
+ { (eval echo "$as_me:24761: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:24776: \$? = $ac_status" >&5
+ echo "$as_me:24764: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_termcap_tgoto=yes
else
@@ -24784,7 +24772,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:24787: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:24775: result: $ac_cv_lib_termcap_tgoto" >&5
echo "${ECHO_T}$ac_cv_lib_termcap_tgoto" >&6
if test $ac_cv_lib_termcap_tgoto = yes; then
@@ -24811,20 +24799,20 @@ fi
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
if test "$cf_cv_termlib" = none; then
- { echo "$as_me:24814: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+ { echo "$as_me:24802: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;}
fi
fi
cf_slang_LIBS2="$LIBS"
-echo "$as_me:24821: checking for acos" >&5
+echo "$as_me:24809: checking for acos" >&5
echo $ECHO_N "checking for acos... $ECHO_C" >&6
if test "${ac_cv_func_acos+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 24827 "configure"
+#line 24815 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char acos (); below. */
@@ -24855,16 +24843,16 @@ f = acos; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24858: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24846: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:24861: \$? = $ac_status" >&5
+ echo "$as_me:24849: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:24864: \"$ac_try\"") >&5
+ { (eval echo "$as_me:24852: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:24867: \$? = $ac_status" >&5
+ echo "$as_me:24855: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_acos=yes
else
@@ -24874,13 +24862,13 @@ ac_cv_func_acos=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:24877: result: $ac_cv_func_acos" >&5
+echo "$as_me:24865: result: $ac_cv_func_acos" >&5
echo "${ECHO_T}$ac_cv_func_acos" >&6
if test $ac_cv_func_acos = yes; then
:
else
-echo "$as_me:24883: checking for acos in -lm" >&5
+echo "$as_me:24871: checking for acos in -lm" >&5
echo $ECHO_N "checking for acos in -lm... $ECHO_C" >&6
if test "${ac_cv_lib_m_acos+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -24888,7 +24876,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lm $LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 24891 "configure"
+#line 24879 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -24907,16 +24895,16 @@ acos ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24910: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24898: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:24913: \$? = $ac_status" >&5
+ echo "$as_me:24901: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:24916: \"$ac_try\"") >&5
+ { (eval echo "$as_me:24904: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:24919: \$? = $ac_status" >&5
+ echo "$as_me:24907: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_m_acos=yes
else
@@ -24927,7 +24915,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:24930: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:24918: result: $ac_cv_lib_m_acos" >&5
echo "${ECHO_T}$ac_cv_lib_m_acos" >&6
if test $ac_cv_lib_m_acos = yes; then
@@ -24953,13 +24941,13 @@ case $host_os in
eval 'cf_cv_have_lib_'video'=no'
cf_libdir=""
- echo "$as_me:24956: checking for v_init" >&5
+ echo "$as_me:24944: checking for v_init" >&5
echo $ECHO_N "checking for v_init... $ECHO_C" >&6
if test "${ac_cv_func_v_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 24962 "configure"
+#line 24950 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char v_init (); below. */
@@ -24990,16 +24978,16 @@ f = v_init; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24993: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24981: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:24996: \$? = $ac_status" >&5
+ echo "$as_me:24984: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:24999: \"$ac_try\"") >&5
+ { (eval echo "$as_me:24987: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:25002: \$? = $ac_status" >&5
+ echo "$as_me:24990: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_v_init=yes
else
@@ -25009,18 +24997,18 @@ ac_cv_func_v_init=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:25012: result: $ac_cv_func_v_init" >&5
+echo "$as_me:25000: result: $ac_cv_func_v_init" >&5
echo "${ECHO_T}$ac_cv_func_v_init" >&6
if test $ac_cv_func_v_init = yes; then
eval 'cf_cv_have_lib_'video'=yes'
else
cf_save_LIBS="$LIBS"
- echo "$as_me:25019: checking for v_init in -lvideo" >&5
+ echo "$as_me:25007: checking for v_init in -lvideo" >&5
echo $ECHO_N "checking for v_init in -lvideo... $ECHO_C" >&6
LIBS="-lvideo $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 25023 "configure"
+#line 25011 "configure"
#include "confdefs.h"
#include <sys/video.h>
int
@@ -25032,25 +25020,25 @@ v_init()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25035: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25023: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:25038: \$? = $ac_status" >&5
+ echo "$as_me:25026: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:25041: \"$ac_try\"") >&5
+ { (eval echo "$as_me:25029: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:25044: \$? = $ac_status" >&5
+ echo "$as_me:25032: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:25046: result: yes" >&5
+ echo "$as_me:25034: result: yes" >&5
echo "${ECHO_T}yes" >&6
eval 'cf_cv_have_lib_'video'=yes'
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "$as_me:25053: result: no" >&5
+echo "$as_me:25041: result: no" >&5
echo "${ECHO_T}no" >&6
cf_search=
@@ -25118,11 +25106,11 @@ cf_search="$cf_library_path_list $cf_search"
for cf_libdir in $cf_search
do
- echo "$as_me:25121: checking for -lvideo in $cf_libdir" >&5
+ echo "$as_me:25109: checking for -lvideo in $cf_libdir" >&5
echo $ECHO_N "checking for -lvideo in $cf_libdir... $ECHO_C" >&6
LIBS="-L$cf_libdir -lvideo $cf_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 25125 "configure"
+#line 25113 "configure"
#include "confdefs.h"
#include <sys/video.h>
int
@@ -25134,25 +25122,25 @@ v_init()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25137: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25125: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:25140: \$? = $ac_status" >&5
+ echo "$as_me:25128: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:25143: \"$ac_try\"") >&5
+ { (eval echo "$as_me:25131: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:25146: \$? = $ac_status" >&5
+ echo "$as_me:25134: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:25148: result: yes" >&5
+ echo "$as_me:25136: result: yes" >&5
echo "${ECHO_T}yes" >&6
eval 'cf_cv_have_lib_'video'=yes'
break
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "$as_me:25155: result: no" >&5
+echo "$as_me:25143: result: no" >&5
echo "${ECHO_T}no" >&6
LIBS="$cf_save_LIBS"
fi
@@ -25167,7 +25155,7 @@ fi
eval 'cf_found_library=$cf_cv_have_lib_'video
if test $cf_found_library = no ; then
- { { echo "$as_me:25170: error: Cannot link video library" >&5
+ { { echo "$as_me:25158: error: Cannot link video library" >&5
echo "$as_me: error: Cannot link video library" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -25177,13 +25165,13 @@ esac
eval 'cf_cv_have_lib_'slang2'=no'
cf_libdir=""
- echo "$as_me:25180: checking for SLtt_get_screen_size" >&5
+ echo "$as_me:25168: checking for SLtt_get_screen_size" >&5
echo $ECHO_N "checking for SLtt_get_screen_size... $ECHO_C" >&6
if test "${ac_cv_func_SLtt_get_screen_size+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 25186 "configure"
+#line 25174 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char SLtt_get_screen_size (); below. */
@@ -25214,16 +25202,16 @@ f = SLtt_get_screen_size; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25217: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25205: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:25220: \$? = $ac_status" >&5
+ echo "$as_me:25208: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:25223: \"$ac_try\"") >&5
+ { (eval echo "$as_me:25211: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:25226: \$? = $ac_status" >&5
+ echo "$as_me:25214: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_SLtt_get_screen_size=yes
else
@@ -25233,18 +25221,18 @@ ac_cv_func_SLtt_get_screen_size=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:25236: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:25224: result: $ac_cv_func_SLtt_get_screen_size" >&5
echo "${ECHO_T}$ac_cv_func_SLtt_get_screen_size" >&6
if test $ac_cv_func_SLtt_get_screen_size = yes; then
eval 'cf_cv_have_lib_'slang2'=yes'
else
cf_save_LIBS="$LIBS"
- echo "$as_me:25243: checking for SLtt_get_screen_size in -lslang2" >&5
+ echo "$as_me:25231: checking for SLtt_get_screen_size in -lslang2" >&5
echo $ECHO_N "checking for SLtt_get_screen_size in -lslang2... $ECHO_C" >&6
LIBS="-lslang2 $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 25247 "configure"
+#line 25235 "configure"
#include "confdefs.h"
#include <slang.h>
int
@@ -25256,25 +25244,25 @@ SLtt_get_screen_size()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25259: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25247: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:25262: \$? = $ac_status" >&5
+ echo "$as_me:25250: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:25265: \"$ac_try\"") >&5
+ { (eval echo "$as_me:25253: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:25268: \$? = $ac_status" >&5
+ echo "$as_me:25256: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:25270: result: yes" >&5
+ echo "$as_me:25258: result: yes" >&5
echo "${ECHO_T}yes" >&6
eval 'cf_cv_have_lib_'slang2'=yes'
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "$as_me:25277: result: no" >&5
+echo "$as_me:25265: result: no" >&5
echo "${ECHO_T}no" >&6
cf_search=
@@ -25342,11 +25330,11 @@ cf_search="$cf_library_path_list $cf_search"
for cf_libdir in $cf_search
do
- echo "$as_me:25345: checking for -lslang2 in $cf_libdir" >&5
+ echo "$as_me:25333: checking for -lslang2 in $cf_libdir" >&5
echo $ECHO_N "checking for -lslang2 in $cf_libdir... $ECHO_C" >&6
LIBS="-L$cf_libdir -lslang2 $cf_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 25349 "configure"
+#line 25337 "configure"
#include "confdefs.h"
#include <slang.h>
int
@@ -25358,25 +25346,25 @@ SLtt_get_screen_size()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25361: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25349: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:25364: \$? = $ac_status" >&5
+ echo "$as_me:25352: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:25367: \"$ac_try\"") >&5
+ { (eval echo "$as_me:25355: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:25370: \$? = $ac_status" >&5
+ echo "$as_me:25358: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:25372: result: yes" >&5
+ echo "$as_me:25360: result: yes" >&5
echo "${ECHO_T}yes" >&6
eval 'cf_cv_have_lib_'slang2'=yes'
break
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "$as_me:25379: result: no" >&5
+echo "$as_me:25367: result: no" >&5
echo "${ECHO_T}no" >&6
LIBS="$cf_save_LIBS"
fi
@@ -25391,13 +25379,13 @@ fi
eval 'cf_found_library=$cf_cv_have_lib_'slang2
if test $cf_found_library = no ; then
- { { echo "$as_me:25394: error: Cannot link slang2 library" >&5
+ { { echo "$as_me:25382: error: Cannot link slang2 library" >&5
echo "$as_me: error: Cannot link slang2 library" >&2;}
{ (exit 1); exit 1; }; }
fi
cf_slang_LIBS3="$LIBS"
-echo "$as_me:25400: checking if we can link slang2 without termcap" >&5
+echo "$as_me:25388: checking if we can link slang2 without termcap" >&5
echo $ECHO_N "checking if we can link slang2 without termcap... $ECHO_C" >&6
if test -n "`echo $cf_slang_LIBS1 | sed -e 's/ //g'`" ; then
cf_exclude=`echo ".$cf_slang_LIBS2" | sed -e "s%$cf_slang_LIBS1%%" -e 's%^.%%'`
@@ -25406,7 +25394,7 @@ else
fi
LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
cat >conftest.$ac_ext <<_ACEOF
-#line 25409 "configure"
+#line 25397 "configure"
#include "confdefs.h"
#include <slang.h>
int
@@ -25418,16 +25406,16 @@ SLtt_get_screen_size()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25421: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25409: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:25424: \$? = $ac_status" >&5
+ echo "$as_me:25412: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:25427: \"$ac_try\"") >&5
+ { (eval echo "$as_me:25415: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:25430: \$? = $ac_status" >&5
+ echo "$as_me:25418: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
@@ -25436,12 +25424,12 @@ cat conftest.$ac_ext >&5
cf_result=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:25439: result: $cf_result" >&5
+echo "$as_me:25427: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
test $cf_result = no && LIBS="$cf_slang_LIBS3"
else
- { { echo "$as_me:25444: error: cannot find slang headers" >&5
+ { { echo "$as_me:25432: error: cannot find slang headers" >&5
echo "$as_me: error: cannot find slang headers" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -25449,14 +25437,14 @@ fi
# There's an unofficial set of patches for slang that gives it some limited
# UTF8 capability. Unfortunately it won't compile unless one defines UTF8.
-echo "$as_me:25452: checking if we must define UTF8" >&5
+echo "$as_me:25440: checking if we must define UTF8" >&5
echo $ECHO_N "checking if we must define UTF8... $ECHO_C" >&6
if test "${cf_cv_slang_utf8+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 25459 "configure"
+#line 25447 "configure"
#include "confdefs.h"
#include <slang.h>
int
@@ -25468,16 +25456,16 @@ SLtt_get_screen_size()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25471: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25459: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:25474: \$? = $ac_status" >&5
+ echo "$as_me:25462: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:25477: \"$ac_try\"") >&5
+ { (eval echo "$as_me:25465: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:25480: \$? = $ac_status" >&5
+ echo "$as_me:25468: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_slang_utf8=no
else
@@ -25485,7 +25473,7 @@ else
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 25488 "configure"
+#line 25476 "configure"
#include "confdefs.h"
#define UTF8
@@ -25499,16 +25487,16 @@ SLtt_get_screen_size()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25502: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25490: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:25505: \$? = $ac_status" >&5
+ echo "$as_me:25493: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:25508: \"$ac_try\"") >&5
+ { (eval echo "$as_me:25496: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:25511: \$? = $ac_status" >&5
+ echo "$as_me:25499: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_slang_utf8=yes
else
@@ -25521,7 +25509,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:25524: result: $cf_cv_slang_utf8" >&5
+echo "$as_me:25512: result: $cf_cv_slang_utf8" >&5
echo "${ECHO_T}$cf_cv_slang_utf8" >&6
if test "$cf_cv_slang_utf8" = yes ; then
@@ -25532,14 +25520,14 @@ EOF
fi
-echo "$as_me:25535: checking if we must tell slang this is UNIX" >&5
+echo "$as_me:25523: checking if we must tell slang this is UNIX" >&5
echo $ECHO_N "checking if we must tell slang this is UNIX... $ECHO_C" >&6
if test "${cf_cv_slang_unix+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 25542 "configure"
+#line 25530 "configure"
#include "confdefs.h"
#include <slang.h>
int
@@ -25558,16 +25546,16 @@ SLang_TT_Baud_Rate = 1
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25561: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25549: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:25564: \$? = $ac_status" >&5
+ echo "$as_me:25552: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:25567: \"$ac_try\"") >&5
+ { (eval echo "$as_me:25555: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:25570: \$? = $ac_status" >&5
+ echo "$as_me:25558: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_slang_unix=yes
else
@@ -25578,20 +25566,20 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:25581: result: $cf_cv_slang_unix" >&5
+echo "$as_me:25569: result: $cf_cv_slang_unix" >&5
echo "${ECHO_T}$cf_cv_slang_unix" >&6
test $cf_cv_slang_unix = yes &&
cat >>confdefs.h <<\EOF
#define REAL_UNIX_SYSTEM 1
EOF
- echo "$as_me:25588: checking for SLsmg_Color_Type" >&5
+ echo "$as_me:25576: checking for SLsmg_Color_Type" >&5
echo $ECHO_N "checking for SLsmg_Color_Type... $ECHO_C" >&6
if test "${ac_cv_type_SLsmg_Color_Type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 25594 "configure"
+#line 25582 "configure"
#include "confdefs.h"
#include <slang.h>
@@ -25607,16 +25595,16 @@ if (sizeof (SLsmg_Color_Type))
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25610: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25598: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:25613: \$? = $ac_status" >&5
+ echo "$as_me:25601: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:25616: \"$ac_try\"") >&5
+ { (eval echo "$as_me:25604: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:25619: \$? = $ac_status" >&5
+ echo "$as_me:25607: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_SLsmg_Color_Type=yes
else
@@ -25626,7 +25614,7 @@ ac_cv_type_SLsmg_Color_Type=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:25629: result: $ac_cv_type_SLsmg_Color_Type" >&5
+echo "$as_me:25617: result: $ac_cv_type_SLsmg_Color_Type" >&5
echo "${ECHO_T}$ac_cv_type_SLsmg_Color_Type" >&6
if test $ac_cv_type_SLsmg_Color_Type = yes; then
ac_cv_type_SLsmg_Color_Type=yes
@@ -25642,13 +25630,13 @@ EOF
fi
- echo "$as_me:25645: checking for SLtt_Char_Type" >&5
+ echo "$as_me:25633: checking for SLtt_Char_Type" >&5
echo $ECHO_N "checking for SLtt_Char_Type... $ECHO_C" >&6
if test "${ac_cv_type_SLtt_Char_Type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 25651 "configure"
+#line 25639 "configure"
#include "confdefs.h"
#include <slang.h>
@@ -25664,16 +25652,16 @@ if (sizeof (SLtt_Char_Type))
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25667: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25655: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:25670: \$? = $ac_status" >&5
+ echo "$as_me:25658: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:25673: \"$ac_try\"") >&5
+ { (eval echo "$as_me:25661: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:25676: \$? = $ac_status" >&5
+ echo "$as_me:25664: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_SLtt_Char_Type=yes
else
@@ -25683,7 +25671,7 @@ ac_cv_type_SLtt_Char_Type=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:25686: result: $ac_cv_type_SLtt_Char_Type" >&5
+echo "$as_me:25674: result: $ac_cv_type_SLtt_Char_Type" >&5
echo "${ECHO_T}$ac_cv_type_SLtt_Char_Type" >&6
if test $ac_cv_type_SLtt_Char_Type = yes; then
ac_cv_type_SLtt_Char_Type=yes
@@ -25703,14 +25691,14 @@ fi
;;
esac
-echo "$as_me:25706: checking for chtype typedef" >&5
+echo "$as_me:25694: checking for chtype typedef" >&5
echo $ECHO_N "checking for chtype typedef... $ECHO_C" >&6
if test "${cf_cv_chtype_decl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 25713 "configure"
+#line 25701 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -25722,16 +25710,16 @@ chtype foo
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25725: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25713: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:25728: \$? = $ac_status" >&5
+ echo "$as_me:25716: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:25731: \"$ac_try\"") >&5
+ { (eval echo "$as_me:25719: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:25734: \$? = $ac_status" >&5
+ echo "$as_me:25722: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_chtype_decl=yes
else
@@ -25741,7 +25729,7 @@ cf_cv_chtype_decl=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:25744: result: $cf_cv_chtype_decl" >&5
+echo "$as_me:25732: result: $cf_cv_chtype_decl" >&5
echo "${ECHO_T}$cf_cv_chtype_decl" >&6
if test $cf_cv_chtype_decl = yes ; then
@@ -25749,14 +25737,14 @@ cat >>confdefs.h <<\EOF
#define HAVE_TYPE_CHTYPE 1
EOF
- echo "$as_me:25752: checking if chtype is scalar or struct" >&5
+ echo "$as_me:25740: checking if chtype is scalar or struct" >&5
echo $ECHO_N "checking if chtype is scalar or struct... $ECHO_C" >&6
if test "${cf_cv_chtype_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 25759 "configure"
+#line 25747 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -25768,16 +25756,16 @@ chtype foo; long x = foo
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25771: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25759: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:25774: \$? = $ac_status" >&5
+ echo "$as_me:25762: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:25777: \"$ac_try\"") >&5
+ { (eval echo "$as_me:25765: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:25780: \$? = $ac_status" >&5
+ echo "$as_me:25768: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_chtype_type=scalar
else
@@ -25787,7 +25775,7 @@ cf_cv_chtype_type=struct
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:25790: result: $cf_cv_chtype_type" >&5
+echo "$as_me:25778: result: $cf_cv_chtype_type" >&5
echo "${ECHO_T}$cf_cv_chtype_type" >&6
if test $cf_cv_chtype_type = scalar ; then
@@ -25798,47 +25786,47 @@ EOF
fi
fi
-echo "$as_me:25801: checking if you want the wide-curses features" >&5
+echo "$as_me:25789: checking if you want the wide-curses features" >&5
echo $ECHO_N "checking if you want the wide-curses features... $ECHO_C" >&6
# Check whether --enable-widec or --disable-widec was given.
if test "${enable_widec+set}" = set; then
enableval="$enable_widec"
test "$enableval" != yes && enableval=no
- if test "$enableval" != "no" ; then
+ if test "$enableval" != "no" ; then
use_wide_curses=$enableval
- else
- use_wide_curses=$cf_wide_curses
- fi
+ else
+ use_wide_curses=$cf_wide_curses
+ fi
else
enableval=no
- use_wide_curses=$cf_wide_curses
+ use_wide_curses=$cf_wide_curses
fi;
-echo "$as_me:25818: result: $use_wide_curses" >&5
+echo "$as_me:25806: result: $use_wide_curses" >&5
echo "${ECHO_T}$use_wide_curses" >&6
-echo "$as_me:25821: checking if color-style code should be used" >&5
+echo "$as_me:25809: checking if color-style code should be used" >&5
echo $ECHO_N "checking if color-style code should be used... $ECHO_C" >&6
# Check whether --enable-color-style or --disable-color-style was given.
if test "${enable_color_style+set}" = set; then
enableval="$enable_color_style"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
use_color_style=$enableval
- else
- use_color_style=$dft_color_style
- fi
+ else
+ use_color_style=$dft_color_style
+ fi
else
enableval=yes
- use_color_style=$dft_color_style
+ use_color_style=$dft_color_style
fi;
case $use_color_style in
(no)
- echo "$as_me:25841: result: no" >&5
+ echo "$as_me:25829: result: no" >&5
echo "${ECHO_T}no" >&6
INSTALL_LSS=
;;
@@ -25848,10 +25836,10 @@ cat >>confdefs.h <<\EOF
#define USE_COLOR_STYLE 1
EOF
- echo "$as_me:25851: result: yes" >&5
+ echo "$as_me:25839: result: yes" >&5
echo "${ECHO_T}yes" >&6
- echo "$as_me:25854: checking for location of style-sheet file" >&5
+ echo "$as_me:25842: checking for location of style-sheet file" >&5
echo $ECHO_N "checking for location of style-sheet file... $ECHO_C" >&6
# Check whether --with-lss-file or --without-lss-file was given.
@@ -25887,7 +25875,7 @@ case ".$withval" in
withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
;;
(*)
- { { echo "$as_me:25890: error: expected a pathname, not \"$withval\"" >&5
+ { { echo "$as_me:25878: error: expected a pathname, not \"$withval\"" >&5
echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
{ (exit 1); exit 1; }; }
;;
@@ -25896,7 +25884,7 @@ esac
fi
eval LYNX_LSS_FILE="$withval"
- echo "$as_me:25899: result: $LYNX_LSS_FILE" >&5
+ echo "$as_me:25887: result: $LYNX_LSS_FILE" >&5
echo "${ECHO_T}$LYNX_LSS_FILE" >&6
test "$LYNX_LSS_FILE" = no && LYNX_LSS_FILE=
@@ -25909,7 +25897,7 @@ EOF
;;
esac
-echo "$as_me:25912: checking for the default configuration-file" >&5
+echo "$as_me:25900: checking for the default configuration-file" >&5
echo $ECHO_N "checking for the default configuration-file... $ECHO_C" >&6
# Check whether --with-cfg-file or --without-cfg-file was given.
@@ -25945,7 +25933,7 @@ case ".$withval" in
withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
;;
(*)
- { { echo "$as_me:25948: error: expected a pathname, not \"$withval\"" >&5
+ { { echo "$as_me:25936: error: expected a pathname, not \"$withval\"" >&5
echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
{ (exit 1); exit 1; }; }
;;
@@ -25954,7 +25942,7 @@ esac
fi
eval LYNX_CFG_FILE="$withval"
-echo "$as_me:25957: result: $LYNX_CFG_FILE" >&5
+echo "$as_me:25945: result: $LYNX_CFG_FILE" >&5
echo "${ECHO_T}$LYNX_CFG_FILE" >&6
test "$LYNX_CFG_FILE" = no && LYNX_CFG_FILE=
@@ -25963,7 +25951,7 @@ cat >>confdefs.h <<EOF
#define LYNX_CFG_FILE "$LYNX_CFG_FILE"
EOF
-echo "$as_me:25966: checking for the default configuration-path" >&5
+echo "$as_me:25954: checking for the default configuration-path" >&5
echo $ECHO_N "checking for the default configuration-path... $ECHO_C" >&6
# Check whether --with-cfg-path or --without-cfg-path was given.
@@ -25999,7 +25987,7 @@ case ".$withval" in
withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
;;
(*)
- { { echo "$as_me:26002: error: expected a pathname, not \"$withval\"" >&5
+ { { echo "$as_me:25990: error: expected a pathname, not \"$withval\"" >&5
echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
{ (exit 1); exit 1; }; }
;;
@@ -26008,7 +25996,7 @@ esac
fi
eval LYNX_CFG_PATH="$withval"
-echo "$as_me:26011: result: $LYNX_CFG_PATH" >&5
+echo "$as_me:25999: result: $LYNX_CFG_PATH" >&5
echo "${ECHO_T}$LYNX_CFG_PATH" >&6
test -z "$LYNX_CFG_PATH" && `echo "$LYNX_CFG_FILE" | sed -e 's%/[^/]*$%%'`
@@ -26018,24 +26006,24 @@ cat >>confdefs.h <<EOF
#define LYNX_CFG_PATH "$LYNX_CFG_PATH"
EOF
-echo "$as_me:26021: checking if htmlized lynx.cfg should be built" >&5
+echo "$as_me:26009: checking if htmlized lynx.cfg should be built" >&5
echo $ECHO_N "checking if htmlized lynx.cfg should be built... $ECHO_C" >&6
# Check whether --enable-htmlized-cfg or --disable-htmlized-cfg was given.
if test "${enable_htmlized_cfg+set}" = set; then
enableval="$enable_htmlized_cfg"
test "$enableval" != yes && enableval=no
- if test "$enableval" != "no" ; then
+ if test "$enableval" != "no" ; then
use_htmlized_cfg=$enableval
- else
- use_htmlized_cfg=no
- fi
+ else
+ use_htmlized_cfg=no
+ fi
else
enableval=no
- use_htmlized_cfg=no
+ use_htmlized_cfg=no
fi;
-echo "$as_me:26038: result: $use_htmlized_cfg" >&5
+echo "$as_me:26026: result: $use_htmlized_cfg" >&5
echo "${ECHO_T}$use_htmlized_cfg" >&6
LYNXCFG_MAKE=''
@@ -26043,24 +26031,24 @@ if test $use_htmlized_cfg = no ; then
LYNXCFG_MAKE='#'
fi
-echo "$as_me:26046: checking if local doc directory should be linked to help page" >&5
+echo "$as_me:26034: checking if local doc directory should be linked to help page" >&5
echo $ECHO_N "checking if local doc directory should be linked to help page... $ECHO_C" >&6
# Check whether --enable-local-docs or --disable-local-docs was given.
if test "${enable_local_docs+set}" = set; then
enableval="$enable_local_docs"
test "$enableval" != yes && enableval=no
- if test "$enableval" != "no" ; then
+ if test "$enableval" != "no" ; then
use_local_docs=$enableval
- else
- use_local_docs=no
- fi
+ else
+ use_local_docs=no
+ fi
else
enableval=no
- use_local_docs=no
+ use_local_docs=no
fi;
-echo "$as_me:26063: result: $use_local_docs" >&5
+echo "$as_me:26051: result: $use_local_docs" >&5
echo "${ECHO_T}$use_local_docs" >&6
LYNXDOC_MAKE=''
@@ -26068,7 +26056,7 @@ if test $use_local_docs = no ; then
LYNXDOC_MAKE='#'
fi
-echo "$as_me:26071: checking for MIME library directory" >&5
+echo "$as_me:26059: checking for MIME library directory" >&5
echo $ECHO_N "checking for MIME library directory... $ECHO_C" >&6
# Check whether --with-mime-libdir or --without-mime-libdir was given.
@@ -26104,7 +26092,7 @@ case ".$withval" in
withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
;;
(*)
- { { echo "$as_me:26107: error: expected a pathname, not \"$withval\"" >&5
+ { { echo "$as_me:26095: error: expected a pathname, not \"$withval\"" >&5
echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
{ (exit 1); exit 1; }; }
;;
@@ -26113,7 +26101,7 @@ esac
fi
eval MIME_LIBDIR="$withval"
-echo "$as_me:26116: result: $MIME_LIBDIR" >&5
+echo "$as_me:26104: result: $MIME_LIBDIR" >&5
echo "${ECHO_T}$MIME_LIBDIR" >&6
MIME_LIBDIR=`echo "$MIME_LIBDIR" | sed -e 's,/$,,' -e 's,$,/,'`
@@ -26121,24 +26109,24 @@ cat >>confdefs.h <<EOF
#define MIME_LIBDIR "$MIME_LIBDIR"
EOF
-echo "$as_me:26124: checking if locale-charset selection logic should be used" >&5
+echo "$as_me:26112: checking if locale-charset selection logic should be used" >&5
echo $ECHO_N "checking if locale-charset selection logic should be used... $ECHO_C" >&6
# Check whether --enable-locale-charset or --disable-locale-charset was given.
if test "${enable_locale_charset+set}" = set; then
enableval="$enable_locale_charset"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
use_locale_charset=$enableval
- else
- use_locale_charset=yes
- fi
+ else
+ use_locale_charset=yes
+ fi
else
enableval=yes
- use_locale_charset=yes
+ use_locale_charset=yes
fi;
-echo "$as_me:26141: result: $use_locale_charset" >&5
+echo "$as_me:26129: result: $use_locale_charset" >&5
echo "${ECHO_T}$use_locale_charset" >&6
test $use_locale_charset != no &&
cat >>confdefs.h <<\EOF
@@ -26147,7 +26135,7 @@ EOF
CHARSET_DEFS=
-echo "$as_me:26150: checking if you want only a few charsets" >&5
+echo "$as_me:26138: checking if you want only a few charsets" >&5
echo $ECHO_N "checking if you want only a few charsets... $ECHO_C" >&6
# Check whether --with-charsets or --without-charsets was given.
@@ -26159,7 +26147,7 @@ else
fi;
if test -n "$cf_charsets" ; then
- echo "$as_me:26162: result: yes" >&5
+ echo "$as_me:26150: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
@@ -26173,7 +26161,7 @@ EOF
if test "$cf_charsets" = "minimal" ; then
test -n "$verbose" && echo " using minimal list of charsets: $cf_min_charsets" 1>&6
-echo "${as_me:-configure}:26176: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5
+echo "${as_me:-configure}:26164: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5
fi
cf_charsets=`echo $cf_charsets | sed -e "s/minimal/$cf_min_charsets/g" -e 's/,/ /g'`
@@ -26200,28 +26188,28 @@ echo "${as_me:-configure}:26176: testing using minimal list of charsets: $cf_min
then
test -n "$verbose" && echo " found $cf_charset" 1>&6
-echo "${as_me:-configure}:26203: testing found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:26191: testing found $cf_charset ..." 1>&5
CHARSET_DEFS="-DNO_CHARSET_${cf_def_charset}=0 $CHARSET_DEFS"
else
test -n "$verbose" && echo " not found $cf_charset" 1>&6
-echo "${as_me:-configure}:26209: testing not found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:26197: testing not found $cf_charset ..." 1>&5
fi
done
else
- echo "$as_me:26214: result: no" >&5
+ echo "$as_me:26202: result: no" >&5
echo "${ECHO_T}no" >&6
fi
-echo "$as_me:26218: checking for ANSI C header files" >&5
+echo "$as_me:26206: checking for ANSI C header files" >&5
echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 26224 "configure"
+#line 26212 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -26229,13 +26217,13 @@ else
#include <float.h>
_ACEOF
-if { (eval echo "$as_me:26232: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26220: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:26238: \$? = $ac_status" >&5
+ echo "$as_me:26226: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26257,7 +26245,7 @@ rm -f conftest.err conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat >conftest.$ac_ext <<_ACEOF
-#line 26260 "configure"
+#line 26248 "configure"
#include "confdefs.h"
#include <string.h>
@@ -26275,7 +26263,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 <<_ACEOF
-#line 26278 "configure"
+#line 26266 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -26296,7 +26284,7 @@ if test $ac_cv_header_stdc = yes; then
:
else
cat >conftest.$ac_ext <<_ACEOF
-#line 26299 "configure"
+#line 26287 "configure"
#include "confdefs.h"
#include <ctype.h>
#if ((' ' & 0x0FF) == 0x020)
@@ -26322,15 +26310,15 @@ main ()
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:26325: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26313: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:26328: \$? = $ac_status" >&5
+ echo "$as_me:26316: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:26330: \"$ac_try\"") >&5
+ { (eval echo "$as_me:26318: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:26333: \$? = $ac_status" >&5
+ echo "$as_me:26321: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -26343,7 +26331,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
fi
-echo "$as_me:26346: result: $ac_cv_header_stdc" >&5
+echo "$as_me:26334: result: $ac_cv_header_stdc" >&5
echo "${ECHO_T}$ac_cv_header_stdc" >&6
if test $ac_cv_header_stdc = yes; then
@@ -26353,13 +26341,13 @@ EOF
fi
-echo "$as_me:26356: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:26344: checking whether time.h and sys/time.h may both be included" >&5
echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
if test "${ac_cv_header_time+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 26362 "configure"
+#line 26350 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -26375,16 +26363,16 @@ return 0;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26378: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26366: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:26381: \$? = $ac_status" >&5
+ echo "$as_me:26369: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:26384: \"$ac_try\"") >&5
+ { (eval echo "$as_me:26372: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:26387: \$? = $ac_status" >&5
+ echo "$as_me:26375: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_header_time=yes
else
@@ -26394,7 +26382,7 @@ ac_cv_header_time=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:26397: result: $ac_cv_header_time" >&5
+echo "$as_me:26385: result: $ac_cv_header_time" >&5
echo "${ECHO_T}$ac_cv_header_time" >&6
if test $ac_cv_header_time = yes; then
@@ -26407,13 +26395,13 @@ fi
ac_header_dirent=no
for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-echo "$as_me:26410: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:26398: checking for $ac_hdr that defines DIR" >&5
echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 26416 "configure"
+#line 26404 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_hdr>
@@ -26428,16 +26416,16 @@ return 0;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26431: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26419: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:26434: \$? = $ac_status" >&5
+ echo "$as_me:26422: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:26437: \"$ac_try\"") >&5
+ { (eval echo "$as_me:26425: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:26440: \$? = $ac_status" >&5
+ echo "$as_me:26428: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_Header=yes"
else
@@ -26447,7 +26435,7 @@ eval "$as_ac_Header=no"
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:26450: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26438: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -26460,7 +26448,7 @@ fi
done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
- echo "$as_me:26463: checking for opendir in -ldir" >&5
+ echo "$as_me:26451: checking for opendir in -ldir" >&5
echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
if test "${ac_cv_lib_dir_opendir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26468,7 +26456,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldir $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 26471 "configure"
+#line 26459 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -26487,16 +26475,16 @@ opendir ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26490: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26478: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:26493: \$? = $ac_status" >&5
+ echo "$as_me:26481: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:26496: \"$ac_try\"") >&5
+ { (eval echo "$as_me:26484: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:26499: \$? = $ac_status" >&5
+ echo "$as_me:26487: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dir_opendir=yes
else
@@ -26507,14 +26495,14 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:26510: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:26498: result: $ac_cv_lib_dir_opendir" >&5
echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
if test $ac_cv_lib_dir_opendir = yes; then
LIBS="$LIBS -ldir"
fi
else
- echo "$as_me:26517: checking for opendir in -lx" >&5
+ echo "$as_me:26505: checking for opendir in -lx" >&5
echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
if test "${ac_cv_lib_x_opendir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -26522,7 +26510,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lx $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 26525 "configure"
+#line 26513 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -26541,16 +26529,16 @@ opendir ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26544: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26532: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:26547: \$? = $ac_status" >&5
+ echo "$as_me:26535: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:26550: \"$ac_try\"") >&5
+ { (eval echo "$as_me:26538: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:26553: \$? = $ac_status" >&5
+ echo "$as_me:26541: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_x_opendir=yes
else
@@ -26561,7 +26549,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:26564: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:26552: result: $ac_cv_lib_x_opendir" >&5
echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
if test $ac_cv_lib_x_opendir = yes; then
LIBS="$LIBS -lx"
@@ -26589,23 +26577,23 @@ for ac_header in \
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26592: checking for $ac_header" >&5
+echo "$as_me:26580: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 26598 "configure"
+#line 26586 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:26602: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26590: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:26608: \$? = $ac_status" >&5
+ echo "$as_me:26596: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26624,7 +26612,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:26627: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26615: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -26634,14 +26622,14 @@ EOF
fi
done
-echo "$as_me:26637: checking termio.h and termios.h" >&5
+echo "$as_me:26625: checking termio.h and termios.h" >&5
echo $ECHO_N "checking termio.h and termios.h... $ECHO_C" >&6
if test "${cf_cv_termio_and_termios+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 26644 "configure"
+#line 26632 "configure"
#include "confdefs.h"
#if HAVE_TERMIO_H
@@ -26659,16 +26647,16 @@ putchar (0x0a)
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26662: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26650: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:26665: \$? = $ac_status" >&5
+ echo "$as_me:26653: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:26668: \"$ac_try\"") >&5
+ { (eval echo "$as_me:26656: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:26671: \$? = $ac_status" >&5
+ echo "$as_me:26659: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_termio_and_termios=yes
else
@@ -26679,21 +26667,21 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:26682: result: $cf_cv_termio_and_termios" >&5
+echo "$as_me:26670: result: $cf_cv_termio_and_termios" >&5
echo "${ECHO_T}$cf_cv_termio_and_termios" >&6
test $cf_cv_termio_and_termios = no &&
cat >>confdefs.h <<\EOF
#define TERMIO_AND_TERMIOS 1
EOF
-echo "$as_me:26689: checking for sigaction and structs" >&5
+echo "$as_me:26677: checking for sigaction and structs" >&5
echo $ECHO_N "checking for sigaction and structs... $ECHO_C" >&6
if test "${cf_cv_func_sigaction+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 26696 "configure"
+#line 26684 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -26713,16 +26701,16 @@ struct sigaction act;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26716: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26704: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:26719: \$? = $ac_status" >&5
+ echo "$as_me:26707: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:26722: \"$ac_try\"") >&5
+ { (eval echo "$as_me:26710: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:26725: \$? = $ac_status" >&5
+ echo "$as_me:26713: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_func_sigaction=yes
else
@@ -26733,7 +26721,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:26736: result: $cf_cv_func_sigaction" >&5
+echo "$as_me:26724: result: $cf_cv_func_sigaction" >&5
echo "${ECHO_T}$cf_cv_func_sigaction" >&6
test "$cf_cv_func_sigaction" = yes &&
cat >>confdefs.h <<\EOF
@@ -26743,23 +26731,23 @@ EOF
for ac_header in sys/wait.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26746: checking for $ac_header" >&5
+echo "$as_me:26734: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 26752 "configure"
+#line 26740 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:26756: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26744: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:26762: \$? = $ac_status" >&5
+ echo "$as_me:26750: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26778,7 +26766,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:26781: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26769: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -26799,23 +26787,23 @@ else
for ac_header in wait.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26802: checking for $ac_header" >&5
+echo "$as_me:26790: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 26808 "configure"
+#line 26796 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:26812: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26800: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:26818: \$? = $ac_status" >&5
+ echo "$as_me:26806: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26834,7 +26822,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:26837: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26825: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -26847,23 +26835,23 @@ done
for ac_header in waitstatus.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26850: checking for $ac_header" >&5
+echo "$as_me:26838: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 26856 "configure"
+#line 26844 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:26860: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26848: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:26866: \$? = $ac_status" >&5
+ echo "$as_me:26854: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26882,7 +26870,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:26885: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26873: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -26904,14 +26892,14 @@ cf_wait_headers="$cf_wait_headers
fi
fi
-echo "$as_me:26907: checking for union wait" >&5
+echo "$as_me:26895: checking for union wait" >&5
echo $ECHO_N "checking for union wait... $ECHO_C" >&6
if test "${cf_cv_type_unionwait+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 26914 "configure"
+#line 26902 "configure"
#include "confdefs.h"
$cf_wait_headers
int
@@ -26927,16 +26915,16 @@ int x;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26930: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26918: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:26933: \$? = $ac_status" >&5
+ echo "$as_me:26921: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:26936: \"$ac_try\"") >&5
+ { (eval echo "$as_me:26924: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:26939: \$? = $ac_status" >&5
+ echo "$as_me:26927: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_type_unionwait=no
echo compiles ok w/o union wait 1>&5
@@ -26946,7 +26934,7 @@ else
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 26949 "configure"
+#line 26937 "configure"
#include "confdefs.h"
$cf_wait_headers
int
@@ -26966,16 +26954,16 @@ union wait x;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26969: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26957: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:26972: \$? = $ac_status" >&5
+ echo "$as_me:26960: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:26975: \"$ac_try\"") >&5
+ { (eval echo "$as_me:26963: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:26978: \$? = $ac_status" >&5
+ echo "$as_me:26966: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_type_unionwait=yes
echo compiles ok with union wait and possibly macros too 1>&5
@@ -26990,7 +26978,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:26993: result: $cf_cv_type_unionwait" >&5
+echo "$as_me:26981: result: $cf_cv_type_unionwait" >&5
echo "${ECHO_T}$cf_cv_type_unionwait" >&6
test $cf_cv_type_unionwait = yes &&
cat >>confdefs.h <<\EOF
@@ -26999,14 +26987,14 @@ EOF
if test $cf_cv_type_unionwait = yes; then
- echo "$as_me:27002: checking if union wait can be used as wait-arg" >&5
+ echo "$as_me:26990: checking if union wait can be used as wait-arg" >&5
echo $ECHO_N "checking if union wait can be used as wait-arg... $ECHO_C" >&6
if test "${cf_cv_arg_union_wait+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 27009 "configure"
+#line 26997 "configure"
#include "confdefs.h"
$cf_wait_headers
int
@@ -27018,16 +27006,16 @@ union wait x; wait(&x)
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27021: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27009: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:27024: \$? = $ac_status" >&5
+ echo "$as_me:27012: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:27027: \"$ac_try\"") >&5
+ { (eval echo "$as_me:27015: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:27030: \$? = $ac_status" >&5
+ echo "$as_me:27018: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_arg_union_wait=yes
else
@@ -27039,21 +27027,21 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
- echo "$as_me:27042: result: $cf_cv_arg_union_wait" >&5
+ echo "$as_me:27030: result: $cf_cv_arg_union_wait" >&5
echo "${ECHO_T}$cf_cv_arg_union_wait" >&6
test $cf_cv_arg_union_wait = yes &&
cat >>confdefs.h <<\EOF
#define WAIT_USES_UNION 1
EOF
- echo "$as_me:27049: checking if union wait can be used as waitpid-arg" >&5
+ echo "$as_me:27037: checking if union wait can be used as waitpid-arg" >&5
echo $ECHO_N "checking if union wait can be used as waitpid-arg... $ECHO_C" >&6
if test "${cf_cv_arg_union_waitpid+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 27056 "configure"
+#line 27044 "configure"
#include "confdefs.h"
$cf_wait_headers
int
@@ -27065,16 +27053,16 @@ union wait x; waitpid(0, &x, 0)
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27068: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27056: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:27071: \$? = $ac_status" >&5
+ echo "$as_me:27059: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:27074: \"$ac_try\"") >&5
+ { (eval echo "$as_me:27062: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:27077: \$? = $ac_status" >&5
+ echo "$as_me:27065: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_arg_union_waitpid=yes
else
@@ -27086,7 +27074,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
- echo "$as_me:27089: result: $cf_cv_arg_union_waitpid" >&5
+ echo "$as_me:27077: result: $cf_cv_arg_union_waitpid" >&5
echo "${ECHO_T}$cf_cv_arg_union_waitpid" >&6
test $cf_cv_arg_union_waitpid = yes &&
cat >>confdefs.h <<\EOF
@@ -27095,13 +27083,13 @@ EOF
fi
-echo "$as_me:27098: checking for uid_t in sys/types.h" >&5
+echo "$as_me:27086: checking for uid_t in sys/types.h" >&5
echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
if test "${ac_cv_type_uid_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 27104 "configure"
+#line 27092 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -27115,7 +27103,7 @@ fi
rm -rf conftest*
fi
-echo "$as_me:27118: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:27106: result: $ac_cv_type_uid_t" >&5
echo "${ECHO_T}$ac_cv_type_uid_t" >&6
if test $ac_cv_type_uid_t = no; then
@@ -27129,7 +27117,7 @@ EOF
fi
-echo "$as_me:27132: checking type of array argument to getgroups" >&5
+echo "$as_me:27120: checking type of array argument to getgroups" >&5
echo $ECHO_N "checking type of array argument to getgroups... $ECHO_C" >&6
if test "${ac_cv_type_getgroups+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27138,7 +27126,7 @@ else
ac_cv_type_getgroups=cross
else
cat >conftest.$ac_ext <<_ACEOF
-#line 27141 "configure"
+#line 27129 "configure"
#include "confdefs.h"
/* Thanks to Mike Rendell for this test. */
#include <sys/types.h>
@@ -27164,15 +27152,15 @@ main ()
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:27167: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27155: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:27170: \$? = $ac_status" >&5
+ echo "$as_me:27158: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:27172: \"$ac_try\"") >&5
+ { (eval echo "$as_me:27160: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:27175: \$? = $ac_status" >&5
+ echo "$as_me:27163: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_getgroups=gid_t
else
@@ -27185,7 +27173,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
if test $ac_cv_type_getgroups = cross; then
cat >conftest.$ac_ext <<_ACEOF
-#line 27188 "configure"
+#line 27176 "configure"
#include "confdefs.h"
#include <unistd.h>
@@ -27200,20 +27188,20 @@ rm -rf conftest*
fi
fi
-echo "$as_me:27203: result: $ac_cv_type_getgroups" >&5
+echo "$as_me:27191: result: $ac_cv_type_getgroups" >&5
echo "${ECHO_T}$ac_cv_type_getgroups" >&6
cat >>confdefs.h <<EOF
#define GETGROUPS_T $ac_cv_type_getgroups
EOF
-echo "$as_me:27210: checking for off_t" >&5
+echo "$as_me:27198: checking for off_t" >&5
echo $ECHO_N "checking for off_t... $ECHO_C" >&6
if test "${ac_cv_type_off_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 27216 "configure"
+#line 27204 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -27228,16 +27216,16 @@ if (sizeof (off_t))
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27231: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27219: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:27234: \$? = $ac_status" >&5
+ echo "$as_me:27222: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:27237: \"$ac_try\"") >&5
+ { (eval echo "$as_me:27225: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:27240: \$? = $ac_status" >&5
+ echo "$as_me:27228: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_off_t=yes
else
@@ -27247,7 +27235,7 @@ ac_cv_type_off_t=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:27250: result: $ac_cv_type_off_t" >&5
+echo "$as_me:27238: result: $ac_cv_type_off_t" >&5
echo "${ECHO_T}$ac_cv_type_off_t" >&6
if test $ac_cv_type_off_t = yes; then
:
@@ -27259,13 +27247,13 @@ EOF
fi
-echo "$as_me:27262: checking for pid_t" >&5
+echo "$as_me:27250: checking for pid_t" >&5
echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
if test "${ac_cv_type_pid_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 27268 "configure"
+#line 27256 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -27280,16 +27268,16 @@ if (sizeof (pid_t))
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27283: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27271: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:27286: \$? = $ac_status" >&5
+ echo "$as_me:27274: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:27289: \"$ac_try\"") >&5
+ { (eval echo "$as_me:27277: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:27292: \$? = $ac_status" >&5
+ echo "$as_me:27280: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_pid_t=yes
else
@@ -27299,7 +27287,7 @@ ac_cv_type_pid_t=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:27302: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:27290: result: $ac_cv_type_pid_t" >&5
echo "${ECHO_T}$ac_cv_type_pid_t" >&6
if test $ac_cv_type_pid_t = yes; then
:
@@ -27311,13 +27299,13 @@ EOF
fi
-echo "$as_me:27314: checking for uid_t in sys/types.h" >&5
+echo "$as_me:27302: checking for uid_t in sys/types.h" >&5
echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
if test "${ac_cv_type_uid_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 27320 "configure"
+#line 27308 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -27331,7 +27319,7 @@ fi
rm -rf conftest*
fi
-echo "$as_me:27334: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:27322: result: $ac_cv_type_uid_t" >&5
echo "${ECHO_T}$ac_cv_type_uid_t" >&6
if test $ac_cv_type_uid_t = no; then
@@ -27345,13 +27333,13 @@ EOF
fi
-echo "$as_me:27348: checking for mode_t" >&5
+echo "$as_me:27336: checking for mode_t" >&5
echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
if test "${ac_cv_type_mode_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 27354 "configure"
+#line 27342 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -27366,16 +27354,16 @@ if (sizeof (mode_t))
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27369: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27357: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:27372: \$? = $ac_status" >&5
+ echo "$as_me:27360: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:27375: \"$ac_try\"") >&5
+ { (eval echo "$as_me:27363: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:27378: \$? = $ac_status" >&5
+ echo "$as_me:27366: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_mode_t=yes
else
@@ -27385,7 +27373,7 @@ ac_cv_type_mode_t=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:27388: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:27376: result: $ac_cv_type_mode_t" >&5
echo "${ECHO_T}$ac_cv_type_mode_t" >&6
if test $ac_cv_type_mode_t = yes; then
:
@@ -27397,13 +27385,13 @@ EOF
fi
- echo "$as_me:27400: checking for ssize_t" >&5
+ echo "$as_me:27388: checking for ssize_t" >&5
echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
if test "${ac_cv_type_ssize_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 27406 "configure"
+#line 27394 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -27418,16 +27406,16 @@ if (sizeof (ssize_t))
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27421: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27409: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:27424: \$? = $ac_status" >&5
+ echo "$as_me:27412: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:27427: \"$ac_try\"") >&5
+ { (eval echo "$as_me:27415: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:27430: \$? = $ac_status" >&5
+ echo "$as_me:27418: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_ssize_t=yes
else
@@ -27437,7 +27425,7 @@ ac_cv_type_ssize_t=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:27440: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:27428: result: $ac_cv_type_ssize_t" >&5
echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
if test $ac_cv_type_ssize_t = yes; then
ac_cv_type_ssize_t=yes
@@ -27453,13 +27441,13 @@ EOF
fi
- echo "$as_me:27456: checking for socklen_t" >&5
+ echo "$as_me:27444: checking for socklen_t" >&5
echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
if test "${ac_cv_type_socklen_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 27462 "configure"
+#line 27450 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -27477,16 +27465,16 @@ if (sizeof (socklen_t))
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27480: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27468: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:27483: \$? = $ac_status" >&5
+ echo "$as_me:27471: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:27486: \"$ac_try\"") >&5
+ { (eval echo "$as_me:27474: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:27489: \$? = $ac_status" >&5
+ echo "$as_me:27477: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_socklen_t=yes
else
@@ -27496,7 +27484,7 @@ ac_cv_type_socklen_t=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:27499: result: $ac_cv_type_socklen_t" >&5
+echo "$as_me:27487: result: $ac_cv_type_socklen_t" >&5
echo "${ECHO_T}$ac_cv_type_socklen_t" >&6
if test $ac_cv_type_socklen_t = yes; then
ac_cv_type_socklen_t=yes
@@ -27512,7 +27500,7 @@ EOF
fi
-echo "$as_me:27515: checking for long long type" >&5
+echo "$as_me:27503: checking for long long type" >&5
echo $ECHO_N "checking for long long type... $ECHO_C" >&6
if test "${cf_cv_type_long_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27543,7 +27531,7 @@ _CFEOF
rm -f conftest*
fi
-echo "$as_me:27546: result: $cf_cv_type_long_long" >&5
+echo "$as_me:27534: result: $cf_cv_type_long_long" >&5
echo "${ECHO_T}$cf_cv_type_long_long" >&6
if test "$cf_cv_type_long_long" = yes ; then
@@ -27554,14 +27542,14 @@ EOF
fi
-echo "$as_me:27557: checking for tm.tm_gmtoff" >&5
+echo "$as_me:27545: checking for tm.tm_gmtoff" >&5
echo $ECHO_N "checking for tm.tm_gmtoff... $ECHO_C" >&6
if test "${cf_cv_tm_gmtoff+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 27564 "configure"
+#line 27552 "configure"
#include "confdefs.h"
#ifdef TIME_WITH_SYS_TIME
@@ -27586,16 +27574,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27589: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27577: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:27592: \$? = $ac_status" >&5
+ echo "$as_me:27580: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:27595: \"$ac_try\"") >&5
+ { (eval echo "$as_me:27583: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:27598: \$? = $ac_status" >&5
+ echo "$as_me:27586: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_tm_gmtoff=yes
else
@@ -27606,20 +27594,20 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:27609: result: $cf_cv_tm_gmtoff" >&5
+echo "$as_me:27597: result: $cf_cv_tm_gmtoff" >&5
echo "${ECHO_T}$cf_cv_tm_gmtoff" >&6
test $cf_cv_tm_gmtoff = no &&
cat >>confdefs.h <<\EOF
#define DONT_HAVE_TM_GMTOFF 1
EOF
-echo "$as_me:27616: checking for int" >&5
+echo "$as_me:27604: checking for int" >&5
echo $ECHO_N "checking for int... $ECHO_C" >&6
if test "${ac_cv_type_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 27622 "configure"
+#line 27610 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -27634,16 +27622,16 @@ if (sizeof (int))
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27637: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27625: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:27640: \$? = $ac_status" >&5
+ echo "$as_me:27628: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:27643: \"$ac_try\"") >&5
+ { (eval echo "$as_me:27631: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:27646: \$? = $ac_status" >&5
+ echo "$as_me:27634: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_int=yes
else
@@ -27653,10 +27641,10 @@ ac_cv_type_int=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:27656: result: $ac_cv_type_int" >&5
+echo "$as_me:27644: result: $ac_cv_type_int" >&5
echo "${ECHO_T}$ac_cv_type_int" >&6
-echo "$as_me:27659: checking size of int" >&5
+echo "$as_me:27647: checking size of int" >&5
echo $ECHO_N "checking size of int... $ECHO_C" >&6
if test "${ac_cv_sizeof_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27665,7 +27653,7 @@ else
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-#line 27668 "configure"
+#line 27656 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -27677,21 +27665,21 @@ int _array_ [1 - 2 * !((sizeof (int)) >= 0)]
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27680: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27668: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:27683: \$? = $ac_status" >&5
+ echo "$as_me:27671: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:27686: \"$ac_try\"") >&5
+ { (eval echo "$as_me:27674: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:27689: \$? = $ac_status" >&5
+ echo "$as_me:27677: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_lo=0 ac_mid=0
while :; do
cat >conftest.$ac_ext <<_ACEOF
-#line 27694 "configure"
+#line 27682 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -27703,16 +27691,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27706: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27694: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:27709: \$? = $ac_status" >&5
+ echo "$as_me:27697: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:27712: \"$ac_try\"") >&5
+ { (eval echo "$as_me:27700: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:27715: \$? = $ac_status" >&5
+ echo "$as_me:27703: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_hi=$ac_mid; break
else
@@ -27728,7 +27716,7 @@ cat conftest.$ac_ext >&5
ac_hi=-1 ac_mid=-1
while :; do
cat >conftest.$ac_ext <<_ACEOF
-#line 27731 "configure"
+#line 27719 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -27740,16 +27728,16 @@ int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)]
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27743: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27731: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:27746: \$? = $ac_status" >&5
+ echo "$as_me:27734: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:27749: \"$ac_try\"") >&5
+ { (eval echo "$as_me:27737: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:27752: \$? = $ac_status" >&5
+ echo "$as_me:27740: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_lo=$ac_mid; break
else
@@ -27765,7 +27753,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
cat >conftest.$ac_ext <<_ACEOF
-#line 27768 "configure"
+#line 27756 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -27777,16 +27765,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27780: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27768: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:27783: \$? = $ac_status" >&5
+ echo "$as_me:27771: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:27786: \"$ac_try\"") >&5
+ { (eval echo "$as_me:27774: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:27789: \$? = $ac_status" >&5
+ echo "$as_me:27777: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_hi=$ac_mid
else
@@ -27799,12 +27787,12 @@ done
ac_cv_sizeof_int=$ac_lo
else
if test "$cross_compiling" = yes; then
- { { echo "$as_me:27802: error: cannot run test program while cross compiling" >&5
+ { { echo "$as_me:27790: error: cannot run test program while cross compiling" >&5
echo "$as_me: error: cannot run test program while cross compiling" >&2;}
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-#line 27807 "configure"
+#line 27795 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -27820,15 +27808,15 @@ fclose (f);
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:27823: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27811: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:27826: \$? = $ac_status" >&5
+ echo "$as_me:27814: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:27828: \"$ac_try\"") >&5
+ { (eval echo "$as_me:27816: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:27831: \$? = $ac_status" >&5
+ echo "$as_me:27819: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sizeof_int=`cat conftest.val`
else
@@ -27844,31 +27832,31 @@ else
ac_cv_sizeof_int=0
fi
fi
-echo "$as_me:27847: result: $ac_cv_sizeof_int" >&5
+echo "$as_me:27835: result: $ac_cv_sizeof_int" >&5
echo "${ECHO_T}$ac_cv_sizeof_int" >&6
cat >>confdefs.h <<EOF
#define SIZEOF_INT $ac_cv_sizeof_int
EOF
-if test "${ac_cv_type_int:+set}" = set; then
- if test "${ac_cv_sizeof_int:+set}" != set; then
- { echo "$as_me:27855: WARNING: using 4 for sizeof int" >&5
+if test "${ac_cv_type_int+set}" = set; then
+ if test "${ac_cv_sizeof_int+set}" != set; then
+ { echo "$as_me:27843: WARNING: using 4 for sizeof int" >&5
echo "$as_me: WARNING: using 4 for sizeof int" >&2;}
ac_cv_sizeof_int=4
elif test "x${ac_cv_sizeof_int}" = x0; then
- { echo "$as_me:27859: WARNING: sizeof int not found, using 4" >&5
+ { echo "$as_me:27847: WARNING: sizeof int not found, using 4" >&5
echo "$as_me: WARNING: sizeof int not found, using 4" >&2;}
ac_cv_sizeof_int=4
fi
fi
-echo "$as_me:27865: checking for long" >&5
+echo "$as_me:27853: checking for long" >&5
echo $ECHO_N "checking for long... $ECHO_C" >&6
if test "${ac_cv_type_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 27871 "configure"
+#line 27859 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -27883,16 +27871,16 @@ if (sizeof (long))
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27886: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27874: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:27889: \$? = $ac_status" >&5
+ echo "$as_me:27877: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:27892: \"$ac_try\"") >&5
+ { (eval echo "$as_me:27880: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:27895: \$? = $ac_status" >&5
+ echo "$as_me:27883: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_long=yes
else
@@ -27902,10 +27890,10 @@ ac_cv_type_long=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:27905: result: $ac_cv_type_long" >&5
+echo "$as_me:27893: result: $ac_cv_type_long" >&5
echo "${ECHO_T}$ac_cv_type_long" >&6
-echo "$as_me:27908: checking size of long" >&5
+echo "$as_me:27896: checking size of long" >&5
echo $ECHO_N "checking size of long... $ECHO_C" >&6
if test "${ac_cv_sizeof_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27914,7 +27902,7 @@ else
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-#line 27917 "configure"
+#line 27905 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -27926,21 +27914,21 @@ int _array_ [1 - 2 * !((sizeof (long)) >= 0)]
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27929: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27917: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:27932: \$? = $ac_status" >&5
+ echo "$as_me:27920: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:27935: \"$ac_try\"") >&5
+ { (eval echo "$as_me:27923: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:27938: \$? = $ac_status" >&5
+ echo "$as_me:27926: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_lo=0 ac_mid=0
while :; do
cat >conftest.$ac_ext <<_ACEOF
-#line 27943 "configure"
+#line 27931 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -27952,16 +27940,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27955: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27943: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:27958: \$? = $ac_status" >&5
+ echo "$as_me:27946: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:27961: \"$ac_try\"") >&5
+ { (eval echo "$as_me:27949: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:27964: \$? = $ac_status" >&5
+ echo "$as_me:27952: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_hi=$ac_mid; break
else
@@ -27977,7 +27965,7 @@ cat conftest.$ac_ext >&5
ac_hi=-1 ac_mid=-1
while :; do
cat >conftest.$ac_ext <<_ACEOF
-#line 27980 "configure"
+#line 27968 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -27989,16 +27977,16 @@ int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)]
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27992: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27980: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:27995: \$? = $ac_status" >&5
+ echo "$as_me:27983: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:27998: \"$ac_try\"") >&5
+ { (eval echo "$as_me:27986: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:28001: \$? = $ac_status" >&5
+ echo "$as_me:27989: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_lo=$ac_mid; break
else
@@ -28014,7 +28002,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
cat >conftest.$ac_ext <<_ACEOF
-#line 28017 "configure"
+#line 28005 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -28026,16 +28014,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28029: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28017: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:28032: \$? = $ac_status" >&5
+ echo "$as_me:28020: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:28035: \"$ac_try\"") >&5
+ { (eval echo "$as_me:28023: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:28038: \$? = $ac_status" >&5
+ echo "$as_me:28026: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_hi=$ac_mid
else
@@ -28048,12 +28036,12 @@ done
ac_cv_sizeof_long=$ac_lo
else
if test "$cross_compiling" = yes; then
- { { echo "$as_me:28051: error: cannot run test program while cross compiling" >&5
+ { { echo "$as_me:28039: error: cannot run test program while cross compiling" >&5
echo "$as_me: error: cannot run test program while cross compiling" >&2;}
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-#line 28056 "configure"
+#line 28044 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -28069,15 +28057,15 @@ fclose (f);
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28072: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28060: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:28075: \$? = $ac_status" >&5
+ echo "$as_me:28063: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:28077: \"$ac_try\"") >&5
+ { (eval echo "$as_me:28065: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:28080: \$? = $ac_status" >&5
+ echo "$as_me:28068: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sizeof_long=`cat conftest.val`
else
@@ -28093,31 +28081,31 @@ else
ac_cv_sizeof_long=0
fi
fi
-echo "$as_me:28096: result: $ac_cv_sizeof_long" >&5
+echo "$as_me:28084: result: $ac_cv_sizeof_long" >&5
echo "${ECHO_T}$ac_cv_sizeof_long" >&6
cat >>confdefs.h <<EOF
#define SIZEOF_LONG $ac_cv_sizeof_long
EOF
-if test "${ac_cv_type_long:+set}" = set; then
- if test "${ac_cv_sizeof_long:+set}" != set; then
- { echo "$as_me:28104: WARNING: using 4 for sizeof long" >&5
+if test "${ac_cv_type_long+set}" = set; then
+ if test "${ac_cv_sizeof_long+set}" != set; then
+ { echo "$as_me:28092: WARNING: using 4 for sizeof long" >&5
echo "$as_me: WARNING: using 4 for sizeof long" >&2;}
ac_cv_sizeof_long=4
elif test "x${ac_cv_sizeof_long}" = x0; then
- { echo "$as_me:28108: WARNING: sizeof long not found, using 4" >&5
+ { echo "$as_me:28096: WARNING: sizeof long not found, using 4" >&5
echo "$as_me: WARNING: sizeof long not found, using 4" >&2;}
ac_cv_sizeof_long=4
fi
fi
-echo "$as_me:28114: checking for off_t" >&5
+echo "$as_me:28102: checking for off_t" >&5
echo $ECHO_N "checking for off_t... $ECHO_C" >&6
if test "${ac_cv_type_off_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 28120 "configure"
+#line 28108 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -28132,16 +28120,16 @@ if (sizeof (off_t))
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28135: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28123: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:28138: \$? = $ac_status" >&5
+ echo "$as_me:28126: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:28141: \"$ac_try\"") >&5
+ { (eval echo "$as_me:28129: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:28144: \$? = $ac_status" >&5
+ echo "$as_me:28132: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_off_t=yes
else
@@ -28151,10 +28139,10 @@ ac_cv_type_off_t=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:28154: result: $ac_cv_type_off_t" >&5
+echo "$as_me:28142: result: $ac_cv_type_off_t" >&5
echo "${ECHO_T}$ac_cv_type_off_t" >&6
-echo "$as_me:28157: checking size of off_t" >&5
+echo "$as_me:28145: checking size of off_t" >&5
echo $ECHO_N "checking size of off_t... $ECHO_C" >&6
if test "${ac_cv_sizeof_off_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28163,7 +28151,7 @@ else
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-#line 28166 "configure"
+#line 28154 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -28175,21 +28163,21 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= 0)]
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28178: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28166: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:28181: \$? = $ac_status" >&5
+ echo "$as_me:28169: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:28184: \"$ac_try\"") >&5
+ { (eval echo "$as_me:28172: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:28187: \$? = $ac_status" >&5
+ echo "$as_me:28175: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_lo=0 ac_mid=0
while :; do
cat >conftest.$ac_ext <<_ACEOF
-#line 28192 "configure"
+#line 28180 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -28201,16 +28189,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28204: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28192: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:28207: \$? = $ac_status" >&5
+ echo "$as_me:28195: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:28210: \"$ac_try\"") >&5
+ { (eval echo "$as_me:28198: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:28213: \$? = $ac_status" >&5
+ echo "$as_me:28201: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_hi=$ac_mid; break
else
@@ -28226,7 +28214,7 @@ cat conftest.$ac_ext >&5
ac_hi=-1 ac_mid=-1
while :; do
cat >conftest.$ac_ext <<_ACEOF
-#line 28229 "configure"
+#line 28217 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -28238,16 +28226,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= $ac_mid)]
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28241: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28229: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:28244: \$? = $ac_status" >&5
+ echo "$as_me:28232: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:28247: \"$ac_try\"") >&5
+ { (eval echo "$as_me:28235: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:28250: \$? = $ac_status" >&5
+ echo "$as_me:28238: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_lo=$ac_mid; break
else
@@ -28263,7 +28251,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
cat >conftest.$ac_ext <<_ACEOF
-#line 28266 "configure"
+#line 28254 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -28275,16 +28263,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28278: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28266: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:28281: \$? = $ac_status" >&5
+ echo "$as_me:28269: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:28284: \"$ac_try\"") >&5
+ { (eval echo "$as_me:28272: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:28287: \$? = $ac_status" >&5
+ echo "$as_me:28275: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_hi=$ac_mid
else
@@ -28297,12 +28285,12 @@ done
ac_cv_sizeof_off_t=$ac_lo
else
if test "$cross_compiling" = yes; then
- { { echo "$as_me:28300: error: cannot run test program while cross compiling" >&5
+ { { echo "$as_me:28288: error: cannot run test program while cross compiling" >&5
echo "$as_me: error: cannot run test program while cross compiling" >&2;}
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-#line 28305 "configure"
+#line 28293 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -28318,15 +28306,15 @@ fclose (f);
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28321: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28309: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:28324: \$? = $ac_status" >&5
+ echo "$as_me:28312: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:28326: \"$ac_try\"") >&5
+ { (eval echo "$as_me:28314: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:28329: \$? = $ac_status" >&5
+ echo "$as_me:28317: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sizeof_off_t=`cat conftest.val`
else
@@ -28342,31 +28330,31 @@ else
ac_cv_sizeof_off_t=0
fi
fi
-echo "$as_me:28345: result: $ac_cv_sizeof_off_t" >&5
+echo "$as_me:28333: result: $ac_cv_sizeof_off_t" >&5
echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6
cat >>confdefs.h <<EOF
#define SIZEOF_OFF_T $ac_cv_sizeof_off_t
EOF
-if test "${ac_cv_type_off_t:+set}" = set; then
- if test "${ac_cv_sizeof_off_t:+set}" != set; then
- { echo "$as_me:28353: WARNING: using 4 for sizeof off_t" >&5
+if test "${ac_cv_type_off_t+set}" = set; then
+ if test "${ac_cv_sizeof_off_t+set}" != set; then
+ { echo "$as_me:28341: WARNING: using 4 for sizeof off_t" >&5
echo "$as_me: WARNING: using 4 for sizeof off_t" >&2;}
ac_cv_sizeof_off_t=4
elif test "x${ac_cv_sizeof_off_t}" = x0; then
- { echo "$as_me:28357: WARNING: sizeof off_t not found, using 4" >&5
+ { echo "$as_me:28345: WARNING: sizeof off_t not found, using 4" >&5
echo "$as_me: WARNING: sizeof off_t not found, using 4" >&2;}
ac_cv_sizeof_off_t=4
fi
fi
-echo "$as_me:28363: checking for time_t" >&5
+echo "$as_me:28351: checking for time_t" >&5
echo $ECHO_N "checking for time_t... $ECHO_C" >&6
if test "${ac_cv_type_time_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 28369 "configure"
+#line 28357 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -28381,16 +28369,16 @@ if (sizeof (time_t))
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28384: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28372: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:28387: \$? = $ac_status" >&5
+ echo "$as_me:28375: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:28390: \"$ac_try\"") >&5
+ { (eval echo "$as_me:28378: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:28393: \$? = $ac_status" >&5
+ echo "$as_me:28381: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_time_t=yes
else
@@ -28400,10 +28388,10 @@ ac_cv_type_time_t=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:28403: result: $ac_cv_type_time_t" >&5
+echo "$as_me:28391: result: $ac_cv_type_time_t" >&5
echo "${ECHO_T}$ac_cv_type_time_t" >&6
-echo "$as_me:28406: checking size of time_t" >&5
+echo "$as_me:28394: checking size of time_t" >&5
echo $ECHO_N "checking size of time_t... $ECHO_C" >&6
if test "${ac_cv_sizeof_time_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28412,7 +28400,7 @@ else
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-#line 28415 "configure"
+#line 28403 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -28424,21 +28412,21 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= 0)]
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28427: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28415: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:28430: \$? = $ac_status" >&5
+ echo "$as_me:28418: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:28433: \"$ac_try\"") >&5
+ { (eval echo "$as_me:28421: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:28436: \$? = $ac_status" >&5
+ echo "$as_me:28424: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_lo=0 ac_mid=0
while :; do
cat >conftest.$ac_ext <<_ACEOF
-#line 28441 "configure"
+#line 28429 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -28450,16 +28438,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28453: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28441: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:28456: \$? = $ac_status" >&5
+ echo "$as_me:28444: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:28459: \"$ac_try\"") >&5
+ { (eval echo "$as_me:28447: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:28462: \$? = $ac_status" >&5
+ echo "$as_me:28450: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_hi=$ac_mid; break
else
@@ -28475,7 +28463,7 @@ cat conftest.$ac_ext >&5
ac_hi=-1 ac_mid=-1
while :; do
cat >conftest.$ac_ext <<_ACEOF
-#line 28478 "configure"
+#line 28466 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -28487,16 +28475,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= $ac_mid)]
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28490: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28478: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:28493: \$? = $ac_status" >&5
+ echo "$as_me:28481: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:28496: \"$ac_try\"") >&5
+ { (eval echo "$as_me:28484: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:28499: \$? = $ac_status" >&5
+ echo "$as_me:28487: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_lo=$ac_mid; break
else
@@ -28512,7 +28500,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
cat >conftest.$ac_ext <<_ACEOF
-#line 28515 "configure"
+#line 28503 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -28524,16 +28512,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28527: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28515: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:28530: \$? = $ac_status" >&5
+ echo "$as_me:28518: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:28533: \"$ac_try\"") >&5
+ { (eval echo "$as_me:28521: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:28536: \$? = $ac_status" >&5
+ echo "$as_me:28524: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_hi=$ac_mid
else
@@ -28546,12 +28534,12 @@ done
ac_cv_sizeof_time_t=$ac_lo
else
if test "$cross_compiling" = yes; then
- { { echo "$as_me:28549: error: cannot run test program while cross compiling" >&5
+ { { echo "$as_me:28537: error: cannot run test program while cross compiling" >&5
echo "$as_me: error: cannot run test program while cross compiling" >&2;}
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-#line 28554 "configure"
+#line 28542 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -28567,15 +28555,15 @@ fclose (f);
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28570: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28558: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:28573: \$? = $ac_status" >&5
+ echo "$as_me:28561: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:28575: \"$ac_try\"") >&5
+ { (eval echo "$as_me:28563: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:28578: \$? = $ac_status" >&5
+ echo "$as_me:28566: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sizeof_time_t=`cat conftest.val`
else
@@ -28591,31 +28579,31 @@ else
ac_cv_sizeof_time_t=0
fi
fi
-echo "$as_me:28594: result: $ac_cv_sizeof_time_t" >&5
+echo "$as_me:28582: result: $ac_cv_sizeof_time_t" >&5
echo "${ECHO_T}$ac_cv_sizeof_time_t" >&6
cat >>confdefs.h <<EOF
#define SIZEOF_TIME_T $ac_cv_sizeof_time_t
EOF
-if test "${ac_cv_type_time_t:+set}" = set; then
- if test "${ac_cv_sizeof_time_t:+set}" != set; then
- { echo "$as_me:28602: WARNING: using 4 for sizeof time_t" >&5
+if test "${ac_cv_type_time_t+set}" = set; then
+ if test "${ac_cv_sizeof_time_t+set}" != set; then
+ { echo "$as_me:28590: WARNING: using 4 for sizeof time_t" >&5
echo "$as_me: WARNING: using 4 for sizeof time_t" >&2;}
ac_cv_sizeof_time_t=4
elif test "x${ac_cv_sizeof_time_t}" = x0; then
- { echo "$as_me:28606: WARNING: sizeof time_t not found, using 4" >&5
+ { echo "$as_me:28594: WARNING: sizeof time_t not found, using 4" >&5
echo "$as_me: WARNING: sizeof time_t not found, using 4" >&2;}
ac_cv_sizeof_time_t=4
fi
fi
-echo "$as_me:28612: checking for intptr_t" >&5
+echo "$as_me:28600: checking for intptr_t" >&5
echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6
if test "${ac_cv_type_intptr_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 28618 "configure"
+#line 28606 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -28630,16 +28618,16 @@ if (sizeof (intptr_t))
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28633: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28621: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:28636: \$? = $ac_status" >&5
+ echo "$as_me:28624: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:28639: \"$ac_try\"") >&5
+ { (eval echo "$as_me:28627: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:28642: \$? = $ac_status" >&5
+ echo "$as_me:28630: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_intptr_t=yes
else
@@ -28649,7 +28637,7 @@ ac_cv_type_intptr_t=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:28652: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:28640: result: $ac_cv_type_intptr_t" >&5
echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
if test $ac_cv_type_intptr_t = yes; then
:
@@ -28663,13 +28651,13 @@ fi
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless!
-echo "$as_me:28666: checking for working alloca.h" >&5
+echo "$as_me:28654: checking for working alloca.h" >&5
echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
if test "${ac_cv_working_alloca_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 28672 "configure"
+#line 28660 "configure"
#include "confdefs.h"
#include <alloca.h>
int
@@ -28681,16 +28669,16 @@ char *p = (char *) alloca (2 * sizeof (int));
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28684: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28672: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:28687: \$? = $ac_status" >&5
+ echo "$as_me:28675: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:28690: \"$ac_try\"") >&5
+ { (eval echo "$as_me:28678: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:28693: \$? = $ac_status" >&5
+ echo "$as_me:28681: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_working_alloca_h=yes
else
@@ -28700,7 +28688,7 @@ ac_cv_working_alloca_h=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:28703: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:28691: result: $ac_cv_working_alloca_h" >&5
echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
if test $ac_cv_working_alloca_h = yes; then
@@ -28710,13 +28698,13 @@ EOF
fi
-echo "$as_me:28713: checking for alloca" >&5
+echo "$as_me:28701: checking for alloca" >&5
echo $ECHO_N "checking for alloca... $ECHO_C" >&6
if test "${ac_cv_func_alloca_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 28719 "configure"
+#line 28707 "configure"
#include "confdefs.h"
#ifdef __GNUC__
# define alloca __builtin_alloca
@@ -28748,16 +28736,16 @@ char *p = (char *) alloca (1);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28751: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28739: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:28754: \$? = $ac_status" >&5
+ echo "$as_me:28742: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:28757: \"$ac_try\"") >&5
+ { (eval echo "$as_me:28745: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:28760: \$? = $ac_status" >&5
+ echo "$as_me:28748: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_alloca_works=yes
else
@@ -28767,7 +28755,7 @@ ac_cv_func_alloca_works=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:28770: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:28758: result: $ac_cv_func_alloca_works" >&5
echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
if test $ac_cv_func_alloca_works = yes; then
@@ -28788,13 +28776,13 @@ cat >>confdefs.h <<\EOF
#define C_ALLOCA 1
EOF
-echo "$as_me:28791: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:28779: checking whether \`alloca.c' needs Cray hooks" >&5
echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
if test "${ac_cv_os_cray+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 28797 "configure"
+#line 28785 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
@@ -28812,18 +28800,18 @@ fi
rm -rf conftest*
fi
-echo "$as_me:28815: result: $ac_cv_os_cray" >&5
+echo "$as_me:28803: result: $ac_cv_os_cray" >&5
echo "${ECHO_T}$ac_cv_os_cray" >&6
if test $ac_cv_os_cray = yes; then
for ac_func in _getb67 GETB67 getb67; do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:28820: checking for $ac_func" >&5
+echo "$as_me:28808: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 28826 "configure"
+#line 28814 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -28854,16 +28842,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28857: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28845: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:28860: \$? = $ac_status" >&5
+ echo "$as_me:28848: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:28863: \"$ac_try\"") >&5
+ { (eval echo "$as_me:28851: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:28866: \$? = $ac_status" >&5
+ echo "$as_me:28854: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -28873,7 +28861,7 @@ eval "$as_ac_var=no"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:28876: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:28864: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
@@ -28887,7 +28875,7 @@ fi
done
fi
-echo "$as_me:28890: checking stack direction for C alloca" >&5
+echo "$as_me:28878: checking stack direction for C alloca" >&5
echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
if test "${ac_cv_c_stack_direction+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -28896,7 +28884,7 @@ else
ac_cv_c_stack_direction=0
else
cat >conftest.$ac_ext <<_ACEOF
-#line 28899 "configure"
+#line 28887 "configure"
#include "confdefs.h"
int
find_stack_direction ()
@@ -28919,15 +28907,15 @@ main ()
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28922: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28910: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:28925: \$? = $ac_status" >&5
+ echo "$as_me:28913: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:28927: \"$ac_try\"") >&5
+ { (eval echo "$as_me:28915: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:28930: \$? = $ac_status" >&5
+ echo "$as_me:28918: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_c_stack_direction=1
else
@@ -28939,7 +28927,7 @@ fi
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
-echo "$as_me:28942: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:28930: result: $ac_cv_c_stack_direction" >&5
echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
cat >>confdefs.h <<EOF
@@ -28951,23 +28939,23 @@ fi
for ac_header in unistd.h vfork.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:28954: checking for $ac_header" >&5
+echo "$as_me:28942: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 28960 "configure"
+#line 28948 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:28964: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:28952: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:28970: \$? = $ac_status" >&5
+ echo "$as_me:28958: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -28986,7 +28974,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:28989: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:28977: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -28999,13 +28987,13 @@ done
for ac_func in fork vfork
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:29002: checking for $ac_func" >&5
+echo "$as_me:28990: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 29008 "configure"
+#line 28996 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -29036,16 +29024,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29039: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29027: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:29042: \$? = $ac_status" >&5
+ echo "$as_me:29030: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:29045: \"$ac_try\"") >&5
+ { (eval echo "$as_me:29033: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:29048: \$? = $ac_status" >&5
+ echo "$as_me:29036: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -29055,7 +29043,7 @@ eval "$as_ac_var=no"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:29058: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:29046: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -29067,7 +29055,7 @@ done
ac_cv_func_fork_works=$ac_cv_func_fork
if test "x$ac_cv_func_fork" = xyes; then
- echo "$as_me:29070: checking for working fork" >&5
+ echo "$as_me:29058: checking for working fork" >&5
echo $ECHO_N "checking for working fork... $ECHO_C" >&6
if test "${ac_cv_func_fork_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29090,15 +29078,15 @@ else
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:29093: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29081: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:29096: \$? = $ac_status" >&5
+ echo "$as_me:29084: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:29098: \"$ac_try\"") >&5
+ { (eval echo "$as_me:29086: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:29101: \$? = $ac_status" >&5
+ echo "$as_me:29089: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_fork_works=yes
else
@@ -29110,7 +29098,7 @@ fi
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
-echo "$as_me:29113: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:29101: result: $ac_cv_func_fork_works" >&5
echo "${ECHO_T}$ac_cv_func_fork_works" >&6
fi
@@ -29124,12 +29112,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
ac_cv_func_fork_works=yes
;;
esac
- { echo "$as_me:29127: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+ { echo "$as_me:29115: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
fi
ac_cv_func_vfork_works=$ac_cv_func_vfork
if test "x$ac_cv_func_vfork" = xyes; then
- echo "$as_me:29132: checking for working vfork" >&5
+ echo "$as_me:29120: checking for working vfork" >&5
echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
if test "${ac_cv_func_vfork_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29138,7 +29126,7 @@ else
ac_cv_func_vfork_works=cross
else
cat >conftest.$ac_ext <<_ACEOF
-#line 29141 "configure"
+#line 29129 "configure"
#include "confdefs.h"
/* Thanks to Paul Eggert for this test. */
#include <stdio.h>
@@ -29235,15 +29223,15 @@ main ()
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:29238: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29226: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:29241: \$? = $ac_status" >&5
+ echo "$as_me:29229: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:29243: \"$ac_try\"") >&5
+ { (eval echo "$as_me:29231: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:29246: \$? = $ac_status" >&5
+ echo "$as_me:29234: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_vfork_works=yes
else
@@ -29255,13 +29243,13 @@ fi
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
-echo "$as_me:29258: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:29246: result: $ac_cv_func_vfork_works" >&5
echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
fi;
if test "x$ac_cv_func_fork_works" = xcross; then
ac_cv_func_vfork_works=ac_cv_func_vfork
- { echo "$as_me:29264: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+ { echo "$as_me:29252: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
fi
@@ -29286,14 +29274,14 @@ EOF
fi
-echo "$as_me:29289: checking if we should use fcntl or ioctl" >&5
+echo "$as_me:29277: checking if we should use fcntl or ioctl" >&5
echo $ECHO_N "checking if we should use fcntl or ioctl... $ECHO_C" >&6
if test "${cf_cv_fionbio+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 29296 "configure"
+#line 29284 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -29310,16 +29298,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29313: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29301: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:29316: \$? = $ac_status" >&5
+ echo "$as_me:29304: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:29319: \"$ac_try\"") >&5
+ { (eval echo "$as_me:29307: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:29322: \$? = $ac_status" >&5
+ echo "$as_me:29310: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_fionbio=ioctl
else
@@ -29327,7 +29315,7 @@ else
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 29330 "configure"
+#line 29318 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -29349,16 +29337,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29352: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29340: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:29355: \$? = $ac_status" >&5
+ echo "$as_me:29343: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:29358: \"$ac_try\"") >&5
+ { (eval echo "$as_me:29346: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:29361: \$? = $ac_status" >&5
+ echo "$as_me:29349: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_fionbio=fcntl
else
@@ -29371,21 +29359,21 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:29374: result: $cf_cv_fionbio" >&5
+echo "$as_me:29362: result: $cf_cv_fionbio" >&5
echo "${ECHO_T}$cf_cv_fionbio" >&6
test "$cf_cv_fionbio" = "fcntl" &&
cat >>confdefs.h <<\EOF
#define USE_FCNTL 1
EOF
-echo "$as_me:29381: checking for broken/missing definition of remove" >&5
+echo "$as_me:29369: checking for broken/missing definition of remove" >&5
echo $ECHO_N "checking for broken/missing definition of remove... $ECHO_C" >&6
if test "${cf_cv_baddef_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 29388 "configure"
+#line 29376 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -29397,23 +29385,23 @@ remove("dummy")
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29400: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29388: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:29403: \$? = $ac_status" >&5
+ echo "$as_me:29391: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:29406: \"$ac_try\"") >&5
+ { (eval echo "$as_me:29394: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:29409: \$? = $ac_status" >&5
+ echo "$as_me:29397: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_baddef_remove=no
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 29416 "configure"
+#line 29404 "configure"
#include "confdefs.h"
#include <stdio.h>
int __unlink(name) { return unlink(name); }
@@ -29426,16 +29414,16 @@ remove("dummy")
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29429: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29417: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:29432: \$? = $ac_status" >&5
+ echo "$as_me:29420: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:29435: \"$ac_try\"") >&5
+ { (eval echo "$as_me:29423: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:29438: \$? = $ac_status" >&5
+ echo "$as_me:29426: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_baddef_remove=yes
else
@@ -29450,21 +29438,21 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:29453: result: $cf_cv_baddef_remove" >&5
+echo "$as_me:29441: result: $cf_cv_baddef_remove" >&5
echo "${ECHO_T}$cf_cv_baddef_remove" >&6
test "$cf_cv_baddef_remove" != no &&
cat >>confdefs.h <<\EOF
#define NEED_REMOVE 1
EOF
-echo "$as_me:29460: checking for lstat" >&5
+echo "$as_me:29448: checking for lstat" >&5
echo $ECHO_N "checking for lstat... $ECHO_C" >&6
if test "${ac_cv_func_lstat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 29467 "configure"
+#line 29455 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -29478,16 +29466,16 @@ lstat(".", (struct stat *)0)
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29481: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29469: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:29484: \$? = $ac_status" >&5
+ echo "$as_me:29472: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:29487: \"$ac_try\"") >&5
+ { (eval echo "$as_me:29475: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:29490: \$? = $ac_status" >&5
+ echo "$as_me:29478: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_lstat=yes
else
@@ -29499,7 +29487,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:29502: result: $ac_cv_func_lstat " >&5
+echo "$as_me:29490: result: $ac_cv_func_lstat " >&5
echo "${ECHO_T}$ac_cv_func_lstat " >&6
if test $ac_cv_func_lstat = yes; then
@@ -29534,13 +29522,13 @@ for ac_func in \
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:29537: checking for $ac_func" >&5
+echo "$as_me:29525: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 29543 "configure"
+#line 29531 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -29571,16 +29559,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29574: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29562: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:29577: \$? = $ac_status" >&5
+ echo "$as_me:29565: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:29580: \"$ac_try\"") >&5
+ { (eval echo "$as_me:29568: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:29583: \$? = $ac_status" >&5
+ echo "$as_me:29571: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -29590,7 +29578,7 @@ eval "$as_ac_var=no"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:29593: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:29581: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -29606,13 +29594,13 @@ for ac_func in \
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:29609: checking for $ac_func" >&5
+echo "$as_me:29597: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 29615 "configure"
+#line 29603 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -29643,16 +29631,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29646: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29634: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:29649: \$? = $ac_status" >&5
+ echo "$as_me:29637: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:29652: \"$ac_try\"") >&5
+ { (eval echo "$as_me:29640: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:29655: \$? = $ac_status" >&5
+ echo "$as_me:29643: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -29662,7 +29650,7 @@ eval "$as_ac_var=no"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:29665: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:29653: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -29674,7 +29662,7 @@ else
fi
done
-echo "$as_me:29677: checking for random-integer functions" >&5
+echo "$as_me:29665: checking for random-integer functions" >&5
echo $ECHO_N "checking for random-integer functions... $ECHO_C" >&6
if test "${cf_cv_srand_func+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29694,7 +29682,7 @@ do
esac
cat >conftest.$ac_ext <<_ACEOF
-#line 29697 "configure"
+#line 29685 "configure"
#include "confdefs.h"
#ifdef HAVE_STDLIB_H
@@ -29713,16 +29701,16 @@ long seed = 1; $cf_srand_func(seed); seed = $cf_rand_func()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29716: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29704: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:29719: \$? = $ac_status" >&5
+ echo "$as_me:29707: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:29722: \"$ac_try\"") >&5
+ { (eval echo "$as_me:29710: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:29725: \$? = $ac_status" >&5
+ echo "$as_me:29713: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_srand_func=$cf_func
break
@@ -29734,10 +29722,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
done
fi
-echo "$as_me:29737: result: $cf_cv_srand_func" >&5
+echo "$as_me:29725: result: $cf_cv_srand_func" >&5
echo "${ECHO_T}$cf_cv_srand_func" >&6
if test "$cf_cv_srand_func" != unknown ; then
- echo "$as_me:29740: checking for range of random-integers" >&5
+ echo "$as_me:29728: checking for range of random-integers" >&5
echo $ECHO_N "checking for range of random-integers... $ECHO_C" >&6
if test "${cf_cv_rand_max+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -29758,7 +29746,7 @@ else
;;
esac
cat >conftest.$ac_ext <<_ACEOF
-#line 29761 "configure"
+#line 29749 "configure"
#include "confdefs.h"
#ifdef HAVE_STDLIB_H
@@ -29777,16 +29765,16 @@ long x = $cf_cv_rand_max
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29780: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29768: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:29783: \$? = $ac_status" >&5
+ echo "$as_me:29771: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:29786: \"$ac_try\"") >&5
+ { (eval echo "$as_me:29774: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:29789: \$? = $ac_status" >&5
+ echo "$as_me:29777: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -29797,15 +29785,15 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:29800: result: $cf_cv_rand_max" >&5
+echo "$as_me:29788: result: $cf_cv_rand_max" >&5
echo "${ECHO_T}$cf_cv_rand_max" >&6
case $cf_cv_srand_func in
(*/arc4random)
- echo "$as_me:29805: checking if <bsd/stdlib.h> should be included" >&5
+ echo "$as_me:29793: checking if <bsd/stdlib.h> should be included" >&5
echo $ECHO_N "checking if <bsd/stdlib.h> should be included... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 29808 "configure"
+#line 29796 "configure"
#include "confdefs.h"
#include <bsd/stdlib.h>
int
@@ -29818,23 +29806,23 @@ void *arc4random(int);
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29821: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29809: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:29824: \$? = $ac_status" >&5
+ echo "$as_me:29812: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:29827: \"$ac_try\"") >&5
+ { (eval echo "$as_me:29815: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:29830: \$? = $ac_status" >&5
+ echo "$as_me:29818: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_bsd_stdlib_h=no
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 29837 "configure"
+#line 29825 "configure"
#include "confdefs.h"
#include <bsd/stdlib.h>
int
@@ -29846,16 +29834,16 @@ unsigned x = arc4random()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29849: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29837: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:29852: \$? = $ac_status" >&5
+ echo "$as_me:29840: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:29855: \"$ac_try\"") >&5
+ { (eval echo "$as_me:29843: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:29858: \$? = $ac_status" >&5
+ echo "$as_me:29846: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_bsd_stdlib_h=yes
else
@@ -29866,7 +29854,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:29869: result: $cf_bsd_stdlib_h" >&5
+ echo "$as_me:29857: result: $cf_bsd_stdlib_h" >&5
echo "${ECHO_T}$cf_bsd_stdlib_h" >&6
if test "$cf_bsd_stdlib_h" = yes
then
@@ -29876,10 +29864,10 @@ cat >>confdefs.h <<\EOF
EOF
else
- echo "$as_me:29879: checking if <bsd/random.h> should be included" >&5
+ echo "$as_me:29867: checking if <bsd/random.h> should be included" >&5
echo $ECHO_N "checking if <bsd/random.h> should be included... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 29882 "configure"
+#line 29870 "configure"
#include "confdefs.h"
#include <bsd/random.h>
int
@@ -29892,23 +29880,23 @@ void *arc4random(int);
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29895: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29883: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:29898: \$? = $ac_status" >&5
+ echo "$as_me:29886: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:29901: \"$ac_try\"") >&5
+ { (eval echo "$as_me:29889: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:29904: \$? = $ac_status" >&5
+ echo "$as_me:29892: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_bsd_random_h=no
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 29911 "configure"
+#line 29899 "configure"
#include "confdefs.h"
#include <bsd/random.h>
int
@@ -29920,16 +29908,16 @@ unsigned x = arc4random()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29923: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29911: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:29926: \$? = $ac_status" >&5
+ echo "$as_me:29914: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:29929: \"$ac_try\"") >&5
+ { (eval echo "$as_me:29917: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:29932: \$? = $ac_status" >&5
+ echo "$as_me:29920: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_bsd_random_h=yes
else
@@ -29940,7 +29928,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:29943: result: $cf_bsd_random_h" >&5
+ echo "$as_me:29931: result: $cf_bsd_random_h" >&5
echo "${ECHO_T}$cf_bsd_random_h" >&6
if test "$cf_bsd_random_h" = yes
then
@@ -29950,7 +29938,7 @@ cat >>confdefs.h <<\EOF
EOF
else
- { echo "$as_me:29953: WARNING: no header file found for arc4random" >&5
+ { echo "$as_me:29941: WARNING: no header file found for arc4random" >&5
echo "$as_me: WARNING: no header file found for arc4random" >&2;}
fi
fi
@@ -29985,13 +29973,13 @@ fi
for ac_func in sleep
do
-echo "$as_me:29988: checking for $ac_func declaration" >&5
+echo "$as_me:29976: checking for $ac_func declaration" >&5
echo $ECHO_N "checking for $ac_func declaration... $ECHO_C" >&6
if eval "test \"\${ac_cv_func_decl_$ac_func+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 29994 "configure"
+#line 29982 "configure"
#include "confdefs.h"
#ifdef HAVE_STDLIB_H
@@ -30012,20 +30000,20 @@ extern int $ac_func();
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30015: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30003: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:30018: \$? = $ac_status" >&5
+ echo "$as_me:30006: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:30021: \"$ac_try\"") >&5
+ { (eval echo "$as_me:30009: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:30024: \$? = $ac_status" >&5
+ echo "$as_me:30012: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cat >conftest.$ac_ext <<_ACEOF
-#line 30028 "configure"
+#line 30016 "configure"
#include "confdefs.h"
#ifdef HAVE_STDLIB_H
@@ -30046,16 +30034,16 @@ int (*p)() = $ac_func;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30049: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30037: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:30052: \$? = $ac_status" >&5
+ echo "$as_me:30040: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:30055: \"$ac_try\"") >&5
+ { (eval echo "$as_me:30043: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:30058: \$? = $ac_status" >&5
+ echo "$as_me:30046: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "ac_cv_func_decl_$ac_func=yes"
@@ -30076,11 +30064,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
if eval "test \"`echo '$ac_cv_func_'decl_$ac_func`\" = yes"; then
- echo "$as_me:30079: result: yes" >&5
+ echo "$as_me:30067: result: yes" >&5
echo "${ECHO_T}yes" >&6
:
else
- echo "$as_me:30083: result: no" >&5
+ echo "$as_me:30071: result: no" >&5
echo "${ECHO_T}no" >&6
ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -30095,13 +30083,13 @@ done
for ac_func in strstr
do
-echo "$as_me:30098: checking for $ac_func declaration" >&5
+echo "$as_me:30086: checking for $ac_func declaration" >&5
echo $ECHO_N "checking for $ac_func declaration... $ECHO_C" >&6
if eval "test \"\${ac_cv_func_decl_$ac_func+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 30104 "configure"
+#line 30092 "configure"
#include "confdefs.h"
#include <string.h>
int
@@ -30115,20 +30103,20 @@ extern int $ac_func();
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30118: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30106: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:30121: \$? = $ac_status" >&5
+ echo "$as_me:30109: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:30124: \"$ac_try\"") >&5
+ { (eval echo "$as_me:30112: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:30127: \$? = $ac_status" >&5
+ echo "$as_me:30115: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cat >conftest.$ac_ext <<_ACEOF
-#line 30131 "configure"
+#line 30119 "configure"
#include "confdefs.h"
#include <string.h>
int
@@ -30142,16 +30130,16 @@ int (*p)() = $ac_func;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30145: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30133: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:30148: \$? = $ac_status" >&5
+ echo "$as_me:30136: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:30151: \"$ac_try\"") >&5
+ { (eval echo "$as_me:30139: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:30154: \$? = $ac_status" >&5
+ echo "$as_me:30142: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "ac_cv_func_decl_$ac_func=yes"
@@ -30172,11 +30160,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
if eval "test \"`echo '$ac_cv_func_'decl_$ac_func`\" = yes"; then
- echo "$as_me:30175: result: yes" >&5
+ echo "$as_me:30163: result: yes" >&5
echo "${ECHO_T}yes" >&6
:
else
- echo "$as_me:30179: result: no" >&5
+ echo "$as_me:30167: result: no" >&5
echo "${ECHO_T}no" >&6
ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -30191,13 +30179,13 @@ done
for ac_func in getgrgid getgrnam
do
-echo "$as_me:30194: checking for $ac_func declaration" >&5
+echo "$as_me:30182: checking for $ac_func declaration" >&5
echo $ECHO_N "checking for $ac_func declaration... $ECHO_C" >&6
if eval "test \"\${ac_cv_func_decl_$ac_func+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 30200 "configure"
+#line 30188 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -30213,20 +30201,20 @@ extern int $ac_func();
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30216: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30204: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:30219: \$? = $ac_status" >&5
+ echo "$as_me:30207: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:30222: \"$ac_try\"") >&5
+ { (eval echo "$as_me:30210: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:30225: \$? = $ac_status" >&5
+ echo "$as_me:30213: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cat >conftest.$ac_ext <<_ACEOF
-#line 30229 "configure"
+#line 30217 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -30242,16 +30230,16 @@ int (*p)() = $ac_func;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30245: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30233: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:30248: \$? = $ac_status" >&5
+ echo "$as_me:30236: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:30251: \"$ac_try\"") >&5
+ { (eval echo "$as_me:30239: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:30254: \$? = $ac_status" >&5
+ echo "$as_me:30242: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "ac_cv_func_decl_$ac_func=yes"
@@ -30272,11 +30260,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
if eval "test \"`echo '$ac_cv_func_'decl_$ac_func`\" = yes"; then
- echo "$as_me:30275: result: yes" >&5
+ echo "$as_me:30263: result: yes" >&5
echo "${ECHO_T}yes" >&6
:
else
- echo "$as_me:30279: result: no" >&5
+ echo "$as_me:30267: result: no" >&5
echo "${ECHO_T}no" >&6
ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -30288,14 +30276,14 @@ EOF
fi
done
-echo "$as_me:30291: checking if TRUE/FALSE are defined" >&5
+echo "$as_me:30279: checking if TRUE/FALSE are defined" >&5
echo $ECHO_N "checking if TRUE/FALSE are defined... $ECHO_C" >&6
if test "${cf_cv_bool_defs+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 30298 "configure"
+#line 30286 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
@@ -30309,16 +30297,16 @@ int x = TRUE, y = FALSE
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30312: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30300: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:30315: \$? = $ac_status" >&5
+ echo "$as_me:30303: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:30318: \"$ac_try\"") >&5
+ { (eval echo "$as_me:30306: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:30321: \$? = $ac_status" >&5
+ echo "$as_me:30309: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_bool_defs=yes
else
@@ -30329,7 +30317,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:30332: result: $cf_cv_bool_defs" >&5
+echo "$as_me:30320: result: $cf_cv_bool_defs" >&5
echo "${ECHO_T}$cf_cv_bool_defs" >&6
if test "$cf_cv_bool_defs" = no ; then
@@ -30343,14 +30331,14 @@ EOF
fi
-echo "$as_me:30346: checking if external errno is declared" >&5
+echo "$as_me:30334: checking if external errno is declared" >&5
echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6
if test "${cf_cv_dcl_errno+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 30353 "configure"
+#line 30341 "configure"
#include "confdefs.h"
#ifdef HAVE_STDLIB_H
@@ -30368,16 +30356,16 @@ int x = (int) errno
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30371: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30359: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:30374: \$? = $ac_status" >&5
+ echo "$as_me:30362: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:30377: \"$ac_try\"") >&5
+ { (eval echo "$as_me:30365: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:30380: \$? = $ac_status" >&5
+ echo "$as_me:30368: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_dcl_errno=yes
else
@@ -30388,7 +30376,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:30391: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:30379: result: $cf_cv_dcl_errno" >&5
echo "${ECHO_T}$cf_cv_dcl_errno" >&6
if test "$cf_cv_dcl_errno" = no ; then
@@ -30403,14 +30391,14 @@ fi
# It's possible (for near-UNIX clones) that the data doesn't exist
-echo "$as_me:30406: checking if external errno exists" >&5
+echo "$as_me:30394: checking if external errno exists" >&5
echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
if test "${cf_cv_have_errno+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 30413 "configure"
+#line 30401 "configure"
#include "confdefs.h"
#undef errno
@@ -30425,16 +30413,16 @@ errno = 2
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30428: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30416: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:30431: \$? = $ac_status" >&5
+ echo "$as_me:30419: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:30434: \"$ac_try\"") >&5
+ { (eval echo "$as_me:30422: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:30437: \$? = $ac_status" >&5
+ echo "$as_me:30425: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_have_errno=yes
else
@@ -30445,7 +30433,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:30448: result: $cf_cv_have_errno" >&5
+echo "$as_me:30436: result: $cf_cv_have_errno" >&5
echo "${ECHO_T}$cf_cv_have_errno" >&6
if test "$cf_cv_have_errno" = yes ; then
@@ -30458,7 +30446,7 @@ EOF
fi
-echo "$as_me:30461: checking if we can set errno" >&5
+echo "$as_me:30449: checking if we can set errno" >&5
echo $ECHO_N "checking if we can set errno... $ECHO_C" >&6
if test "${cf_cv_set_errno+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -30466,7 +30454,7 @@ else
if test "$cross_compiling" = yes; then
cat >conftest.$ac_ext <<_ACEOF
-#line 30469 "configure"
+#line 30457 "configure"
#include "confdefs.h"
#include <errno.h>
int
@@ -30478,16 +30466,16 @@ errno = 255
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30481: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30469: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:30484: \$? = $ac_status" >&5
+ echo "$as_me:30472: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:30487: \"$ac_try\"") >&5
+ { (eval echo "$as_me:30475: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:30490: \$? = $ac_status" >&5
+ echo "$as_me:30478: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_set_errno=maybe
else
@@ -30498,7 +30486,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
-#line 30501 "configure"
+#line 30489 "configure"
#include "confdefs.h"
#include <errno.h>
@@ -30509,15 +30497,15 @@ int main()
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:30512: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30500: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:30515: \$? = $ac_status" >&5
+ echo "$as_me:30503: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:30517: \"$ac_try\"") >&5
+ { (eval echo "$as_me:30505: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:30520: \$? = $ac_status" >&5
+ echo "$as_me:30508: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_set_errno=yes
else
@@ -30530,21 +30518,21 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
-echo "$as_me:30533: result: $cf_cv_set_errno" >&5
+echo "$as_me:30521: result: $cf_cv_set_errno" >&5
echo "${ECHO_T}$cf_cv_set_errno" >&6
test "$cf_cv_set_errno" != no &&
cat >>confdefs.h <<\EOF
#define CAN_SET_ERRNO 1
EOF
-echo "$as_me:30540: checking for setlocale()" >&5
+echo "$as_me:30528: checking for setlocale()" >&5
echo $ECHO_N "checking for setlocale()... $ECHO_C" >&6
if test "${cf_cv_locale+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 30547 "configure"
+#line 30535 "configure"
#include "confdefs.h"
#include <locale.h>
int
@@ -30556,16 +30544,16 @@ setlocale(LC_ALL, "")
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30559: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30547: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:30562: \$? = $ac_status" >&5
+ echo "$as_me:30550: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:30565: \"$ac_try\"") >&5
+ { (eval echo "$as_me:30553: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:30568: \$? = $ac_status" >&5
+ echo "$as_me:30556: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_locale=yes
else
@@ -30577,7 +30565,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:30580: result: $cf_cv_locale" >&5
+echo "$as_me:30568: result: $cf_cv_locale" >&5
echo "${ECHO_T}$cf_cv_locale" >&6
test $cf_cv_locale = yes && {
cat >>confdefs.h <<\EOF
@@ -30585,14 +30573,14 @@ cat >>confdefs.h <<\EOF
EOF
}
-echo "$as_me:30588: checking if NGROUPS is defined" >&5
+echo "$as_me:30576: checking if NGROUPS is defined" >&5
echo $ECHO_N "checking if NGROUPS is defined... $ECHO_C" >&6
if test "${cf_cv_ngroups+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 30595 "configure"
+#line 30583 "configure"
#include "confdefs.h"
#if HAVE_SYS_PARAM_H
@@ -30611,23 +30599,23 @@ int x = NGROUPS
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30614: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30602: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:30617: \$? = $ac_status" >&5
+ echo "$as_me:30605: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:30620: \"$ac_try\"") >&5
+ { (eval echo "$as_me:30608: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:30623: \$? = $ac_status" >&5
+ echo "$as_me:30611: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ngroups=yes
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 30630 "configure"
+#line 30618 "configure"
#include "confdefs.h"
#if HAVE_SYS_PARAM_H
@@ -30646,16 +30634,16 @@ int x = NGROUPS_MAX
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30649: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30637: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:30652: \$? = $ac_status" >&5
+ echo "$as_me:30640: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:30655: \"$ac_try\"") >&5
+ { (eval echo "$as_me:30643: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:30658: \$? = $ac_status" >&5
+ echo "$as_me:30646: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ngroups=NGROUPS_MAX
else
@@ -30667,7 +30655,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:30670: result: $cf_cv_ngroups" >&5
+echo "$as_me:30658: result: $cf_cv_ngroups" >&5
echo "${ECHO_T}$cf_cv_ngroups" >&6
fi
@@ -30685,14 +30673,14 @@ EOF
fi
-echo "$as_me:30688: checking if external sys_nerr is declared" >&5
+echo "$as_me:30676: checking if external sys_nerr is declared" >&5
echo $ECHO_N "checking if external sys_nerr is declared... $ECHO_C" >&6
if test "${cf_cv_dcl_sys_nerr+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 30695 "configure"
+#line 30683 "configure"
#include "confdefs.h"
#ifdef HAVE_STDLIB_H
@@ -30710,16 +30698,16 @@ int x = (int) sys_nerr
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30713: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30701: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:30716: \$? = $ac_status" >&5
+ echo "$as_me:30704: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:30719: \"$ac_try\"") >&5
+ { (eval echo "$as_me:30707: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:30722: \$? = $ac_status" >&5
+ echo "$as_me:30710: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_dcl_sys_nerr=yes
else
@@ -30730,7 +30718,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:30733: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:30721: result: $cf_cv_dcl_sys_nerr" >&5
echo "${ECHO_T}$cf_cv_dcl_sys_nerr" >&6
if test "$cf_cv_dcl_sys_nerr" = no ; then
@@ -30745,14 +30733,14 @@ fi
# It's possible (for near-UNIX clones) that the data doesn't exist
-echo "$as_me:30748: checking if external sys_nerr exists" >&5
+echo "$as_me:30736: checking if external sys_nerr exists" >&5
echo $ECHO_N "checking if external sys_nerr exists... $ECHO_C" >&6
if test "${cf_cv_have_sys_nerr+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 30755 "configure"
+#line 30743 "configure"
#include "confdefs.h"
#undef sys_nerr
@@ -30767,16 +30755,16 @@ sys_nerr = 2
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30770: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30758: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:30773: \$? = $ac_status" >&5
+ echo "$as_me:30761: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:30776: \"$ac_try\"") >&5
+ { (eval echo "$as_me:30764: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:30779: \$? = $ac_status" >&5
+ echo "$as_me:30767: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_have_sys_nerr=yes
else
@@ -30787,7 +30775,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:30790: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:30778: result: $cf_cv_have_sys_nerr" >&5
echo "${ECHO_T}$cf_cv_have_sys_nerr" >&6
if test "$cf_cv_have_sys_nerr" = yes ; then
@@ -30800,14 +30788,14 @@ EOF
fi
-echo "$as_me:30803: checking if external sys_errlist is declared" >&5
+echo "$as_me:30791: checking if external sys_errlist is declared" >&5
echo $ECHO_N "checking if external sys_errlist is declared... $ECHO_C" >&6
if test "${cf_cv_dcl_sys_errlist+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 30810 "configure"
+#line 30798 "configure"
#include "confdefs.h"
#ifdef HAVE_STDLIB_H
@@ -30825,16 +30813,16 @@ int x = (int) sys_errlist
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30828: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30816: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:30831: \$? = $ac_status" >&5
+ echo "$as_me:30819: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:30834: \"$ac_try\"") >&5
+ { (eval echo "$as_me:30822: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:30837: \$? = $ac_status" >&5
+ echo "$as_me:30825: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_dcl_sys_errlist=yes
else
@@ -30845,7 +30833,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:30848: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:30836: result: $cf_cv_dcl_sys_errlist" >&5
echo "${ECHO_T}$cf_cv_dcl_sys_errlist" >&6
if test "$cf_cv_dcl_sys_errlist" = no ; then
@@ -30860,14 +30848,14 @@ fi
# It's possible (for near-UNIX clones) that the data doesn't exist
-echo "$as_me:30863: checking if external sys_errlist exists" >&5
+echo "$as_me:30851: checking if external sys_errlist exists" >&5
echo $ECHO_N "checking if external sys_errlist exists... $ECHO_C" >&6
if test "${cf_cv_have_sys_errlist+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 30870 "configure"
+#line 30858 "configure"
#include "confdefs.h"
#undef sys_errlist
@@ -30882,16 +30870,16 @@ sys_errlist = 2
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30885: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30873: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:30888: \$? = $ac_status" >&5
+ echo "$as_me:30876: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:30891: \"$ac_try\"") >&5
+ { (eval echo "$as_me:30879: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:30894: \$? = $ac_status" >&5
+ echo "$as_me:30882: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_have_sys_errlist=yes
else
@@ -30902,7 +30890,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:30905: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:30893: result: $cf_cv_have_sys_errlist" >&5
echo "${ECHO_T}$cf_cv_have_sys_errlist" >&6
if test "$cf_cv_have_sys_errlist" = yes ; then
@@ -30918,23 +30906,23 @@ fi
for ac_header in lastlog.h paths.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:30921: checking for $ac_header" >&5
+echo "$as_me:30909: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 30927 "configure"
+#line 30915 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:30931: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:30919: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:30937: \$? = $ac_status" >&5
+ echo "$as_me:30925: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -30953,7 +30941,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:30956: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:30944: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -30963,14 +30951,14 @@ EOF
fi
done
-echo "$as_me:30966: checking for lastlog path" >&5
+echo "$as_me:30954: checking for lastlog path" >&5
echo $ECHO_N "checking for lastlog path... $ECHO_C" >&6
if test "${cf_cv_path_lastlog+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 30973 "configure"
+#line 30961 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -30990,16 +30978,16 @@ char *path = _PATH_LASTLOG
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30993: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30981: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:30996: \$? = $ac_status" >&5
+ echo "$as_me:30984: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:30999: \"$ac_try\"") >&5
+ { (eval echo "$as_me:30987: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:31002: \$? = $ac_status" >&5
+ echo "$as_me:30990: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_path_lastlog="_PATH_LASTLOG"
else
@@ -31014,14 +31002,14 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:31017: result: $cf_cv_path_lastlog" >&5
+echo "$as_me:31005: result: $cf_cv_path_lastlog" >&5
echo "${ECHO_T}$cf_cv_path_lastlog" >&6
test $cf_cv_path_lastlog != no &&
cat >>confdefs.h <<\EOF
#define USE_LASTLOG 1
EOF
-echo "$as_me:31024: checking for utmp implementation" >&5
+echo "$as_me:31012: checking for utmp implementation" >&5
echo $ECHO_N "checking for utmp implementation... $ECHO_C" >&6
if test "${cf_cv_have_utmp+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -31038,7 +31026,7 @@ cf_utmp_includes="
#endif
"
cat >conftest.$ac_ext <<_ACEOF
-#line 31041 "configure"
+#line 31029 "configure"
#include "confdefs.h"
$cf_utmp_includes
int
@@ -31052,16 +31040,16 @@ struct $cf_header x;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31055: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31043: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:31058: \$? = $ac_status" >&5
+ echo "$as_me:31046: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:31061: \"$ac_try\"") >&5
+ { (eval echo "$as_me:31049: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:31064: \$? = $ac_status" >&5
+ echo "$as_me:31052: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_have_utmp=$cf_header
break
@@ -31070,7 +31058,7 @@ else
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 31073 "configure"
+#line 31061 "configure"
#include "confdefs.h"
$cf_utmp_includes
int
@@ -31084,16 +31072,16 @@ struct $cf_header x;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31087: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31075: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:31090: \$? = $ac_status" >&5
+ echo "$as_me:31078: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:31093: \"$ac_try\"") >&5
+ { (eval echo "$as_me:31081: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:31096: \$? = $ac_status" >&5
+ echo "$as_me:31084: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_have_utmp=$cf_header
break
@@ -31108,7 +31096,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
done
fi
-echo "$as_me:31111: result: $cf_cv_have_utmp" >&5
+echo "$as_me:31099: result: $cf_cv_have_utmp" >&5
echo "${ECHO_T}$cf_cv_have_utmp" >&6
if test $cf_cv_have_utmp != no ; then
@@ -31123,14 +31111,14 @@ cat >>confdefs.h <<\EOF
EOF
if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31126: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
+echo "$as_me:31114: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_host is declared... $ECHO_C" >&6
if test "${cf_cv_have_utmp_ut_host+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 31133 "configure"
+#line 31121 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -31144,16 +31132,16 @@ struct $cf_cv_have_utmp x; char *y = &x.ut_host[0]
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31147: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31135: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:31150: \$? = $ac_status" >&5
+ echo "$as_me:31138: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:31153: \"$ac_try\"") >&5
+ { (eval echo "$as_me:31141: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:31156: \$? = $ac_status" >&5
+ echo "$as_me:31144: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_have_utmp_ut_host=yes
else
@@ -31165,7 +31153,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:31168: result: $cf_cv_have_utmp_ut_host" >&5
+echo "$as_me:31156: result: $cf_cv_have_utmp_ut_host" >&5
echo "${ECHO_T}$cf_cv_have_utmp_ut_host" >&6
test $cf_cv_have_utmp_ut_host != no &&
cat >>confdefs.h <<\EOF
@@ -31175,14 +31163,14 @@ EOF
fi
if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31178: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
+echo "$as_me:31166: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_syslen is declared... $ECHO_C" >&6
if test "${cf_cv_have_utmp_ut_syslen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 31185 "configure"
+#line 31173 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -31196,16 +31184,16 @@ struct $cf_cv_have_utmp x; int y = x.ut_syslen
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31199: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31187: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:31202: \$? = $ac_status" >&5
+ echo "$as_me:31190: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:31205: \"$ac_try\"") >&5
+ { (eval echo "$as_me:31193: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:31208: \$? = $ac_status" >&5
+ echo "$as_me:31196: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_have_utmp_ut_syslen=yes
else
@@ -31217,7 +31205,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:31220: result: $cf_cv_have_utmp_ut_syslen" >&5
+echo "$as_me:31208: result: $cf_cv_have_utmp_ut_syslen" >&5
echo "${ECHO_T}$cf_cv_have_utmp_ut_syslen" >&6
test $cf_cv_have_utmp_ut_syslen != no &&
cat >>confdefs.h <<\EOF
@@ -31227,7 +31215,7 @@ EOF
fi
if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31230: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
+echo "$as_me:31218: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_name is declared... $ECHO_C" >&6
if test "${cf_cv_have_utmp_ut_name+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -31244,7 +31232,7 @@ cf_utmp_includes="
"
for cf_header in ut_name ut_user ; do
cat >conftest.$ac_ext <<_ACEOF
-#line 31247 "configure"
+#line 31235 "configure"
#include "confdefs.h"
$cf_utmp_includes
int
@@ -31258,16 +31246,16 @@ struct $cf_cv_have_utmp x;
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31261: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31249: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:31264: \$? = $ac_status" >&5
+ echo "$as_me:31252: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:31267: \"$ac_try\"") >&5
+ { (eval echo "$as_me:31255: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:31270: \$? = $ac_status" >&5
+ echo "$as_me:31258: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_have_utmp_ut_name=$cf_header
break
@@ -31279,12 +31267,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
done
fi
-echo "$as_me:31282: result: $cf_cv_have_utmp_ut_name" >&5
+echo "$as_me:31270: result: $cf_cv_have_utmp_ut_name" >&5
echo "${ECHO_T}$cf_cv_have_utmp_ut_name" >&6
case $cf_cv_have_utmp_ut_name in
(no)
- { { echo "$as_me:31287: error: Cannot find declaration for ut.ut_name" >&5
+ { { echo "$as_me:31275: error: Cannot find declaration for ut.ut_name" >&5
echo "$as_me: error: Cannot find declaration for ut.ut_name" >&2;}
{ (exit 1); exit 1; }; }
;;
@@ -31299,7 +31287,7 @@ esac
fi
if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31302: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "$as_me:31290: checking for exit-status in $cf_cv_have_utmp" >&5
echo $ECHO_N "checking for exit-status in $cf_cv_have_utmp... $ECHO_C" >&6
if test "${cf_cv_have_utmp_ut_xstatus+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -31312,7 +31300,7 @@ for cf_result in \
ut_exit.ut_exit
do
cat >conftest.$ac_ext <<_ACEOF
-#line 31315 "configure"
+#line 31303 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -31326,16 +31314,16 @@ struct $cf_cv_have_utmp x; long y = x.$cf_result = 0
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31329: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31317: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:31332: \$? = $ac_status" >&5
+ echo "$as_me:31320: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:31335: \"$ac_try\"") >&5
+ { (eval echo "$as_me:31323: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:31338: \$? = $ac_status" >&5
+ echo "$as_me:31326: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_have_utmp_ut_xstatus=$cf_result
break
@@ -31348,7 +31336,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
done
fi
-echo "$as_me:31351: result: $cf_cv_have_utmp_ut_xstatus" >&5
+echo "$as_me:31339: result: $cf_cv_have_utmp_ut_xstatus" >&5
echo "${ECHO_T}$cf_cv_have_utmp_ut_xstatus" >&6
if test $cf_cv_have_utmp_ut_xstatus != no ; then
@@ -31364,14 +31352,14 @@ fi
fi
if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31367: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
+echo "$as_me:31355: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_xtime is declared... $ECHO_C" >&6
if test "${cf_cv_have_utmp_ut_xtime+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 31374 "configure"
+#line 31362 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -31385,23 +31373,23 @@ struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31388: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31376: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:31391: \$? = $ac_status" >&5
+ echo "$as_me:31379: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:31394: \"$ac_try\"") >&5
+ { (eval echo "$as_me:31382: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:31397: \$? = $ac_status" >&5
+ echo "$as_me:31385: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_have_utmp_ut_xtime=yes
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 31404 "configure"
+#line 31392 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -31415,16 +31403,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_tv.tv_sec
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31418: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31406: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:31421: \$? = $ac_status" >&5
+ echo "$as_me:31409: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:31424: \"$ac_try\"") >&5
+ { (eval echo "$as_me:31412: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:31427: \$? = $ac_status" >&5
+ echo "$as_me:31415: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_have_utmp_ut_xtime=define
else
@@ -31438,7 +31426,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:31441: result: $cf_cv_have_utmp_ut_xtime" >&5
+echo "$as_me:31429: result: $cf_cv_have_utmp_ut_xtime" >&5
echo "${ECHO_T}$cf_cv_have_utmp_ut_xtime" >&6
if test $cf_cv_have_utmp_ut_xtime != no ; then
@@ -31457,14 +31445,14 @@ fi
fi
if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31460: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
+echo "$as_me:31448: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_session is declared... $ECHO_C" >&6
if test "${cf_cv_have_utmp_ut_session+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 31467 "configure"
+#line 31455 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -31478,16 +31466,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_session
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31481: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31469: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:31484: \$? = $ac_status" >&5
+ echo "$as_me:31472: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:31487: \"$ac_try\"") >&5
+ { (eval echo "$as_me:31475: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:31490: \$? = $ac_status" >&5
+ echo "$as_me:31478: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_have_utmp_ut_session=yes
else
@@ -31498,7 +31486,7 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:31501: result: $cf_cv_have_utmp_ut_session" >&5
+echo "$as_me:31489: result: $cf_cv_have_utmp_ut_session" >&5
echo "${ECHO_T}$cf_cv_have_utmp_ut_session" >&6
if test $cf_cv_have_utmp_ut_session != no ; then
@@ -31509,7 +31497,7 @@ EOF
fi
fi
-echo "$as_me:31512: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "$as_me:31500: checking if $cf_cv_have_utmp is SYSV flavor" >&5
echo $ECHO_N "checking if $cf_cv_have_utmp is SYSV flavor... $ECHO_C" >&6
if test "${cf_cv_sysv_utmp+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -31517,7 +31505,7 @@ else
test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
cat >conftest.$ac_ext <<_ACEOF
-#line 31520 "configure"
+#line 31508 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -31536,16 +31524,16 @@ struct $cf_cv_have_utmp x;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31539: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31527: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:31542: \$? = $ac_status" >&5
+ echo "$as_me:31530: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:31545: \"$ac_try\"") >&5
+ { (eval echo "$as_me:31533: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:31548: \$? = $ac_status" >&5
+ echo "$as_me:31536: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_sysv_utmp=yes
else
@@ -31556,7 +31544,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:31559: result: $cf_cv_sysv_utmp" >&5
+echo "$as_me:31547: result: $cf_cv_sysv_utmp" >&5
echo "${ECHO_T}$cf_cv_sysv_utmp" >&6
test $cf_cv_sysv_utmp = yes &&
cat >>confdefs.h <<\EOF
@@ -31565,14 +31553,14 @@ EOF
fi
-echo "$as_me:31568: checking if external h_errno exists" >&5
+echo "$as_me:31556: checking if external h_errno exists" >&5
echo $ECHO_N "checking if external h_errno exists... $ECHO_C" >&6
if test "${cf_cv_have_h_errno+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 31575 "configure"
+#line 31563 "configure"
#include "confdefs.h"
#undef h_errno
@@ -31587,16 +31575,16 @@ h_errno = 2
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31590: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31578: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:31593: \$? = $ac_status" >&5
+ echo "$as_me:31581: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:31596: \"$ac_try\"") >&5
+ { (eval echo "$as_me:31584: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:31599: \$? = $ac_status" >&5
+ echo "$as_me:31587: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_have_h_errno=yes
else
@@ -31607,7 +31595,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:31610: result: $cf_cv_have_h_errno" >&5
+echo "$as_me:31598: result: $cf_cv_have_h_errno" >&5
echo "${ECHO_T}$cf_cv_have_h_errno" >&6
if test "$cf_cv_have_h_errno" = yes ; then
@@ -31620,120 +31608,120 @@ EOF
fi
-echo "$as_me:31623: checking if bibp: URLs should be supported" >&5
+echo "$as_me:31611: checking if bibp: URLs should be supported" >&5
echo $ECHO_N "checking if bibp: URLs should be supported... $ECHO_C" >&6
# Check whether --enable-bibp-urls or --disable-bibp-urls was given.
if test "${enable_bibp_urls+set}" = set; then
enableval="$enable_bibp_urls"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
use_bibp_urls=$enableval
- else
- use_bibp_urls=yes
- fi
+ else
+ use_bibp_urls=yes
+ fi
else
enableval=yes
- use_bibp_urls=yes
+ use_bibp_urls=yes
fi;
-echo "$as_me:31640: result: $use_bibp_urls" >&5
+echo "$as_me:31628: result: $use_bibp_urls" >&5
echo "${ECHO_T}$use_bibp_urls" >&6
test $use_bibp_urls = no &&
cat >>confdefs.h <<\EOF
#define DISABLE_BIBP 1
EOF
-echo "$as_me:31647: checking if configuration info should be browsable" >&5
+echo "$as_me:31635: checking if configuration info should be browsable" >&5
echo $ECHO_N "checking if configuration info should be browsable... $ECHO_C" >&6
# Check whether --enable-config-info or --disable-config-info was given.
if test "${enable_config_info+set}" = set; then
enableval="$enable_config_info"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
use_config_info=$enableval
- else
- use_config_info=yes
- fi
+ else
+ use_config_info=yes
+ fi
else
enableval=yes
- use_config_info=yes
+ use_config_info=yes
fi;
-echo "$as_me:31664: result: $use_config_info" >&5
+echo "$as_me:31652: result: $use_config_info" >&5
echo "${ECHO_T}$use_config_info" >&6
test $use_config_info = no &&
cat >>confdefs.h <<\EOF
#define NO_CONFIG_INFO 1
EOF
-echo "$as_me:31671: checking if new-style forms-based options screen should be used" >&5
+echo "$as_me:31659: checking if new-style forms-based options screen should be used" >&5
echo $ECHO_N "checking if new-style forms-based options screen should be used... $ECHO_C" >&6
# Check whether --enable-forms-options or --disable-forms-options was given.
if test "${enable_forms_options+set}" = set; then
enableval="$enable_forms_options"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
use_forms_options=$enableval
- else
- use_forms_options=yes
- fi
+ else
+ use_forms_options=yes
+ fi
else
enableval=yes
- use_forms_options=yes
+ use_forms_options=yes
fi;
-echo "$as_me:31688: result: $use_forms_options" >&5
+echo "$as_me:31676: result: $use_forms_options" >&5
echo "${ECHO_T}$use_forms_options" >&6
test $use_forms_options = no &&
cat >>confdefs.h <<\EOF
#define NO_OPTION_FORMS 1
EOF
-echo "$as_me:31695: checking if old-style options menu should be used" >&5
+echo "$as_me:31683: checking if old-style options menu should be used" >&5
echo $ECHO_N "checking if old-style options menu should be used... $ECHO_C" >&6
# Check whether --enable-menu-options or --disable-menu-options was given.
if test "${enable_menu_options+set}" = set; then
enableval="$enable_menu_options"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
use_menu_options=$enableval
- else
- use_menu_options=yes
- fi
+ else
+ use_menu_options=yes
+ fi
else
enableval=yes
- use_menu_options=yes
+ use_menu_options=yes
fi;
-echo "$as_me:31712: result: $use_menu_options" >&5
+echo "$as_me:31700: result: $use_menu_options" >&5
echo "${ECHO_T}$use_menu_options" >&6
test $use_menu_options = no &&
cat >>confdefs.h <<\EOF
#define NO_OPTION_MENU 1
EOF
-echo "$as_me:31719: checking if sessions code should be used" >&5
+echo "$as_me:31707: checking if sessions code should be used" >&5
echo $ECHO_N "checking if sessions code should be used... $ECHO_C" >&6
# Check whether --enable-sessions or --disable-sessions was given.
if test "${enable_sessions+set}" = set; then
enableval="$enable_sessions"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
use_sessions=$enableval
- else
- use_sessions=yes
- fi
+ else
+ use_sessions=yes
+ fi
else
enableval=yes
- use_sessions=yes
+ use_sessions=yes
fi;
-echo "$as_me:31736: result: $use_sessions" >&5
+echo "$as_me:31724: result: $use_sessions" >&5
echo "${ECHO_T}$use_sessions" >&6
if test $use_sessions != no ; then
@@ -31744,24 +31732,24 @@ EOF
EXTRA_OBJS="$EXTRA_OBJS LYSession\$o"
fi
-echo "$as_me:31747: checking if session-caching code should be used" >&5
+echo "$as_me:31735: checking if session-caching code should be used" >&5
echo $ECHO_N "checking if session-caching code should be used... $ECHO_C" >&6
# Check whether --enable-session-cache or --disable-session-cache was given.
if test "${enable_session_cache+set}" = set; then
enableval="$enable_session_cache"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
use_session_cache=$enableval
- else
- use_session_cache=yes
- fi
+ else
+ use_session_cache=yes
+ fi
else
enableval=yes
- use_session_cache=yes
+ use_session_cache=yes
fi;
-echo "$as_me:31764: result: $use_session_cache" >&5
+echo "$as_me:31752: result: $use_session_cache" >&5
echo "${ECHO_T}$use_session_cache" >&6
if test $use_session_cache != no ; then
@@ -31771,72 +31759,72 @@ EOF
fi
-echo "$as_me:31774: checking if address-list page should be used" >&5
+echo "$as_me:31762: checking if address-list page should be used" >&5
echo $ECHO_N "checking if address-list page should be used... $ECHO_C" >&6
# Check whether --enable-addrlist-page or --disable-addrlist-page was given.
if test "${enable_addrlist_page+set}" = set; then
enableval="$enable_addrlist_page"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
use_addrlist_page=$enableval
- else
- use_addrlist_page=yes
- fi
+ else
+ use_addrlist_page=yes
+ fi
else
enableval=yes
- use_addrlist_page=yes
+ use_addrlist_page=yes
fi;
-echo "$as_me:31791: result: $use_addrlist_page" >&5
+echo "$as_me:31779: result: $use_addrlist_page" >&5
echo "${ECHO_T}$use_addrlist_page" >&6
test $use_addrlist_page != no &&
cat >>confdefs.h <<\EOF
#define USE_ADDRLIST_PAGE 1
EOF
-echo "$as_me:31798: checking if experimental CJK logic should be used" >&5
+echo "$as_me:31786: checking if experimental CJK logic should be used" >&5
echo $ECHO_N "checking if experimental CJK logic should be used... $ECHO_C" >&6
# Check whether --enable-cjk or --disable-cjk was given.
if test "${enable_cjk+set}" = set; then
enableval="$enable_cjk"
test "$enableval" != yes && enableval=no
- if test "$enableval" != "no" ; then
+ if test "$enableval" != "no" ; then
use_cjk=$enableval
- else
- use_cjk=no
- fi
+ else
+ use_cjk=no
+ fi
else
enableval=no
- use_cjk=no
+ use_cjk=no
fi;
-echo "$as_me:31815: result: $use_cjk" >&5
+echo "$as_me:31803: result: $use_cjk" >&5
echo "${ECHO_T}$use_cjk" >&6
test $use_cjk != no &&
cat >>confdefs.h <<\EOF
#define CJK_EX 1
EOF
-echo "$as_me:31822: checking if experimental Japanese UTF-8 logic should be used" >&5
+echo "$as_me:31810: checking if experimental Japanese UTF-8 logic should be used" >&5
echo $ECHO_N "checking if experimental Japanese UTF-8 logic should be used... $ECHO_C" >&6
# Check whether --enable-japanese-utf8 or --disable-japanese-utf8 was given.
if test "${enable_japanese_utf8+set}" = set; then
enableval="$enable_japanese_utf8"
test "$enableval" != yes && enableval=no
- if test "$enableval" != "no" ; then
+ if test "$enableval" != "no" ; then
use_ja_utf8=$enableval
- else
- use_ja_utf8=no
- fi
+ else
+ use_ja_utf8=no
+ fi
else
enableval=no
- use_ja_utf8=no
+ use_ja_utf8=no
fi;
-echo "$as_me:31839: result: $use_ja_utf8" >&5
+echo "$as_me:31827: result: $use_ja_utf8" >&5
echo "${ECHO_T}$use_ja_utf8" >&6
if test $use_ja_utf8 != no ; then
@@ -31848,12 +31836,12 @@ EOF
if test "${with_libiconv_prefix+set}" = set; then
withval="$with_libiconv_prefix"
- case "$withval" in
- (no)
- ;;
- (yes)
- ;;
- (*)
+case "$withval" in
+(no)
+ ;;
+(yes)
+ ;;
+(*)
for cf_searchpath in `echo "$withval" | tr $PATH_SEPARATOR ' '`; do
if test -d $cf_searchpath/include; then
@@ -31882,7 +31870,7 @@ if test -n "$cf_searchpath/include" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 31885 "configure"
+#line 31873 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -31894,16 +31882,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31897: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31885: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:31900: \$? = $ac_status" >&5
+ echo "$as_me:31888: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:31903: \"$ac_try\"") >&5
+ { (eval echo "$as_me:31891: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:31906: \$? = $ac_status" >&5
+ echo "$as_me:31894: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -31920,7 +31908,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:31923: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:31911: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -31930,6 +31918,8 @@ echo "${as_me:-configure}:31923: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
@@ -31961,7 +31951,7 @@ if test -n "$cf_searchpath/../include" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 31964 "configure"
+#line 31954 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -31973,16 +31963,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31976: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31966: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:31979: \$? = $ac_status" >&5
+ echo "$as_me:31969: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:31982: \"$ac_try\"") >&5
+ { (eval echo "$as_me:31972: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:31985: \$? = $ac_status" >&5
+ echo "$as_me:31975: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -31999,7 +31989,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:32002: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:31992: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -32009,13 +31999,15 @@ echo "${as_me:-configure}:32002: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
fi
else
-{ { echo "$as_me:32018: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:32010: error: cannot find libiconv under $withval" >&5
echo "$as_me: error: cannot find libiconv under $withval" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -32040,7 +32032,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}:32043: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:32035: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -32069,7 +32061,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}:32072: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:32064: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -32078,18 +32070,18 @@ echo "${as_me:-configure}:32072: testing adding $cf_add_libdir to library-path .
fi
else
-{ { echo "$as_me:32081: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:32073: error: cannot find libiconv under $withval" >&5
echo "$as_me: error: cannot find libiconv under $withval" >&2;}
{ (exit 1); exit 1; }; }
fi
done
- ;;
- esac
+ ;;
+esac
fi;
- echo "$as_me:32092: checking for iconv" >&5
+ echo "$as_me:32084: checking for iconv" >&5
echo $ECHO_N "checking for iconv... $ECHO_C" >&6
if test "${am_cv_func_iconv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -32100,12 +32092,12 @@ else
cf_cv_header_path_iconv=
cf_cv_library_path_iconv=
-echo "${as_me:-configure}:32103: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:32095: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
cf_save_LIBS="$LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 32108 "configure"
+#line 32100 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -32124,16 +32116,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32127: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32119: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:32130: \$? = $ac_status" >&5
+ echo "$as_me:32122: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:32133: \"$ac_try\"") >&5
+ { (eval echo "$as_me:32125: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:32136: \$? = $ac_status" >&5
+ echo "$as_me:32128: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_iconv=yes
@@ -32147,7 +32139,7 @@ cat conftest.$ac_ext >&5
LIBS="-liconv $cf_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 32150 "configure"
+#line 32142 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -32166,16 +32158,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32169: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32161: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:32172: \$? = $ac_status" >&5
+ echo "$as_me:32164: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:32175: \"$ac_try\"") >&5
+ { (eval echo "$as_me:32167: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:32178: \$? = $ac_status" >&5
+ echo "$as_me:32170: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_iconv=yes
@@ -32192,9 +32184,9 @@ cat conftest.$ac_ext >&5
test -n "$verbose" && echo " find linkage for iconv library" 1>&6
-echo "${as_me:-configure}:32195: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:32187: testing find linkage for iconv library ..." 1>&5
-echo "${as_me:-configure}:32197: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:32189: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
cf_save_CPPFLAGS="$CPPFLAGS"
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -32285,11 +32277,11 @@ cf_search="$cf_search $cf_header_path_list"
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}:32288: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:32280: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_iconv"
cat >conftest.$ac_ext <<_ACEOF
-#line 32292 "configure"
+#line 32284 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -32308,21 +32300,21 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32311: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32303: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:32314: \$? = $ac_status" >&5
+ echo "$as_me:32306: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:32317: \"$ac_try\"") >&5
+ { (eval echo "$as_me:32309: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:32320: \$? = $ac_status" >&5
+ echo "$as_me:32312: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test -n "$verbose" && echo " ... found iconv headers in $cf_cv_header_path_iconv" 1>&6
-echo "${as_me:-configure}:32325: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:32317: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
cf_cv_find_linkage_iconv=maybe
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -32340,7 +32332,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_cv_find_linkage_iconv" = maybe ; then
-echo "${as_me:-configure}:32343: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:32335: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
cf_save_LIBS="$LIBS"
cf_save_LDFLAGS="$LDFLAGS"
@@ -32415,13 +32407,13 @@ cf_search="$cf_library_path_list $cf_search"
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}:32418: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:32410: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
CPPFLAGS="$cf_test_CPPFLAGS"
LIBS="-liconv $cf_save_LIBS"
LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_iconv"
cat >conftest.$ac_ext <<_ACEOF
-#line 32424 "configure"
+#line 32416 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -32440,21 +32432,21 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32443: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32435: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:32446: \$? = $ac_status" >&5
+ echo "$as_me:32438: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:32449: \"$ac_try\"") >&5
+ { (eval echo "$as_me:32441: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:32452: \$? = $ac_status" >&5
+ echo "$as_me:32444: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test -n "$verbose" && echo " ... found iconv library in $cf_cv_library_path_iconv" 1>&6
-echo "${as_me:-configure}:32457: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:32449: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
cf_cv_find_linkage_iconv=yes
cf_cv_library_file_iconv="-liconv"
@@ -32494,7 +32486,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
fi
fi
-echo "$as_me:32497: result: $am_cv_func_iconv" >&5
+echo "$as_me:32489: result: $am_cv_func_iconv" >&5
echo "${ECHO_T}$am_cv_func_iconv" >&6
if test "$am_cv_func_iconv" = yes; then
@@ -32503,14 +32495,14 @@ cat >>confdefs.h <<\EOF
#define HAVE_ICONV 1
EOF
- echo "$as_me:32506: checking if the declaration of iconv() needs const." >&5
+ echo "$as_me:32498: checking if the declaration of iconv() needs const." >&5
echo $ECHO_N "checking if the declaration of iconv() needs const.... $ECHO_C" >&6
if test "${am_cv_proto_iconv_const+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 32513 "configure"
+#line 32505 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -32535,16 +32527,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32538: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32530: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:32541: \$? = $ac_status" >&5
+ echo "$as_me:32533: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:32544: \"$ac_try\"") >&5
+ { (eval echo "$as_me:32536: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:32547: \$? = $ac_status" >&5
+ echo "$as_me:32539: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
am_cv_proto_iconv_const=no
else
@@ -32554,7 +32546,7 @@ am_cv_proto_iconv_const=yes
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:32557: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:32549: result: $am_cv_proto_iconv_const" >&5
echo "${ECHO_T}$am_cv_proto_iconv_const" >&6
if test "$am_cv_proto_iconv_const" = yes ; then
@@ -32596,7 +32588,7 @@ if test -n "$cf_cv_header_path_iconv" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 32599 "configure"
+#line 32591 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -32608,16 +32600,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32611: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32603: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:32614: \$? = $ac_status" >&5
+ echo "$as_me:32606: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:32617: \"$ac_try\"") >&5
+ { (eval echo "$as_me:32609: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:32620: \$? = $ac_status" >&5
+ echo "$as_me:32612: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -32634,7 +32626,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:32637: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:32629: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -32644,6 +32636,8 @@ echo "${as_me:-configure}:32637: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
@@ -32671,7 +32665,7 @@ if test -n "$cf_cv_library_path_iconv" ; 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}:32674: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:32668: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -32695,24 +32689,24 @@ case $cf_cv_screen in
esac
if test "$use_dft_colors" != no ; then
-echo "$as_me:32698: checking if you want to use default-colors" >&5
+echo "$as_me:32692: checking if you want to use default-colors" >&5
echo $ECHO_N "checking if you want to use default-colors... $ECHO_C" >&6
# Check whether --enable-default-colors or --disable-default-colors was given.
if test "${enable_default_colors+set}" = set; then
enableval="$enable_default_colors"
test "$enableval" != yes && enableval=no
- if test "$enableval" != "no" ; then
+ if test "$enableval" != "no" ; then
use_dft_colors=yes
- else
- use_dft_colors=no
- fi
+ else
+ use_dft_colors=no
+ fi
else
enableval=no
- use_dft_colors=no
+ use_dft_colors=no
fi;
-echo "$as_me:32715: result: $use_dft_colors" >&5
+echo "$as_me:32709: result: $use_dft_colors" >&5
echo "${ECHO_T}$use_dft_colors" >&6
test $use_dft_colors = "yes" &&
cat >>confdefs.h <<\EOF
@@ -32721,178 +32715,178 @@ EOF
fi
-echo "$as_me:32724: checking if experimental keyboard-layout logic should be used" >&5
+echo "$as_me:32718: checking if experimental keyboard-layout logic should be used" >&5
echo $ECHO_N "checking if experimental keyboard-layout logic should be used... $ECHO_C" >&6
# Check whether --enable-kbd-layout or --disable-kbd-layout was given.
if test "${enable_kbd_layout+set}" = set; then
enableval="$enable_kbd_layout"
test "$enableval" != yes && enableval=no
- if test "$enableval" != "no" ; then
+ if test "$enableval" != "no" ; then
use_kbd_layout=$enableval
- else
- use_kbd_layout=no
- fi
+ else
+ use_kbd_layout=no
+ fi
else
enableval=no
- use_kbd_layout=no
+ use_kbd_layout=no
fi;
-echo "$as_me:32741: result: $use_kbd_layout" >&5
+echo "$as_me:32735: result: $use_kbd_layout" >&5
echo "${ECHO_T}$use_kbd_layout" >&6
test $use_kbd_layout != no &&
cat >>confdefs.h <<\EOF
#define EXP_KEYBOARD_LAYOUT 1
EOF
-echo "$as_me:32748: checking if experimental nested-table logic should be used" >&5
+echo "$as_me:32742: checking if experimental nested-table logic should be used" >&5
echo $ECHO_N "checking if experimental nested-table logic should be used... $ECHO_C" >&6
# Check whether --enable-nested-tables or --disable-nested-tables was given.
if test "${enable_nested_tables+set}" = set; then
enableval="$enable_nested_tables"
test "$enableval" != yes && enableval=no
- if test "$enableval" != "no" ; then
+ if test "$enableval" != "no" ; then
use_nested_tables=$enableval
- else
- use_nested_tables=no
- fi
+ else
+ use_nested_tables=no
+ fi
else
enableval=no
- use_nested_tables=no
+ use_nested_tables=no
fi;
-echo "$as_me:32765: result: $use_nested_tables" >&5
+echo "$as_me:32759: result: $use_nested_tables" >&5
echo "${ECHO_T}$use_nested_tables" >&6
test $use_nested_tables != no &&
cat >>confdefs.h <<\EOF
#define EXP_NESTED_TABLES 1
EOF
-echo "$as_me:32772: checking if alternative line-edit bindings should be used" >&5
+echo "$as_me:32766: checking if alternative line-edit bindings should be used" >&5
echo $ECHO_N "checking if alternative line-edit bindings should be used... $ECHO_C" >&6
# Check whether --enable-alt-bindings or --disable-alt-bindings was given.
if test "${enable_alt_bindings+set}" = set; then
enableval="$enable_alt_bindings"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
use_alt_bindings=$enableval
- else
- use_alt_bindings=yes
- fi
+ else
+ use_alt_bindings=yes
+ fi
else
enableval=yes
- use_alt_bindings=yes
+ use_alt_bindings=yes
fi;
-echo "$as_me:32789: result: $use_alt_bindings" >&5
+echo "$as_me:32783: result: $use_alt_bindings" >&5
echo "${ECHO_T}$use_alt_bindings" >&6
test $use_alt_bindings != no &&
cat >>confdefs.h <<\EOF
#define USE_ALT_BINDINGS 1
EOF
-echo "$as_me:32796: checking if ascii case-conversion should be used" >&5
+echo "$as_me:32790: checking if ascii case-conversion should be used" >&5
echo $ECHO_N "checking if ascii case-conversion should be used... $ECHO_C" >&6
# Check whether --enable-ascii-ctypes or --disable-ascii-ctypes was given.
if test "${enable_ascii_ctypes+set}" = set; then
enableval="$enable_ascii_ctypes"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
use_ascii_ctypes=$enableval
- else
- use_ascii_ctypes=yes
- fi
+ else
+ use_ascii_ctypes=yes
+ fi
else
enableval=yes
- use_ascii_ctypes=yes
+ use_ascii_ctypes=yes
fi;
-echo "$as_me:32813: result: $use_ascii_ctypes" >&5
+echo "$as_me:32807: result: $use_ascii_ctypes" >&5
echo "${ECHO_T}$use_ascii_ctypes" >&6
test $use_ascii_ctypes != no &&
cat >>confdefs.h <<\EOF
#define USE_ASCII_CTYPES 1
EOF
-echo "$as_me:32820: checking if you want to use extended HTML DTD logic" >&5
+echo "$as_me:32814: checking if you want to use extended HTML DTD logic" >&5
echo $ECHO_N "checking if you want to use extended HTML DTD logic... $ECHO_C" >&6
# Check whether --enable-extended-dtd or --disable-extended-dtd was given.
if test "${enable_extended_dtd+set}" = set; then
enableval="$enable_extended_dtd"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
use_ext_htmldtd=no
- else
- use_ext_htmldtd=yes
- fi
+ else
+ use_ext_htmldtd=yes
+ fi
else
enableval=yes
- use_ext_htmldtd=yes
+ use_ext_htmldtd=yes
fi;
-echo "$as_me:32837: result: $use_ext_htmldtd" >&5
+echo "$as_me:32831: result: $use_ext_htmldtd" >&5
echo "${ECHO_T}$use_ext_htmldtd" >&6
test $use_ext_htmldtd = "no" &&
cat >>confdefs.h <<\EOF
#define NO_EXTENDED_HTMLDTD 1
EOF
-echo "$as_me:32844: checking if file-upload logic should be used" >&5
+echo "$as_me:32838: checking if file-upload logic should be used" >&5
echo $ECHO_N "checking if file-upload logic should be used... $ECHO_C" >&6
# Check whether --enable-file-upload or --disable-file-upload was given.
if test "${enable_file_upload+set}" = set; then
enableval="$enable_file_upload"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
use_file_upload=$enableval
- else
- use_file_upload=yes
- fi
+ else
+ use_file_upload=yes
+ fi
else
enableval=yes
- use_file_upload=yes
+ use_file_upload=yes
fi;
-echo "$as_me:32861: result: $use_file_upload" >&5
+echo "$as_me:32855: result: $use_file_upload" >&5
echo "${ECHO_T}$use_file_upload" >&6
test $use_file_upload != no &&
cat >>confdefs.h <<\EOF
#define USE_FILE_UPLOAD 1
EOF
-echo "$as_me:32868: checking if IDNA support should be used" >&5
+echo "$as_me:32862: checking if IDNA support should be used" >&5
echo $ECHO_N "checking if IDNA support should be used... $ECHO_C" >&6
# Check whether --enable-idna or --disable-idna was given.
if test "${enable_idna+set}" = set; then
enableval="$enable_idna"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
use_idna=$enableval
- else
- use_idna=yes
- fi
+ else
+ use_idna=yes
+ fi
else
enableval=yes
- use_idna=yes
+ use_idna=yes
fi;
-echo "$as_me:32885: result: $use_idna" >&5
+echo "$as_me:32879: result: $use_idna" >&5
echo "${ECHO_T}$use_idna" >&6
if test "$use_idna" = yes ; then
- case "$use_idna" in
- (no)
- ;;
- (yes)
- ;;
- (*)
+case "$use_idna" in
+(no)
+ ;;
+(yes)
+ ;;
+(*)
for cf_searchpath in `echo "$use_idna" | tr $PATH_SEPARATOR ' '`; do
if test -d $cf_searchpath/include; then
@@ -32921,7 +32915,7 @@ if test -n "$cf_searchpath/include" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 32924 "configure"
+#line 32918 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -32933,16 +32927,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32936: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32930: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:32939: \$? = $ac_status" >&5
+ echo "$as_me:32933: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:32942: \"$ac_try\"") >&5
+ { (eval echo "$as_me:32936: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:32945: \$? = $ac_status" >&5
+ echo "$as_me:32939: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -32959,7 +32953,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:32962: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:32956: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -32969,6 +32963,8 @@ echo "${as_me:-configure}:32962: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
@@ -33000,7 +32996,7 @@ if test -n "$cf_searchpath/../include" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 33003 "configure"
+#line 32999 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -33012,16 +33008,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33015: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33011: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:33018: \$? = $ac_status" >&5
+ echo "$as_me:33014: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:33021: \"$ac_try\"") >&5
+ { (eval echo "$as_me:33017: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:33024: \$? = $ac_status" >&5
+ echo "$as_me:33020: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -33038,7 +33034,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:33041: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:33037: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -33048,13 +33044,15 @@ echo "${as_me:-configure}:33041: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
fi
else
-{ { echo "$as_me:33057: error: cannot find under $use_idna" >&5
+{ { echo "$as_me:33055: error: cannot find under $use_idna" >&5
echo "$as_me: error: cannot find under $use_idna" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -33079,7 +33077,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}:33082: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33080: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -33108,7 +33106,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}:33111: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33109: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -33117,26 +33115,26 @@ echo "${as_me:-configure}:33111: testing adding $cf_add_libdir to library-path .
fi
else
-{ { echo "$as_me:33120: error: cannot find under $use_idna" >&5
+{ { echo "$as_me:33118: error: cannot find under $use_idna" >&5
echo "$as_me: error: cannot find under $use_idna" >&2;}
{ (exit 1); exit 1; }; }
fi
done
- ;;
- esac
+ ;;
+esac
# If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these
# will be set on completion of the AC_TRY_LINK below.
cf_cv_header_path_idn=
cf_cv_library_path_idn=
-echo "${as_me:-configure}:33134: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:33132: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
cf_save_LIBS="$LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 33139 "configure"
+#line 33137 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -33154,16 +33152,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33157: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33155: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:33160: \$? = $ac_status" >&5
+ echo "$as_me:33158: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:33163: \"$ac_try\"") >&5
+ { (eval echo "$as_me:33161: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:33166: \$? = $ac_status" >&5
+ echo "$as_me:33164: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_idn=yes
@@ -33177,7 +33175,7 @@ cat conftest.$ac_ext >&5
LIBS="-lidn $LIBICONV $cf_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 33180 "configure"
+#line 33178 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -33195,16 +33193,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33198: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33196: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:33201: \$? = $ac_status" >&5
+ echo "$as_me:33199: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:33204: \"$ac_try\"") >&5
+ { (eval echo "$as_me:33202: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:33207: \$? = $ac_status" >&5
+ echo "$as_me:33205: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_idn=yes
@@ -33221,9 +33219,9 @@ cat conftest.$ac_ext >&5
test -n "$verbose" && echo " find linkage for idn library" 1>&6
-echo "${as_me:-configure}:33224: testing find linkage for idn library ..." 1>&5
+echo "${as_me:-configure}:33222: testing find linkage for idn library ..." 1>&5
-echo "${as_me:-configure}:33226: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:33224: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
cf_save_CPPFLAGS="$CPPFLAGS"
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -33314,11 +33312,11 @@ cf_search="$cf_search $cf_header_path_list"
if test -d $cf_cv_header_path_idn ; then
test -n "$verbose" && echo " ... testing $cf_cv_header_path_idn" 1>&6
-echo "${as_me:-configure}:33317: testing ... testing $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:33315: testing ... testing $cf_cv_header_path_idn ..." 1>&5
CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_idn"
cat >conftest.$ac_ext <<_ACEOF
-#line 33321 "configure"
+#line 33319 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -33336,21 +33334,21 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33339: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33337: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:33342: \$? = $ac_status" >&5
+ echo "$as_me:33340: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:33345: \"$ac_try\"") >&5
+ { (eval echo "$as_me:33343: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:33348: \$? = $ac_status" >&5
+ echo "$as_me:33346: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test -n "$verbose" && echo " ... found idn headers in $cf_cv_header_path_idn" 1>&6
-echo "${as_me:-configure}:33353: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:33351: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
cf_cv_find_linkage_idn=maybe
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -33368,7 +33366,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_cv_find_linkage_idn" = maybe ; then
-echo "${as_me:-configure}:33371: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:33369: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
cf_save_LIBS="$LIBS"
cf_save_LDFLAGS="$LDFLAGS"
@@ -33443,13 +33441,13 @@ cf_search="$cf_library_path_list $cf_search"
if test -d $cf_cv_library_path_idn ; then
test -n "$verbose" && echo " ... testing $cf_cv_library_path_idn" 1>&6
-echo "${as_me:-configure}:33446: testing ... testing $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:33444: testing ... testing $cf_cv_library_path_idn ..." 1>&5
CPPFLAGS="$cf_test_CPPFLAGS"
LIBS="-lidn $LIBICONV $cf_save_LIBS"
LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_idn"
cat >conftest.$ac_ext <<_ACEOF
-#line 33452 "configure"
+#line 33450 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -33467,21 +33465,21 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33470: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33468: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:33473: \$? = $ac_status" >&5
+ echo "$as_me:33471: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:33476: \"$ac_try\"") >&5
+ { (eval echo "$as_me:33474: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:33479: \$? = $ac_status" >&5
+ echo "$as_me:33477: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test -n "$verbose" && echo " ... found idn library in $cf_cv_library_path_idn" 1>&6
-echo "${as_me:-configure}:33484: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:33482: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
cf_cv_find_linkage_idn=yes
cf_cv_library_file_idn="-lidn"
@@ -33540,7 +33538,7 @@ if test -n "$cf_cv_header_path_idn" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 33543 "configure"
+#line 33541 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -33552,16 +33550,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33555: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33553: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:33558: \$? = $ac_status" >&5
+ echo "$as_me:33556: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:33561: \"$ac_try\"") >&5
+ { (eval echo "$as_me:33559: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:33564: \$? = $ac_status" >&5
+ echo "$as_me:33562: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -33578,7 +33576,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:33581: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:33579: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -33588,6 +33586,8 @@ echo "${as_me:-configure}:33581: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
@@ -33658,14 +33658,14 @@ echo $ECHO_N "checking if element-justification logic should be used... $ECHO_C"
if test "${enable_justify_elts+set}" = set; then
enableval="$enable_justify_elts"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
use_justify_elts=$enableval
- else
- use_justify_elts=yes
- fi
+ else
+ use_justify_elts=yes
+ fi
else
enableval=yes
- use_justify_elts=yes
+ use_justify_elts=yes
fi;
echo "$as_me:33671: result: $use_justify_elts" >&5
@@ -33682,14 +33682,14 @@ echo $ECHO_N "checking if partial-display should be used... $ECHO_C" >&6
if test "${enable_partial+set}" = set; then
enableval="$enable_partial"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
use_partial_display=$enableval
- else
- use_partial_display=yes
- fi
+ else
+ use_partial_display=yes
+ fi
else
enableval=yes
- use_partial_display=yes
+ use_partial_display=yes
fi;
echo "$as_me:33695: result: $use_partial_display" >&5
@@ -33706,14 +33706,14 @@ echo $ECHO_N "checking if persistent-cookie logic should be used... $ECHO_C" >&6
if test "${enable_persistent_cookies+set}" = set; then
enableval="$enable_persistent_cookies"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
use_filed_cookies=$enableval
- else
- use_filed_cookies=yes
- fi
+ else
+ use_filed_cookies=yes
+ fi
else
enableval=yes
- use_filed_cookies=yes
+ use_filed_cookies=yes
fi;
echo "$as_me:33719: result: $use_filed_cookies" >&5
@@ -33730,14 +33730,14 @@ echo $ECHO_N "checking if html source should be colorized... $ECHO_C" >&6
if test "${enable_prettysrc+set}" = set; then
enableval="$enable_prettysrc"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
use_prettysrc=$enableval
- else
- use_prettysrc=yes
- fi
+ else
+ use_prettysrc=yes
+ fi
else
enableval=yes
- use_prettysrc=yes
+ use_prettysrc=yes
fi;
echo "$as_me:33743: result: $use_prettysrc" >&5
@@ -33754,14 +33754,14 @@ echo $ECHO_N "checking if progress-bar code should be used... $ECHO_C" >&6
if test "${enable_progressbar+set}" = set; then
enableval="$enable_progressbar"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
use_progressbar=$enableval
- else
- use_progressbar=yes
- fi
+ else
+ use_progressbar=yes
+ fi
else
enableval=yes
- use_progressbar=yes
+ use_progressbar=yes
fi;
echo "$as_me:33767: result: $use_progressbar" >&5
@@ -33778,14 +33778,14 @@ echo $ECHO_N "checking if read-progress message should show ETA... $ECHO_C" >&6
if test "${enable_read_eta+set}" = set; then
enableval="$enable_read_eta"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
use_read_eta=$enableval
- else
- use_read_eta=yes
- fi
+ else
+ use_read_eta=yes
+ fi
else
enableval=yes
- use_read_eta=yes
+ use_read_eta=yes
fi;
echo "$as_me:33791: result: $use_read_eta" >&5
@@ -33802,14 +33802,14 @@ echo $ECHO_N "checking if source caching should be used... $ECHO_C" >&6
if test "${enable_source_cache+set}" = set; then
enableval="$enable_source_cache"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
use_source_cache=$enableval
- else
- use_source_cache=yes
- fi
+ else
+ use_source_cache=yes
+ fi
else
enableval=yes
- use_source_cache=yes
+ use_source_cache=yes
fi;
echo "$as_me:33815: result: $use_source_cache" >&5
@@ -33826,14 +33826,14 @@ echo $ECHO_N "checking if scrollbar code should be used... $ECHO_C" >&6
if test "${enable_scrollbar+set}" = set; then
enableval="$enable_scrollbar"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
use_scrollbar=$enableval
- else
- use_scrollbar=yes
- fi
+ else
+ use_scrollbar=yes
+ fi
else
enableval=yes
- use_scrollbar=yes
+ use_scrollbar=yes
fi;
echo "$as_me:33839: result: $use_scrollbar" >&5
@@ -33846,14 +33846,14 @@ echo $ECHO_N "checking if charset-selection logic should be used... $ECHO_C" >&6
if test "${enable_charset_choice+set}" = set; then
enableval="$enable_charset_choice"
test "$enableval" != yes && enableval=no
- if test "$enableval" != "no" ; then
+ if test "$enableval" != "no" ; then
use_charset_choice=$enableval
- else
- use_charset_choice=no
- fi
+ else
+ use_charset_choice=no
+ fi
else
enableval=no
- use_charset_choice=no
+ use_charset_choice=no
fi;
echo "$as_me:33859: result: $use_charset_choice" >&5
@@ -33870,14 +33870,14 @@ echo $ECHO_N "checking if you want to use external commands... $ECHO_C" >&6
if test "${enable_externs+set}" = set; then
enableval="$enable_externs"
test "$enableval" != yes && enableval=no
- if test "$enableval" != "no" ; then
+ if test "$enableval" != "no" ; then
use_externs=yes
- else
- use_externs=no
- fi
+ else
+ use_externs=no
+ fi
else
enableval=no
- use_externs=no
+ use_externs=no
fi;
echo "$as_me:33883: result: $use_externs" >&5
@@ -33898,14 +33898,14 @@ echo $ECHO_N "checking if you want to use setfont support... $ECHO_C" >&6
if test "${enable_font_switch+set}" = set; then
enableval="$enable_font_switch"
test "$enableval" != yes && enableval=no
- if test "$enableval" != "no" ; then
+ if test "$enableval" != "no" ; then
use_setfont=yes
- else
- use_setfont=no
- fi
+ else
+ use_setfont=no
+ fi
else
enableval=no
- use_setfont=no
+ use_setfont=no
fi;
echo "$as_me:33911: result: $use_setfont" >&5
@@ -34057,13 +34057,13 @@ echo $ECHO_N "checking if you want cgi-link support... $ECHO_C" >&6
if test "${enable_cgi_links+set}" = set; then
enableval="$enable_cgi_links"
test "$enableval" != yes && enableval=no
- if test "$enableval" != "no" ; then
+ if test "$enableval" != "no" ; then
cat >>confdefs.h <<\EOF
#define LYNXCGI_LINKS 1
EOF
- fi
+ fi
else
enableval=no
fi;
@@ -34077,14 +34077,14 @@ echo $ECHO_N "checking if you want change-exec support... $ECHO_C" >&6
if test "${enable_change_exec+set}" = set; then
enableval="$enable_change_exec"
test "$enableval" != yes && enableval=no
- if test "$enableval" != "no" ; then
+ if test "$enableval" != "no" ; then
use_change_exec=yes
- else
- use_change_exec=no
- fi
+ else
+ use_change_exec=no
+ fi
else
enableval=no
- use_change_exec=no
+ use_change_exec=no
fi;
echo "$as_me:34090: result: $use_change_exec" >&5
@@ -34101,14 +34101,14 @@ echo $ECHO_N "checking if you want exec-links support... $ECHO_C" >&6
if test "${enable_exec_links+set}" = set; then
enableval="$enable_exec_links"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "$use_change_exec" ; then
- use_exec_links=$enableval
- else
+ if test "$enableval" != "$use_change_exec" ; then
use_exec_links=$enableval
- fi
+ else
+ use_exec_links=$enableval
+ fi
else
enableval=$use_change_exec
- use_exec_links=$enableval
+ use_exec_links=$enableval
fi;
echo "$as_me:34114: result: $use_exec_links" >&5
@@ -34125,14 +34125,14 @@ echo $ECHO_N "checking if you want exec-scripts support... $ECHO_C" >&6
if test "${enable_exec_scripts+set}" = set; then
enableval="$enable_exec_scripts"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "$use_change_exec" ; then
- use_exec_scripts=$enableval
- else
+ if test "$enableval" != "$use_change_exec" ; then
use_exec_scripts=$enableval
- fi
+ else
+ use_exec_scripts=$enableval
+ fi
else
enableval=$use_change_exec
- use_exec_scripts=$enableval
+ use_exec_scripts=$enableval
fi;
echo "$as_me:34138: result: $use_exec_scripts" >&5
@@ -34149,14 +34149,14 @@ echo $ECHO_N "checking if you want internal-links feature... $ECHO_C" >&6
if test "${enable_internal_links+set}" = set; then
enableval="$enable_internal_links"
test "$enableval" != yes && enableval=no
- if test "$enableval" != "no" ; then
+ if test "$enableval" != "no" ; then
use_internal_links=yes
- else
- use_internal_links=no
- fi
+ else
+ use_internal_links=no
+ fi
else
enableval=no
- use_internal_links=no
+ use_internal_links=no
fi;
echo "$as_me:34162: result: $use_internal_links" >&5
@@ -34173,14 +34173,14 @@ echo $ECHO_N "checking if you want to fork NSL requests... $ECHO_C" >&6
if test "${enable_nsl_fork+set}" = set; then
enableval="$enable_nsl_fork"
test "$enableval" != yes && enableval=no
- if test "$enableval" != "no" ; then
+ if test "$enableval" != "no" ; then
use_nsl_fork=yes
- else
- use_nsl_fork=no
- fi
+ else
+ use_nsl_fork=no
+ fi
else
enableval=no
- use_nsl_fork=no
+ use_nsl_fork=no
fi;
echo "$as_me:34186: result: $use_nsl_fork" >&5
@@ -34211,14 +34211,14 @@ echo $ECHO_N "checking if you want to log URL requests via syslog... $ECHO_C" >&
if test "${enable_syslog+set}" = set; then
enableval="$enable_syslog"
test "$enableval" != yes && enableval=no
- if test "$enableval" != "no" ; then
+ if test "$enableval" != "no" ; then
use_syslog=yes
- else
- use_syslog=no
- fi
+ else
+ use_syslog=no
+ fi
else
enableval=no
- use_syslog=no
+ use_syslog=no
fi;
echo "$as_me:34224: result: $use_syslog" >&5
@@ -34235,14 +34235,14 @@ echo $ECHO_N "checking if you want to underline links... $ECHO_C" >&6
if test "${enable_underlines+set}" = set; then
enableval="$enable_underlines"
test "$enableval" != yes && enableval=no
- if test "$enableval" != "no" ; then
+ if test "$enableval" != "no" ; then
use_underline=yes
- else
- use_underline=no
- fi
+ else
+ use_underline=no
+ fi
else
enableval=no
- use_underline=no
+ use_underline=no
fi;
echo "$as_me:34248: result: $use_underline" >&5
@@ -34264,14 +34264,14 @@ echo $ECHO_N "checking if help files should be gzip'ed... $ECHO_C" >&6
if test "${enable_gzip_help+set}" = set; then
enableval="$enable_gzip_help"
test "$enableval" != yes && enableval=no
- if test "$enableval" != "no" ; then
+ if test "$enableval" != "no" ; then
use_gzip_help=$enableval
- else
- use_gzip_help=no
- fi
+ else
+ use_gzip_help=no
+ fi
else
enableval=no
- use_gzip_help=no
+ use_gzip_help=no
fi;
echo "$as_me:34277: result: $use_gzip_help" >&5
@@ -34292,12 +34292,12 @@ echo "${ECHO_T}$use_bzlib" >&6
if test ".$use_bzlib" != ".no" ; then
- case "$use_bzlib" in
- (no)
- ;;
- (yes)
- ;;
- (*)
+case "$use_bzlib" in
+(no)
+ ;;
+(yes)
+ ;;
+(*)
for cf_searchpath in `echo "$use_bzlib" | tr $PATH_SEPARATOR ' '`; do
if test -d $cf_searchpath/include; then
@@ -34374,6 +34374,8 @@ echo "${as_me:-configure}:34367: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
@@ -34405,7 +34407,7 @@ if test -n "$cf_searchpath/../include" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 34408 "configure"
+#line 34410 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -34417,16 +34419,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34420: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34422: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:34423: \$? = $ac_status" >&5
+ echo "$as_me:34425: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:34426: \"$ac_try\"") >&5
+ { (eval echo "$as_me:34428: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:34429: \$? = $ac_status" >&5
+ echo "$as_me:34431: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -34443,7 +34445,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:34446: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:34448: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -34453,13 +34455,15 @@ echo "${as_me:-configure}:34446: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
fi
else
-{ { echo "$as_me:34462: error: cannot find under $use_bzlib" >&5
+{ { echo "$as_me:34466: error: cannot find under $use_bzlib" >&5
echo "$as_me: error: cannot find under $use_bzlib" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -34484,7 +34488,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}:34487: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:34491: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -34513,7 +34517,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}:34516: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:34520: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -34522,26 +34526,26 @@ echo "${as_me:-configure}:34516: testing adding $cf_add_libdir to library-path .
fi
else
-{ { echo "$as_me:34525: error: cannot find under $use_bzlib" >&5
+{ { echo "$as_me:34529: error: cannot find under $use_bzlib" >&5
echo "$as_me: error: cannot find under $use_bzlib" >&2;}
{ (exit 1); exit 1; }; }
fi
done
- ;;
- esac
+ ;;
+esac
# If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these
# will be set on completion of the AC_TRY_LINK below.
cf_cv_header_path_bz2=
cf_cv_library_path_bz2=
-echo "${as_me:-configure}:34539: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:34543: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
cf_save_LIBS="$LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 34544 "configure"
+#line 34548 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -34558,16 +34562,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34561: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34565: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:34564: \$? = $ac_status" >&5
+ echo "$as_me:34568: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:34567: \"$ac_try\"") >&5
+ { (eval echo "$as_me:34571: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:34570: \$? = $ac_status" >&5
+ echo "$as_me:34574: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_bz2=yes
@@ -34581,7 +34585,7 @@ cat conftest.$ac_ext >&5
LIBS="-lbz2 $cf_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 34584 "configure"
+#line 34588 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -34598,16 +34602,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34601: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34605: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:34604: \$? = $ac_status" >&5
+ echo "$as_me:34608: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:34607: \"$ac_try\"") >&5
+ { (eval echo "$as_me:34611: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:34610: \$? = $ac_status" >&5
+ echo "$as_me:34614: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_bz2=yes
@@ -34624,9 +34628,9 @@ cat conftest.$ac_ext >&5
test -n "$verbose" && echo " find linkage for bz2 library" 1>&6
-echo "${as_me:-configure}:34627: testing find linkage for bz2 library ..." 1>&5
+echo "${as_me:-configure}:34631: testing find linkage for bz2 library ..." 1>&5
-echo "${as_me:-configure}:34629: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:34633: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
cf_save_CPPFLAGS="$CPPFLAGS"
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -34717,11 +34721,11 @@ cf_search="$cf_search $cf_header_path_list"
if test -d $cf_cv_header_path_bz2 ; then
test -n "$verbose" && echo " ... testing $cf_cv_header_path_bz2" 1>&6
-echo "${as_me:-configure}:34720: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:34724: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_bz2"
cat >conftest.$ac_ext <<_ACEOF
-#line 34724 "configure"
+#line 34728 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -34738,21 +34742,21 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34741: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34745: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:34744: \$? = $ac_status" >&5
+ echo "$as_me:34748: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:34747: \"$ac_try\"") >&5
+ { (eval echo "$as_me:34751: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:34750: \$? = $ac_status" >&5
+ echo "$as_me:34754: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test -n "$verbose" && echo " ... found bz2 headers in $cf_cv_header_path_bz2" 1>&6
-echo "${as_me:-configure}:34755: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:34759: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
cf_cv_find_linkage_bz2=maybe
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -34770,7 +34774,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_cv_find_linkage_bz2" = maybe ; then
-echo "${as_me:-configure}:34773: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:34777: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
cf_save_LIBS="$LIBS"
cf_save_LDFLAGS="$LDFLAGS"
@@ -34778,7 +34782,7 @@ echo "${as_me:-configure}:34773: testing Searching for bz2 library in FIND_LINKA
CPPFLAGS="$cf_test_CPPFLAGS"
LIBS="-lbz2 $cf_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 34781 "configure"
+#line 34785 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -34795,21 +34799,21 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34798: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34802: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:34801: \$? = $ac_status" >&5
+ echo "$as_me:34805: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:34804: \"$ac_try\"") >&5
+ { (eval echo "$as_me:34808: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:34807: \$? = $ac_status" >&5
+ echo "$as_me:34811: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test -n "$verbose" && echo " ... found bz2 library in system" 1>&6
-echo "${as_me:-configure}:34812: testing ... found bz2 library in system ..." 1>&5
+echo "${as_me:-configure}:34816: testing ... found bz2 library in system ..." 1>&5
cf_cv_find_linkage_bz2=yes
else
@@ -34890,13 +34894,13 @@ cf_search="$cf_library_path_list $cf_search"
if test -d $cf_cv_library_path_bz2 ; then
test -n "$verbose" && echo " ... testing $cf_cv_library_path_bz2" 1>&6
-echo "${as_me:-configure}:34893: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:34897: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5
CPPFLAGS="$cf_test_CPPFLAGS"
LIBS="-lbz2 $cf_save_LIBS"
LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_bz2"
cat >conftest.$ac_ext <<_ACEOF
-#line 34899 "configure"
+#line 34903 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -34913,21 +34917,21 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34916: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34920: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:34919: \$? = $ac_status" >&5
+ echo "$as_me:34923: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:34922: \"$ac_try\"") >&5
+ { (eval echo "$as_me:34926: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:34925: \$? = $ac_status" >&5
+ echo "$as_me:34929: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test -n "$verbose" && echo " ... found bz2 library in $cf_cv_library_path_bz2" 1>&6
-echo "${as_me:-configure}:34930: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:34934: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
cf_cv_find_linkage_bz2=yes
cf_cv_library_file_bz2="-lbz2"
@@ -34986,7 +34990,7 @@ if test -n "$cf_cv_header_path_bz2" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 34989 "configure"
+#line 34993 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -34998,16 +35002,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35001: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35005: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:35004: \$? = $ac_status" >&5
+ echo "$as_me:35008: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:35007: \"$ac_try\"") >&5
+ { (eval echo "$as_me:35011: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:35010: \$? = $ac_status" >&5
+ echo "$as_me:35014: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -35024,7 +35028,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:35027: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35031: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -35034,6 +35038,8 @@ echo "${as_me:-configure}:35027: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
@@ -35058,7 +35064,7 @@ if test -n "$cf_cv_library_path_bz2" ; 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}:35061: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35067: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -35083,7 +35089,7 @@ done
LIBS="$cf_add_libs"
else
-{ echo "$as_me:35086: WARNING: Cannot find bz2 library" >&5
+{ echo "$as_me:35092: WARNING: Cannot find bz2 library" >&5
echo "$as_me: WARNING: Cannot find bz2 library" >&2;}
fi
@@ -35094,7 +35100,7 @@ EOF
fi
-echo "$as_me:35097: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "$as_me:35103: checking if you want to use zlib for decompression of some gzip files" >&5
echo $ECHO_N "checking if you want to use zlib for decompression of some gzip files... $ECHO_C" >&6
# Check whether --with-zlib or --without-zlib was given.
@@ -35104,17 +35110,17 @@ if test "${with_zlib+set}" = set; then
else
use_zlib=no
fi;
-echo "$as_me:35107: result: $use_zlib" >&5
+echo "$as_me:35113: result: $use_zlib" >&5
echo "${ECHO_T}$use_zlib" >&6
if test ".$use_zlib" != ".no" ; then
- case "$use_zlib" in
- (no)
- ;;
- (yes)
- ;;
- (*)
+case "$use_zlib" in
+(no)
+ ;;
+(yes)
+ ;;
+(*)
for cf_searchpath in `echo "$use_zlib" | tr $PATH_SEPARATOR ' '`; do
if test -d $cf_searchpath/include; then
@@ -35143,7 +35149,7 @@ if test -n "$cf_searchpath/include" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 35146 "configure"
+#line 35152 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -35155,16 +35161,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35158: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35164: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:35161: \$? = $ac_status" >&5
+ echo "$as_me:35167: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:35164: \"$ac_try\"") >&5
+ { (eval echo "$as_me:35170: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:35167: \$? = $ac_status" >&5
+ echo "$as_me:35173: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -35181,7 +35187,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:35184: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35190: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -35191,6 +35197,8 @@ echo "${as_me:-configure}:35184: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
@@ -35222,7 +35230,7 @@ if test -n "$cf_searchpath/../include" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 35225 "configure"
+#line 35233 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -35234,16 +35242,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35237: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35245: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:35240: \$? = $ac_status" >&5
+ echo "$as_me:35248: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:35243: \"$ac_try\"") >&5
+ { (eval echo "$as_me:35251: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:35246: \$? = $ac_status" >&5
+ echo "$as_me:35254: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -35260,7 +35268,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:35263: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35271: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -35270,13 +35278,15 @@ echo "${as_me:-configure}:35263: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
fi
else
-{ { echo "$as_me:35279: error: cannot find under $use_zlib" >&5
+{ { echo "$as_me:35289: error: cannot find under $use_zlib" >&5
echo "$as_me: error: cannot find under $use_zlib" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -35301,7 +35311,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}:35304: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35314: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -35330,7 +35340,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}:35333: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35343: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -35339,26 +35349,26 @@ echo "${as_me:-configure}:35333: testing adding $cf_add_libdir to library-path .
fi
else
-{ { echo "$as_me:35342: error: cannot find under $use_zlib" >&5
+{ { echo "$as_me:35352: error: cannot find under $use_zlib" >&5
echo "$as_me: error: cannot find under $use_zlib" >&2;}
{ (exit 1); exit 1; }; }
fi
done
- ;;
- esac
+ ;;
+esac
# If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these
# will be set on completion of the AC_TRY_LINK below.
cf_cv_header_path_z=
cf_cv_library_path_z=
-echo "${as_me:-configure}:35356: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:35366: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
cf_save_LIBS="$LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 35361 "configure"
+#line 35371 "configure"
#include "confdefs.h"
#include <zlib.h>
@@ -35374,16 +35384,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35377: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35387: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:35380: \$? = $ac_status" >&5
+ echo "$as_me:35390: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:35383: \"$ac_try\"") >&5
+ { (eval echo "$as_me:35393: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:35386: \$? = $ac_status" >&5
+ echo "$as_me:35396: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_z=yes
@@ -35397,7 +35407,7 @@ cat conftest.$ac_ext >&5
LIBS="-lz $cf_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 35400 "configure"
+#line 35410 "configure"
#include "confdefs.h"
#include <zlib.h>
@@ -35413,16 +35423,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35416: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35426: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:35419: \$? = $ac_status" >&5
+ echo "$as_me:35429: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:35422: \"$ac_try\"") >&5
+ { (eval echo "$as_me:35432: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:35425: \$? = $ac_status" >&5
+ echo "$as_me:35435: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_find_linkage_z=yes
@@ -35439,9 +35449,9 @@ cat conftest.$ac_ext >&5
test -n "$verbose" && echo " find linkage for z library" 1>&6
-echo "${as_me:-configure}:35442: testing find linkage for z library ..." 1>&5
+echo "${as_me:-configure}:35452: testing find linkage for z library ..." 1>&5
-echo "${as_me:-configure}:35444: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:35454: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
cf_save_CPPFLAGS="$CPPFLAGS"
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -35532,11 +35542,11 @@ cf_search="$cf_search $cf_header_path_list"
if test -d $cf_cv_header_path_z ; then
test -n "$verbose" && echo " ... testing $cf_cv_header_path_z" 1>&6
-echo "${as_me:-configure}:35535: testing ... testing $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:35545: testing ... testing $cf_cv_header_path_z ..." 1>&5
CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_z"
cat >conftest.$ac_ext <<_ACEOF
-#line 35539 "configure"
+#line 35549 "configure"
#include "confdefs.h"
#include <zlib.h>
@@ -35552,21 +35562,21 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35555: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35565: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:35558: \$? = $ac_status" >&5
+ echo "$as_me:35568: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:35561: \"$ac_try\"") >&5
+ { (eval echo "$as_me:35571: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:35564: \$? = $ac_status" >&5
+ echo "$as_me:35574: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test -n "$verbose" && echo " ... found z headers in $cf_cv_header_path_z" 1>&6
-echo "${as_me:-configure}:35569: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:35579: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
cf_cv_find_linkage_z=maybe
cf_test_CPPFLAGS="$CPPFLAGS"
@@ -35584,7 +35594,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_cv_find_linkage_z" = maybe ; then
-echo "${as_me:-configure}:35587: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:35597: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
cf_save_LIBS="$LIBS"
cf_save_LDFLAGS="$LDFLAGS"
@@ -35592,7 +35602,7 @@ echo "${as_me:-configure}:35587: testing Searching for z library in FIND_LINKAGE
CPPFLAGS="$cf_test_CPPFLAGS"
LIBS="-lz $cf_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 35595 "configure"
+#line 35605 "configure"
#include "confdefs.h"
#include <zlib.h>
@@ -35608,21 +35618,21 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35611: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35621: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:35614: \$? = $ac_status" >&5
+ echo "$as_me:35624: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:35617: \"$ac_try\"") >&5
+ { (eval echo "$as_me:35627: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:35620: \$? = $ac_status" >&5
+ echo "$as_me:35630: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test -n "$verbose" && echo " ... found z library in system" 1>&6
-echo "${as_me:-configure}:35625: testing ... found z library in system ..." 1>&5
+echo "${as_me:-configure}:35635: testing ... found z library in system ..." 1>&5
cf_cv_find_linkage_z=yes
else
@@ -35703,13 +35713,13 @@ cf_search="$cf_library_path_list $cf_search"
if test -d $cf_cv_library_path_z ; then
test -n "$verbose" && echo " ... testing $cf_cv_library_path_z" 1>&6
-echo "${as_me:-configure}:35706: testing ... testing $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:35716: testing ... testing $cf_cv_library_path_z ..." 1>&5
CPPFLAGS="$cf_test_CPPFLAGS"
LIBS="-lz $cf_save_LIBS"
LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_z"
cat >conftest.$ac_ext <<_ACEOF
-#line 35712 "configure"
+#line 35722 "configure"
#include "confdefs.h"
#include <zlib.h>
@@ -35725,21 +35735,21 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35728: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35738: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:35731: \$? = $ac_status" >&5
+ echo "$as_me:35741: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:35734: \"$ac_try\"") >&5
+ { (eval echo "$as_me:35744: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:35737: \$? = $ac_status" >&5
+ echo "$as_me:35747: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test -n "$verbose" && echo " ... found z library in $cf_cv_library_path_z" 1>&6
-echo "${as_me:-configure}:35742: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:35752: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
cf_cv_find_linkage_z=yes
cf_cv_library_file_z="-lz"
@@ -35798,7 +35808,7 @@ if test -n "$cf_cv_header_path_z" ; then
cf_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 35801 "configure"
+#line 35811 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -35810,16 +35820,16 @@ printf("Hello")
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35813: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35823: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:35816: \$? = $ac_status" >&5
+ echo "$as_me:35826: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:35819: \"$ac_try\"") >&5
+ { (eval echo "$as_me:35829: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:35822: \$? = $ac_status" >&5
+ echo "$as_me:35832: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -35836,7 +35846,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
if test "$cf_have_incdir" = no ; then
test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
-echo "${as_me:-configure}:35839: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35849: testing adding $cf_add_incdir to include-path ..." 1>&5
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
@@ -35846,6 +35856,8 @@ echo "${as_me:-configure}:35839: testing adding $cf_add_incdir to include-path .
else
break
fi
+ else
+ break
fi
done
done
@@ -35870,7 +35882,7 @@ if test -n "$cf_cv_library_path_z" ; 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}:35873: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35885: testing adding $cf_add_libdir to library-path ..." 1>&5
LDFLAGS="-L$cf_add_libdir $LDFLAGS"
fi
@@ -35895,7 +35907,7 @@ done
LIBS="$cf_add_libs"
else
-{ echo "$as_me:35898: WARNING: Cannot find z library" >&5
+{ echo "$as_me:35910: WARNING: Cannot find z library" >&5
echo "$as_me: WARNING: Cannot find z library" >&2;}
fi
@@ -35904,13 +35916,13 @@ for ac_func in \
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:35907: checking for $ac_func" >&5
+echo "$as_me:35919: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 35913 "configure"
+#line 35925 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -35941,16 +35953,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35944: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35956: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:35947: \$? = $ac_status" >&5
+ echo "$as_me:35959: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:35950: \"$ac_try\"") >&5
+ { (eval echo "$as_me:35962: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:35953: \$? = $ac_status" >&5
+ echo "$as_me:35965: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -35960,7 +35972,7 @@ eval "$as_ac_var=no"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:35963: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:35975: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -35977,126 +35989,126 @@ EOF
fi
-echo "$as_me:35980: checking if you want to exclude FINGER code" >&5
+echo "$as_me:35992: checking if you want to exclude FINGER code" >&5
echo $ECHO_N "checking if you want to exclude FINGER code... $ECHO_C" >&6
# Check whether --enable-finger or --disable-finger was given.
if test "${enable_finger+set}" = set; then
enableval="$enable_finger"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
use_finger=yes
- else
- use_finger=no
- fi
+ else
+ use_finger=no
+ fi
else
enableval=yes
- use_finger=no
+ use_finger=no
fi;
-echo "$as_me:35997: result: $use_finger" >&5
+echo "$as_me:36009: result: $use_finger" >&5
echo "${ECHO_T}$use_finger" >&6
test $use_finger != "no" &&
cat >>confdefs.h <<\EOF
#define DISABLE_FINGER 1
EOF
-echo "$as_me:36004: checking if you want to exclude GOPHER code" >&5
+echo "$as_me:36016: checking if you want to exclude GOPHER code" >&5
echo $ECHO_N "checking if you want to exclude GOPHER code... $ECHO_C" >&6
# Check whether --enable-gopher or --disable-gopher was given.
if test "${enable_gopher+set}" = set; then
enableval="$enable_gopher"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
use_gopher=yes
- else
- use_gopher=no
- fi
+ else
+ use_gopher=no
+ fi
else
enableval=yes
- use_gopher=no
+ use_gopher=no
fi;
-echo "$as_me:36021: result: $use_gopher" >&5
+echo "$as_me:36033: result: $use_gopher" >&5
echo "${ECHO_T}$use_gopher" >&6
test $use_gopher != "no" &&
cat >>confdefs.h <<\EOF
#define DISABLE_GOPHER 1
EOF
-echo "$as_me:36028: checking if you want to exclude NEWS code" >&5
+echo "$as_me:36040: checking if you want to exclude NEWS code" >&5
echo $ECHO_N "checking if you want to exclude NEWS code... $ECHO_C" >&6
# Check whether --enable-news or --disable-news was given.
if test "${enable_news+set}" = set; then
enableval="$enable_news"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
use_news=yes
- else
- use_news=no
- fi
+ else
+ use_news=no
+ fi
else
enableval=yes
- use_news=no
+ use_news=no
fi;
-echo "$as_me:36045: result: $use_news" >&5
+echo "$as_me:36057: result: $use_news" >&5
echo "${ECHO_T}$use_news" >&6
test $use_news != "no" &&
cat >>confdefs.h <<\EOF
#define DISABLE_NEWS 1
EOF
-echo "$as_me:36052: checking if you want to exclude FTP code" >&5
+echo "$as_me:36064: checking if you want to exclude FTP code" >&5
echo $ECHO_N "checking if you want to exclude FTP code... $ECHO_C" >&6
# Check whether --enable-ftp or --disable-ftp was given.
if test "${enable_ftp+set}" = set; then
enableval="$enable_ftp"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
use_ftp=yes
- else
- use_ftp=no
- fi
+ else
+ use_ftp=no
+ fi
else
enableval=yes
- use_ftp=no
+ use_ftp=no
fi;
-echo "$as_me:36069: result: $use_ftp" >&5
+echo "$as_me:36081: result: $use_ftp" >&5
echo "${ECHO_T}$use_ftp" >&6
test $use_ftp != "no" &&
cat >>confdefs.h <<\EOF
#define DISABLE_FTP 1
EOF
-echo "$as_me:36076: checking if you want to include WAIS code" >&5
+echo "$as_me:36088: checking if you want to include WAIS code" >&5
echo $ECHO_N "checking if you want to include WAIS code... $ECHO_C" >&6
# Check whether --enable-wais or --disable-wais was given.
if test "${enable_wais+set}" = set; then
enableval="$enable_wais"
test "$enableval" != yes && enableval=no
- if test "$enableval" != "no" ; then
+ if test "$enableval" != "no" ; then
use_wais=yes
- else
- use_wais=no
- fi
+ else
+ use_wais=no
+ fi
else
enableval=no
- use_wais=no
+ use_wais=no
fi;
-echo "$as_me:36093: result: $use_wais" >&5
+echo "$as_me:36105: result: $use_wais" >&5
echo "${ECHO_T}$use_wais" >&6
MAKE_WAIS="#"
if test $use_wais != "no"
then
- echo "$as_me:36099: checking for fs_free in -lwais" >&5
+ echo "$as_me:36111: checking for fs_free in -lwais" >&5
echo $ECHO_N "checking for fs_free in -lwais... $ECHO_C" >&6
if test "${ac_cv_lib_wais_fs_free+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -36104,7 +36116,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lwais $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 36107 "configure"
+#line 36119 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -36123,16 +36135,16 @@ fs_free ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36126: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36138: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:36129: \$? = $ac_status" >&5
+ echo "$as_me:36141: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:36132: \"$ac_try\"") >&5
+ { (eval echo "$as_me:36144: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:36135: \$? = $ac_status" >&5
+ echo "$as_me:36147: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_wais_fs_free=yes
else
@@ -36143,18 +36155,18 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:36146: result: $ac_cv_lib_wais_fs_free" >&5
+echo "$as_me:36158: result: $ac_cv_lib_wais_fs_free" >&5
echo "${ECHO_T}$ac_cv_lib_wais_fs_free" >&6
if test $ac_cv_lib_wais_fs_free = yes; then
-echo "$as_me:36150: checking if -lm needed for math functions" >&5
+echo "$as_me:36162: checking if -lm needed for math functions" >&5
echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
if test "${cf_cv_need_libm+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 36157 "configure"
+#line 36169 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -36169,16 +36181,16 @@ double x = rand(); printf("result = %g\n", sin(x))
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36172: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36184: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:36175: \$? = $ac_status" >&5
+ echo "$as_me:36187: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:36178: \"$ac_try\"") >&5
+ { (eval echo "$as_me:36190: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:36181: \$? = $ac_status" >&5
+ echo "$as_me:36193: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_need_libm=no
else
@@ -36188,7 +36200,7 @@ cf_cv_need_libm=yes
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:36191: result: $cf_cv_need_libm" >&5
+echo "$as_me:36203: result: $cf_cv_need_libm" >&5
echo "${ECHO_T}$cf_cv_need_libm" >&6
if test "$cf_cv_need_libm" = yes
then
@@ -36230,23 +36242,23 @@ LIBS="$cf_add_libs"
for ac_header in wais.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:36233: checking for $ac_header" >&5
+echo "$as_me:36245: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 36239 "configure"
+#line 36251 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:36243: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:36255: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:36249: \$? = $ac_status" >&5
+ echo "$as_me:36261: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -36265,7 +36277,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:36268: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:36280: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -36278,7 +36290,7 @@ done
MAKE_WAIS=
else
- { echo "$as_me:36281: WARNING: could not find WAIS library" >&5
+ { echo "$as_me:36293: WARNING: could not find WAIS library" >&5
echo "$as_me: WARNING: could not find WAIS library" >&2;}
fi
@@ -36286,24 +36298,24 @@ fi
# All DirEd functions that were enabled on compilation can be disabled
# or modified at run time via DIRED_MENU symbols in lynx.cfg.
-echo "$as_me:36289: checking if directory-editor code should be used" >&5
+echo "$as_me:36301: checking if directory-editor code should be used" >&5
echo $ECHO_N "checking if directory-editor code should be used... $ECHO_C" >&6
# Check whether --enable-dired or --disable-dired was given.
if test "${enable_dired+set}" = set; then
enableval="$enable_dired"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
use_dired=$enableval
- else
- use_dired=yes
- fi
+ else
+ use_dired=yes
+ fi
else
enableval=yes
- use_dired=yes
+ use_dired=yes
fi;
-echo "$as_me:36306: result: $use_dired" >&5
+echo "$as_me:36318: result: $use_dired" >&5
echo "${ECHO_T}$use_dired" >&6
if test ".$use_dired" != ".no" ; then
@@ -36313,42 +36325,42 @@ cat >>confdefs.h <<\EOF
#define DIRED_SUPPORT 1
EOF
- echo "$as_me:36316: checking if you wish to allow extracting from archives via DirEd" >&5
+ echo "$as_me:36328: checking if you wish to allow extracting from archives via DirEd" >&5
echo $ECHO_N "checking if you wish to allow extracting from archives via DirEd... $ECHO_C" >&6
# Check whether --enable-dired-dearchive or --disable-dired-dearchive was given.
if test "${enable_dired_dearchive+set}" = set; then
enableval="$enable_dired_dearchive"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
cat >>confdefs.h <<\EOF
#define ARCHIVE_ONLY 1
EOF
- fi
+ fi
else
enableval=yes
fi;
- echo "$as_me:36333: result: $enableval" >&5
+ echo "$as_me:36345: result: $enableval" >&5
echo "${ECHO_T}$enableval" >&6
- echo "$as_me:36336: checking if DirEd mode should override keys" >&5
+ echo "$as_me:36348: checking if DirEd mode should override keys" >&5
echo $ECHO_N "checking if DirEd mode should override keys... $ECHO_C" >&6
# Check whether --enable-dired-override or --disable-dired-override was given.
if test "${enable_dired_override+set}" = set; then
enableval="$enable_dired_override"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
:
- else
+ else
cat >>confdefs.h <<\EOF
#define OK_OVERRIDE 1
EOF
- fi
+ fi
else
enableval=yes
@@ -36357,25 +36369,25 @@ cat >>confdefs.h <<\EOF
EOF
fi;
- echo "$as_me:36360: result: $enableval" >&5
+ echo "$as_me:36372: result: $enableval" >&5
echo "${ECHO_T}$enableval" >&6
- echo "$as_me:36363: checking if you wish to allow permissions commands via DirEd" >&5
+ echo "$as_me:36375: checking if you wish to allow permissions commands via DirEd" >&5
echo $ECHO_N "checking if you wish to allow permissions commands via DirEd... $ECHO_C" >&6
# Check whether --enable-dired-permit or --disable-dired-permit was given.
if test "${enable_dired_permit+set}" = set; then
enableval="$enable_dired_permit"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
:
- else
+ else
cat >>confdefs.h <<\EOF
#define OK_PERMIT 1
EOF
- fi
+ fi
else
enableval=yes
@@ -36384,45 +36396,45 @@ cat >>confdefs.h <<\EOF
EOF
fi;
- echo "$as_me:36387: result: $enableval" >&5
+ echo "$as_me:36399: result: $enableval" >&5
echo "${ECHO_T}$enableval" >&6
- echo "$as_me:36390: checking if you wish to allow executable-permission commands via DirEd" >&5
+ echo "$as_me:36402: checking if you wish to allow executable-permission commands via DirEd" >&5
echo $ECHO_N "checking if you wish to allow executable-permission commands via DirEd... $ECHO_C" >&6
# Check whether --enable-dired-xpermit or --disable-dired-xpermit was given.
if test "${enable_dired_xpermit+set}" = set; then
enableval="$enable_dired_xpermit"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
cat >>confdefs.h <<\EOF
#define NO_CHANGE_EXECUTE_PERMS 1
EOF
- fi
+ fi
else
enableval=yes
fi;
- echo "$as_me:36407: result: $enableval" >&5
+ echo "$as_me:36419: result: $enableval" >&5
echo "${ECHO_T}$enableval" >&6
- echo "$as_me:36410: checking if you wish to allow \"tar\" commands from DirEd" >&5
+ echo "$as_me:36422: checking if you wish to allow \"tar\" commands from DirEd" >&5
echo $ECHO_N "checking if you wish to allow \"tar\" commands from DirEd... $ECHO_C" >&6
# Check whether --enable-dired-tar or --disable-dired-tar was given.
if test "${enable_dired_tar+set}" = set; then
enableval="$enable_dired_tar"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
:
- else
+ else
cat >>confdefs.h <<\EOF
#define OK_TAR 1
EOF
- fi
+ fi
else
enableval=yes
@@ -36431,25 +36443,25 @@ cat >>confdefs.h <<\EOF
EOF
fi;
- echo "$as_me:36434: result: $enableval" >&5
+ echo "$as_me:36446: result: $enableval" >&5
echo "${ECHO_T}$enableval" >&6
- echo "$as_me:36437: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
+ echo "$as_me:36449: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
echo $ECHO_N "checking if you wish to allow \"uudecode\" commands from DirEd... $ECHO_C" >&6
# Check whether --enable-dired-uudecode or --disable-dired-uudecode was given.
if test "${enable_dired_uudecode+set}" = set; then
enableval="$enable_dired_uudecode"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
:
- else
+ else
cat >>confdefs.h <<\EOF
#define OK_UUDECODE 1
EOF
- fi
+ fi
else
enableval=yes
@@ -36458,25 +36470,25 @@ cat >>confdefs.h <<\EOF
EOF
fi;
- echo "$as_me:36461: result: $enableval" >&5
+ echo "$as_me:36473: result: $enableval" >&5
echo "${ECHO_T}$enableval" >&6
- echo "$as_me:36464: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
+ echo "$as_me:36476: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
echo $ECHO_N "checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd... $ECHO_C" >&6
# Check whether --enable-dired-zip or --disable-dired-zip was given.
if test "${enable_dired_zip+set}" = set; then
enableval="$enable_dired_zip"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
:
- else
+ else
cat >>confdefs.h <<\EOF
#define OK_ZIP 1
EOF
- fi
+ fi
else
enableval=yes
@@ -36485,25 +36497,25 @@ cat >>confdefs.h <<\EOF
EOF
fi;
- echo "$as_me:36488: result: $enableval" >&5
+ echo "$as_me:36500: result: $enableval" >&5
echo "${ECHO_T}$enableval" >&6
- echo "$as_me:36491: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
+ echo "$as_me:36503: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
echo $ECHO_N "checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd... $ECHO_C" >&6
# Check whether --enable-dired-gzip or --disable-dired-gzip was given.
if test "${enable_dired_gzip+set}" = set; then
enableval="$enable_dired_gzip"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
:
- else
+ else
cat >>confdefs.h <<\EOF
#define OK_GZIP 1
EOF
- fi
+ fi
else
enableval=yes
@@ -36512,26 +36524,26 @@ cat >>confdefs.h <<\EOF
EOF
fi;
- echo "$as_me:36515: result: $enableval" >&5
+ echo "$as_me:36527: result: $enableval" >&5
echo "${ECHO_T}$enableval" >&6
fi
-echo "$as_me:36519: checking if you want long-directory listings" >&5
+echo "$as_me:36531: checking if you want long-directory listings" >&5
echo $ECHO_N "checking if you want long-directory listings... $ECHO_C" >&6
# Check whether --enable-long-list or --disable-long-list was given.
if test "${enable_long_list+set}" = set; then
enableval="$enable_long_list"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
:
- else
+ else
cat >>confdefs.h <<\EOF
#define LONG_LIST 1
EOF
- fi
+ fi
else
enableval=yes
@@ -36540,27 +36552,27 @@ cat >>confdefs.h <<\EOF
EOF
fi;
-echo "$as_me:36543: result: $enableval" >&5
+echo "$as_me:36555: result: $enableval" >&5
echo "${ECHO_T}$enableval" >&6
-echo "$as_me:36546: checking if parent-directory references are permitted" >&5
+echo "$as_me:36558: checking if parent-directory references are permitted" >&5
echo $ECHO_N "checking if parent-directory references are permitted... $ECHO_C" >&6
# Check whether --enable-parent-dir-refs or --disable-parent-dir-refs was given.
if test "${enable_parent_dir_refs+set}" = set; then
enableval="$enable_parent_dir_refs"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
cat >>confdefs.h <<\EOF
#define NO_PARENT_DIR_REFERENCE 1
EOF
- fi
+ fi
else
enableval=yes
fi;
-echo "$as_me:36563: result: $enableval" >&5
+echo "$as_me:36575: result: $enableval" >&5
echo "${ECHO_T}$enableval" >&6
test -z "$TELNET" && TELNET=telnet
@@ -36568,7 +36580,7 @@ for ac_prog in $TELNET telnet
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:36571: checking for $ac_word" >&5
+echo "$as_me:36583: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_TELNET+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -36585,7 +36597,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_TELNET="$ac_dir/$ac_word"
- echo "$as_me:36588: found $ac_dir/$ac_word" >&5
+ echo "$as_me:36600: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -36596,10 +36608,10 @@ fi
TELNET=$ac_cv_path_TELNET
if test -n "$TELNET"; then
- echo "$as_me:36599: result: $TELNET" >&5
+ echo "$as_me:36611: result: $TELNET" >&5
echo "${ECHO_T}$TELNET" >&6
else
- echo "$as_me:36602: result: no" >&5
+ echo "$as_me:36614: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -36658,7 +36670,7 @@ IFS="$cf_save_ifs"
if test -n "$cf_path_prog" ; then
-echo "${as_me:-configure}:36661: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36673: testing defining path for ${cf_path_prog} ..." 1>&5
cat >>confdefs.h <<EOF
#define TELNET_PATH "$cf_path_prog"
@@ -36676,7 +36688,7 @@ for ac_prog in $TN3270 tn3270
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:36679: checking for $ac_word" >&5
+echo "$as_me:36691: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_TN3270+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -36693,7 +36705,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_TN3270="$ac_dir/$ac_word"
- echo "$as_me:36696: found $ac_dir/$ac_word" >&5
+ echo "$as_me:36708: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -36704,10 +36716,10 @@ fi
TN3270=$ac_cv_path_TN3270
if test -n "$TN3270"; then
- echo "$as_me:36707: result: $TN3270" >&5
+ echo "$as_me:36719: result: $TN3270" >&5
echo "${ECHO_T}$TN3270" >&6
else
- echo "$as_me:36710: result: no" >&5
+ echo "$as_me:36722: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -36766,7 +36778,7 @@ IFS="$cf_save_ifs"
if test -n "$cf_path_prog" ; then
-echo "${as_me:-configure}:36769: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36781: testing defining path for ${cf_path_prog} ..." 1>&5
cat >>confdefs.h <<EOF
#define TN3270_PATH "$cf_path_prog"
@@ -36784,7 +36796,7 @@ for ac_prog in $RLOGIN rlogin
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:36787: checking for $ac_word" >&5
+echo "$as_me:36799: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_RLOGIN+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -36801,7 +36813,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_RLOGIN="$ac_dir/$ac_word"
- echo "$as_me:36804: found $ac_dir/$ac_word" >&5
+ echo "$as_me:36816: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -36812,10 +36824,10 @@ fi
RLOGIN=$ac_cv_path_RLOGIN
if test -n "$RLOGIN"; then
- echo "$as_me:36815: result: $RLOGIN" >&5
+ echo "$as_me:36827: result: $RLOGIN" >&5
echo "${ECHO_T}$RLOGIN" >&6
else
- echo "$as_me:36818: result: no" >&5
+ echo "$as_me:36830: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -36874,7 +36886,7 @@ IFS="$cf_save_ifs"
if test -n "$cf_path_prog" ; then
-echo "${as_me:-configure}:36877: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36889: testing defining path for ${cf_path_prog} ..." 1>&5
cat >>confdefs.h <<EOF
#define RLOGIN_PATH "$cf_path_prog"
@@ -36892,7 +36904,7 @@ for ac_prog in $MV mv
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:36895: checking for $ac_word" >&5
+echo "$as_me:36907: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_MV+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -36909,7 +36921,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_MV="$ac_dir/$ac_word"
- echo "$as_me:36912: found $ac_dir/$ac_word" >&5
+ echo "$as_me:36924: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -36920,10 +36932,10 @@ fi
MV=$ac_cv_path_MV
if test -n "$MV"; then
- echo "$as_me:36923: result: $MV" >&5
+ echo "$as_me:36935: result: $MV" >&5
echo "${ECHO_T}$MV" >&6
else
- echo "$as_me:36926: result: no" >&5
+ echo "$as_me:36938: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -36982,7 +36994,7 @@ IFS="$cf_save_ifs"
if test -n "$cf_path_prog" ; then
-echo "${as_me:-configure}:36985: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36997: testing defining path for ${cf_path_prog} ..." 1>&5
cat >>confdefs.h <<EOF
#define MV_PATH "$cf_path_prog"
@@ -37000,7 +37012,7 @@ for ac_prog in $GZIP gzip
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:37003: checking for $ac_word" >&5
+echo "$as_me:37015: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_GZIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -37017,7 +37029,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_GZIP="$ac_dir/$ac_word"
- echo "$as_me:37020: found $ac_dir/$ac_word" >&5
+ echo "$as_me:37032: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -37028,10 +37040,10 @@ fi
GZIP=$ac_cv_path_GZIP
if test -n "$GZIP"; then
- echo "$as_me:37031: result: $GZIP" >&5
+ echo "$as_me:37043: result: $GZIP" >&5
echo "${ECHO_T}$GZIP" >&6
else
- echo "$as_me:37034: result: no" >&5
+ echo "$as_me:37046: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -37090,7 +37102,7 @@ IFS="$cf_save_ifs"
if test -n "$cf_path_prog" ; then
-echo "${as_me:-configure}:37093: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37105: testing defining path for ${cf_path_prog} ..." 1>&5
cat >>confdefs.h <<EOF
#define GZIP_PATH "$cf_path_prog"
@@ -37108,7 +37120,7 @@ for ac_prog in $UNCOMPRESS gunzip
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:37111: checking for $ac_word" >&5
+echo "$as_me:37123: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_UNCOMPRESS+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -37125,7 +37137,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_UNCOMPRESS="$ac_dir/$ac_word"
- echo "$as_me:37128: found $ac_dir/$ac_word" >&5
+ echo "$as_me:37140: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -37136,10 +37148,10 @@ fi
UNCOMPRESS=$ac_cv_path_UNCOMPRESS
if test -n "$UNCOMPRESS"; then
- echo "$as_me:37139: result: $UNCOMPRESS" >&5
+ echo "$as_me:37151: result: $UNCOMPRESS" >&5
echo "${ECHO_T}$UNCOMPRESS" >&6
else
- echo "$as_me:37142: result: no" >&5
+ echo "$as_me:37154: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -37198,7 +37210,7 @@ IFS="$cf_save_ifs"
if test -n "$cf_path_prog" ; then
-echo "${as_me:-configure}:37201: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37213: testing defining path for ${cf_path_prog} ..." 1>&5
cat >>confdefs.h <<EOF
#define UNCOMPRESS_PATH "$cf_path_prog"
@@ -37216,7 +37228,7 @@ for ac_prog in $UNZIP unzip
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:37219: checking for $ac_word" >&5
+echo "$as_me:37231: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_UNZIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -37233,7 +37245,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_UNZIP="$ac_dir/$ac_word"
- echo "$as_me:37236: found $ac_dir/$ac_word" >&5
+ echo "$as_me:37248: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -37244,10 +37256,10 @@ fi
UNZIP=$ac_cv_path_UNZIP
if test -n "$UNZIP"; then
- echo "$as_me:37247: result: $UNZIP" >&5
+ echo "$as_me:37259: result: $UNZIP" >&5
echo "${ECHO_T}$UNZIP" >&6
else
- echo "$as_me:37250: result: no" >&5
+ echo "$as_me:37262: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -37306,7 +37318,7 @@ IFS="$cf_save_ifs"
if test -n "$cf_path_prog" ; then
-echo "${as_me:-configure}:37309: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37321: testing defining path for ${cf_path_prog} ..." 1>&5
cat >>confdefs.h <<EOF
#define UNZIP_PATH "$cf_path_prog"
@@ -37324,7 +37336,7 @@ for ac_prog in $BZIP2 bzip2
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:37327: checking for $ac_word" >&5
+echo "$as_me:37339: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_BZIP2+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -37341,7 +37353,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_BZIP2="$ac_dir/$ac_word"
- echo "$as_me:37344: found $ac_dir/$ac_word" >&5
+ echo "$as_me:37356: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -37352,10 +37364,10 @@ fi
BZIP2=$ac_cv_path_BZIP2
if test -n "$BZIP2"; then
- echo "$as_me:37355: result: $BZIP2" >&5
+ echo "$as_me:37367: result: $BZIP2" >&5
echo "${ECHO_T}$BZIP2" >&6
else
- echo "$as_me:37358: result: no" >&5
+ echo "$as_me:37370: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -37414,7 +37426,7 @@ IFS="$cf_save_ifs"
if test -n "$cf_path_prog" ; then
-echo "${as_me:-configure}:37417: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37429: testing defining path for ${cf_path_prog} ..." 1>&5
cat >>confdefs.h <<EOF
#define BZIP2_PATH "$cf_path_prog"
@@ -37432,7 +37444,7 @@ for ac_prog in $TAR tar pax gtar gnutar bsdtar star
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:37435: checking for $ac_word" >&5
+echo "$as_me:37447: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_TAR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -37449,7 +37461,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_TAR="$ac_dir/$ac_word"
- echo "$as_me:37452: found $ac_dir/$ac_word" >&5
+ echo "$as_me:37464: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -37460,10 +37472,10 @@ fi
TAR=$ac_cv_path_TAR
if test -n "$TAR"; then
- echo "$as_me:37463: result: $TAR" >&5
+ echo "$as_me:37475: result: $TAR" >&5
echo "${ECHO_T}$TAR" >&6
else
- echo "$as_me:37466: result: no" >&5
+ echo "$as_me:37478: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -37522,7 +37534,7 @@ IFS="$cf_save_ifs"
if test -n "$cf_path_prog" ; then
-echo "${as_me:-configure}:37525: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37537: testing defining path for ${cf_path_prog} ..." 1>&5
cat >>confdefs.h <<EOF
#define TAR_PATH "$cf_path_prog"
@@ -37580,7 +37592,7 @@ for ac_prog in $COMPRESS compress
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:37583: checking for $ac_word" >&5
+echo "$as_me:37595: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_COMPRESS+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -37597,7 +37609,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_COMPRESS="$ac_dir/$ac_word"
- echo "$as_me:37600: found $ac_dir/$ac_word" >&5
+ echo "$as_me:37612: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -37608,10 +37620,10 @@ fi
COMPRESS=$ac_cv_path_COMPRESS
if test -n "$COMPRESS"; then
- echo "$as_me:37611: result: $COMPRESS" >&5
+ echo "$as_me:37623: result: $COMPRESS" >&5
echo "${ECHO_T}$COMPRESS" >&6
else
- echo "$as_me:37614: result: no" >&5
+ echo "$as_me:37626: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -37670,7 +37682,7 @@ IFS="$cf_save_ifs"
if test -n "$cf_path_prog" ; then
-echo "${as_me:-configure}:37673: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37685: testing defining path for ${cf_path_prog} ..." 1>&5
cat >>confdefs.h <<EOF
#define COMPRESS_PATH "$cf_path_prog"
@@ -37688,7 +37700,7 @@ for ac_prog in $RM rm
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:37691: checking for $ac_word" >&5
+echo "$as_me:37703: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_RM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -37705,7 +37717,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_RM="$ac_dir/$ac_word"
- echo "$as_me:37708: found $ac_dir/$ac_word" >&5
+ echo "$as_me:37720: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -37716,10 +37728,10 @@ fi
RM=$ac_cv_path_RM
if test -n "$RM"; then
- echo "$as_me:37719: result: $RM" >&5
+ echo "$as_me:37731: result: $RM" >&5
echo "${ECHO_T}$RM" >&6
else
- echo "$as_me:37722: result: no" >&5
+ echo "$as_me:37734: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -37778,7 +37790,7 @@ IFS="$cf_save_ifs"
if test -n "$cf_path_prog" ; then
-echo "${as_me:-configure}:37781: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37793: testing defining path for ${cf_path_prog} ..." 1>&5
cat >>confdefs.h <<EOF
#define RM_PATH "$cf_path_prog"
@@ -37796,7 +37808,7 @@ for ac_prog in $UUDECODE uudecode
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:37799: checking for $ac_word" >&5
+echo "$as_me:37811: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_UUDECODE+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -37813,7 +37825,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_UUDECODE="$ac_dir/$ac_word"
- echo "$as_me:37816: found $ac_dir/$ac_word" >&5
+ echo "$as_me:37828: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -37824,10 +37836,10 @@ fi
UUDECODE=$ac_cv_path_UUDECODE
if test -n "$UUDECODE"; then
- echo "$as_me:37827: result: $UUDECODE" >&5
+ echo "$as_me:37839: result: $UUDECODE" >&5
echo "${ECHO_T}$UUDECODE" >&6
else
- echo "$as_me:37830: result: no" >&5
+ echo "$as_me:37842: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -37886,7 +37898,7 @@ IFS="$cf_save_ifs"
if test -n "$cf_path_prog" ; then
-echo "${as_me:-configure}:37889: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37901: testing defining path for ${cf_path_prog} ..." 1>&5
cat >>confdefs.h <<EOF
#define UUDECODE_PATH "$cf_path_prog"
@@ -37904,7 +37916,7 @@ for ac_prog in $ZCAT zcat
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:37907: checking for $ac_word" >&5
+echo "$as_me:37919: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_ZCAT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -37921,7 +37933,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_ZCAT="$ac_dir/$ac_word"
- echo "$as_me:37924: found $ac_dir/$ac_word" >&5
+ echo "$as_me:37936: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -37932,10 +37944,10 @@ fi
ZCAT=$ac_cv_path_ZCAT
if test -n "$ZCAT"; then
- echo "$as_me:37935: result: $ZCAT" >&5
+ echo "$as_me:37947: result: $ZCAT" >&5
echo "${ECHO_T}$ZCAT" >&6
else
- echo "$as_me:37938: result: no" >&5
+ echo "$as_me:37950: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -37994,7 +38006,7 @@ IFS="$cf_save_ifs"
if test -n "$cf_path_prog" ; then
-echo "${as_me:-configure}:37997: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:38009: testing defining path for ${cf_path_prog} ..." 1>&5
cat >>confdefs.h <<EOF
#define ZCAT_PATH "$cf_path_prog"
@@ -38012,7 +38024,7 @@ for ac_prog in $ZIP zip
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:38015: checking for $ac_word" >&5
+echo "$as_me:38027: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_ZIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -38029,7 +38041,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_ZIP="$ac_dir/$ac_word"
- echo "$as_me:38032: found $ac_dir/$ac_word" >&5
+ echo "$as_me:38044: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -38040,10 +38052,10 @@ fi
ZIP=$ac_cv_path_ZIP
if test -n "$ZIP"; then
- echo "$as_me:38043: result: $ZIP" >&5
+ echo "$as_me:38055: result: $ZIP" >&5
echo "${ECHO_T}$ZIP" >&6
else
- echo "$as_me:38046: result: no" >&5
+ echo "$as_me:38058: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -38102,7 +38114,7 @@ IFS="$cf_save_ifs"
if test -n "$cf_path_prog" ; then
-echo "${as_me:-configure}:38105: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:38117: testing defining path for ${cf_path_prog} ..." 1>&5
cat >>confdefs.h <<EOF
#define ZIP_PATH "$cf_path_prog"
@@ -38130,7 +38142,7 @@ for ac_prog in $INSTALL install
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:38133: checking for $ac_word" >&5
+echo "$as_me:38145: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_INSTALL+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -38147,7 +38159,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_INSTALL="$ac_dir/$ac_word"
- echo "$as_me:38150: found $ac_dir/$ac_word" >&5
+ echo "$as_me:38162: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -38158,10 +38170,10 @@ fi
INSTALL=$ac_cv_path_INSTALL
if test -n "$INSTALL"; then
- echo "$as_me:38161: result: $INSTALL" >&5
+ echo "$as_me:38173: result: $INSTALL" >&5
echo "${ECHO_T}$INSTALL" >&6
else
- echo "$as_me:38164: result: no" >&5
+ echo "$as_me:38176: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -38220,7 +38232,7 @@ IFS="$cf_save_ifs"
if test -n "$cf_path_prog" ; then
-echo "${as_me:-configure}:38223: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:38235: testing defining path for ${cf_path_prog} ..." 1>&5
cat >>confdefs.h <<EOF
#define INSTALL_PATH "$cf_path_prog"
@@ -38241,7 +38253,7 @@ fi
COMPRESS_PROG=
COMPRESS_EXT=
if test $use_gzip_help = yes ; then
- COMPRESS_PROG="$ac_cv_path_GZIP -9"
+ COMPRESS_PROG="$ac_cv_path_GZIP -9 -n"
COMPRESS_EXT=.gz
fi
@@ -38250,7 +38262,7 @@ if test $cf_cv_screen = pdcurses ; then
case $host_os in
(mingw*)
-echo "$as_me:38253: checking for initscr in -lpdcurses" >&5
+echo "$as_me:38265: checking for initscr in -lpdcurses" >&5
echo $ECHO_N "checking for initscr in -lpdcurses... $ECHO_C" >&6
if test "${ac_cv_lib_pdcurses_initscr+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -38258,7 +38270,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpdcurses $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 38261 "configure"
+#line 38273 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -38277,16 +38289,16 @@ initscr ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38280: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38292: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:38283: \$? = $ac_status" >&5
+ echo "$as_me:38295: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:38286: \"$ac_try\"") >&5
+ { (eval echo "$as_me:38298: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:38289: \$? = $ac_status" >&5
+ echo "$as_me:38301: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_pdcurses_initscr=yes
else
@@ -38297,7 +38309,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:38300: result: $ac_cv_lib_pdcurses_initscr" >&5
+echo "$as_me:38312: result: $ac_cv_lib_pdcurses_initscr" >&5
echo "${ECHO_T}$ac_cv_lib_pdcurses_initscr" >&6
if test $ac_cv_lib_pdcurses_initscr = yes; then
@@ -38319,13 +38331,13 @@ LIBS="$cf_add_libs"
cf_cv_term_header=no
cf_cv_unctrl_header=no
- echo "$as_me:38322: checking for winwstr" >&5
+ echo "$as_me:38334: checking for winwstr" >&5
echo $ECHO_N "checking for winwstr... $ECHO_C" >&6
if test "${ac_cv_func_winwstr+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 38328 "configure"
+#line 38340 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char winwstr (); below. */
@@ -38356,16 +38368,16 @@ f = winwstr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38359: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38371: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:38362: \$? = $ac_status" >&5
+ echo "$as_me:38374: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:38365: \"$ac_try\"") >&5
+ { (eval echo "$as_me:38377: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:38368: \$? = $ac_status" >&5
+ echo "$as_me:38380: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_winwstr=yes
else
@@ -38375,7 +38387,7 @@ ac_cv_func_winwstr=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:38378: result: $ac_cv_func_winwstr" >&5
+echo "$as_me:38390: result: $ac_cv_func_winwstr" >&5
echo "${ECHO_T}$ac_cv_func_winwstr" >&6
if test $ac_cv_func_winwstr = yes; then
cat >>confdefs.h <<\EOF
@@ -38384,13 +38396,13 @@ EOF
fi
- echo "$as_me:38387: checking for pdcurses_dll_iname" >&5
+ echo "$as_me:38399: checking for pdcurses_dll_iname" >&5
echo $ECHO_N "checking for pdcurses_dll_iname... $ECHO_C" >&6
if test "${ac_cv_func_pdcurses_dll_iname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 38393 "configure"
+#line 38405 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char pdcurses_dll_iname (); below. */
@@ -38421,16 +38433,16 @@ f = pdcurses_dll_iname; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38424: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38436: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:38427: \$? = $ac_status" >&5
+ echo "$as_me:38439: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:38430: \"$ac_try\"") >&5
+ { (eval echo "$as_me:38442: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:38433: \$? = $ac_status" >&5
+ echo "$as_me:38445: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_pdcurses_dll_iname=yes
else
@@ -38440,7 +38452,7 @@ ac_cv_func_pdcurses_dll_iname=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:38443: result: $ac_cv_func_pdcurses_dll_iname" >&5
+echo "$as_me:38455: result: $ac_cv_func_pdcurses_dll_iname" >&5
echo "${ECHO_T}$ac_cv_func_pdcurses_dll_iname" >&6
if test $ac_cv_func_pdcurses_dll_iname = yes; then
cat >>confdefs.h <<\EOF
@@ -38453,7 +38465,7 @@ fi
;;
(*)
- echo "$as_me:38456: checking for X" >&5
+ echo "$as_me:38468: checking for X" >&5
echo $ECHO_N "checking for X... $ECHO_C" >&6
# Check whether --with-x or --without-x was given.
@@ -38550,17 +38562,17 @@ if test "$ac_x_includes" = no; then
# Guess where to find include files, by looking for Intrinsic.h.
# First, try using that file with no special directory specified.
cat >conftest.$ac_ext <<_ACEOF
-#line 38553 "configure"
+#line 38565 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
_ACEOF
-if { (eval echo "$as_me:38557: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:38569: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:38563: \$? = $ac_status" >&5
+ echo "$as_me:38575: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -38593,7 +38605,7 @@ if test "$ac_x_libraries" = no; then
ac_save_LIBS=$LIBS
LIBS="-lXt $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 38596 "configure"
+#line 38608 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
int
@@ -38605,16 +38617,16 @@ XtMalloc (0)
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38608: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38620: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:38611: \$? = $ac_status" >&5
+ echo "$as_me:38623: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:38614: \"$ac_try\"") >&5
+ { (eval echo "$as_me:38626: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:38617: \$? = $ac_status" >&5
+ echo "$as_me:38629: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
LIBS=$ac_save_LIBS
# We can link X programs with no special library path.
@@ -38652,7 +38664,7 @@ fi
fi # $with_x != no
if test "$have_x" != yes; then
- echo "$as_me:38655: result: $have_x" >&5
+ echo "$as_me:38667: result: $have_x" >&5
echo "${ECHO_T}$have_x" >&6
no_x=yes
else
@@ -38662,7 +38674,7 @@ else
# Update the cache value to reflect the command line values.
ac_cv_have_x="have_x=yes \
ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
- echo "$as_me:38665: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "$as_me:38677: result: libraries $x_libraries, headers $x_includes" >&5
echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
fi
@@ -38686,11 +38698,11 @@ else
# others require no space. Words are not sufficient . . . .
case `(uname -sr) 2>/dev/null` in
"SunOS 5"*)
- echo "$as_me:38689: checking whether -R must be followed by a space" >&5
+ echo "$as_me:38701: checking whether -R must be followed by a space" >&5
echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
cat >conftest.$ac_ext <<_ACEOF
-#line 38693 "configure"
+#line 38705 "configure"
#include "confdefs.h"
int
@@ -38702,16 +38714,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38705: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38717: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:38708: \$? = $ac_status" >&5
+ echo "$as_me:38720: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:38711: \"$ac_try\"") >&5
+ { (eval echo "$as_me:38723: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:38714: \$? = $ac_status" >&5
+ echo "$as_me:38726: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_R_nospace=yes
else
@@ -38721,13 +38733,13 @@ ac_R_nospace=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
if test $ac_R_nospace = yes; then
- echo "$as_me:38724: result: no" >&5
+ echo "$as_me:38736: result: no" >&5
echo "${ECHO_T}no" >&6
X_LIBS="$X_LIBS -R$x_libraries"
else
LIBS="$ac_xsave_LIBS -R $x_libraries"
cat >conftest.$ac_ext <<_ACEOF
-#line 38730 "configure"
+#line 38742 "configure"
#include "confdefs.h"
int
@@ -38739,16 +38751,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38742: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38754: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:38745: \$? = $ac_status" >&5
+ echo "$as_me:38757: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:38748: \"$ac_try\"") >&5
+ { (eval echo "$as_me:38760: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:38751: \$? = $ac_status" >&5
+ echo "$as_me:38763: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_R_space=yes
else
@@ -38758,11 +38770,11 @@ ac_R_space=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
if test $ac_R_space = yes; then
- echo "$as_me:38761: result: yes" >&5
+ echo "$as_me:38773: result: yes" >&5
echo "${ECHO_T}yes" >&6
X_LIBS="$X_LIBS -R $x_libraries"
else
- echo "$as_me:38765: result: neither works" >&5
+ echo "$as_me:38777: result: neither works" >&5
echo "${ECHO_T}neither works" >&6
fi
fi
@@ -38782,7 +38794,7 @@ echo "${ECHO_T}neither works" >&6
# the Alpha needs dnet_stub (dnet does not exist).
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
cat >conftest.$ac_ext <<_ACEOF
-#line 38785 "configure"
+#line 38797 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -38801,22 +38813,22 @@ XOpenDisplay ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38804: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38816: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:38807: \$? = $ac_status" >&5
+ echo "$as_me:38819: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:38810: \"$ac_try\"") >&5
+ { (eval echo "$as_me:38822: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:38813: \$? = $ac_status" >&5
+ echo "$as_me:38825: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "$as_me:38819: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:38831: checking for dnet_ntoa in -ldnet" >&5
echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -38824,7 +38836,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldnet $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 38827 "configure"
+#line 38839 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -38843,16 +38855,16 @@ dnet_ntoa ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38846: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38858: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:38849: \$? = $ac_status" >&5
+ echo "$as_me:38861: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:38852: \"$ac_try\"") >&5
+ { (eval echo "$as_me:38864: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:38855: \$? = $ac_status" >&5
+ echo "$as_me:38867: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dnet_dnet_ntoa=yes
else
@@ -38863,14 +38875,14 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:38866: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:38878: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
fi
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
- echo "$as_me:38873: checking for dnet_ntoa in -ldnet_stub" >&5
+ echo "$as_me:38885: checking for dnet_ntoa in -ldnet_stub" >&5
echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -38878,7 +38890,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldnet_stub $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 38881 "configure"
+#line 38893 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -38897,16 +38909,16 @@ dnet_ntoa ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38900: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38912: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:38903: \$? = $ac_status" >&5
+ echo "$as_me:38915: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:38906: \"$ac_try\"") >&5
+ { (eval echo "$as_me:38918: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:38909: \$? = $ac_status" >&5
+ echo "$as_me:38921: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dnet_stub_dnet_ntoa=yes
else
@@ -38917,7 +38929,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:38920: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:38932: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
@@ -38936,13 +38948,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
# on Irix 5.2, according to T.E. Dickey.
# The functions gethostbyname, getservbyname, and inet_addr are
# in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
- echo "$as_me:38939: checking for gethostbyname" >&5
+ echo "$as_me:38951: checking for gethostbyname" >&5
echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
if test "${ac_cv_func_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 38945 "configure"
+#line 38957 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname (); below. */
@@ -38973,16 +38985,16 @@ f = gethostbyname; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38976: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38988: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:38979: \$? = $ac_status" >&5
+ echo "$as_me:38991: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:38982: \"$ac_try\"") >&5
+ { (eval echo "$as_me:38994: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:38985: \$? = $ac_status" >&5
+ echo "$as_me:38997: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_gethostbyname=yes
else
@@ -38992,11 +39004,11 @@ ac_cv_func_gethostbyname=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:38995: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:39007: result: $ac_cv_func_gethostbyname" >&5
echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
if test $ac_cv_func_gethostbyname = no; then
- echo "$as_me:38999: checking for gethostbyname in -lnsl" >&5
+ echo "$as_me:39011: checking for gethostbyname in -lnsl" >&5
echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -39004,7 +39016,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lnsl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 39007 "configure"
+#line 39019 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -39023,16 +39035,16 @@ gethostbyname ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39026: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39038: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:39029: \$? = $ac_status" >&5
+ echo "$as_me:39041: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:39032: \"$ac_try\"") >&5
+ { (eval echo "$as_me:39044: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:39035: \$? = $ac_status" >&5
+ echo "$as_me:39047: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_nsl_gethostbyname=yes
else
@@ -39043,14 +39055,14 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:39046: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:39058: result: $ac_cv_lib_nsl_gethostbyname" >&5
echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
if test $ac_cv_lib_nsl_gethostbyname = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
fi
if test $ac_cv_lib_nsl_gethostbyname = no; then
- echo "$as_me:39053: checking for gethostbyname in -lbsd" >&5
+ echo "$as_me:39065: checking for gethostbyname in -lbsd" >&5
echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -39058,7 +39070,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lbsd $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 39061 "configure"
+#line 39073 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -39077,16 +39089,16 @@ gethostbyname ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39080: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39092: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:39083: \$? = $ac_status" >&5
+ echo "$as_me:39095: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:39086: \"$ac_try\"") >&5
+ { (eval echo "$as_me:39098: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:39089: \$? = $ac_status" >&5
+ echo "$as_me:39101: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_bsd_gethostbyname=yes
else
@@ -39097,7 +39109,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:39100: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:39112: result: $ac_cv_lib_bsd_gethostbyname" >&5
echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
if test $ac_cv_lib_bsd_gethostbyname = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
@@ -39113,13 +39125,13 @@ fi
# variants that don't use the nameserver (or something). -lsocket
# must be given before -lnsl if both are needed. We assume that
# if connect needs -lnsl, so does gethostbyname.
- echo "$as_me:39116: checking for connect" >&5
+ echo "$as_me:39128: checking for connect" >&5
echo $ECHO_N "checking for connect... $ECHO_C" >&6
if test "${ac_cv_func_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 39122 "configure"
+#line 39134 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect (); below. */
@@ -39150,16 +39162,16 @@ f = connect; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39153: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39165: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:39156: \$? = $ac_status" >&5
+ echo "$as_me:39168: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:39159: \"$ac_try\"") >&5
+ { (eval echo "$as_me:39171: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:39162: \$? = $ac_status" >&5
+ echo "$as_me:39174: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_connect=yes
else
@@ -39169,11 +39181,11 @@ ac_cv_func_connect=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:39172: result: $ac_cv_func_connect" >&5
+echo "$as_me:39184: result: $ac_cv_func_connect" >&5
echo "${ECHO_T}$ac_cv_func_connect" >&6
if test $ac_cv_func_connect = no; then
- echo "$as_me:39176: checking for connect in -lsocket" >&5
+ echo "$as_me:39188: checking for connect in -lsocket" >&5
echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
if test "${ac_cv_lib_socket_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -39181,7 +39193,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 39184 "configure"
+#line 39196 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -39200,16 +39212,16 @@ connect ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39203: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39215: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:39206: \$? = $ac_status" >&5
+ echo "$as_me:39218: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:39209: \"$ac_try\"") >&5
+ { (eval echo "$as_me:39221: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:39212: \$? = $ac_status" >&5
+ echo "$as_me:39224: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_socket_connect=yes
else
@@ -39220,7 +39232,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:39223: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:39235: result: $ac_cv_lib_socket_connect" >&5
echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
if test $ac_cv_lib_socket_connect = yes; then
X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
@@ -39229,13 +39241,13 @@ fi
fi
# Guillermo Gomez says -lposix is necessary on A/UX.
- echo "$as_me:39232: checking for remove" >&5
+ echo "$as_me:39244: checking for remove" >&5
echo $ECHO_N "checking for remove... $ECHO_C" >&6
if test "${ac_cv_func_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 39238 "configure"
+#line 39250 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove (); below. */
@@ -39266,16 +39278,16 @@ f = remove; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39269: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39281: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:39272: \$? = $ac_status" >&5
+ echo "$as_me:39284: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:39275: \"$ac_try\"") >&5
+ { (eval echo "$as_me:39287: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:39278: \$? = $ac_status" >&5
+ echo "$as_me:39290: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_remove=yes
else
@@ -39285,11 +39297,11 @@ ac_cv_func_remove=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:39288: result: $ac_cv_func_remove" >&5
+echo "$as_me:39300: result: $ac_cv_func_remove" >&5
echo "${ECHO_T}$ac_cv_func_remove" >&6
if test $ac_cv_func_remove = no; then
- echo "$as_me:39292: checking for remove in -lposix" >&5
+ echo "$as_me:39304: checking for remove in -lposix" >&5
echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
if test "${ac_cv_lib_posix_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -39297,7 +39309,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lposix $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 39300 "configure"
+#line 39312 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -39316,16 +39328,16 @@ remove ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39319: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39331: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:39322: \$? = $ac_status" >&5
+ echo "$as_me:39334: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:39325: \"$ac_try\"") >&5
+ { (eval echo "$as_me:39337: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:39328: \$? = $ac_status" >&5
+ echo "$as_me:39340: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_posix_remove=yes
else
@@ -39336,7 +39348,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:39339: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:39351: result: $ac_cv_lib_posix_remove" >&5
echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
if test $ac_cv_lib_posix_remove = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
@@ -39345,13 +39357,13 @@ fi
fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
- echo "$as_me:39348: checking for shmat" >&5
+ echo "$as_me:39360: checking for shmat" >&5
echo $ECHO_N "checking for shmat... $ECHO_C" >&6
if test "${ac_cv_func_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 39354 "configure"
+#line 39366 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat (); below. */
@@ -39382,16 +39394,16 @@ f = shmat; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39385: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39397: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:39388: \$? = $ac_status" >&5
+ echo "$as_me:39400: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:39391: \"$ac_try\"") >&5
+ { (eval echo "$as_me:39403: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:39394: \$? = $ac_status" >&5
+ echo "$as_me:39406: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_shmat=yes
else
@@ -39401,11 +39413,11 @@ ac_cv_func_shmat=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:39404: result: $ac_cv_func_shmat" >&5
+echo "$as_me:39416: result: $ac_cv_func_shmat" >&5
echo "${ECHO_T}$ac_cv_func_shmat" >&6
if test $ac_cv_func_shmat = no; then
- echo "$as_me:39408: checking for shmat in -lipc" >&5
+ echo "$as_me:39420: checking for shmat in -lipc" >&5
echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
if test "${ac_cv_lib_ipc_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -39413,7 +39425,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lipc $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 39416 "configure"
+#line 39428 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -39432,16 +39444,16 @@ shmat ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39435: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39447: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:39438: \$? = $ac_status" >&5
+ echo "$as_me:39450: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:39441: \"$ac_try\"") >&5
+ { (eval echo "$as_me:39453: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:39444: \$? = $ac_status" >&5
+ echo "$as_me:39456: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_ipc_shmat=yes
else
@@ -39452,7 +39464,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:39455: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:39467: result: $ac_cv_lib_ipc_shmat" >&5
echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
if test $ac_cv_lib_ipc_shmat = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
@@ -39470,7 +39482,7 @@ fi
# These have to be linked with before -lX11, unlike the other
# libraries we check for below, so use a different variable.
# John Interrante, Karl Berry
- echo "$as_me:39473: checking for IceConnectionNumber in -lICE" >&5
+ echo "$as_me:39485: checking for IceConnectionNumber in -lICE" >&5
echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -39478,7 +39490,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 39481 "configure"
+#line 39493 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -39497,16 +39509,16 @@ IceConnectionNumber ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39500: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39512: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:39503: \$? = $ac_status" >&5
+ echo "$as_me:39515: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:39506: \"$ac_try\"") >&5
+ { (eval echo "$as_me:39518: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:39509: \$? = $ac_status" >&5
+ echo "$as_me:39521: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_ICE_IceConnectionNumber=yes
else
@@ -39517,7 +39529,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:39520: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:39532: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
@@ -39529,7 +39541,7 @@ fi
cf_x_athena=${cf_x_athena:-Xaw}
-echo "$as_me:39532: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:39544: checking if you want to link with Xaw 3d library" >&5
echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6
withval=
@@ -39540,14 +39552,14 @@ if test "${with_Xaw3d+set}" = set; then
fi;
if test "$withval" = yes ; then
cf_x_athena=Xaw3d
- echo "$as_me:39543: result: yes" >&5
+ echo "$as_me:39555: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
- echo "$as_me:39546: result: no" >&5
+ echo "$as_me:39558: result: no" >&5
echo "${ECHO_T}no" >&6
fi
-echo "$as_me:39550: checking if you want to link with Xaw 3d xft library" >&5
+echo "$as_me:39562: checking if you want to link with Xaw 3d xft library" >&5
echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6
withval=
@@ -39558,14 +39570,14 @@ if test "${with_Xaw3dxft+set}" = set; then
fi;
if test "$withval" = yes ; then
cf_x_athena=Xaw3dxft
- echo "$as_me:39561: result: yes" >&5
+ echo "$as_me:39573: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
- echo "$as_me:39564: result: no" >&5
+ echo "$as_me:39576: result: no" >&5
echo "${ECHO_T}no" >&6
fi
-echo "$as_me:39568: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:39580: checking if you want to link with neXT Athena library" >&5
echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6
withval=
@@ -39576,14 +39588,14 @@ if test "${with_neXtaw+set}" = set; then
fi;
if test "$withval" = yes ; then
cf_x_athena=neXtaw
- echo "$as_me:39579: result: yes" >&5
+ echo "$as_me:39591: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
- echo "$as_me:39582: result: no" >&5
+ echo "$as_me:39594: result: no" >&5
echo "${ECHO_T}no" >&6
fi
-echo "$as_me:39586: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:39598: checking if you want to link with Athena-Plus library" >&5
echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6
withval=
@@ -39594,10 +39606,10 @@ if test "${with_XawPlus+set}" = set; then
fi;
if test "$withval" = yes ; then
cf_x_athena=XawPlus
- echo "$as_me:39597: result: yes" >&5
+ echo "$as_me:39609: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
- echo "$as_me:39600: result: no" >&5
+ echo "$as_me:39612: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -39617,17 +39629,17 @@ if test "$PKG_CONFIG" != none ; then
if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $cf_athena_pkg; then
test -n "$verbose" && echo " found package $cf_athena_pkg" 1>&6
-echo "${as_me:-configure}:39620: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:39632: 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}:39626: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:39638: 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}:39630: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:39642: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
cf_fix_cppflags=no
cf_new_cflags=
@@ -39738,20 +39750,20 @@ EOF
LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
test -n "$verbose" && echo " ..trimmed $LIBS" 1>&6
-echo "${as_me:-configure}:39741: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:39753: testing ..trimmed $LIBS ..." 1>&5
;;
esac
done
-echo "$as_me:39747: checking for usable $cf_x_athena/Xmu package" >&5
+echo "$as_me:39759: checking for usable $cf_x_athena/Xmu package" >&5
echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6
if test "${cf_cv_xaw_compat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 39754 "configure"
+#line 39766 "configure"
#include "confdefs.h"
#include <X11/Xmu/CharSet.h>
@@ -39767,16 +39779,16 @@ int check = XmuCompareISOLatin1("big", "small")
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39770: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39782: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:39773: \$? = $ac_status" >&5
+ echo "$as_me:39785: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:39776: \"$ac_try\"") >&5
+ { (eval echo "$as_me:39788: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:39779: \$? = $ac_status" >&5
+ echo "$as_me:39791: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_xaw_compat=yes
else
@@ -39786,7 +39798,7 @@ cf_cv_xaw_compat=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:39789: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:39801: result: $cf_cv_xaw_compat" >&5
echo "${ECHO_T}$cf_cv_xaw_compat" >&6
if test "$cf_cv_xaw_compat" = no
@@ -39798,7 +39810,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
(*)
test -n "$verbose" && echo " work around broken package" 1>&6
-echo "${as_me:-configure}:39801: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:39813: testing work around broken package ..." 1>&5
cf_save_xmu="$LIBS"
cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^ *//' -e 's/ .*//'`
@@ -39806,17 +39818,17 @@ echo "${as_me:-configure}:39801: 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}:39809: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:39821: 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}:39815: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:39827: 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}:39819: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:39831: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
cf_fix_cppflags=no
cf_new_cflags=
@@ -39916,12 +39928,12 @@ LIBS="$cf_add_libs"
test -n "$verbose" && echo " ...before $LIBS" 1>&6
-echo "${as_me:-configure}:39919: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:39931: testing ...before $LIBS ..." 1>&5
LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's% % %g'`
test -n "$verbose" && echo " ...after $LIBS" 1>&6
-echo "${as_me:-configure}:39924: testing ...after $LIBS ..." 1>&5
+echo "${as_me:-configure}:39936: testing ...after $LIBS ..." 1>&5
else
cf_pkgconfig_incs=
@@ -39929,12 +39941,12 @@ else
test -n "$verbose" && echo " ...before $LIBS" 1>&6
-echo "${as_me:-configure}:39932: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:39944: testing ...before $LIBS ..." 1>&5
LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's% % %g'`
test -n "$verbose" && echo " ...after $LIBS" 1>&6
-echo "${as_me:-configure}:39937: testing ...after $LIBS ..." 1>&5
+echo "${as_me:-configure}:39949: testing ...after $LIBS ..." 1>&5
fi
@@ -39945,7 +39957,7 @@ fi
LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
test -n "$verbose" && echo " ..trimmed $LIBS" 1>&6
-echo "${as_me:-configure}:39948: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:39960: testing ..trimmed $LIBS ..." 1>&5
;;
esac
@@ -39970,17 +39982,17 @@ if test -z "$cf_x_athena_lib" ; then
if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then
test -n "$verbose" && echo " found package Xext" 1>&6
-echo "${as_me:-configure}:39973: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:39985: 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}:39979: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:39991: 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}:39983: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:39995: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
cf_fix_cppflags=no
cf_new_cflags=
@@ -40081,7 +40093,7 @@ else
cf_pkgconfig_incs=
cf_pkgconfig_libs=
- echo "$as_me:40084: checking for XextCreateExtension in -lXext" >&5
+ echo "$as_me:40096: checking for XextCreateExtension in -lXext" >&5
echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6
if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -40089,7 +40101,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXext $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 40092 "configure"
+#line 40104 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -40108,16 +40120,16 @@ XextCreateExtension ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40111: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40123: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:40114: \$? = $ac_status" >&5
+ echo "$as_me:40126: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:40117: \"$ac_try\"") >&5
+ { (eval echo "$as_me:40129: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:40120: \$? = $ac_status" >&5
+ echo "$as_me:40132: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_Xext_XextCreateExtension=yes
else
@@ -40128,7 +40140,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:40131: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:40143: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
if test $ac_cv_lib_Xext_XextCreateExtension = yes; then
@@ -40164,17 +40176,17 @@ then
if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
test -n "$verbose" && echo " found package x11" 1>&6
-echo "${as_me:-configure}:40167: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:40179: 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}:40173: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40185: 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}:40177: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40189: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
cf_fix_cppflags=no
cf_new_cflags=
@@ -40274,24 +40286,24 @@ LIBS="$cf_add_libs"
else
cf_pkgconfig_incs=
cf_pkgconfig_libs=
- { echo "$as_me:40277: WARNING: unable to find X11 library" >&5
+ { echo "$as_me:40289: WARNING: unable to find X11 library" >&5
echo "$as_me: WARNING: unable to find X11 library" >&2;}
fi
if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
test -n "$verbose" && echo " found package ice" 1>&6
-echo "${as_me:-configure}:40284: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:40296: 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}:40290: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40302: 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}:40294: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40306: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
cf_fix_cppflags=no
cf_new_cflags=
@@ -40391,24 +40403,24 @@ LIBS="$cf_add_libs"
else
cf_pkgconfig_incs=
cf_pkgconfig_libs=
- { echo "$as_me:40394: WARNING: unable to find ICE library" >&5
+ { echo "$as_me:40406: WARNING: unable to find ICE library" >&5
echo "$as_me: WARNING: unable to find ICE library" >&2;}
fi
if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
test -n "$verbose" && echo " found package sm" 1>&6
-echo "${as_me:-configure}:40401: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:40413: 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}:40407: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40419: 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}:40411: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40423: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
cf_fix_cppflags=no
cf_new_cflags=
@@ -40508,24 +40520,24 @@ LIBS="$cf_add_libs"
else
cf_pkgconfig_incs=
cf_pkgconfig_libs=
- { echo "$as_me:40511: WARNING: unable to find SM library" >&5
+ { echo "$as_me:40523: WARNING: unable to find SM library" >&5
echo "$as_me: WARNING: unable to find SM library" >&2;}
fi
if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
test -n "$verbose" && echo " found package xt" 1>&6
-echo "${as_me:-configure}:40518: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:40530: 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}:40524: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40536: 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}:40528: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40540: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
cf_fix_cppflags=no
cf_new_cflags=
@@ -40625,7 +40637,7 @@ LIBS="$cf_add_libs"
else
cf_pkgconfig_incs=
cf_pkgconfig_libs=
- { echo "$as_me:40628: WARNING: unable to find Xt library" >&5
+ { echo "$as_me:40640: WARNING: unable to find Xt library" >&5
echo "$as_me: WARNING: unable to find Xt library" >&2;}
fi
@@ -40636,17 +40648,17 @@ cf_have_X_LIBS=no
if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
test -n "$verbose" && echo " found package xt" 1>&6
-echo "${as_me:-configure}:40639: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:40651: 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}:40645: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40657: 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}:40649: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40661: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
cf_fix_cppflags=no
cf_new_cflags=
@@ -40747,14 +40759,14 @@ LIBS="$cf_add_libs"
;;
(*)
# we have an "xt" package, but it may omit Xt's dependency on X11
-echo "$as_me:40750: checking for usable X dependency" >&5
+echo "$as_me:40762: checking for usable X dependency" >&5
echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6
if test "${cf_cv_xt_x11_compat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 40757 "configure"
+#line 40769 "configure"
#include "confdefs.h"
#include <X11/Xlib.h>
@@ -40773,16 +40785,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40776: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40788: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:40779: \$? = $ac_status" >&5
+ echo "$as_me:40791: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:40782: \"$ac_try\"") >&5
+ { (eval echo "$as_me:40794: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:40785: \$? = $ac_status" >&5
+ echo "$as_me:40797: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_xt_x11_compat=yes
else
@@ -40792,30 +40804,30 @@ cf_cv_xt_x11_compat=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:40795: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:40807: result: $cf_cv_xt_x11_compat" >&5
echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6
if test "$cf_cv_xt_x11_compat" = no
then
test -n "$verbose" && echo " work around broken X11 dependency" 1>&6
-echo "${as_me:-configure}:40801: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:40813: 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}:40808: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:40820: 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}:40814: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40826: 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}:40818: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40830: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
cf_fix_cppflags=no
cf_new_cflags=
@@ -40918,12 +40930,12 @@ else
test -n "$verbose" && echo " ...before $LIBS" 1>&6
-echo "${as_me:-configure}:40921: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:40933: 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}:40926: testing ...after $LIBS ..." 1>&5
+echo "${as_me:-configure}:40938: testing ...after $LIBS ..." 1>&5
fi
@@ -40931,14 +40943,14 @@ fi
;;
esac
-echo "$as_me:40934: checking for usable X Toolkit package" >&5
+echo "$as_me:40946: checking for usable X Toolkit package" >&5
echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6
if test "${cf_cv_xt_ice_compat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 40941 "configure"
+#line 40953 "configure"
#include "confdefs.h"
#include <X11/Shell.h>
@@ -40953,16 +40965,16 @@ int num = IceConnectionNumber(0)
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40956: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40968: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:40959: \$? = $ac_status" >&5
+ echo "$as_me:40971: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:40962: \"$ac_try\"") >&5
+ { (eval echo "$as_me:40974: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:40965: \$? = $ac_status" >&5
+ echo "$as_me:40977: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_xt_ice_compat=yes
else
@@ -40972,7 +40984,7 @@ cf_cv_xt_ice_compat=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:40975: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:40987: result: $cf_cv_xt_ice_compat" >&5
echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
if test "$cf_cv_xt_ice_compat" = no
@@ -40986,22 +40998,22 @@ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
(*)
test -n "$verbose" && echo " work around broken ICE dependency" 1>&6
-echo "${as_me:-configure}:40989: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:41001: testing work around broken ICE dependency ..." 1>&5
if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
test -n "$verbose" && echo " found package ice" 1>&6
-echo "${as_me:-configure}:40994: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:41006: 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}:41000: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:41012: 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}:41004: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:41016: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
cf_fix_cppflags=no
cf_new_cflags=
@@ -41100,17 +41112,17 @@ LIBS="$cf_add_libs"
if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
test -n "$verbose" && echo " found package sm" 1>&6
-echo "${as_me:-configure}:41103: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:41115: 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}:41109: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:41121: 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}:41113: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:41125: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
cf_fix_cppflags=no
cf_new_cflags=
@@ -41219,12 +41231,12 @@ else
test -n "$verbose" && echo " ...before $LIBS" 1>&6
-echo "${as_me:-configure}:41222: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:41234: testing ...before $LIBS ..." 1>&5
LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's% % %g'`
test -n "$verbose" && echo " ...after $LIBS" 1>&6
-echo "${as_me:-configure}:41227: testing ...after $LIBS ..." 1>&5
+echo "${as_me:-configure}:41239: testing ...after $LIBS ..." 1>&5
fi
@@ -41244,7 +41256,7 @@ else
test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6
-echo "${as_me:-configure}:41247: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:41259: testing checking additions to CFLAGS ..." 1>&5
cf_check_cflags="$CFLAGS"
cf_check_cppflags="$CPPFLAGS"
@@ -41315,7 +41327,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}:41318: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:41330: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
CFLAGS="$CFLAGS $cf_new_cflags"
fi
@@ -41323,7 +41335,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}:41326: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:41338: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
fi
@@ -41331,14 +41343,14 @@ 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}:41334: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:41346: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
fi
if test "x$cf_check_cflags" != "x$CFLAGS" ; then
cat >conftest.$ac_ext <<_ACEOF
-#line 41341 "configure"
+#line 41353 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -41350,16 +41362,16 @@ printf("Hello world");
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41353: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41365: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:41356: \$? = $ac_status" >&5
+ echo "$as_me:41368: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:41359: \"$ac_try\"") >&5
+ { (eval echo "$as_me:41371: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:41362: \$? = $ac_status" >&5
+ echo "$as_me:41374: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -41367,12 +41379,12 @@ else
cat conftest.$ac_ext >&5
test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6
-echo "${as_me:-configure}:41370: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:41382: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5
if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6
-echo "${as_me:-configure}:41375: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:41387: testing but keeping change to \$CPPFLAGS ..." 1>&5
fi
CFLAGS="$cf_check_flags"
@@ -41380,13 +41392,13 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
- echo "$as_me:41383: checking for XOpenDisplay" >&5
+ echo "$as_me:41395: checking for XOpenDisplay" >&5
echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6
if test "${ac_cv_func_XOpenDisplay+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 41389 "configure"
+#line 41401 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char XOpenDisplay (); below. */
@@ -41417,16 +41429,16 @@ f = XOpenDisplay; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41420: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41432: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:41423: \$? = $ac_status" >&5
+ echo "$as_me:41435: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:41426: \"$ac_try\"") >&5
+ { (eval echo "$as_me:41438: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:41429: \$? = $ac_status" >&5
+ echo "$as_me:41441: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_XOpenDisplay=yes
else
@@ -41436,13 +41448,13 @@ ac_cv_func_XOpenDisplay=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:41439: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:41451: result: $ac_cv_func_XOpenDisplay" >&5
echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6
if test $ac_cv_func_XOpenDisplay = yes; then
:
else
- echo "$as_me:41445: checking for XOpenDisplay in -lX11" >&5
+ echo "$as_me:41457: checking for XOpenDisplay in -lX11" >&5
echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -41450,7 +41462,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 41453 "configure"
+#line 41465 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -41469,16 +41481,16 @@ XOpenDisplay ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41472: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41484: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:41475: \$? = $ac_status" >&5
+ echo "$as_me:41487: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:41478: \"$ac_try\"") >&5
+ { (eval echo "$as_me:41490: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:41481: \$? = $ac_status" >&5
+ echo "$as_me:41493: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_X11_XOpenDisplay=yes
else
@@ -41489,7 +41501,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:41492: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:41504: result: $ac_cv_lib_X11_XOpenDisplay" >&5
echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
if test $ac_cv_lib_X11_XOpenDisplay = yes; then
@@ -41513,13 +41525,13 @@ fi
fi
- echo "$as_me:41516: checking for XtAppInitialize" >&5
+ echo "$as_me:41528: checking for XtAppInitialize" >&5
echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
if test "${ac_cv_func_XtAppInitialize+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 41522 "configure"
+#line 41534 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char XtAppInitialize (); below. */
@@ -41550,16 +41562,16 @@ f = XtAppInitialize; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41553: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41565: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:41556: \$? = $ac_status" >&5
+ echo "$as_me:41568: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:41559: \"$ac_try\"") >&5
+ { (eval echo "$as_me:41571: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:41562: \$? = $ac_status" >&5
+ echo "$as_me:41574: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_XtAppInitialize=yes
else
@@ -41569,13 +41581,13 @@ ac_cv_func_XtAppInitialize=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:41572: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:41584: result: $ac_cv_func_XtAppInitialize" >&5
echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
if test $ac_cv_func_XtAppInitialize = yes; then
:
else
- echo "$as_me:41578: checking for XtAppInitialize in -lXt" >&5
+ echo "$as_me:41590: checking for XtAppInitialize in -lXt" >&5
echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6
if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -41583,7 +41595,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 41586 "configure"
+#line 41598 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -41602,16 +41614,16 @@ XtAppInitialize ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41605: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41617: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:41608: \$? = $ac_status" >&5
+ echo "$as_me:41620: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:41611: \"$ac_try\"") >&5
+ { (eval echo "$as_me:41623: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:41614: \$? = $ac_status" >&5
+ echo "$as_me:41626: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_Xt_XtAppInitialize=yes
else
@@ -41622,7 +41634,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:41625: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:41637: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
if test $ac_cv_lib_Xt_XtAppInitialize = yes; then
@@ -41639,7 +41651,7 @@ fi
fi
if test $cf_have_X_LIBS = no ; then
- { echo "$as_me:41642: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+ { echo "$as_me:41654: WARNING: Unable to successfully link X Toolkit library (-lXt) with
test program. You will have to check and add the proper libraries by hand
to makefile." >&5
echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with
@@ -41661,14 +41673,14 @@ do
cf_test=X11/$cf_x_athena_root/SimpleMenu.h
if test $cf_path != default ; then
CPPFLAGS="$cf_save -I$cf_path/include"
- echo "$as_me:41664: checking for $cf_test in $cf_path" >&5
+ echo "$as_me:41676: checking for $cf_test in $cf_path" >&5
echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6
else
- echo "$as_me:41667: checking for $cf_test" >&5
+ echo "$as_me:41679: checking for $cf_test" >&5
echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
fi
cat >conftest.$ac_ext <<_ACEOF
-#line 41671 "configure"
+#line 41683 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
@@ -41682,16 +41694,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:41685: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41697: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:41688: \$? = $ac_status" >&5
+ echo "$as_me:41700: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:41691: \"$ac_try\"") >&5
+ { (eval echo "$as_me:41703: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:41694: \$? = $ac_status" >&5
+ echo "$as_me:41706: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
@@ -41700,7 +41712,7 @@ cat conftest.$ac_ext >&5
cf_result=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:41703: result: $cf_result" >&5
+ echo "$as_me:41715: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
if test "$cf_result" = yes ; then
cf_x_athena_inc=$cf_path
@@ -41712,7 +41724,7 @@ echo "${ECHO_T}$cf_result" >&6
done
if test -z "$cf_x_athena_inc" ; then
- { echo "$as_me:41715: WARNING: Unable to successfully find Athena header files with test program" >&5
+ { echo "$as_me:41727: WARNING: Unable to successfully find Athena header files with test program" >&5
echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;}
elif test "$cf_x_athena_inc" != default ; then
CPPFLAGS="$CPPFLAGS -I$cf_x_athena_inc"
@@ -41758,7 +41770,7 @@ do
done
LIBS="$cf_add_libs"
- echo "$as_me:41761: checking for $cf_libs in $cf_path" >&5
+ echo "$as_me:41773: checking for $cf_libs in $cf_path" >&5
echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6
else
@@ -41778,11 +41790,11 @@ do
done
LIBS="$cf_add_libs"
- echo "$as_me:41781: checking for $cf_test in $cf_libs" >&5
+ echo "$as_me:41793: checking for $cf_test in $cf_libs" >&5
echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
fi
cat >conftest.$ac_ext <<_ACEOF
-#line 41785 "configure"
+#line 41797 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
@@ -41798,16 +41810,16 @@ $cf_test((XtAppContext) 0)
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41801: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41813: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:41804: \$? = $ac_status" >&5
+ echo "$as_me:41816: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:41807: \"$ac_try\"") >&5
+ { (eval echo "$as_me:41819: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:41810: \$? = $ac_status" >&5
+ echo "$as_me:41822: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
@@ -41816,7 +41828,7 @@ cat conftest.$ac_ext >&5
cf_result=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- echo "$as_me:41819: result: $cf_result" >&5
+ echo "$as_me:41831: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
if test "$cf_result" = yes ; then
cf_x_athena_lib="$cf_libs"
@@ -41830,7 +41842,7 @@ echo "${ECHO_T}$cf_result" >&6
done
if test -z "$cf_x_athena_lib" ; then
- { { echo "$as_me:41833: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+ { { echo "$as_me:41845: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -41848,7 +41860,7 @@ if test -n "$ac_tool_prefix"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:41851: checking for $ac_word" >&5
+echo "$as_me:41863: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -41863,7 +41875,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:41866: found $ac_dir/$ac_word" >&5
+echo "$as_me:41878: found $ac_dir/$ac_word" >&5
break
done
@@ -41871,10 +41883,10 @@ fi
fi
XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
if test -n "$XCURSES_CONFIG"; then
- echo "$as_me:41874: result: $XCURSES_CONFIG" >&5
+ echo "$as_me:41886: result: $XCURSES_CONFIG" >&5
echo "${ECHO_T}$XCURSES_CONFIG" >&6
else
- echo "$as_me:41877: result: no" >&5
+ echo "$as_me:41889: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -41887,7 +41899,7 @@ if test -z "$XCURSES_CONFIG"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:41890: checking for $ac_word" >&5
+echo "$as_me:41902: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -41902,7 +41914,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"
-echo "$as_me:41905: found $ac_dir/$ac_word" >&5
+echo "$as_me:41917: found $ac_dir/$ac_word" >&5
break
done
@@ -41910,10 +41922,10 @@ fi
fi
ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
if test -n "$ac_ct_XCURSES_CONFIG"; then
- echo "$as_me:41913: result: $ac_ct_XCURSES_CONFIG" >&5
+ echo "$as_me:41925: result: $ac_ct_XCURSES_CONFIG" >&5
echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
else
- echo "$as_me:41916: result: no" >&5
+ echo "$as_me:41928: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -41952,7 +41964,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6
-echo "${as_me:-configure}:41955: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:41967: testing checking additions to CFLAGS ..." 1>&5
cf_check_cflags="$CFLAGS"
cf_check_cppflags="$CPPFLAGS"
@@ -42023,7 +42035,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}:42026: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:42038: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
CFLAGS="$CFLAGS $cf_new_cflags"
fi
@@ -42031,7 +42043,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}:42034: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:42046: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
fi
@@ -42039,14 +42051,14 @@ 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}:42042: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:42054: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
fi
if test "x$cf_check_cflags" != "x$CFLAGS" ; then
cat >conftest.$ac_ext <<_ACEOF
-#line 42049 "configure"
+#line 42061 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -42058,16 +42070,16 @@ printf("Hello world");
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42061: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42073: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:42064: \$? = $ac_status" >&5
+ echo "$as_me:42076: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:42067: \"$ac_try\"") >&5
+ { (eval echo "$as_me:42079: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:42070: \$? = $ac_status" >&5
+ echo "$as_me:42082: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -42075,12 +42087,12 @@ else
cat conftest.$ac_ext >&5
test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6
-echo "${as_me:-configure}:42078: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:42090: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5
if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6
-echo "${as_me:-configure}:42083: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:42095: testing but keeping change to \$CPPFLAGS ..." 1>&5
fi
CFLAGS="$cf_check_flags"
@@ -42088,7 +42100,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:42091: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:42103: checking for XOpenDisplay in -lX11" >&5
echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -42096,7 +42108,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 42099 "configure"
+#line 42111 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -42115,16 +42127,16 @@ XOpenDisplay ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42118: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42130: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:42121: \$? = $ac_status" >&5
+ echo "$as_me:42133: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:42124: \"$ac_try\"") >&5
+ { (eval echo "$as_me:42136: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:42127: \$? = $ac_status" >&5
+ echo "$as_me:42139: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_X11_XOpenDisplay=yes
else
@@ -42135,7 +42147,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:42138: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:42150: result: $ac_cv_lib_X11_XOpenDisplay" >&5
echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
if test $ac_cv_lib_X11_XOpenDisplay = yes; then
@@ -42157,7 +42169,7 @@ LIBS="$cf_add_libs"
fi
-echo "$as_me:42160: checking for XCurses library" >&5
+echo "$as_me:42172: checking for XCurses library" >&5
echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6
if test "${cf_cv_lib_XCurses+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -42180,7 +42192,7 @@ done
LIBS="$cf_add_libs"
cat >conftest.$ac_ext <<_ACEOF
-#line 42183 "configure"
+#line 42195 "configure"
#include "confdefs.h"
#include <xcurses.h>
@@ -42195,16 +42207,16 @@ XCursesExit();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42198: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42210: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:42201: \$? = $ac_status" >&5
+ echo "$as_me:42213: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:42204: \"$ac_try\"") >&5
+ { (eval echo "$as_me:42216: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:42207: \$? = $ac_status" >&5
+ echo "$as_me:42219: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_lib_XCurses=yes
else
@@ -42215,7 +42227,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:42218: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:42230: result: $cf_cv_lib_XCurses" >&5
echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
fi
@@ -42230,23 +42242,23 @@ cat >>confdefs.h <<\EOF
#define XCURSES 1
EOF
- echo "$as_me:42233: checking for xcurses.h" >&5
+ echo "$as_me:42245: checking for xcurses.h" >&5
echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6
if test "${ac_cv_header_xcurses_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 42239 "configure"
+#line 42251 "configure"
#include "confdefs.h"
#include <xcurses.h>
_ACEOF
-if { (eval echo "$as_me:42243: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:42255: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:42249: \$? = $ac_status" >&5
+ echo "$as_me:42261: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -42265,7 +42277,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:42268: result: $ac_cv_header_xcurses_h" >&5
+echo "$as_me:42280: result: $ac_cv_header_xcurses_h" >&5
echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6
if test $ac_cv_header_xcurses_h = yes; then
@@ -42276,7 +42288,7 @@ EOF
fi
else
- { { echo "$as_me:42279: error: Cannot link with XCurses" >&5
+ { { echo "$as_me:42291: error: Cannot link with XCurses" >&5
echo "$as_me: error: Cannot link with XCurses" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -42285,7 +42297,7 @@ fi
esac
else
-echo "$as_me:42288: checking if we can include termio.h with curses" >&5
+echo "$as_me:42300: checking if we can include termio.h with curses" >&5
echo $ECHO_N "checking if we can include termio.h with curses... $ECHO_C" >&6
if test "${cf_cv_termio_and_curses+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -42295,7 +42307,7 @@ else
CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H -I. -I${srcdir:-.} -I${srcdir:-.}/src -I${srcdir:-.}/WWW/Library/Implementation"
touch lynx_cfg.h
cat >conftest.$ac_ext <<_ACEOF
-#line 42298 "configure"
+#line 42310 "configure"
#include "confdefs.h"
#include <LYCurses.h>
@@ -42309,16 +42321,16 @@ putchar(0x0a)
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42312: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42324: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:42315: \$? = $ac_status" >&5
+ echo "$as_me:42327: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:42318: \"$ac_try\"") >&5
+ { (eval echo "$as_me:42330: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:42321: \$? = $ac_status" >&5
+ echo "$as_me:42333: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_termio_and_curses=yes
else
@@ -42331,7 +42343,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
rm -f lynx_cfg.h
fi
-echo "$as_me:42334: result: $cf_cv_termio_and_curses" >&5
+echo "$as_me:42346: result: $cf_cv_termio_and_curses" >&5
echo "${ECHO_T}$cf_cv_termio_and_curses" >&6
test $cf_cv_termio_and_curses = yes &&
@@ -42348,23 +42360,23 @@ if test $cf_cv_screen != slang ; then
for ac_header in $cf_cv_screen/term.h term.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:42351: checking for $ac_header" >&5
+echo "$as_me:42363: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 42357 "configure"
+#line 42369 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:42361: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:42373: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:42367: \$? = $ac_status" >&5
+ echo "$as_me:42379: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -42383,7 +42395,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:42386: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:42398: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -42395,7 +42407,7 @@ done
fi
-echo "$as_me:42398: checking if curses supports alternate-character set" >&5
+echo "$as_me:42410: checking if curses supports alternate-character set" >&5
echo $ECHO_N "checking if curses supports alternate-character set... $ECHO_C" >&6
if test "${cf_cv_alt_char_set+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -42404,7 +42416,7 @@ else
for mapname in acs_map _acs_map
do
cat >conftest.$ac_ext <<_ACEOF
-#line 42407 "configure"
+#line 42419 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
@@ -42418,16 +42430,16 @@ chtype x = $mapname['l']; $mapname['m'] = 0
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42421: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42433: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:42424: \$? = $ac_status" >&5
+ echo "$as_me:42436: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:42427: \"$ac_try\"") >&5
+ { (eval echo "$as_me:42439: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:42430: \$? = $ac_status" >&5
+ echo "$as_me:42442: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_alt_char_set=$mapname
break
@@ -42441,21 +42453,21 @@ done
fi
-echo "$as_me:42444: result: $cf_cv_alt_char_set" >&5
+echo "$as_me:42456: result: $cf_cv_alt_char_set" >&5
echo "${ECHO_T}$cf_cv_alt_char_set" >&6
test $cf_cv_alt_char_set != no &&
cat >>confdefs.h <<EOF
#define ALT_CHAR_SET $cf_cv_alt_char_set
EOF
-echo "$as_me:42451: checking if curses supports fancy attributes" >&5
+echo "$as_me:42463: checking if curses supports fancy attributes" >&5
echo $ECHO_N "checking if curses supports fancy attributes... $ECHO_C" >&6
if test "${cf_cv_fancy_curses+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 42458 "configure"
+#line 42470 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
@@ -42473,16 +42485,16 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42476: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42488: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:42479: \$? = $ac_status" >&5
+ echo "$as_me:42491: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:42482: \"$ac_try\"") >&5
+ { (eval echo "$as_me:42494: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:42485: \$? = $ac_status" >&5
+ echo "$as_me:42497: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_fancy_curses=yes
else
@@ -42494,14 +42506,14 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:42497: result: $cf_cv_fancy_curses" >&5
+echo "$as_me:42509: result: $cf_cv_fancy_curses" >&5
echo "${ECHO_T}$cf_cv_fancy_curses" >&6
test $cf_cv_fancy_curses = yes &&
cat >>confdefs.h <<\EOF
#define FANCY_CURSES 1
EOF
-echo "$as_me:42504: checking for function curses_version" >&5
+echo "$as_me:42516: checking for function curses_version" >&5
echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6
if test "${cf_cv_func_curses_version+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -42511,7 +42523,7 @@ if test "$cross_compiling" = yes; then
cf_cv_func_curses_version=unknown
else
cat >conftest.$ac_ext <<_ACEOF
-#line 42514 "configure"
+#line 42526 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
@@ -42524,15 +42536,15 @@ int main()
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:42527: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42539: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:42530: \$? = $ac_status" >&5
+ echo "$as_me:42542: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:42532: \"$ac_try\"") >&5
+ { (eval echo "$as_me:42544: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:42535: \$? = $ac_status" >&5
+ echo "$as_me:42547: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_func_curses_version=yes
@@ -42547,7 +42559,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f core
fi
-echo "$as_me:42550: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:42562: result: $cf_cv_func_curses_version" >&5
echo "${ECHO_T}$cf_cv_func_curses_version" >&6
test "$cf_cv_func_curses_version" = yes &&
cat >>confdefs.h <<\EOF
@@ -42555,14 +42567,14 @@ cat >>confdefs.h <<\EOF
EOF
if test "$cf_cv_ncurses_version" != no ; then
-echo "$as_me:42558: checking for obsolete/broken version of ncurses" >&5
+echo "$as_me:42570: checking for obsolete/broken version of ncurses" >&5
echo $ECHO_N "checking for obsolete/broken version of ncurses... $ECHO_C" >&6
if test "${cf_cv_ncurses_broken+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 42565 "configure"
+#line 42577 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
@@ -42581,16 +42593,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42584: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42596: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:42587: \$? = $ac_status" >&5
+ echo "$as_me:42599: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:42590: \"$ac_try\"") >&5
+ { (eval echo "$as_me:42602: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:42593: \$? = $ac_status" >&5
+ echo "$as_me:42605: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_broken=no
else
@@ -42602,10 +42614,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:42605: result: $cf_cv_ncurses_broken" >&5
+echo "$as_me:42617: result: $cf_cv_ncurses_broken" >&5
echo "${ECHO_T}$cf_cv_ncurses_broken" >&6
if test "$cf_cv_ncurses_broken" = yes ; then
- { echo "$as_me:42608: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
+ { echo "$as_me:42620: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
echo "$as_me: WARNING: hmm... you should get an up-to-date version of ncurses" >&2;}
cat >>confdefs.h <<\EOF
@@ -42615,14 +42627,14 @@ EOF
fi
fi
-echo "$as_me:42618: checking if curses supports color attributes" >&5
+echo "$as_me:42630: checking if curses supports color attributes" >&5
echo $ECHO_N "checking if curses supports color attributes... $ECHO_C" >&6
if test "${cf_cv_color_curses+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 42625 "configure"
+#line 42637 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
@@ -42642,16 +42654,16 @@ chtype x = COLOR_BLUE;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42645: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42657: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:42648: \$? = $ac_status" >&5
+ echo "$as_me:42660: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:42651: \"$ac_try\"") >&5
+ { (eval echo "$as_me:42663: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:42654: \$? = $ac_status" >&5
+ echo "$as_me:42666: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_color_curses=yes
else
@@ -42663,7 +42675,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:42666: result: $cf_cv_color_curses" >&5
+echo "$as_me:42678: result: $cf_cv_color_curses" >&5
echo "${ECHO_T}$cf_cv_color_curses" >&6
if test $cf_cv_color_curses = yes ; then
@@ -42685,23 +42697,23 @@ unistd.h \
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:42688: checking for $ac_header" >&5
+echo "$as_me:42700: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 42694 "configure"
+#line 42706 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:42698: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:42710: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:42704: \$? = $ac_status" >&5
+ echo "$as_me:42716: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -42720,7 +42732,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:42723: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:42735: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -42735,23 +42747,23 @@ if test "$ISC" = yes ; then
for ac_header in sys/termio.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:42738: checking for $ac_header" >&5
+echo "$as_me:42750: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 42744 "configure"
+#line 42756 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:42748: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:42760: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:42754: \$? = $ac_status" >&5
+ echo "$as_me:42766: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -42770,7 +42782,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:42773: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:42785: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -42788,10 +42800,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
(*) termios_bad=maybe ;;
esac
if test "$termios_bad" = maybe ; then
- echo "$as_me:42791: checking whether termios.h needs _POSIX_SOURCE" >&5
+ echo "$as_me:42803: checking whether termios.h needs _POSIX_SOURCE" >&5
echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 42794 "configure"
+#line 42806 "configure"
#include "confdefs.h"
#include <termios.h>
int
@@ -42803,16 +42815,16 @@ struct termios foo; int x = foo.c_iflag
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42806: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42818: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:42809: \$? = $ac_status" >&5
+ echo "$as_me:42821: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:42812: \"$ac_try\"") >&5
+ { (eval echo "$as_me:42824: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:42815: \$? = $ac_status" >&5
+ echo "$as_me:42827: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
termios_bad=no
else
@@ -42820,7 +42832,7 @@ else
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 42823 "configure"
+#line 42835 "configure"
#include "confdefs.h"
#define _POSIX_SOURCE
@@ -42834,16 +42846,16 @@ struct termios foo; int x = foo.c_iflag
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42837: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42849: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:42840: \$? = $ac_status" >&5
+ echo "$as_me:42852: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:42843: \"$ac_try\"") >&5
+ { (eval echo "$as_me:42855: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:42846: \$? = $ac_status" >&5
+ echo "$as_me:42858: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
termios_bad=unknown
else
@@ -42859,12 +42871,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:42862: result: $termios_bad" >&5
+ echo "$as_me:42874: result: $termios_bad" >&5
echo "${ECHO_T}$termios_bad" >&6
fi
fi
-echo "$as_me:42867: checking declaration of size-change" >&5
+echo "$as_me:42879: checking declaration of size-change" >&5
echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6
if test "${cf_cv_sizechange+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -42879,7 +42891,7 @@ do
CPPFLAGS="$cf_save_CPPFLAGS"
test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
cat >conftest.$ac_ext <<_ACEOF
-#line 42882 "configure"
+#line 42894 "configure"
#include "confdefs.h"
#include <sys/types.h>
#ifdef HAVE_TERMIOS_H
@@ -42923,16 +42935,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42926: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42938: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:42929: \$? = $ac_status" >&5
+ echo "$as_me:42941: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:42932: \"$ac_try\"") >&5
+ { (eval echo "$as_me:42944: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:42935: \$? = $ac_status" >&5
+ echo "$as_me:42947: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_sizechange=yes
else
@@ -42951,7 +42963,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
done
fi
-echo "$as_me:42954: result: $cf_cv_sizechange" >&5
+echo "$as_me:42966: result: $cf_cv_sizechange" >&5
echo "${ECHO_T}$cf_cv_sizechange" >&6
if test "$cf_cv_sizechange" != no ; then
@@ -42969,14 +42981,14 @@ EOF
esac
fi
-echo "$as_me:42972: checking if ttytype is declared in curses library" >&5
+echo "$as_me:42984: checking if ttytype is declared in curses library" >&5
echo $ECHO_N "checking if ttytype is declared in curses library... $ECHO_C" >&6
if test "${cf_cv_have_ttytype+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 42979 "configure"
+#line 42991 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -42988,16 +43000,16 @@ char *x = &ttytype[1]; *x = 1
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42991: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43003: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:42994: \$? = $ac_status" >&5
+ echo "$as_me:43006: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:42997: \"$ac_try\"") >&5
+ { (eval echo "$as_me:43009: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:43000: \$? = $ac_status" >&5
+ echo "$as_me:43012: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_have_ttytype=yes
else
@@ -43009,7 +43021,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:43012: result: $cf_cv_have_ttytype" >&5
+echo "$as_me:43024: result: $cf_cv_have_ttytype" >&5
echo "${ECHO_T}$cf_cv_have_ttytype" >&6
test $cf_cv_have_ttytype = yes &&
cat >>confdefs.h <<\EOF
@@ -43018,14 +43030,14 @@ EOF
if test "$use_wide_curses" = yes ; then
-echo "$as_me:43021: checking if curses supports wide characters" >&5
+echo "$as_me:43033: checking if curses supports wide characters" >&5
echo $ECHO_N "checking if curses supports wide characters... $ECHO_C" >&6
if test "${cf_cv_widec_curses+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 43028 "configure"
+#line 43040 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -43044,16 +43056,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43047: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43059: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:43050: \$? = $ac_status" >&5
+ echo "$as_me:43062: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:43053: \"$ac_try\"") >&5
+ { (eval echo "$as_me:43065: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:43056: \$? = $ac_status" >&5
+ echo "$as_me:43068: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_widec_curses=yes
else
@@ -43064,7 +43076,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:43067: result: $cf_cv_widec_curses" >&5
+echo "$as_me:43079: result: $cf_cv_widec_curses" >&5
echo "${ECHO_T}$cf_cv_widec_curses" >&6
if test "$cf_cv_widec_curses" = yes ; then
@@ -43074,14 +43086,14 @@ cat >>confdefs.h <<\EOF
EOF
# This is needed on Tru64 5.0 to declare mbstate_t
- echo "$as_me:43077: checking if we must include wchar.h to declare mbstate_t" >&5
+ echo "$as_me:43089: checking if we must include wchar.h to declare mbstate_t" >&5
echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
if test "${cf_cv_widec_mbstate+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 43084 "configure"
+#line 43096 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -43095,23 +43107,23 @@ mbstate_t state
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43098: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43110: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:43101: \$? = $ac_status" >&5
+ echo "$as_me:43113: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:43104: \"$ac_try\"") >&5
+ { (eval echo "$as_me:43116: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:43107: \$? = $ac_status" >&5
+ echo "$as_me:43119: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_widec_mbstate=no
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 43114 "configure"
+#line 43126 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -43126,16 +43138,16 @@ mbstate_t state
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43129: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43141: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:43132: \$? = $ac_status" >&5
+ echo "$as_me:43144: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:43135: \"$ac_try\"") >&5
+ { (eval echo "$as_me:43147: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:43138: \$? = $ac_status" >&5
+ echo "$as_me:43150: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_widec_mbstate=yes
else
@@ -43147,7 +43159,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:43150: result: $cf_cv_widec_mbstate" >&5
+echo "$as_me:43162: result: $cf_cv_widec_mbstate" >&5
echo "${ECHO_T}$cf_cv_widec_mbstate" >&6
if test "$cf_cv_widec_mbstate" = yes ; then
@@ -43170,14 +43182,15 @@ fi
fi
-echo "$as_me:43173: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
-echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
+echo "$as_me:43185: checking definition to turn on extended curses functions" >&5
+echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6
if test "${cf_cv_need_xopen_extension+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
+cf_cv_need_xopen_extension=unknown
cat >conftest.$ac_ext <<_ACEOF
-#line 43180 "configure"
+#line 43193 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -43191,6 +43204,10 @@ main ()
make an error
#endif
#endif
+#ifdef NCURSES_VERSION
+ cchar_t check;
+ int check2 = curs_set((int)sizeof(check));
+#endif
long x = winnstr(stdscr, "", 0);
int x1, y1;
getbegyx(stdscr, y1, x1)
@@ -43199,26 +43216,29 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43202: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43219: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:43205: \$? = $ac_status" >&5
+ echo "$as_me:43222: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:43208: \"$ac_try\"") >&5
+ { (eval echo "$as_me:43225: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:43211: \$? = $ac_status" >&5
+ echo "$as_me:43228: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- cf_cv_need_xopen_extension=no
+ cf_cv_need_xopen_extension=none
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-cat >conftest.$ac_ext <<_ACEOF
-#line 43218 "configure"
+
+ for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+#line 43238 "configure"
#include "confdefs.h"
-#define _XOPEN_SOURCE_EXTENDED
+#define $cf_try_xopen_extension 1
#include <stdlib.h>
#include <${cf_cv_ncurses_header:-curses.h}>
int
@@ -43226,43 +43246,50 @@ main ()
{
#ifdef NCURSES_VERSION
- cchar_t check;
- int check2 = curs_set((int)sizeof(check));
+ cchar_t check;
+ int check2 = curs_set((int)sizeof(check));
#endif
- long x = winnstr(stdscr, "", 0);
- int x1, y1;
- getbegyx(stdscr, y1, x1)
+ long x = winnstr(stdscr, "", 0);
+ int x1, y1;
+ getbegyx(stdscr, y1, x1)
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43240: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43260: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:43243: \$? = $ac_status" >&5
+ echo "$as_me:43263: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:43246: \"$ac_try\"") >&5
+ { (eval echo "$as_me:43266: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:43249: \$? = $ac_status" >&5
+ echo "$as_me:43269: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- cf_cv_need_xopen_extension=yes
+ cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-cf_cv_need_xopen_extension=unknown
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ done
+
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+
fi
-echo "$as_me:43261: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:43283: result: $cf_cv_need_xopen_extension" >&5
echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
-test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
-echo "$as_me:43265: checking for term.h" >&5
+case $cf_cv_need_xopen_extension in
+(*_*)
+ CPPFLAGS="$CPPFLAGS -D$cf_cv_need_xopen_extension"
+ ;;
+esac
+
+echo "$as_me:43292: checking for term.h" >&5
echo $ECHO_N "checking for term.h... $ECHO_C" >&6
if test "${cf_cv_term_header+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -43283,7 +43310,7 @@ esac
for cf_header in $cf_header_list
do
cat >conftest.$ac_ext <<_ACEOF
-#line 43286 "configure"
+#line 43313 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
@@ -43297,16 +43324,16 @@ WINDOW *x
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43300: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43327: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:43303: \$? = $ac_status" >&5
+ echo "$as_me:43330: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:43306: \"$ac_try\"") >&5
+ { (eval echo "$as_me:43333: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:43309: \$? = $ac_status" >&5
+ echo "$as_me:43336: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_term_header=$cf_header
break
@@ -43325,7 +43352,7 @@ case $cf_cv_term_header in
for cf_header in ncurses/term.h ncursesw/term.h
do
cat >conftest.$ac_ext <<_ACEOF
-#line 43328 "configure"
+#line 43355 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
@@ -43343,16 +43370,16 @@ WINDOW *x
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43346: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43373: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:43349: \$? = $ac_status" >&5
+ echo "$as_me:43376: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:43352: \"$ac_try\"") >&5
+ { (eval echo "$as_me:43379: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:43355: \$? = $ac_status" >&5
+ echo "$as_me:43382: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_term_header=$cf_header
break
@@ -43367,7 +43394,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
esac
fi
-echo "$as_me:43370: result: $cf_cv_term_header" >&5
+echo "$as_me:43397: result: $cf_cv_term_header" >&5
echo "${ECHO_T}$cf_cv_term_header" >&6
case $cf_cv_term_header in
@@ -43394,7 +43421,7 @@ EOF
;;
esac
-echo "$as_me:43397: checking for unctrl.h" >&5
+echo "$as_me:43424: checking for unctrl.h" >&5
echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6
if test "${cf_cv_unctrl_header+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -43415,7 +43442,7 @@ esac
for cf_header in $cf_header_list
do
cat >conftest.$ac_ext <<_ACEOF
-#line 43418 "configure"
+#line 43445 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header:-curses.h}>
@@ -43429,16 +43456,16 @@ WINDOW *x
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43432: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43459: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:43435: \$? = $ac_status" >&5
+ echo "$as_me:43462: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:43438: \"$ac_try\"") >&5
+ { (eval echo "$as_me:43465: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:43441: \$? = $ac_status" >&5
+ echo "$as_me:43468: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_unctrl_header=$cf_header
break
@@ -43451,12 +43478,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
done
fi
-echo "$as_me:43454: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:43481: result: $cf_cv_unctrl_header" >&5
echo "${ECHO_T}$cf_cv_unctrl_header" >&6
case $cf_cv_unctrl_header in
(no)
- { echo "$as_me:43459: WARNING: unctrl.h header not found" >&5
+ { echo "$as_me:43486: WARNING: unctrl.h header not found" >&5
echo "$as_me: WARNING: unctrl.h header not found" >&2;}
;;
esac
@@ -43512,10 +43539,10 @@ do
cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
- echo "$as_me:43515: checking for ${cf_func}" >&5
+ echo "$as_me:43542: checking for ${cf_func}" >&5
echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
-echo "${as_me:-configure}:43518: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:43545: testing ${cf_func} ..." 1>&5
if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -43524,7 +43551,7 @@ else
eval cf_result='$ac_cv_func_'$cf_func
if test ".$cf_result" != ".no"; then
cat >conftest.$ac_ext <<_ACEOF
-#line 43527 "configure"
+#line 43554 "configure"
#include "confdefs.h"
#ifdef HAVE_XCURSES
@@ -43557,16 +43584,16 @@ if (foo + 1234 > 5678)
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43560: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43587: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:43563: \$? = $ac_status" >&5
+ echo "$as_me:43590: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:43566: \"$ac_try\"") >&5
+ { (eval echo "$as_me:43593: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:43569: \$? = $ac_status" >&5
+ echo "$as_me:43596: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
@@ -43582,7 +43609,7 @@ fi
# use the computed/retrieved cache-value:
eval 'cf_result=$cf_cv_func_'$cf_func
- echo "$as_me:43585: result: $cf_result" >&5
+ echo "$as_me:43612: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
if test $cf_result != no; then
cat >>confdefs.h <<EOF
@@ -43598,13 +43625,13 @@ for ac_func in \
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:43601: checking for $ac_func" >&5
+echo "$as_me:43628: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 43607 "configure"
+#line 43634 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -43635,16 +43662,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43638: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43665: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:43641: \$? = $ac_status" >&5
+ echo "$as_me:43668: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:43644: \"$ac_try\"") >&5
+ { (eval echo "$as_me:43671: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:43647: \$? = $ac_status" >&5
+ echo "$as_me:43674: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -43654,7 +43681,7 @@ eval "$as_ac_var=no"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:43657: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:43684: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<EOF
@@ -43668,12 +43695,12 @@ fi
if test $use_color_style != no ; then
if test .$cf_cv_color_curses != .yes ; then
- { { echo "$as_me:43671: error: Configuration does not support color-styles" >&5
+ { { echo "$as_me:43698: error: Configuration does not support color-styles" >&5
echo "$as_me: error: Configuration does not support color-styles" >&2;}
{ (exit 1); exit 1; }; }
fi
if test $cf_cv_screen = slang ; then
- { { echo "$as_me:43676: error: Configuration does not support color-styles" >&5
+ { { echo "$as_me:43703: error: Configuration does not support color-styles" >&5
echo "$as_me: error: Configuration does not support color-styles" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -43681,7 +43708,7 @@ fi
if test $use_scrollbar != no ; then
if test .$cf_cv_fancy_curses != .yes ; then
- { echo "$as_me:43684: WARNING: Configuration does not support ACS_xxx definitions" >&5
+ { echo "$as_me:43711: WARNING: Configuration does not support ACS_xxx definitions" >&5
echo "$as_me: WARNING: Configuration does not support ACS_xxx definitions" >&2;}
else
@@ -43695,7 +43722,7 @@ fi
# use rpath for libraries in unusual places
LD_RPATH_OPT=
-echo "$as_me:43698: checking for an rpath option" >&5
+echo "$as_me:43725: checking for an rpath option" >&5
echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
case $cf_cv_system_name in
(irix*)
@@ -43726,12 +43753,12 @@ case $cf_cv_system_name in
(*)
;;
esac
-echo "$as_me:43729: result: $LD_RPATH_OPT" >&5
+echo "$as_me:43756: result: $LD_RPATH_OPT" >&5
echo "${ECHO_T}$LD_RPATH_OPT" >&6
case "x$LD_RPATH_OPT" in
(x-R*)
- echo "$as_me:43734: checking if we need a space after rpath option" >&5
+ echo "$as_me:43761: checking if we need a space after rpath option" >&5
echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
cf_save_LIBS="$LIBS"
@@ -43752,7 +43779,7 @@ done
LIBS="$cf_add_libs"
cat >conftest.$ac_ext <<_ACEOF
-#line 43755 "configure"
+#line 43782 "configure"
#include "confdefs.h"
int
@@ -43764,16 +43791,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43767: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43794: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:43770: \$? = $ac_status" >&5
+ echo "$as_me:43797: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:43773: \"$ac_try\"") >&5
+ { (eval echo "$as_me:43800: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:43776: \$? = $ac_status" >&5
+ echo "$as_me:43803: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_rpath_space=no
else
@@ -43783,44 +43810,44 @@ cf_rpath_space=yes
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS="$cf_save_LIBS"
- echo "$as_me:43786: result: $cf_rpath_space" >&5
+ echo "$as_me:43813: result: $cf_rpath_space" >&5
echo "${ECHO_T}$cf_rpath_space" >&6
test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
;;
esac
-echo "$as_me:43792: checking if rpath-hack should be disabled" >&5
+echo "$as_me:43819: checking if rpath-hack should be disabled" >&5
echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
# Check whether --enable-rpath-hack or --disable-rpath-hack was given.
if test "${enable_rpath_hack+set}" = set; then
enableval="$enable_rpath_hack"
test "$enableval" != no && enableval=yes
- if test "$enableval" != "yes" ; then
+ if test "$enableval" != "yes" ; then
cf_disable_rpath_hack=yes
- else
- cf_disable_rpath_hack=no
- fi
+ else
+ cf_disable_rpath_hack=no
+ fi
else
enableval=yes
- cf_disable_rpath_hack=no
+ cf_disable_rpath_hack=no
fi;
-echo "$as_me:43809: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:43836: result: $cf_disable_rpath_hack" >&5
echo "${ECHO_T}$cf_disable_rpath_hack" >&6
if test "$cf_disable_rpath_hack" = no ; then
-echo "$as_me:43813: checking for updated LDFLAGS" >&5
+echo "$as_me:43840: checking for updated LDFLAGS" >&5
echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
if test -n "$LD_RPATH_OPT" ; then
- echo "$as_me:43816: result: maybe" >&5
+ echo "$as_me:43843: result: maybe" >&5
echo "${ECHO_T}maybe" >&6
for ac_prog in ldd
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo "$as_me:43823: checking for $ac_word" >&5
+echo "$as_me:43850: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -43835,7 +43862,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:43838: found $ac_dir/$ac_word" >&5
+echo "$as_me:43865: found $ac_dir/$ac_word" >&5
break
done
@@ -43843,10 +43870,10 @@ fi
fi
cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
if test -n "$cf_ldd_prog"; then
- echo "$as_me:43846: result: $cf_ldd_prog" >&5
+ echo "$as_me:43873: result: $cf_ldd_prog" >&5
echo "${ECHO_T}$cf_ldd_prog" >&6
else
- echo "$as_me:43849: result: no" >&5
+ echo "$as_me:43876: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -43860,7 +43887,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
cf_rpath_oops=
cat >conftest.$ac_ext <<_ACEOF
-#line 43863 "configure"
+#line 43890 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -43872,16 +43899,16 @@ printf("Hello");
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43875: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43902: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:43878: \$? = $ac_status" >&5
+ echo "$as_me:43905: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:43881: \"$ac_try\"") >&5
+ { (eval echo "$as_me:43908: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:43884: \$? = $ac_status" >&5
+ echo "$as_me:43911: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -43909,7 +43936,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
then
test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
-echo "${as_me:-configure}:43912: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:43939: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
break
@@ -43921,11 +43948,11 @@ echo "${as_me:-configure}:43912: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
-echo "${as_me:-configure}:43924: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:43951: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6
-echo "${as_me:-configure}:43928: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:43955: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
cf_rpath_dst=
for cf_rpath_src in $LDFLAGS
@@ -43962,7 +43989,7 @@ do
then
test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
-echo "${as_me:-configure}:43965: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:43992: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
fi
@@ -43975,11 +44002,11 @@ LDFLAGS=$cf_rpath_dst
test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6
-echo "${as_me:-configure}:43978: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:44005: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6
-echo "${as_me:-configure}:43982: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:44009: testing ...checking LIBS $LIBS ..." 1>&5
cf_rpath_dst=
for cf_rpath_src in $LIBS
@@ -44016,7 +44043,7 @@ do
then
test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
-echo "${as_me:-configure}:44019: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:44046: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
fi
@@ -44029,14 +44056,14 @@ LIBS=$cf_rpath_dst
test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6
-echo "${as_me:-configure}:44032: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:44059: testing ...checked LIBS $LIBS ..." 1>&5
test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
-echo "${as_me:-configure}:44036: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:44063: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
else
- echo "$as_me:44039: result: no" >&5
+ echo "$as_me:44066: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -44137,7 +44164,7 @@ DEFS=-DHAVE_CONFIG_H
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:44140: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:44167: creating $CONFIG_STATUS" >&5
echo "$as_me: creating $CONFIG_STATUS" >&6;}
cat >$CONFIG_STATUS <<_ACEOF
#! $SHELL
@@ -44269,7 +44296,7 @@ EOF
cat >>$CONFIG_STATUS <<EOF
ac_cs_version="\\
config.status
-configured by $0, generated by GNU Autoconf 2.52.20141204,
+configured by $0, generated by GNU Autoconf 2.52.20150926,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -44313,7 +44340,7 @@ cat >>$CONFIG_STATUS <<\EOF
echo "$ac_cs_version"; exit 0 ;;
--he | --h)
# Conflict between --help and --header
- { { echo "$as_me:44316: error: ambiguous option: $1
+ { { echo "$as_me:44343: error: ambiguous option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: ambiguous option: $1
Try \`$0 --help' for more information." >&2;}
@@ -44332,7 +44359,7 @@ Try \`$0 --help' for more information." >&2;}
ac_need_defaults=false;;
# This is an error.
- -*) { { echo "$as_me:44335: error: unrecognized option: $1
+ -*) { { echo "$as_me:44362: error: unrecognized option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: unrecognized option: $1
Try \`$0 --help' for more information." >&2;}
@@ -44351,7 +44378,7 @@ cat >&5 << _ACEOF
## Running config.status. ##
## ----------------------- ##
-This file was extended by $as_me 2.52.20141204, executed with
+This file was extended by $as_me 2.52.20150926, executed with
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
CONFIG_LINKS = $CONFIG_LINKS
@@ -44385,7 +44412,7 @@ do
"default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
"$CONFIG_H" ) CONFIG_HEADERS="$CONFIG_HEADERS $CONFIG_H:config.hin" ;;
- *) { { echo "$as_me:44388: error: invalid argument: $ac_config_target" >&5
+ *) { { echo "$as_me:44415: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
esac
@@ -44633,10 +44660,28 @@ EOF
# These are the two extra sed commands mentioned above.
(echo ':t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+ # It is possible to make a multiline substitution using escaped newlines.
+ # Ensure that we do not split the substitution between script fragments.
+ ac_BEG=$ac_end
+ ac_END=`expr $ac_end + $ac_max_sed_lines`
+ sed "1,${ac_BEG}d; ${ac_END}p; q" $tmp/subs.sed >$tmp/subs.next
+ if test -s $tmp/subs.next; then
+ grep '^s,@[^@,][^@,]*@,.*\\$' $tmp/subs.next >$tmp/subs.edit
+ if test ! -s $tmp/subs.edit; then
+ grep "^s,@[^@,][^@,]*@,.*,;t t$" $tmp/subs.next >$tmp/subs.edit
+ if test ! -s $tmp/subs.edit; then
+ if test $ac_beg -gt 1; then
+ ac_end=`expr $ac_end - 1`
+ continue
+ fi
+ fi
+ fi
+ fi
+
if test -z "$ac_sed_cmds"; then
- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+ ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
else
- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+ ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
fi
ac_sed_frag=`expr $ac_sed_frag + 1`
ac_beg=$ac_end
@@ -44719,7 +44764,7 @@ done; }
esac
if test x"$ac_file" != x-; then
- { echo "$as_me:44722: creating $ac_file" >&5
+ { echo "$as_me:44767: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
fi
@@ -44737,7 +44782,7 @@ echo "$as_me: creating $ac_file" >&6;}
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:44740: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:44785: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@@ -44750,7 +44795,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:44753: error: cannot find input file: $f" >&5
+ { { echo "$as_me:44798: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@@ -44766,7 +44811,7 @@ cat >>$CONFIG_STATUS <<\EOF
if test -n "$ac_seen"; then
ac_used=`grep '@datarootdir@' $ac_item`
if test -z "$ac_used"; then
- { echo "$as_me:44769: WARNING: datarootdir was used implicitly but not set:
+ { echo "$as_me:44814: WARNING: datarootdir was used implicitly but not set:
$ac_seen" >&5
echo "$as_me: WARNING: datarootdir was used implicitly but not set:
$ac_seen" >&2;}
@@ -44775,7 +44820,7 @@ $ac_seen" >&2;}
fi
ac_seen=`grep '${datarootdir}' $ac_item`
if test -n "$ac_seen"; then
- { echo "$as_me:44778: WARNING: datarootdir was used explicitly but not set:
+ { echo "$as_me:44823: WARNING: datarootdir was used explicitly but not set:
$ac_seen" >&5
echo "$as_me: WARNING: datarootdir was used explicitly but not set:
$ac_seen" >&2;}
@@ -44812,7 +44857,7 @@ s, at INSTALL@,$ac_INSTALL,;t t
ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file`
if test -z "$ac_init"; then
ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
- { echo "$as_me:44815: WARNING: Variable $ac_name is used but was not set:
+ { echo "$as_me:44860: WARNING: Variable $ac_name is used but was not set:
$ac_seen" >&5
echo "$as_me: WARNING: Variable $ac_name is used but was not set:
$ac_seen" >&2;}
@@ -44823,7 +44868,7 @@ $ac_seen" >&2;}
egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
if test -s $tmp/out; then
ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
- { echo "$as_me:44826: WARNING: Some variables may not be substituted:
+ { echo "$as_me:44871: WARNING: Some variables may not be substituted:
$ac_seen" >&5
echo "$as_me: WARNING: Some variables may not be substituted:
$ac_seen" >&2;}
@@ -44872,7 +44917,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
* ) ac_file_in=$ac_file.in ;;
esac
- test x"$ac_file" != x- && { echo "$as_me:44875: creating $ac_file" >&5
+ test x"$ac_file" != x- && { echo "$as_me:44920: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
# First look for the input files in the build tree, otherwise in the
@@ -44883,7 +44928,7 @@ echo "$as_me: creating $ac_file" >&6;}
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:44886: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:44931: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@@ -44896,7 +44941,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:44899: error: cannot find input file: $f" >&5
+ { { echo "$as_me:44944: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@@ -45014,7 +45059,7 @@ cat >>$CONFIG_STATUS <<\EOF
rm -f $tmp/in
if test x"$ac_file" != x-; then
if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
- { echo "$as_me:45017: $ac_file is unchanged" >&5
+ { echo "$as_me:45062: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
diff --git a/configure.in b/configure.in
index 6799ca1..f2dae08 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.276 2015/04/23 09:26:06 tom Exp $
+dnl $LynxId: configure.in,v 1.279 2015/10/08 00:48:41 Andreas.Metzler Exp $
dnl
dnl Process this file with autoconf to produce a configure script.
dnl
@@ -29,7 +29,7 @@ dnl ---------------------------------------------------------------------------
dnl
dnl ask PRCS to plug-in the project-version for the configure-script.
dnl $Format: "AC_REVISION($ProjectVersion$)"$
-AC_REVISION(2.8.9dev.6)
+AC_REVISION(2.8.9dev.7)
# Save the original $CFLAGS so we can distinguish whether the user set those
# in the environment, or whether autoconf added -O and -g options:
@@ -64,7 +64,7 @@ AC_ARG_PROGRAM
PACKAGE=lynx
dnl ask PRCS to plug-in the project-version for the packages.
# $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.9dev.6
+VERSION=2.8.9dev.7
AC_SUBST(PACKAGE)
AC_SUBST(VERSION)
@@ -487,7 +487,6 @@ if test "x$cf_cv_use_libssl" != xno ; then
elif test "x$cf_cv_use_libgnutls" != xno ; then
if test "x$cf_cv_gnutls_compat" = xno ; then
CF_GNUTLS($cf_cv_use_libgnutls,tidy_tls\$o)
- AC_CHECK_FUNCS(gnutls_priority_set_direct)
else
CF_GNUTLS($cf_cv_use_libgnutls)
fi
@@ -1463,7 +1462,7 @@ fi
COMPRESS_PROG=
COMPRESS_EXT=
if test $use_gzip_help = yes ; then
- COMPRESS_PROG="$ac_cv_path_GZIP -9"
+ COMPRESS_PROG="$ac_cv_path_GZIP -9 -n"
COMPRESS_EXT=.gz
fi
AC_SUBST(COMPRESS_PROG)
diff --git a/docs/OS-390.announce b/docs/OS-390.announce
index e28767d..55e3fb3 100644
--- a/docs/OS-390.announce
+++ b/docs/OS-390.announce
@@ -3,7 +3,7 @@ This document suggests steps to install Lynx on OS/390 systems.
========================================================================
o Download the archive file lynx2-8-6.tar.Z in BINARY from the site
where you found this announcement or from a site listed at
- http://lynx.isc.org/
+ http://lynx.invisible-island.net/
o Unpack with:
diff --git a/lynx.cfg b/lynx.cfg
index c4e113d..1c11c15 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1,13 +1,13 @@
-# $LynxId: lynx.cfg,v 1.256 2015/04/15 00:19:14 tom Exp $
+# $LynxId: lynx.cfg,v 1.270 2015/12/18 10:24:31 tom Exp $
# lynx.cfg file.
# The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
# or Lynx_Dir:lynx.cfg (VMS)
#
# $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
-#PRCS LYNX_VERSION "2.8.9dev.6"
+#PRCS LYNX_VERSION "2.8.9dev.7"
#
# $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
-#PRCS LYNX_DATE "Wed, 06 May 2015 17:56:19 -0700"
+#PRCS LYNX_DATE "Fri, 18 Dec 2015 05:24:31 -0500"
#
# Definition pairs are of the form VARIABLE:DEFINITION
# NO spaces are allowed between the pair items.
@@ -23,7 +23,7 @@
# An HTML'ized description of all settings (based on comments in this file,
# with alphabetical table of settings and with table of settings by category)
-# is available at http://lynx.isc.org/release/breakout/lynx_help/cattoc.html
+# is available at http://lynx.invisible-island.net/release/breakout/lynx_help/cattoc.html
#
### The conversion is done via the scripts/cfg2html.pl script.
### Several directives beginning with '.' are used for this purpose.
@@ -90,7 +90,7 @@
#
# Normally we expect you will connect to a remote site, e.g., the Lynx starting
# site:
-STARTFILE:http://lynx.isc.org/
+STARTFILE:http://lynx.invisible-island.net/
#
# As an alternative, you may want to use a local URL. A good choice for this is
# the user's home directory:
@@ -109,12 +109,12 @@ STARTFILE:http://lynx.isc.org/
# for this distribution (use SHELL syntax including the device
# on VMS systems).
# The default HELPFILE is:
-.url http://lynx.isc.org/release/breakout/lynx_help/lynx_help_main.html
+.url http://lynx.invisible-island.net/lynx_help/lynx_help_main.html
# This should be changed to the local path.
# This definition will be overridden if the "LYNX_HELPFILE" environment
# variable has been set.
#
-HELPFILE:http://lynx.isc.org/release/breakout/lynx_help/lynx_help_main.html
+HELPFILE:http://lynx.invisible-island.net/lynx_help/lynx_help_main.html
.ex
#HELPFILE:file://localhost/PATH_TO/lynx_help/lynx_help_main.html
@@ -442,7 +442,7 @@ DEFAULT_INDEX_FILE:http://scout.wisc.edu/
# LOCALE_CHARSET overrides CHARACTER_SET if true, using the current locale to
# lookup a MIME name that corresponds, and use that as the display charset.
#
-# It also modifies the default value for ASSUMED_CHARSET; it does not override
+# It also modifies the default value for ASSUME_CHARSET; it does not override
# that setting.
#
# Note that while nl_langinfo(CODESET) itself is standardized, the return
@@ -1462,8 +1462,8 @@ DEFAULT_INDEX_FILE:http://scout.wisc.edu/
# pipe.
#
# Please read sendmail.txt in the LYNX_W32.ZIP distribution
-.url http://lynx.isc.org/lynx-2.8.1/lynx_w32.zip
-.url ftp://lynx.isc.org/lynx-2.8.1/lynx_w32.zip
+.url http://invisible-mirror.net/archives/lynx/tarballs/lynx2.8.1_w32.zip
+.url ftp://invisible-island.net/lynx/tarballs/lynx2.8.1_w32.zip
#
# As an alternative, the newer "sendmail for windows" may be useful:
.url http://glob.com.au/sendmail/
@@ -3387,6 +3387,7 @@ COLOR:6:brightred:black
#ENABLE_LYNXRC:FORCE_SSL_PROMPT:OFF
#ENABLE_LYNXRC:FTP_PASSIVE:OFF
#ENABLE_LYNXRC:HTML5_CHARSETS:OFF
+#ENABLE_LYNXRC:HTTP_PROTOCOL:1.0
#ENABLE_LYNXRC:KBLAYOUT:ON
#ENABLE_LYNXRC:KEYPAD_MODE:ON
#ENABLE_LYNXRC:LINEEDIT_MODE:ON
@@ -3557,6 +3558,22 @@ COLOR:6:brightred:black
#SSL_CERT_FILE:/etc/ssl/certs/ca-certificates.crt
#SSL_CERT_FILE:NULL
+.h2 SSL_CLIENT_CERT_FILE
+# Set SSL_CLIENT_CERT_FILE to the file that contains a client certificate
+# (in PEM format) in case the $SSL_CLIENT_CERT_FILE environment variable is
+# not set, e.g.,
+#
+#SSL_CLIENT_CERT_FILE:/home/qux/certs/cert.crt
+#SSL_CLIENT_CERT_FILE:NULL
+
+.h2 SSL_CLIENT_KEY_FILE
+# Set SSL_CLIENT_KEY_FILE to the file that contains a client certificate
+# key (in PEM format), in case the $SSL_CLIENT_KEY_FILE environment variable
+# is not set, e.g.,
+#
+#SSL_CLIENT_KEY_FILE:/home/qux/certs/cert.key
+#SSL_CLIENT_KEY_FILE:NULL
+
.h1 Appearance
.h2 SCREEN_SIZE
@@ -3744,3 +3761,11 @@ COLOR:6:brightred:black
.h2 WITH_BACKSPACES
# Emit backspaces in output if -dump'ing or -crawl'ing (like 'man' does).
#WITH_BACKSPACES:FALSE
+
+.h1 Internal Behavior
+.h2 HTTP_PROTOCOL
+# Normally Lynx negotiates HTTP/1.0, because it does not support chunked
+# transfer (a requirement for all HTTP/1.1 clients), although it supports
+# several other features of HTTP/1.1. You may encounter a server which does
+# not support HTTP/1.0 which can be used by switching to the later protocol.
+#HTTP_PROTOCOL:1.0
diff --git a/lynx.man b/lynx.man
index fd4a456..e8331d2 100644
--- a/lynx.man
+++ b/lynx.man
@@ -1,4 +1,4 @@
-.\" $LynxId: lynx.man,v 1.110 2014/02/13 13:32:15 tom Exp $
+.\" $LynxId: lynx.man,v 1.112 2015/10/08 00:19:45 tom Exp $
.\" **************************************************************************
.\" Escape single quotes in literal strings from groff's Unicode transform.
.ie \n(.g .ds AQ \(aq
@@ -946,6 +946,9 @@ tells \fILynx\fP that it can ignore certain tags which have no content
in an XHTML 1.0 document.
For example \*(``<p/>\*('' will be discarded.
.SH COMMANDS
+.PP
+More than one key can be mapped to a given command.
+Here are some of the most useful:
.TP 3
.B o
Use \fBUp arrow\fR and \fBDown arrow\fR to scroll through hypertext links.
@@ -954,15 +957,21 @@ Use \fBUp arrow\fR and \fBDown arrow\fR to scroll through hypertext links.
\fBRight arrow\fR or \fBReturn\fR will follow a highlighted hypertext link.
.TP
.B o
-\fBLeft Arrow\fR will retreat from a link.
+\fBLeft Arrow\fR or \*(``\fBu\fR\*('' will retreat from a link.
.TP
.B o
-Type \*(``\fBH\fR\*('' or \*(``\fB?\fR\*('' for online help and descriptions
+Type \*(``\fBH\fR\*('', \*(``\fB?\fR\*('', or \fBF1\fR for online help and descriptions
of key-stroke commands.
.TP
.B o
-Type \*(``\fBK\fR\*('' for a complete list of the current key-stroke
+Type \*(``\fBk\fR\*('' or \*(``\fBK\fR\*('' for a list of the current key-stroke
command mappings.
+.IP
+If the same command is mapped to the same letter differing only
+by upper/lowercase only the lowercase mapping is shown.
+.TP
+.B o
+Type \fBDelete\fR to view history list.
.SH ENVIRONMENT
In addition to various \*(``standard\*('' environment variables such as
\fBHOME\fR, \fBPATH\fR, \fBUSER\fR, \fBDISPLAY\fR, \fBTMPDIR\fR, \fBetc\fR,
diff --git a/lynx_help/Lynx_users_guide.html b/lynx_help/Lynx_users_guide.html
index 4ee7c31..338894b 100644
--- a/lynx_help/Lynx_users_guide.html
+++ b/lynx_help/Lynx_users_guide.html
@@ -1,4 +1,4 @@
-<!-- $LynxId: Lynx_users_guide.html,v 1.124 2014/02/13 13:24:06 tom Exp $ -->
+<!-- $LynxId: Lynx_users_guide.html,v 1.128 2015/12/18 10:24:31 tom Exp $ -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<html>
@@ -327,7 +327,7 @@
<dl>
<dt>HTTP (HyperText Transfer Protocol)</dt>
- <dd><code>http://lynx.isc.org</code></dd>
+ <dd><code>http://invisible-island.net/lynx/</code></dd>
<dt>Gopher</dt>
@@ -733,6 +733,7 @@
Preferred encoding (!) : [All_____]
Preferred document character set : _________________________________
Preferred document language : en_______________________________
+ HTTP protocol (!) : [HTTP 1.0]
Send User-Agent header (!) : [X]
User-Agent header (!) : Lynx/2.8.8pre.2 libwww-FM/2.14 SSL-MM/1.4.
@@ -987,6 +988,15 @@
"keystrokes/option_help.html#tagsoup">recovery mode</a> used by
Lynx.</dd>
+ <dt>HTTP protocol</dt>
+
+ <dd>Normally Lynx negotiates HTTP/1.0, because it does not
+ support chunked transfer (a requirement for all HTTP/1.1
+ clients), although it supports several other features of
+ HTTP/1.1. You may encounter a server which does not support
+ HTTP/1.0 which can be used by switching to the later
+ protocol.</dd>
+
<dt>Invalid-Cookie Prompting</dt>
<dd>This allows you to tell how to handle invalid cookies:
@@ -4331,10 +4341,10 @@ the other two cannot be saved between sessions.
comments for hundreds of options, most of them commented out
because they are built-in defaults. You may visit an index of
options: <a href=
- "http://lynx.isc.org/release/breakout/lynx_help/cattoc.html">by
- category</a> or <a href=
- "http://lynx.isc.org/release/breakout/lynx_help/alphatoc.html">by
- alphabet</a>.</p>
+ "http://lynx.invisible-island.net/release/breakout/lynx_help/cattoc.html">
+ by category</a> or <a href=
+ "http://lynx.invisible-island.net/release/breakout/lynx_help/alphatoc.html">
+ by alphabet</a>.</p>
<p>To view your current configuration derived from lynx.cfg and
any included configuration files, press <em>'g'</em> and type in
@@ -4444,8 +4454,9 @@ the other two cannot be saved between sessions.
of this distribution.</p>
<p>Information on obtaining the most current version of Lynx is
- available at <a href="http://lynx.isc.org/current/index.html">the
- current distribution page</a>.</p>
+ available at <a href=
+ "http://lynx.invisible-island.net/current/index.html">the current
+ distribution page</a>.</p>
<p>[<a href="#Contents">ToC</a>]</p>
</body>
diff --git a/lynx_help/about_lynx.html b/lynx_help/about_lynx.html
index 2bd2b77..5313066 100644
--- a/lynx_help/about_lynx.html
+++ b/lynx_help/about_lynx.html
@@ -1,4 +1,4 @@
-<!-- $LynxId: about_lynx.html,v 1.20 2014/01/06 22:47:21 tom Exp $ -->
+<!-- $LynxId: about_lynx.html,v 1.22 2015/09/19 17:36:28 tom Exp $ -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<html>
@@ -103,7 +103,7 @@
<p>Information on obtaining the most current version of
<strong>Lynx</strong> is available via the <a href=
- "http://lynx.isc.org">Lynx homepage</a>.</p>
+ "http://lynx.invisible-island.net">Lynx homepage</a>.</p>
<h2><a name="lynx-dev_list" id="lynx-dev_list">Mailing
List</a></h2>
diff --git a/lynx_help/lynx-dev.html b/lynx_help/lynx-dev.html
index 43457fb..d178e49 100644
--- a/lynx_help/lynx-dev.html
+++ b/lynx_help/lynx-dev.html
@@ -1,4 +1,4 @@
-<!-- $LynxId: lynx-dev.html,v 1.15 2014/01/06 22:37:07 tom Exp $ -->
+<!-- $LynxId: lynx-dev.html,v 1.17 2015/09/19 17:36:28 tom Exp $ -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<html>
@@ -48,15 +48,16 @@
<p>Besides <em>releases</em>, which are stable versions of
<strong>Lynx</strong> which come out once or twice a year and can
- be obtained from <a href="http://lynx.isc.org/release/">the
- release site</a>, there are <em>development</em> versions, which
- are experimental — though usually stable enough to use
- — and appear every few weeks, depending on current
- activity.</p>
+ be obtained from <a href=
+ "http://lynx.invisible-island.net/release/">the release site</a>,
+ there are <em>development</em> versions, which are experimental
+ — though usually stable enough to use — and appear
+ every few weeks, depending on current activity.</p>
<p>You can find the latest <em>development</em> version of
<strong>Lynx</strong> by visiting <a href=
- "http://lynx.isc.org/current/">the development site</a>.</p>
+ "http://lynx.invisible-island.net/current/">the development
+ site</a>.</p>
<h2>Subscribing to Lynx-Dev</h2>
diff --git a/lynx_help/lynx_help_main.html b/lynx_help/lynx_help_main.html
index 2e75b94..ff8e7ae 100644
--- a/lynx_help/lynx_help_main.html
+++ b/lynx_help/lynx_help_main.html
@@ -1,4 +1,4 @@
-<!-- $LynxId: lynx_help_main.html,v 1.50 2014/01/09 22:27:48 tom Exp $ -->
+<!-- $LynxId: lynx_help_main.html,v 1.53 2015/09/19 17:36:28 tom Exp $ -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<html>
@@ -48,17 +48,17 @@
<ul>
<li><a href=
- "http://lynx.isc.org/release/breakout/lynx_help/cattoc.html">lynx.cfg
- options</a> — a reference for advanced
+ "http://lynx.invisible-island.net/release/breakout/lynx_help/cattoc.html">
+ lynx.cfg options</a> — a reference for advanced
configurations</li>
- <li><a href="http://lynx.isc.org/release/breakout/docs/">lynx
+ <li><a href=
+ "http://lynx.invisible-island.net/release/breakout/docs/">lynx
documentation</a> — supplementary documentation</li>
<li><a href=
"http://www.chass.utoronto.ca/%7Epurslow/lhfb.html">Lynx Help
- for Beginners</a> — quick help on many common problems
- <!-- {li}{a href="http://lynx.isc.org/cgi-bin/fom"}The Lynx FAQ-O-Matic{/a} .. many common queries, some more advanced; users may add answers. --></li>
+ for Beginners</a> — quick help on many common problems</li>
<li><a href="http://leb.net/blinux/blynx/">Blynx</a> —
Speech-Friendly Help for the visually impaired</li>
diff --git a/makefile.in b/makefile.in
index 273e373..cb71284 100644
--- a/makefile.in
+++ b/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.151 2015/04/15 00:19:14 tom Exp $
+# $LynxId: makefile.in,v 1.154 2015/09/19 17:40:20 tom Exp $
##makefile for lynx
SHELL = @CONFIG_SHELL@
@@ -46,7 +46,7 @@ TAR_UP = $(TAR) @TAR_UP_OPTIONS@ @TAR_PIPE_OPTIONS@
TAR_DOWN = $(TAR) @TAR_DOWN_OPTIONS@ @TAR_PIPE_OPTIONS@
# $Format: "LYNX_VERSION = $ProjectVersion$"$
-LYNX_VERSION = 2.8.9dev.6
+LYNX_VERSION = 2.8.9dev.7
## This is the version which we are developing (or, upon release, make this
## the same). Use no dots in the name, since it must work on VMS and MS-DOS.
@@ -347,7 +347,7 @@ install-doc : $(DOCDIR) $(HELPDIR)
# So we limit sed delimiters to '!' and '%', depending on the expected text.
FIX_SED = tr '=' '"'
-LYNX_URL='http://lynx.isc.org/release/breakout'
+LYNX_URL='http://lynx.invisible-island.net/release/breakout'
LYNXDOCS_URL='$(LYNX_URL)/docs/'
LYNXHELP_URL='$(LYNX_URL)/lynx_help/'
diff --git a/po/ca.po b/po/ca.po
index 4e97294..de52995 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,19 +1,15 @@
-# Missatges del lynx en catal�
+# Catalan translation of the Lynx browser message catalog
# Copyright (C) 2002 Free Software Foundation, Inc.
-# Carles Sadurn� Anguita <isard at ctv.es>, 2000-2003
-#
-# Agra�ments
-#
-# Gr�cies als membres de la llista DocsTerms del CALIU i als de la
-# llista del Translation Project per les correccions i els suggeriments.
+# This file is distributed under the same license as the lynx package.
+# Walter Garcia-fontes <walter.garci at upf.edu>, 2015
#
msgid ""
msgstr ""
-"Project-Id-Version: lynx 2.8.5pre15\n"
+"Project-Id-Version: lynx 2.8.9-dev5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-12 19:13-0500\n"
-"PO-Revision-Date: 2003-07-06 18:12+0200\n"
-"Last-Translator: Carles Sadurn� Anguita <isard at ctv.es>\n"
+"POT-Creation-Date: 2015-04-14 20:53-0400\n"
+"PO-Revision-Date: 2015-12-04 08:16+0100\n"
+"Last-Translator: Walter Garcia-Fontes <walter.garcia at upf.edu>\n"
"Language-Team: Catalan <ca at dodds.net>\n"
"Language: ca\n"
"MIME-Version: 1.0\n"
@@ -34,2029 +30,2020 @@ msgstr ""
#. * translations. When no translation is available, the English default is
#. * used.
#.
-#: LYMessages.c:27
+#: LYMessages.c:28
#, c-format
msgid "Alert!: %s"
msgstr "Alerta!: %s"
-#: LYMessages.c:28
+#: LYMessages.c:29
msgid "Welcome"
msgstr "Benvinguts"
-#: LYMessages.c:29
+#: LYMessages.c:30
msgid "Are you sure you want to quit?"
msgstr "Esteu segur/a que voleu eixir?"
-#: LYMessages.c:31
+#: LYMessages.c:32
msgid "Really exit from Lynx?"
msgstr "Esteu segur/a que voleu eixir de Lynx?"
-#: LYMessages.c:33
+#: LYMessages.c:34
msgid "Connection interrupted."
msgstr "Connexi� interrompuda."
-#: LYMessages.c:34
+#: LYMessages.c:35
msgid "Data transfer interrupted."
msgstr "Transfer�ncia de dades interrompuda"
-#: LYMessages.c:35
+#: LYMessages.c:36
msgid "Cancelled!!!"
msgstr "Cancel�lat!!"
-#: LYMessages.c:36
+#: LYMessages.c:37
msgid "Cancelling!"
msgstr "Cancel�laci�!"
-#: LYMessages.c:37
+#: LYMessages.c:38
msgid "Excellent!!!"
msgstr "Excel�lent!!"
-#: LYMessages.c:38
+#: LYMessages.c:39
msgid "OK"
msgstr "D'acord"
-#: LYMessages.c:39
+#: LYMessages.c:40
msgid "Done!"
msgstr "Fet!"
-#: LYMessages.c:40
+#: LYMessages.c:41
msgid "Bad request!"
msgstr "Sol�licitud incorrecta!"
-#: LYMessages.c:41
+#: LYMessages.c:42
msgid "previous"
msgstr "anterior"
-#: LYMessages.c:42
+#: LYMessages.c:43
msgid "next screen"
msgstr "seg�ent pantalla"
-#: LYMessages.c:43
+#: LYMessages.c:44
msgid "HELP!"
msgstr "AJUDA!"
-#: LYMessages.c:44
+#: LYMessages.c:45
msgid ", help on "
msgstr ", ajuda sobre "
#. #define HELP
-#: LYMessages.c:46
+#: LYMessages.c:47
msgid "Commands: Use arrow keys to move, '?' for help, 'q' to quit, '<-' to go back."
msgstr "Useu les fletxes per a moure-us, '?' ajuda, 'q' eixir, '<-' torna enrere."
#. #define MOREHELP
-#: LYMessages.c:48
+#: LYMessages.c:49
msgid "-- press space for more, use arrow keys to move, '?' for help, 'q' to quit."
msgstr "Useu <espai> per a continuar, fletxes per a moure-us, '?' ajuda, 'q' eixir."
-#: LYMessages.c:49
+#: LYMessages.c:50
msgid "-- press space for next page --"
msgstr "-- premeu <espai> per passar a la seg�ent p�gina --"
-#: LYMessages.c:50
+#: LYMessages.c:51
msgid "URL too long"
msgstr "La URL especificada �s massa llarga"
#. Inactive input fields, messages used with -tna option - kw
#. #define FORM_LINK_TEXT_MESSAGE_INA
-#: LYMessages.c:56
+#: LYMessages.c:57
msgid "(Text entry field) Inactive. Press <return> to activate."
msgstr "(Camp d'entrada de text) Inactiu. Premeu <intro> per activar-lo."
#. #define FORM_LINK_TEXTAREA_MESSAGE_INA
-#: LYMessages.c:58
+#: LYMessages.c:59
msgid "(Textarea) Inactive. Press <return> to activate."
msgstr "(�rea de text) Inactiva. Premeu <intro> per activar-la."
#. #define FORM_LINK_TEXTAREA_MESSAGE_INA_E
-#: LYMessages.c:60
+#: LYMessages.c:61
#, c-format
msgid "(Textarea) Inactive. Press <return> to activate (%s for editor)."
msgstr "(�rea de text) Inactiva. Premeu <intro> per activar-la (%s per a l'editor)."
#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_INA
-#: LYMessages.c:62
+#: LYMessages.c:63
msgid "(Form field) Inactive. Use <return> to edit."
msgstr "(Camp de formulari) Inactiu. Useu <intro> per a editar."
#. #define FORM_TEXT_SUBMIT_MESSAGE_INA_X
-#: LYMessages.c:64
+#: LYMessages.c:65
#, c-format
msgid "(Form field) Inactive. Use <return> to edit (%s to submit with no cache)."
msgstr "(Camp form.) Inactiu. <intro> per a editar (%s per a enviar sense mem. cau)."
#. #define FORM_TEXT_RESUBMIT_MESSAGE_INA
-#: LYMessages.c:66
+#: LYMessages.c:67
msgid "(Form field) Inactive. Press <return> to edit, press <return> twice to submit."
msgstr "(Camp form.) Inactiu. <intro> per a editar, <intro> dues vegades per a enviar."
#. #define FORM_TEXT_SUBMIT_MAILTO_MSG_INA
-#: LYMessages.c:68
+#: LYMessages.c:69
msgid "(mailto form field) Inactive. Press <return> to change."
msgstr "(Camp de formulari de correu) Inactiu. Premeu <intro> per a canviar-ho."
#. #define FORM_LINK_PASSWORD_MESSAGE_INA
-#: LYMessages.c:70
+#: LYMessages.c:71
msgid "(Password entry field) Inactive. Press <return> to activate."
msgstr "(Camp de contrasenya) Inactiu. Premeu <intro> per activar-lo."
#. #define FORM_LINK_FILE_UNM_MSG
-#: LYMessages.c:73
+#: LYMessages.c:74
msgid "UNMODIFIABLE file entry field. Use UP or DOWN arrows or tab to move off."
msgstr "Camp de fitxer IMMODIFICABLE. Useu les fletxes o <tab> per a eixir-ne."
#. #define FORM_LINK_FILE_MESSAGE
-#: LYMessages.c:75
+#: LYMessages.c:76
msgid "(File entry field) Enter filename. Use UP or DOWN arrows or tab to move off."
msgstr "(Camp de fitxer) Introdu�u el nom de l'arxiu. Fletxes o <tab> per a eixir-ne."
#. #define FORM_LINK_TEXT_MESSAGE
-#: LYMessages.c:77
+#: LYMessages.c:78
msgid "(Text entry field) Enter text. Use UP or DOWN arrows or tab to move off."
msgstr "(Camp de text) Introdu�u text. Useu les fletxes o <tab> per a eixir-ne."
#. #define FORM_LINK_TEXTAREA_MESSAGE
-#: LYMessages.c:79
+#: LYMessages.c:80
msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off."
msgstr "(�rea de text) Introdu�u text. Fletxes o <tab> per a eixir-ne."
#. #define FORM_LINK_TEXTAREA_MESSAGE_E
-#: LYMessages.c:81
+#: LYMessages.c:82
#, c-format
msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
msgstr "(�. text) Introdu�u text. Fletxes o <tab> per a eixir-ne (%s per a l'editor)."
#. #define FORM_LINK_TEXT_UNM_MSG
-#: LYMessages.c:83
+#: LYMessages.c:84
msgid "UNMODIFIABLE form text field. Use UP or DOWN arrows or tab to move off."
msgstr "Camp de text IMMODIFICABLE. Useu les fletxes o <tab> per a eixir-ne."
#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE
-#: LYMessages.c:85
+#: LYMessages.c:86
msgid "(Form field) Enter text. Use <return> to submit."
msgstr "(Camp de formulari) Introdu�u text. Useu <intro> per a enviar."
#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_X
-#: LYMessages.c:87
+#: LYMessages.c:88
#, c-format
msgid "(Form field) Enter text. Use <return> to submit (%s for no cache)."
msgstr "(Camp de formulari) Introdu�u text. <intro> per a enviar (%s sensemem. cau)."
#. #define FORM_LINK_TEXT_RESUBMIT_MESSAGE
-#: LYMessages.c:89
+#: LYMessages.c:90
msgid "(Form field) Enter text. Use <return> to submit, arrows or tab to move off."
msgstr "(C. form.) Introdu�u text. <intro> per a enviar, fletxes o tab per eixir-ne."
#. #define FORM_LINK_TEXT_SUBMIT_UNM_MSG
-#: LYMessages.c:91
+#: LYMessages.c:92
msgid "UNMODIFIABLE form field. Use UP or DOWN arrows or tab to move off."
msgstr "Camp IMMODIFICABLE. Useu les fletxes o el tabulador per a eixir-ne."
#. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG
-#: LYMessages.c:93
+#: LYMessages.c:94
msgid "(mailto form field) Enter text. Use <return> to submit, arrows to move off."
msgstr "(correu) Introdu�u text. <intro> per enviar-lo, amb les fletxes n'eixireu."
#. #define FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:95
+#: LYMessages.c:96
msgid "(mailto form field) Mail is disallowed so you cannot submit."
msgstr "(Camp form. correu) El correu no est� perm�s: no podeu enviar-ne."
#. #define FORM_LINK_PASSWORD_MESSAGE
-#: LYMessages.c:97
+#: LYMessages.c:98
msgid "(Password entry field) Enter text. Use UP or DOWN arrows or tab to move off."
msgstr "(Contrasenya) Introdu�u text. Useu les fletxes o <tab> per a eixir-ne."
#. #define FORM_LINK_PASSWORD_UNM_MSG
-#: LYMessages.c:99
+#: LYMessages.c:100
msgid "UNMODIFIABLE form password. Use UP or DOWN arrows or tab to move off."
msgstr "Camp de contrasenya IMMODIFICABLE. Fletxes o <tab> per a eixir-ne."
#. #define FORM_LINK_CHECKBOX_MESSAGE
-#: LYMessages.c:101
+#: LYMessages.c:102
msgid "(Checkbox Field) Use right-arrow or <return> to toggle."
msgstr "(Camp de verificaci�) Useu '->' o <intro> per a canviar."
#. #define FORM_LINK_CHECKBOX_UNM_MSG
-#: LYMessages.c:103
+#: LYMessages.c:104
msgid "UNMODIFIABLE form checkbox. Use UP or DOWN arrows or tab to move off."
msgstr "Quadre de verificaci� IMMODIFICABLE. Useu les fletxes per a eixir-ne."
#. #define FORM_LINK_RADIO_MESSAGE
-#: LYMessages.c:105
-#, fuzzy
+#: LYMessages.c:106
msgid "(Radio Button) Use right-arrow or <return> to toggle."
-msgstr "(Bot� de grup) Useu '->' o <intro> per a canviar."
+msgstr "(Bot� d'opci�) Useu fletxa-dreta o <intro> per commutar."
#. #define FORM_LINK_RADIO_UNM_MSG
-#: LYMessages.c:107
+#: LYMessages.c:108
msgid "UNMODIFIABLE form radio button. Use UP or DOWN arrows or tab to move off."
msgstr "Bot� de grup IMMODIFICABLE. Useu fletxes o <tab> per a eixir-ne."
#. #define FORM_LINK_SUBMIT_PREFIX
-#: LYMessages.c:109
+#: LYMessages.c:110
msgid "Submit ('x' for no cache) to "
msgstr "Enviar a ('x' sense mem. cau) "
#. #define FORM_LINK_RESUBMIT_PREFIX
-#: LYMessages.c:111
+#: LYMessages.c:112
msgid "Submit to "
msgstr "Enviar a "
#. #define FORM_LINK_SUBMIT_MESSAGE
-#: LYMessages.c:113
+#: LYMessages.c:114
msgid "(Form submit button) Use right-arrow or <return> to submit ('x' for no cache)."
msgstr "(Bot� d'enviament) Useu '->' o <intro> per a enviar ('x' sense mem. cau)."
#. #define FORM_LINK_RESUBMIT_MESSAGE
-#: LYMessages.c:115
+#: LYMessages.c:116
msgid "(Form submit button) Use right-arrow or <return> to submit."
msgstr "(Bot� d'enviament) Useu '->' o <intro> per a enviar."
#. #define FORM_LINK_SUBMIT_DIS_MSG
-#: LYMessages.c:117
+#: LYMessages.c:118
msgid "DISABLED form submit button. Use UP or DOWN arrows or tab to move off."
msgstr "Bot� d'enviament DESACTIVAT. Useu les fletxes o <tab> per a eixir-ne."
#. #define FORM_LINK_SUBMIT_MAILTO_PREFIX
-#: LYMessages.c:119
+#: LYMessages.c:120
msgid "Submit mailto form to "
msgstr "Enviar correu a "
#. #define FORM_LINK_SUBMIT_MAILTO_MSG
-#: LYMessages.c:121
+#: LYMessages.c:122
msgid "(mailto form submit button) Use right-arrow or <return> to submit."
msgstr "(Bot� d'enviament de correu) Useu '->' o <intro> per a enviar-lo."
#. #define FORM_LINK_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:123
+#: LYMessages.c:124
msgid "(mailto form submit button) Mail is disallowed so you cannot submit."
msgstr "(Bot� d'enviament de correu) El correu no est� perm�s: no podeuenviar-ne."
#. #define FORM_LINK_RESET_MESSAGE
-#: LYMessages.c:125
+#: LYMessages.c:126
msgid "(Form reset button) Use right-arrow or <return> to reset form to defaults."
msgstr "(Bot� de reinici) Useu '->' o <intro> per a tornar als valors predeterminats."
#. #define FORM_LINK_RESET_DIS_MSG
-#: LYMessages.c:127
+#: LYMessages.c:128
msgid "DISABLED form reset button. Use UP or DOWN arrows or tab to move off."
msgstr "Bot� de reinici DESACTIVAT. Useu les fletxes o <tab> per a eixir-ne."
#. #define FORM_LINK_BUTTON_MESSAGE
-#: LYMessages.c:129
-#, fuzzy
-#| msgid "DISABLED form submit button. Use UP or DOWN arrows or tab to move off."
+#: LYMessages.c:130
msgid "(Script button) Use UP or DOWN arrows or tab to move off."
-msgstr "Bot� d'enviament DESACTIVAT. Useu les fletxes o <tab> per a eixir-ne."
+msgstr "(Bot� d'script) Useu les fletxes cap amunt o cap avall o el tabulador per eixir-ne."
#. #define FORM_LINK_BUTTON_DIS_MSG
-#: LYMessages.c:131
-#, fuzzy
-#| msgid "DISABLED form submit button. Use UP or DOWN arrows or tab to move off."
+#: LYMessages.c:132
msgid "DISABLED Script button. Use UP or DOWN arrows or tab to move off."
-msgstr "Bot� d'enviament DESACTIVAT. Useu les fletxes o <tab> per a eixir-ne."
+msgstr "Bot� d'script DESACTIVAT. Useu les fletxes cap amunt o cap avall o el tabulador per eixir-ne."
#. #define FORM_LINK_OPTION_LIST_MESSAGE
-#: LYMessages.c:133
+#: LYMessages.c:134
msgid "(Option list) Hit return and use arrow keys and return to select option."
msgstr "(Opcions) Premeu <intro> i useu les fletxes i <intro> per a triar-ne una."
#. #define CHOICE_LIST_MESSAGE
-#: LYMessages.c:135
+#: LYMessages.c:136
msgid "(Choice list) Hit return and use arrow keys and return to select option."
msgstr "(Tria) Premeu <intro>; useu les fletxes i <intro> per a triar una opci�."
#. #define FORM_LINK_OPTION_LIST_UNM_MSG
-#: LYMessages.c:137
+#: LYMessages.c:138
msgid "UNMODIFIABLE option list. Use return or arrow keys to review or leave."
msgstr "Llista IMMODIFICABLE. <intro> per a revisar-la o fletxes per aeixir-ne."
#. #define CHOICE_LIST_UNM_MSG
-#: LYMessages.c:139
+#: LYMessages.c:140
msgid "UNMODIFIABLE choice list. Use return or arrow keys to review or leave."
msgstr "Llista IMMODIFICABLE. <intro> per a revisar-la o les fletxes per aeixir-ne."
-#: LYMessages.c:140
+#: LYMessages.c:141
msgid "Submitting form..."
msgstr "Enviant..."
-#: LYMessages.c:141
+#: LYMessages.c:142
msgid "Resetting form..."
msgstr "Restablint els valors inicials del formulari..."
#. #define RELOADING_FORM
-#: LYMessages.c:143
+#: LYMessages.c:144
msgid "Reloading document. Any form entries will be lost!"
msgstr "Recarregant document. Qualsevol entrada anterior es perdr�!"
#. #define LINK_NOT_IN_FORM
-#: LYMessages.c:145
+#: LYMessages.c:146
msgid "The current link is not in a FORM"
-msgstr ""
+msgstr "L'enlla�a actual no est� a un FORMULARI"
-#: LYMessages.c:146
+#: LYMessages.c:147
#, c-format
msgid "Warning: Cannot transcode form data to charset %s!"
msgstr "Alerta: No es poden convertir les dades al joc de car�cters %s!"
#. #define NORMAL_LINK_MESSAGE
-#: LYMessages.c:149
+#: LYMessages.c:150
msgid "(NORMAL LINK) Use right-arrow or <return> to activate."
msgstr "(ENLLA� NORMAL) Useu la fletxa a la dreta o <return> per a seguir-lo."
-#: LYMessages.c:150
+#: LYMessages.c:151
msgid "The resource requested is not available at this time."
msgstr "El recurs sol�licitat no est� disponible a hores d'ara."
-#: LYMessages.c:151
+#: LYMessages.c:152
msgid "Enter Lynx keystroke command: "
msgstr "Introdu�u la combinaci� de tecles: "
-#: LYMessages.c:152
+#: LYMessages.c:153
msgid "Looking up "
msgstr "Buscant "
-#: LYMessages.c:153
+#: LYMessages.c:154
#, c-format
msgid "Getting %s"
msgstr "Rebent %s"
-#: LYMessages.c:154
+#: LYMessages.c:155
#, c-format
msgid "Skipping %s"
msgstr "Saltant-se %s"
-#: LYMessages.c:155
+#: LYMessages.c:156
#, c-format
msgid "Using %s"
msgstr "Usant %s"
-#: LYMessages.c:156
+#: LYMessages.c:157
#, c-format
msgid "Illegal URL: %s"
msgstr "Adre�a il�legal: %s"
-#: LYMessages.c:157
+#: LYMessages.c:158
#, c-format
msgid "Badly formed address %s"
msgstr "Adre�a mal formada: %s"
-#: LYMessages.c:158
+#: LYMessages.c:159
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: LYMessages.c:159
+#: LYMessages.c:160
msgid "Unable to access WWW file!!!"
msgstr "No ha estat possible accedir a l'arxiu!!"
-#: LYMessages.c:160
+#: LYMessages.c:161
#, c-format
msgid "This is a searchable index. Use %s to search."
msgstr "�ndex de recerca. Useu %s per a buscar."
#. #define WWW_INDEX_MORE_MESSAGE
-#: LYMessages.c:162
+#: LYMessages.c:163
#, c-format
msgid "--More-- This is a searchable index. Use %s to search."
msgstr "--M�s-- �ndex de recerca. Useu %s per a buscar."
-#: LYMessages.c:163
+#: LYMessages.c:164
msgid "You have entered an invalid link number."
msgstr "Heu introdu�t un n�mero d'enlla� incorrecte."
#. #define SOURCE_HELP
-#: LYMessages.c:165
+#: LYMessages.c:166
msgid "Currently viewing document source. Press '\\' to return to rendered version."
msgstr "Aquest �s el document font. Premeu '\\' per tornar a la versi� interpretada."
#. #define NOVICE_LINE_ONE
-#: LYMessages.c:167
+#: LYMessages.c:168
msgid " Arrow keys: Up and Down to move. Right to follow a link; Left to go back. \n"
msgstr "Fletxes amunt i avall per a moure-us. '->' segueix l'enlla�; '<-' tornaenrere\n"
#. #define NOVICE_LINE_TWO
-#: LYMessages.c:169
+#: LYMessages.c:170
msgid " H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list \n"
msgstr "H ajuda O)pcions im(P)rimir G anar M principal Q ix / buscar [del] hist�ria\n"
#. #define NOVICE_LINE_TWO_A
-#: LYMessages.c:171
+#: LYMessages.c:172
msgid " O)ther cmds H)elp K)eymap G)oto P)rint M)ain screen o)ptions Q)uit \n"
msgstr "O altres H ajuda K tecles G anar im(P)rimir M principal o)pcions Q ix \n"
#. #define NOVICE_LINE_TWO_B
-#: LYMessages.c:173
+#: LYMessages.c:174
msgid " O)ther cmds B)ack E)dit D)ownload ^R)eload ^W)ipe screen search doc: / \n"
msgstr "O altres B enrere E)ditar D)escarregar ^R)ecarregar ^W refrescar / buscar \n"
#. #define NOVICE_LINE_TWO_C
-#: LYMessages.c:175
+#: LYMessages.c:176
msgid "O)ther cmds C)omment History: <backspace> Bookmarks: V)iew, A)dd, R)emove \n"
msgstr "O altres C)omentari [del] hist�ria llibreta: V)eure, A)fegir, R eliminar\n"
#. #define FORM_NOVICELINE_ONE
-#: LYMessages.c:177
+#: LYMessages.c:178
msgid " Enter text into the field by typing on the keyboard "
msgstr " Useu el teclat per a introduir text en el camp "
#. #define FORM_NOVICELINE_TWO
-#: LYMessages.c:179
+#: LYMessages.c:180
msgid " Ctrl-U to delete all text in field, [Backspace] to delete a character "
msgstr " Ctrl-U esborra tot el text, [Backspace] esborra nom�s un car�cter "
#. #define FORM_NOVICELINE_TWO_DELBL
-#: LYMessages.c:181
+#: LYMessages.c:182
msgid " Ctrl-U to delete text in field, [Backspace] to delete a character "
msgstr " Ctrl-U esborra el text, [Backspace] esborra nom�s un car�cter "
#. #define FORM_NOVICELINE_TWO_VAR
-#: LYMessages.c:183
+#: LYMessages.c:184
#, c-format
msgid " %s to delete all text in field, [Backspace] to delete a character "
msgstr " %s esborra tot el text, [Backspace] esborra nom�s un car�cter "
#. #define FORM_NOVICELINE_TWO_DELBL_VAR
-#: LYMessages.c:185
+#: LYMessages.c:186
#, c-format
msgid " %s to delete text in field, [Backspace] to delete a character "
msgstr " %s esborra el text, [Backspace] esborra nom�s un car�cter "
#. mailto
-#: LYMessages.c:188
+#: LYMessages.c:189
msgid "Malformed mailto form submission! Cancelled!"
msgstr "Formulari d'enviament de correu mal format! Anul�laci�!"
-#: LYMessages.c:189
+#: LYMessages.c:190
msgid "Warning! Control codes in mail address replaced by ?"
msgstr "Alerta! Codis de control en l'adre�a de correu substitu�ts per \"?\""
-#: LYMessages.c:190
+#: LYMessages.c:191
msgid "Mail disallowed! Cannot submit."
msgstr "El correu no est� perm�s! No s'ha pogut enviar."
-#: LYMessages.c:191
+#: LYMessages.c:192
msgid "Mailto form submission failed!"
msgstr "El formulari d'enviament de correu ha fallat!"
-#: LYMessages.c:192
+#: LYMessages.c:193
msgid "Mailto form submission Cancelled!!!"
msgstr "Enviament cancel�lat!!"
-#: LYMessages.c:193
+#: LYMessages.c:194
msgid "Sending form content..."
msgstr "Enviant el contingut del formulari..."
-#: LYMessages.c:194
+#: LYMessages.c:195
msgid "No email address is present in mailto URL!"
msgstr "No hi ha cap adre�a de correu en aquesta URL!"
#. #define MAILTO_URL_TEMPOPEN_FAILED
-#: LYMessages.c:196
+#: LYMessages.c:197
msgid "Unable to open temporary file for mailto URL!"
msgstr "Ha estat impossible obrir el fitxer temporal per a enviar correu a URL!"
#. #define INC_ORIG_MSG_PROMPT
-#: LYMessages.c:198
+#: LYMessages.c:199
msgid "Do you wish to include the original message?"
msgstr "Voleu incloure-hi el missatge original?"
#. #define INC_PREPARSED_MSG_PROMPT
-#: LYMessages.c:200
+#: LYMessages.c:201
msgid "Do you wish to include the preparsed source?"
msgstr "Voleu incloure-hi la font preanalitzada?"
#. #define SPAWNING_EDITOR_FOR_MAIL
-#: LYMessages.c:202
+#: LYMessages.c:203
msgid "Spawning your selected editor to edit mail message"
msgstr "Obrint l'editor seleccionat per a editar el missatge de correu"
#. #define ERROR_SPAWNING_EDITOR
-#: LYMessages.c:204
+#: LYMessages.c:205
msgid "Error spawning editor, check your editor definition in the options menu"
msgstr "No s'ha pogut obrir l'editor, comproveu-ne la definici� en el men�d'opcions"
-#: LYMessages.c:205
+#: LYMessages.c:206
msgid "Send this comment?"
msgstr "Enviar aquest comentari?"
-#: LYMessages.c:206
+#: LYMessages.c:207
msgid "Send this message?"
msgstr "Enviar aquest missatge?"
-#: LYMessages.c:207
+#: LYMessages.c:208
msgid "Sending your message..."
msgstr "Enviant el missatge..."
-#: LYMessages.c:208
+#: LYMessages.c:209
msgid "Sending your comment:"
msgstr "Enviant el comentari:"
#. textarea
-#: LYMessages.c:211
+#: LYMessages.c:212
msgid "Not in a TEXTAREA; cannot use external editor."
msgstr "No �s una �rea de text; no hi podeu usar l'editor extern."
-#: LYMessages.c:212
+#: LYMessages.c:213
msgid "Not in a TEXTAREA; cannot use command."
msgstr "No �s una �rea de text; no s'hi pot usar l'ordre indicada."
-#: LYMessages.c:214
+#: LYMessages.c:215
msgid "file: ACTIONs are disallowed!"
msgstr "fitxer: les accions (ACTIONS) no estan permeses!"
#. #define FILE_SERVED_LINKS_DISALLOWED
-#: LYMessages.c:216
+#: LYMessages.c:217
msgid "file: URLs via served links are disallowed!"
-msgstr ""
+msgstr "fitxer: no estan permesos els URL prove�ts per un enlla� servit"
-#: LYMessages.c:217
+#: LYMessages.c:218
msgid "Access to local files denied."
msgstr "Acc�s als arxius locals denegat."
-#: LYMessages.c:218
+#: LYMessages.c:219
msgid "file: URLs via bookmarks are disallowed!"
msgstr "fitxer: les URLs del fitxer d'adreces d'inter�s no estan permeses!"
#. #define SPECIAL_VIA_EXTERNAL_DISALLOWED
-#: LYMessages.c:220
+#: LYMessages.c:221
msgid "This special URL is not allowed in external documents!"
msgstr "No es permet aquesta URL especial en documents externs!"
-#: LYMessages.c:221
+#: LYMessages.c:222
msgid "Press <return> to return to Lynx."
msgstr "Premeu <return> per tornar a Lynx."
#. #define SPAWNING_MSG
-#: LYMessages.c:224
+#: LYMessages.c:225
msgid "Spawning DCL subprocess. Use 'logout' to return to Lynx.\n"
-msgstr ""
+msgstr "S'est� engendrant el subproc�s DCL. Useu �logout� per tornar al Lynx.\n"
#. #define SPAWNING_MSG
-#: LYMessages.c:228
+#: LYMessages.c:229
msgid "Type EXIT to return to Lynx.\n"
msgstr "Escriviu 'exit' per a tornar a Lynx.\n"
#. #define SPAWNING_MSG
-#: LYMessages.c:231
+#: LYMessages.c:232
msgid "Spawning your default shell. Use 'exit' to return to Lynx.\n"
msgstr "Obrint la shell predeterminada. Useu \"exit\" per a tornar a Lynx.\n"
-#: LYMessages.c:234
+#: LYMessages.c:235
msgid "Spawning is currently disabled."
-msgstr ""
+msgstr "Actualment no est� habilitat engendrar."
-#: LYMessages.c:235
+#: LYMessages.c:236
msgid "The 'd'ownload command is currently disabled."
msgstr "Actualment l'opci� de (d)esc�rrega no est� activa."
-#: LYMessages.c:236
+#: LYMessages.c:237
msgid "You cannot download an input field."
msgstr "No �s possible descarregar un camp d'entrada de dades."
-#: LYMessages.c:237
+#: LYMessages.c:238
msgid "Form has a mailto action! Cannot download."
-msgstr ""
+msgstr "El formulari t� una acci� mailto. No es pot descarregar."
-#: LYMessages.c:238
+#: LYMessages.c:239
msgid "You cannot download a mailto: link."
msgstr "No es pot descarregar un enlla� a una adre�a de correu."
-#: LYMessages.c:239
+#: LYMessages.c:240
msgid "You cannot download cookies."
msgstr "Les cookies es poden descarregar."
-#: LYMessages.c:240
+#: LYMessages.c:241
msgid "You cannot download a printing option."
msgstr "No es poden descarregar les opcions d'impressi�."
-#: LYMessages.c:241
+#: LYMessages.c:242
msgid "You cannot download an upload option."
msgstr "No es poden descarregar les opcions de c�rrega."
-#: LYMessages.c:242
+#: LYMessages.c:243
msgid "You cannot download an permit option."
-msgstr ""
+msgstr "No podeu descarregar una opci� de perm�s."
-#: LYMessages.c:243
+#: LYMessages.c:244
msgid "This special URL cannot be downloaded!"
msgstr "Aquesta URL especial no es pot descarregar!"
-#: LYMessages.c:244
+#: LYMessages.c:245
msgid "Nothing to download."
msgstr "No hi ha res per descarregar."
-#: LYMessages.c:245
+#: LYMessages.c:246
msgid "Trace ON!"
msgstr "Rastreig activat! (Trace ON!)"
-#: LYMessages.c:246
+#: LYMessages.c:247
msgid "Trace OFF!"
msgstr "Rastreig desactivat! (Trace OFF!)"
#. #define CLICKABLE_IMAGES_ON
-#: LYMessages.c:248
+#: LYMessages.c:249
msgid "Links will be included for all images! Reloading..."
msgstr "S'hi inclouran els enlla�os a totes les imatges! Recarregant..."
#. #define CLICKABLE_IMAGES_OFF
-#: LYMessages.c:250
+#: LYMessages.c:251
msgid "Standard image handling restored! Reloading..."
msgstr "Manejament est�ndar d'imatges restaurat! Recarregant..."
#. #define PSEUDO_INLINE_ALTS_ON
-#: LYMessages.c:252
+#: LYMessages.c:253
msgid "Pseudo_ALTs will be inserted for inlines without ALT strings! Reloading..."
msgstr "S'inseriran pseudo-ALTs per a les imatges sense cadena ALT! Recarrega..."
#. #define PSEUDO_INLINE_ALTS_OFF
-#: LYMessages.c:254
+#: LYMessages.c:255
msgid "Inlines without an ALT string specified will be ignored! Reloading..."
msgstr "S'ignoraran les imatges sense cadena alternativa ("
-#: LYMessages.c:255
+#: LYMessages.c:256
msgid "Raw 8-bit or CJK mode toggled OFF! Reloading..."
msgstr "Mode 8-bits cru o CJK activat! Rec�rrega..."
-#: LYMessages.c:256
+#: LYMessages.c:257
msgid "Raw 8-bit or CJK mode toggled ON! Reloading..."
msgstr "Mode 8-bits cru o CJK desactivat! Rec�rrega..."
#. #define HEAD_D_L_OR_CANCEL
-#: LYMessages.c:258
+#: LYMessages.c:259
msgid "Send HEAD request for D)ocument or L)ink, or C)ancel? (d,l,c): "
msgstr "Voleu enviar una sol�licitud HEAD per al D)ocument o l'en(L)la�, or C)ancel�lar? (d,l,c):"
#. #define HEAD_D_OR_CANCEL
-#: LYMessages.c:260
+#: LYMessages.c:261
msgid "Send HEAD request for D)ocument, or C)ancel? (d,c): "
msgstr "Voleu enviar una sol�licitud HEAD per al D)ocument o C)ancel�lar? (d,c):"
-#: LYMessages.c:261
+#: LYMessages.c:262
msgid "Sorry, the document is not an http URL."
msgstr "El document no �s una URL http."
-#: LYMessages.c:262
+#: LYMessages.c:263
msgid "Sorry, the link is not an http URL."
msgstr "L'enlla� no �s una URL http."
-#: LYMessages.c:263
+#: LYMessages.c:264
msgid "Sorry, the ACTION for this form is disabled."
msgstr "L'ACCI� del formulari no est� disponible."
#. #define FORM_ACTION_NOT_HTTP_URL
-#: LYMessages.c:265
+#: LYMessages.c:266
msgid "Sorry, the ACTION for this form is not an http URL."
msgstr "L'ACCI� del formulari no �s una adre�a de http."
-#: LYMessages.c:266
+#: LYMessages.c:267
msgid "Not an http URL or form ACTION!"
msgstr "No �s una URL http ni una ACCIO de formulari!"
-#: LYMessages.c:267
+#: LYMessages.c:268
msgid "This special URL cannot be a form ACTION!"
msgstr "Aquesta URL especial no pot ser una ACCIO de formulari!"
-#: LYMessages.c:268
+#: LYMessages.c:269
msgid "URL is not in starting realm!"
msgstr "La URL no est� en el domini inicial!"
-#: LYMessages.c:269
+#: LYMessages.c:270
msgid "News posting is disabled!"
msgstr "L'enviament de missatges als f�rums de discusi� est� desactivada!"
-#: LYMessages.c:270
+#: LYMessages.c:271
msgid "File management support is disabled!"
msgstr "L'administraci� de fitxers est� desactivada!"
-#: LYMessages.c:271
+#: LYMessages.c:272
msgid "No jump file is currently available."
msgstr "No hi ha cap fitxer de salts disponible."
-#: LYMessages.c:272
+#: LYMessages.c:273
msgid "Jump to (use '?' for list): "
msgstr "Saltar a (premeu '?' per veure la llista): "
-#: LYMessages.c:273
+#: LYMessages.c:274
msgid "Jumping to a shortcut URL is disallowed!"
-msgstr ""
+msgstr "El salt a una URL de drecera esta deshabilitat!"
-#: LYMessages.c:274
+#: LYMessages.c:275
msgid "Random URL is disallowed! Use a shortcut."
msgstr "Les adreces aleat�ries estan desactivades. Useu una drecera."
-#: LYMessages.c:275
+#: LYMessages.c:276
msgid "No random URLs have been used thus far."
msgstr "Fins ara no s'han usat URLs aleat�ries."
-#: LYMessages.c:276
+#: LYMessages.c:277
msgid "Bookmark features are currently disabled."
msgstr "Els \"favorits\" estan desactivats."
-#: LYMessages.c:277
+#: LYMessages.c:278
msgid "Execution via bookmarks is disabled."
msgstr "L'execuci� a trav�s del fitxer d'adreces est� desactivada."
#. #define BOOKMARK_FILE_NOT_DEFINED
-#: LYMessages.c:279
+#: LYMessages.c:280
#, c-format
msgid "Bookmark file is not defined. Use %s to see options."
msgstr "El fitxer de favorits no est� definit. Useu %s per a veure les opcions."
#. #define NO_TEMP_FOR_HOTLIST
-#: LYMessages.c:281
+#: LYMessages.c:282
msgid "Unable to open tempfile for X Mosaic hotlist conversion."
msgstr "No ha estat possible obrir el fitxer temporal per a convertir el fitxer d'adreces de Mosaic."
-#: LYMessages.c:282
+#: LYMessages.c:283
msgid "ERROR - unable to open bookmark file."
msgstr "ERROR: ha estat impossible obrir l'arxiu d'adreces"
#. #define BOOKMARK_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:284
+#: LYMessages.c:285
msgid "Unable to open bookmark file for deletion of link."
msgstr "No ha estat possible obrir l'arxiu d'adreces per esborrar l'enlla�."
#. #define BOOKSCRA_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:286
+#: LYMessages.c:287
msgid "Unable to open scratch file for deletion of link."
-msgstr ""
+msgstr "No s'ha pogut obrir el fitxer de treball per a l'esborrament de l'enlla�"
-#: LYMessages.c:288
+#: LYMessages.c:289
msgid "Error renaming scratch file."
-msgstr ""
+msgstr "S'ha produ�t un error en reanomenar el fitxer de treball."
-#: LYMessages.c:290
+#: LYMessages.c:291
msgid "Error renaming temporary file."
msgstr "Error quan s'intentava reanomenar un arxiu temporal."
#. #define BOOKTEMP_COPY_FAIL
-#: LYMessages.c:292
+#: LYMessages.c:293
msgid "Unable to copy temporary file for deletion of link."
-msgstr ""
+msgstr "No s'ha pogut copiar el fitxer temporari per l'esborrament de l'enlla�."
#. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL
-#: LYMessages.c:294
+#: LYMessages.c:295
msgid "Unable to reopen temporary file for deletion of link."
-msgstr ""
+msgstr "No s'ha pogut reobrir el fitxer temporari per l'esborrament de l'enlla�.<"
#. #define BOOKMARK_LINK_NOT_ONE_LINE
-#: LYMessages.c:297
+#: LYMessages.c:298
msgid "Link is not by itself all on one line in bookmark file."
msgstr "Hi ha d'haver un "
-#: LYMessages.c:298
+#: LYMessages.c:299
msgid "Bookmark deletion failed."
-msgstr ""
+msgstr "Ha fallat l'esborrament del marcador."
#. #define BOOKMARKS_NOT_TRAVERSED
-#: LYMessages.c:300
+#: LYMessages.c:301
msgid "Bookmark files cannot be traversed (only http URLs)."
-msgstr ""
+msgstr "Els fitxers de marcadors no es poden rec�rrer (sols el URL d'http)."
#. #define BOOKMARKS_NOT_OPEN
-#: LYMessages.c:302
+#: LYMessages.c:303
msgid "Unable to open bookmark file, use 'a' to save a link first"
msgstr "Impossible obrir el fitxer d'adreces, useu 'a' per a guardar-neuna primer."
-#: LYMessages.c:303
+#: LYMessages.c:304
msgid "There are no links in this bookmark file!"
msgstr "No hi ha enlla�os en aquest fitxer d'adreces!"
#. #define CACHE_D_OR_CANCEL
-#: LYMessages.c:305
-#, fuzzy
-#| msgid "Send HEAD request for D)ocument, or C)ancel? (d,c): "
+#: LYMessages.c:306
msgid "D)elete cached document or C)ancel? (d,c): "
-msgstr "Voleu enviar una sol�licitud HEAD per al D)ocument o C)ancel�lar? (d,c):"
+msgstr "D)ocument a la mem�ria cau s'ha d'esborrar o C)ancel�la? (d,c): "
#. #define BOOK_D_L_OR_CANCEL
-#: LYMessages.c:307
+#: LYMessages.c:308
msgid "Save D)ocument or L)ink to bookmark file or C)ancel? (d,l,c): "
msgstr "Guardar com a adre�a d'inter�s D)ocument o en(L)la�,o C)ancel�lar? (d,l,c): "
-#: LYMessages.c:308
+#: LYMessages.c:309
msgid "Save D)ocument to bookmark file or C)ancel? (d,c): "
msgstr "Guardar D)ocument en l'arxiu d'adreces d'inter�so C)ancel�lar? (d, c): "
-#: LYMessages.c:309
+#: LYMessages.c:310
msgid "Save L)ink to bookmark file or C)ancel? (l,c): "
msgstr "Guardar en(L)la� en l'arxiu d'adreces d'inter�so C)ancel�lar? (l, c): "
#. #define NOBOOK_POST_FORM
-#: LYMessages.c:311
+#: LYMessages.c:312
msgid "Documents from forms with POST content cannot be saved as bookmarks."
msgstr "No es pot guardar al fitxer d'adreces documents procedents de formularis POST."
-#: LYMessages.c:312
+#: LYMessages.c:313
msgid "Cannot save form fields/links"
-msgstr ""
+msgstr "No es poden desar el camps dels formularis/enlla�os"
#. #define NOBOOK_HSML
-#: LYMessages.c:314
+#: LYMessages.c:315
msgid "History, showinfo, menu and list files cannot be saved as bookmarks."
msgstr "Els fitxers historial, informaci�, men� i lista no es poden guardar al fitxer d'adreces."
#. #define CONFIRM_BOOKMARK_DELETE
-#: LYMessages.c:316
+#: LYMessages.c:317
msgid "Do you really want to delete this link from your bookmark file?"
msgstr "Esteu segurs que voleu esborrar aquest enlla� de l'arxiu d'adreces?"
-#: LYMessages.c:317
+#: LYMessages.c:318
msgid "Malformed address."
msgstr "Adre�a mal formada."
#. #define HISTORICAL_ON_MINIMAL_OFF
-#: LYMessages.c:319
+#: LYMessages.c:320
msgid "Historical comment parsing ON (Minimal is overridden)!"
-msgstr ""
+msgstr "L'analitzador dels comentaris hist�rics est� activada (El m�nim est� anul�lat)!"
#. #define HISTORICAL_OFF_MINIMAL_ON
-#: LYMessages.c:321
+#: LYMessages.c:322
msgid "Historical comment parsing OFF (Minimal is in effect)!"
-msgstr ""
+msgstr "L'analitzador dels comentaris hist�rics est� desactivada (El m�nim est� en efecte)!"
#. #define HISTORICAL_ON_VALID_OFF
-#: LYMessages.c:323
+#: LYMessages.c:324
msgid "Historical comment parsing ON (Valid is overridden)!"
-msgstr ""
+msgstr "L'analitzador dels comentaris hist�rics est� activada (V�lid est� anul�lat)!"
#. #define HISTORICAL_OFF_VALID_ON
-#: LYMessages.c:325
+#: LYMessages.c:326
msgid "Historical comment parsing OFF (Valid is in effect)!"
-msgstr ""
+msgstr "L'analitzador dels comentaris hist�rics est� desactivada (V�lid est� en efecte)!<"
#. #define MINIMAL_ON_IN_EFFECT
-#: LYMessages.c:327
+#: LYMessages.c:328
msgid "Minimal comment parsing ON (and in effect)!"
-msgstr ""
+msgstr "L'analitzador del comentari m�nim esta activat (i en efecte)!"
#. #define MINIMAL_OFF_VALID_ON
-#: LYMessages.c:329
+#: LYMessages.c:330
msgid "Minimal comment parsing OFF (Valid is in effect)!"
-msgstr ""
+msgstr "L'analitzador del comentari m�nim esta desactivat (V�lid est� en efecte)!<"
#. #define MINIMAL_ON_BUT_HISTORICAL
-#: LYMessages.c:331
+#: LYMessages.c:332
msgid "Minimal comment parsing ON (but Historical is in effect)!"
-msgstr ""
+msgstr "L'analitzador del comentari m�nim esta activat (per� Hist�ric est� en efecte)!"
#. #define MINIMAL_OFF_HISTORICAL_ON
-#: LYMessages.c:333
+#: LYMessages.c:334
msgid "Minimal comment parsing OFF (Historical is in effect)!"
-msgstr ""
+msgstr "L'analitzador del comentari m�nim esta desactivat (Hist�ric est� en efecte)!<"
-#: LYMessages.c:334
+#: LYMessages.c:335
msgid "Soft double-quote parsing ON!"
-msgstr ""
+msgstr "L'analitzador cometes doble suau est� activat!"
-#: LYMessages.c:335
+#: LYMessages.c:336
msgid "Soft double-quote parsing OFF!"
-msgstr ""
+msgstr "L'analitzador cometes doble suau est� activat!<"
-#: LYMessages.c:336
+#: LYMessages.c:337
msgid "Now using TagSoup parsing of HTML."
msgstr "Utilitzant l'analitzador d'HTML TagSoup."
-#: LYMessages.c:337
+#: LYMessages.c:338
msgid "Now using SortaSGML parsing of HTML!"
msgstr "Utilitzant l'analitzador d'HTML SortaSGML!"
-#: LYMessages.c:338
+#: LYMessages.c:339
msgid "You are already at the end of this document."
msgstr "�s a��, el final del document."
-#: LYMessages.c:339
+#: LYMessages.c:340
msgid "You are already at the beginning of this document."
msgstr "�s ac�, el principi del document."
-#: LYMessages.c:340
+#: LYMessages.c:341
#, c-format
msgid "You are already at page %d of this document."
msgstr "�s aquesta, la %da p�gina del document."
-#: LYMessages.c:341
+#: LYMessages.c:342
#, c-format
msgid "Link number %d already is current."
msgstr "�s aquest, l'enlla� n�mero %d."
-#: LYMessages.c:342
+#: LYMessages.c:343
msgid "You are already at the first document"
msgstr "Aquest �s el primer document"
-#: LYMessages.c:343
+#: LYMessages.c:344
msgid "There are no links above this line of the document."
msgstr "No hi ha enlla�os per damunt d'aquesta l�nia."
-#: LYMessages.c:344
+#: LYMessages.c:345
msgid "There are no links below this line of the document."
msgstr "No hi ha enlla�os per sota d'aquesta l�nia."
#. #define MAXLEN_REACHED_DEL_OR_MOV
-#: LYMessages.c:346
+#: LYMessages.c:347
msgid "Maximum length reached! Delete text or move off field."
msgstr "S'ha assolit la longitud m�xima! Esborreu text o eixiu del camp."
#. #define NOT_ON_SUBMIT_OR_LINK
-#: LYMessages.c:348
+#: LYMessages.c:349
msgid "You are not on a form submission button or normal link."
msgstr "No �s ni un bot� d'enviament ni un enlla� normal."
#. #define NEED_CHECKED_RADIO_BUTTON
-#: LYMessages.c:350
+#: LYMessages.c:351
msgid "One radio button must be checked at all times!"
msgstr "Sempre s'ha de triar una opci�!"
-#: LYMessages.c:351
+#: LYMessages.c:352
msgid "No submit button for this form, submit single text field?"
msgstr "No hi ha cap bot� d'enviament, enviar simplemtent el camp de text?"
-#: LYMessages.c:352
+#: LYMessages.c:353
msgid "Do you want to go back to the previous document?"
msgstr "Voleu tornar al document anterior?"
-#: LYMessages.c:353
+#: LYMessages.c:354
msgid "Use arrows or tab to move off of field."
msgstr "Useu les fletxes o <tab> per a eixir-ne."
#. #define ENTER_TEXT_ARROWS_OR_TAB
-#: LYMessages.c:355
+#: LYMessages.c:356
msgid "Enter text. Use arrows or tab to move off of field."
msgstr "Introdu�u text. Useu les fletxes o el tabulador per a eixir-ne."
-#: LYMessages.c:356
+#: LYMessages.c:357
msgid "** Bad HTML!! No form action defined. **"
msgstr "** Codi HTML incorrecte!! No hi ha cap acci� definida. **"
-#: LYMessages.c:357
+#: LYMessages.c:358
msgid "Bad HTML!! Unable to create popup window!"
msgstr "Codi HTML incorrecte! Ha estat impossible crear la finestra emergent!"
-#: LYMessages.c:358
+#: LYMessages.c:359
msgid "Unable to create popup window!"
msgstr "Ha estat impossible crear la finestra emergent!"
-#: LYMessages.c:359
+#: LYMessages.c:360
msgid "Goto a random URL is disallowed!"
msgstr "El salt a una URL aleat�ria est� desactivat!"
-#: LYMessages.c:360
+#: LYMessages.c:361
msgid "Goto a non-http URL is disallowed!"
msgstr "L'acc�s a URLs que no compleixen el protocol http no est� perm�s!"
-#: LYMessages.c:361
+#: LYMessages.c:362
#, c-format
msgid "You are not allowed to goto \"%s\" URLs"
msgstr "No teniu perm�s per a anar a URLs \"%s\""
-#: LYMessages.c:362
+#: LYMessages.c:363
msgid "URL to open: "
msgstr "Anar a: "
-#: LYMessages.c:363
+#: LYMessages.c:364
msgid "Edit the current Goto URL: "
msgstr "Editar l'adre�a actual: "
-#: LYMessages.c:364
+#: LYMessages.c:365
msgid "Edit the previous Goto URL: "
msgstr "Editar l'adre�a anterior: "
-#: LYMessages.c:365
+#: LYMessages.c:366
msgid "Edit a previous Goto URL: "
msgstr "Editar adreces anteriors: "
-#: LYMessages.c:366
+#: LYMessages.c:367
msgid "Current document has POST data."
msgstr "El document actual cont� dades POST."
-#: LYMessages.c:367
+#: LYMessages.c:368
msgid "Edit this document's URL: "
msgstr "Editar l'adre�a d'aquest document: "
-#: LYMessages.c:368
+#: LYMessages.c:369
msgid "Edit the current link's URL: "
msgstr "Editar l'adre�a de l'enlla� actual: "
-#: LYMessages.c:369
-#, fuzzy
-#| msgid "Edit this document's URL: "
+#: LYMessages.c:370
msgid "Edit the form's submit-URL: "
-msgstr "Editar l'adre�a d'aquest document: "
+msgstr "Edita el formulari submit-URL: "
-#: LYMessages.c:370
+#: LYMessages.c:371
msgid "You cannot edit File Management URLs"
msgstr "No es poden editar les URLs del gestor de fitxers."
-#: LYMessages.c:371
+#: LYMessages.c:372
msgid "Enter a database query: "
msgstr "Introdu�u una consulta a la base de dades: "
-#: LYMessages.c:372
+#: LYMessages.c:373
msgid "Enter a whereis query: "
msgstr "Introdu�u la paraula que voleu trobar: "
-#: LYMessages.c:373
+#: LYMessages.c:374
msgid "Edit the current query: "
msgstr "Editar la consulta: "
-#: LYMessages.c:374
+#: LYMessages.c:375
msgid "Edit the previous query: "
msgstr "Editar la consulta anterior: "
-#: LYMessages.c:375
+#: LYMessages.c:376
msgid "Edit a previous query: "
msgstr "Editar una consulta anterior: "
#. #define USE_C_R_TO_RESUB_CUR_QUERY
-#: LYMessages.c:377
+#: LYMessages.c:378
msgid "Use Control-R to resubmit the current query."
msgstr "Useu Ctrl-R per a reenviar la consulta actual."
-#: LYMessages.c:378
+#: LYMessages.c:379
msgid "Edit the current shortcut: "
msgstr "Editar la drecera actual: "
-#: LYMessages.c:379
+#: LYMessages.c:380
msgid "Edit the previous shortcut: "
msgstr "Editar la drecera anterior: "
-#: LYMessages.c:380
+#: LYMessages.c:381
msgid "Edit a previous shortcut: "
msgstr "Editar una drecera anterior: "
-#: LYMessages.c:381
+#: LYMessages.c:382
#, c-format
msgid "Key '%c' is not mapped to a jump file!"
msgstr "La tecla '%c' no est� assignada a cap fitxer de salt!"
-#: LYMessages.c:382
+#: LYMessages.c:383
msgid "Cannot locate jump file!"
msgstr "No s'ha pogut trobar el fitxer de salts!"
-#: LYMessages.c:383
+#: LYMessages.c:384
msgid "Cannot open jump file!"
msgstr "No s'ha pogut obrir el fitxer de salts!"
-#: LYMessages.c:384
+#: LYMessages.c:385
msgid "Error reading jump file!"
msgstr "Error de lectura en el fitxer de salts!"
-#: LYMessages.c:385
+#: LYMessages.c:386
msgid "Out of memory reading jump file!"
msgstr "Mem�ria exhaurida durant la lectura del fitxer de salts!"
-#: LYMessages.c:386
+#: LYMessages.c:387
msgid "Out of memory reading jump table!"
msgstr "Mem�ria exhaurida durant la lectura de la taula de salts!"
-#: LYMessages.c:387
+#: LYMessages.c:388
msgid "No index is currently available."
msgstr "No hi ha cap �ndex disponible."
#. #define CONFIRM_MAIN_SCREEN
-#: LYMessages.c:389
+#: LYMessages.c:390
msgid "Do you really want to go to the Main screen?"
msgstr "Esteu segur de voler anar a la p�gina principal?"
-#: LYMessages.c:390
+#: LYMessages.c:391
msgid "You are already at main screen!"
msgstr "�s aquesta, la p�gina principal!"
#. #define NOT_ISINDEX
-#: LYMessages.c:392
+#: LYMessages.c:393
msgid "Not a searchable indexed document -- press '/' to search for a text string"
msgstr "No �s un document indexat: premeu '/' per a buscar una cadena de text"
#. #define NO_OWNER
-#: LYMessages.c:394
+#: LYMessages.c:395
msgid "No owner is defined for this file so you cannot send a comment"
msgstr "No consta el propietari de l'arxiu: no podeu enviar-li cap comentari"
-#: LYMessages.c:395
+#: LYMessages.c:396
#, c-format
msgid "No owner is defined. Use %s?"
msgstr "No consta el propietari. Usar %s?"
-#: LYMessages.c:396
+#: LYMessages.c:397
msgid "Do you wish to send a comment?"
msgstr "Voleu enviar un comentari?"
-#: LYMessages.c:397
+#: LYMessages.c:398
msgid "Mail is disallowed so you cannot send a comment"
msgstr "El correu no est� perm�s; per tant, no podeu enviar comentaris."
-#: LYMessages.c:398
+#: LYMessages.c:399
msgid "The 'e'dit command is currently disabled."
msgstr "L'ordre Editar est� desactivada."
-#: LYMessages.c:399
+#: LYMessages.c:400
msgid "External editing is currently disabled."
msgstr "L'edici� externa est� desactivada."
-#: LYMessages.c:400
+#: LYMessages.c:401
msgid "System error - failure to get status."
msgstr "Error del sistema: no s'ha pogut obtenir l'estat."
-#: LYMessages.c:401
+#: LYMessages.c:402
msgid "No editor is defined!"
msgstr "No hi ha cap editor definit!"
-#: LYMessages.c:402
+#: LYMessages.c:403
msgid "The 'p'rint command is currently disabled."
msgstr "L'ordre imPrimir est� desactivada."
-#: LYMessages.c:403
+#: LYMessages.c:404
msgid "Document has no Toolbar links or Banner."
msgstr "El document no t� barra d'enlla�os ni banner."
-#: LYMessages.c:404
+#: LYMessages.c:405
msgid "Unable to open traversal file."
-msgstr ""
+msgstr "No s'ha pogut obrir el fitxer de travessada"
-#: LYMessages.c:405
+#: LYMessages.c:406
msgid "Unable to open traversal found file."
-msgstr ""
+msgstr "No s'ha pogut obrir el fitxer trobat de travessada<"
-#: LYMessages.c:406
+#: LYMessages.c:407
msgid "Unable to open reject file."
-msgstr ""
+msgstr "No s'ha pogut obrir el fitxer de rebuig."
-#: LYMessages.c:407
+#: LYMessages.c:408
msgid "Unable to open traversal errors output file"
-msgstr ""
+msgstr "No s'ha pogut obrir el fitxer de sortida d'errors de travessada"
-#: LYMessages.c:408
+#: LYMessages.c:409
msgid "TRAVERSAL WAS INTERRUPTED"
-msgstr ""
+msgstr "LA TRAVESSADA S'HA INTERROMPUT"
-#: LYMessages.c:409
+#: LYMessages.c:410
msgid "Follow link (or goto link or page) number: "
msgstr "Seguir l'enlla� (o anar a la p�gina) n�mero: "
-#: LYMessages.c:410
+#: LYMessages.c:411
msgid "Select option (or page) number: "
msgstr "Triar opci� (o p�gina) n�mero: "
-#: LYMessages.c:411
+#: LYMessages.c:412
#, c-format
msgid "Option number %d already is current."
msgstr "�s aquesta, l'opci� n�mero %d."
#. #define ALREADY_AT_OPTION_END
-#: LYMessages.c:413
+#: LYMessages.c:414
msgid "You are already at the end of this option list."
msgstr "�s ac�, el final de la llista d'opcions."
#. #define ALREADY_AT_OPTION_BEGIN
-#: LYMessages.c:415
+#: LYMessages.c:416
msgid "You are already at the beginning of this option list."
msgstr "�s ac�, el comen�ament de la llista d'opcions."
#. #define ALREADY_AT_OPTION_PAGE
-#: LYMessages.c:417
+#: LYMessages.c:418
#, c-format
msgid "You are already at page %d of this option list."
msgstr "�s aquesta, la p�gina %d de la llista d'opcions."
-#: LYMessages.c:418
+#: LYMessages.c:419
msgid "You have entered an invalid option number."
msgstr "Heu introdu�t un n�mero d'opci� que no �s v�lid."
-#: LYMessages.c:419
+#: LYMessages.c:420
msgid "** Bad HTML!! Use -trace to diagnose. **"
msgstr "** HTML erroni!! Useu l'opci� -trace per a obtenir un diagn�stic. **"
-#: LYMessages.c:420
+#: LYMessages.c:421
msgid "Give name of file to save in"
msgstr "Cal un nom per a l'arxiu."
-#: LYMessages.c:421
+#: LYMessages.c:422
msgid "Can't save data to file -- please run WWW locally"
msgstr "No s'ha pogut guardar les dades al fitxer: executeu WWW localment."
-#: LYMessages.c:422
+#: LYMessages.c:423
msgid "Can't open temporary file!"
msgstr "No ha estat possible obrir l'arxiu temporal!"
-#: LYMessages.c:423
+#: LYMessages.c:424
msgid "Can't open output file! Cancelling!"
msgstr "No ha estat possible obrir l'arxiu d'eixida! Anul�lat!"
-#: LYMessages.c:424
+#: LYMessages.c:425
msgid "Execution is disabled."
msgstr "L'execuci� no est� activada."
#. #define EXECUTION_DISABLED_FOR_FILE
-#: LYMessages.c:426
+#: LYMessages.c:427
#, c-format
msgid "Execution is not enabled for this file. See the Options menu (use %s)."
msgstr "L'execuci� no est� activada. Vegeu el men� d'opcions (useu %s)."
#. #define EXECUTION_NOT_COMPILED
-#: LYMessages.c:428
+#: LYMessages.c:429
msgid "Execution capabilities are not compiled into this version."
msgstr "La capacitat d'executar programes no s'ha compilat en aquesta versi�."
-#: LYMessages.c:429
+#: LYMessages.c:430
msgid "This file cannot be displayed on this terminal."
msgstr "El fitxer no es pot mostrar en aquest terminal."
#. #define CANNOT_DISPLAY_FILE_D_OR_C
-#: LYMessages.c:431
+#: LYMessages.c:432
msgid "This file cannot be displayed on this terminal: D)ownload, or C)ancel"
msgstr "El fitxer no es pot mostrar en aquest terminal: D)escarregar oC)ancel�lar."
-#: LYMessages.c:432
+#: LYMessages.c:433
#, c-format
msgid "%s D)ownload, or C)ancel"
msgstr "%s D)escarregar o C)ancel�lar"
-#: LYMessages.c:433
+#: LYMessages.c:434
msgid "Cancelling file."
msgstr "Cancel�lant."
-#: LYMessages.c:434
+#: LYMessages.c:435
msgid "Retrieving file. - PLEASE WAIT -"
msgstr "Descarregant fitxer. - ESPEREU, PER FAVOR -"
-#: LYMessages.c:435
+#: LYMessages.c:436
msgid "Enter a filename: "
msgstr "Introdu�u un nom per a l'arxiu: "
-#: LYMessages.c:436
+#: LYMessages.c:437
msgid "Edit the previous filename: "
msgstr "Editar el nom anterior: "
-#: LYMessages.c:437
+#: LYMessages.c:438
msgid "Edit a previous filename: "
msgstr "Editar els noms anteriors: "
-#: LYMessages.c:438
+#: LYMessages.c:439
msgid "Enter a new filename: "
msgstr "Introdu�u un nom nou: "
-#: LYMessages.c:439
+#: LYMessages.c:440
msgid "File name may not begin with a dot."
msgstr "Els noms d'arxiu no poden comen�ar amb punt."
-#: LYMessages.c:441
+#: LYMessages.c:442
msgid "File exists. Create higher version?"
-msgstr ""
+msgstr "El fitxer existeix. Voleu crear una versi� m�s alta?"
-#: LYMessages.c:443
+#: LYMessages.c:444
msgid "File exists. Overwrite?"
msgstr "L'arxiu existeix. Voleu sobreescriure'l?"
-#: LYMessages.c:445
+#: LYMessages.c:446
msgid "Cannot write to file."
msgstr "No es pot escriure en el fitxer."
-#: LYMessages.c:446
+#: LYMessages.c:447
msgid "ERROR! - download command is misconfigured."
msgstr "ERROR: l'ordre _descarregar_ est� mal configurada."
-#: LYMessages.c:447
+#: LYMessages.c:448
msgid "Unable to download file."
msgstr "Ha estat impossible descarregar el fitxer."
-#: LYMessages.c:448
+#: LYMessages.c:449
msgid "Reading directory..."
msgstr "Llegint directori..."
-#: LYMessages.c:449
+#: LYMessages.c:450
msgid "Building directory listing..."
msgstr "Construint la llista del directori..."
-#: LYMessages.c:450
+#: LYMessages.c:451
msgid "Saving..."
msgstr "Gravant..."
-#: LYMessages.c:451
+#: LYMessages.c:452
#, c-format
msgid "Could not edit file '%s'."
msgstr "No ha estat possible editar el fitxer '%s'."
-#: LYMessages.c:452
+#: LYMessages.c:453
msgid "Unable to access document!"
msgstr "No ha estat possible accedir al document!"
-#: LYMessages.c:453
+#: LYMessages.c:454
msgid "Could not access file."
msgstr "No ha estat possible accedir a l'arxiu."
-#: LYMessages.c:454
+#: LYMessages.c:455
msgid "Could not access directory."
msgstr "No ha estat possible accedir al directori."
-#: LYMessages.c:455
+#: LYMessages.c:456
msgid "Could not load data."
msgstr "No ha estat possible carregar les dades."
#. #define CANNOT_EDIT_REMOTE_FILES
-#: LYMessages.c:457
+#: LYMessages.c:458
msgid "Lynx cannot currently (e)dit remote WWW files."
msgstr "Lynx no pot editar fitxers WWW remots."
#. #define CANNOT_EDIT_FIELD
-#: LYMessages.c:459
+#: LYMessages.c:460
msgid "This field cannot be (e)dited with an external editor."
msgstr "Aquest camp no es pot editar amb un editor extern."
-#: LYMessages.c:460
+#: LYMessages.c:461
msgid "Bad rule"
msgstr "Regla incorrecta"
-#: LYMessages.c:461
+#: LYMessages.c:462
msgid "Insufficient operands:"
msgstr "Nombre d'operands insuficient:"
-#: LYMessages.c:462
+#: LYMessages.c:463
msgid "You are not authorized to edit this file."
msgstr "No teniu autoritzaci� per a editar aquest arxiu."
-#: LYMessages.c:463
+#: LYMessages.c:464
msgid "Title: "
msgstr "T�tol: "
-#: LYMessages.c:464
+#: LYMessages.c:465
msgid "Subject: "
msgstr "Tema: "
-#: LYMessages.c:465
+#: LYMessages.c:466
msgid "Username: "
msgstr "Nom d'usuari: "
-#: LYMessages.c:466
+#: LYMessages.c:467
msgid "Password: "
msgstr "Contrassenya: "
-#: LYMessages.c:467
+#: LYMessages.c:468
msgid "lynx: Username and Password required!!!"
msgstr "lynx: fa falta el nom d'usuari i la contrasenya!!"
-#: LYMessages.c:468
+#: LYMessages.c:469
msgid "lynx: Password required!!!"
msgstr "lynx: fa falta la contrasenya!!"
-#: LYMessages.c:469
+#: LYMessages.c:470
msgid "Clear all authorization info for this session?"
msgstr "Esborrar tota la informaci� sobre autoritzaci� d'aquesta sessi�?"
-#: LYMessages.c:470
+#: LYMessages.c:471
msgid "Authorization info cleared."
msgstr "Informaci� esborrada."
-#: LYMessages.c:471
+#: LYMessages.c:472
msgid "Authorization failed. Retry?"
msgstr "Autoritzaci� fallida. Reintentar?"
-#: LYMessages.c:472
+#: LYMessages.c:473
msgid "cgi support has been disabled."
msgstr "s'ha desactivat el suport per a CGI."
#. #define CGI_NOT_COMPILED
-#: LYMessages.c:474
+#: LYMessages.c:475
msgid "Lynxcgi capabilities are not compiled into this version."
msgstr "La capacitat d'usar CGI no ha estat compilada en aquesta versi�."
-#: LYMessages.c:475
+#: LYMessages.c:476
#, c-format
msgid "Sorry, no known way of converting %s to %s."
msgstr "Em sap greu, no s� com convertir %s a %s."
-#: LYMessages.c:476
+#: LYMessages.c:477
msgid "Unable to set up connection."
msgstr "Ha estat impossible establir la connexi�."
-#: LYMessages.c:477
+#: LYMessages.c:478
msgid "Unable to make connection"
msgstr "Ha estat impossible fer la connexi�."
#. #define MALFORMED_EXEC_REQUEST
-#: LYMessages.c:479
+#: LYMessages.c:480
msgid "Executable link rejected due to malformed request."
msgstr "Enlla� executable rebutjat a causa d'una sol�licitud mal formada."
#. #define BADCHAR_IN_EXEC_LINK
-#: LYMessages.c:481
+#: LYMessages.c:482
#, c-format
msgid "Executable link rejected due to `%c' character."
msgstr "Enlla� executable rebutjat a causa del car�cter \"%c\"."
#. #define RELPATH_IN_EXEC_LINK
-#: LYMessages.c:483
+#: LYMessages.c:484
msgid "Executable link rejected due to relative path string ('../')."
msgstr "Enlla� executable rebutjat a causa d'un cam� relatiu (\"../\")."
#. #define BADLOCPATH_IN_EXEC_LINK
-#: LYMessages.c:485
+#: LYMessages.c:486
msgid "Executable link rejected due to location or path."
msgstr "Enlla� executable rebutjat a causa de la localitzaci� o la ruta."
-#: LYMessages.c:486
+#: LYMessages.c:487
msgid "Mail access is disabled!"
msgstr "L'acc�s a correu no est� activat!"
#. #define ACCESS_ONLY_LOCALHOST
-#: LYMessages.c:488
+#: LYMessages.c:489
msgid "Only files and servers on the local host can be accessed."
msgstr "Nom�s podeu accedir a fitxers i servidors en la m�quina local."
-#: LYMessages.c:489
+#: LYMessages.c:490
msgid "Telnet access is disabled!"
msgstr "L'acc�s a telnet no est� activat"
#. #define TELNET_PORT_SPECS_DISABLED
-#: LYMessages.c:491
+#: LYMessages.c:492
msgid "Telnet port specifications are disabled."
msgstr "Les especificacions del port telnet estan desactivades."
-#: LYMessages.c:492
+#: LYMessages.c:493
msgid "USENET news access is disabled!"
msgstr "L'acc�s als f�rums de discusi� (USENET) no est� activat!"
-#: LYMessages.c:493
+#: LYMessages.c:494
msgid "Rlogin access is disabled!"
msgstr "L'acc�s a trav�s de rlogin est� desactivat!"
-#: LYMessages.c:494
+#: LYMessages.c:495
msgid "Ftp access is disabled!"
msgstr "L'acc�s a ftp no est� activat!"
-#: LYMessages.c:495
+#: LYMessages.c:496
msgid "There are no references from this document."
msgstr "No hi ha refer�ncies d'aquest document."
-#: LYMessages.c:496
+#: LYMessages.c:497
msgid "There are only hidden links from this document."
msgstr "En aquest document nom�s hi ha enlla�os ocults."
-#: LYMessages.c:498
+#: LYMessages.c:499
msgid "Unable to open command file."
msgstr "No ha estat possible obrir el fitxer d'ordres."
-#: LYMessages.c:500
+#: LYMessages.c:501
msgid "News Post Cancelled!!!"
msgstr "Missatge cancel�lat!!"
#. #define SPAWNING_EDITOR_FOR_NEWS
-#: LYMessages.c:502
+#: LYMessages.c:503
msgid "Spawning your selected editor to edit news message"
msgstr "Creant el proc�s fill que obri l'editor per a editar el missatge"
-#: LYMessages.c:503
+#: LYMessages.c:504
msgid "Post this message?"
msgstr "Esteu segur que voleu enviar aquest missatge?"
-#: LYMessages.c:504
+#: LYMessages.c:505
#, c-format
msgid "Append '%s'?"
msgstr "Afegir \"%s\"?"
-#: LYMessages.c:505
+#: LYMessages.c:506
msgid "Posting to newsgroup(s)..."
msgstr "Enviant al(s) f�rum(s)..."
-#: LYMessages.c:507
+#: LYMessages.c:508
msgid "*** You have unread mail. ***"
msgstr "*** Teniu correu pendent. ***"
-#: LYMessages.c:509
+#: LYMessages.c:510
msgid "*** You have mail. ***"
msgstr "*** Teniu correu. ***"
-#: LYMessages.c:511
+#: LYMessages.c:512
msgid "*** You have new mail. ***"
msgstr "*** Teniu correu nou. ***"
-#: LYMessages.c:512
+#: LYMessages.c:513
msgid "File insert cancelled!!!"
msgstr "Inserci� del fitxer cancel�lada!!"
-#: LYMessages.c:513
+#: LYMessages.c:514
msgid "Not enough memory for file!"
msgstr "No hi ha prou mem�ria per al fitxer!"
-#: LYMessages.c:514
+#: LYMessages.c:515
msgid "Can't open file for reading."
msgstr "No ha estat possible llegir l'arxiu."
-#: LYMessages.c:515
+#: LYMessages.c:516
msgid "File does not exist."
msgstr "L'arxiu no existeix."
-#: LYMessages.c:516
+#: LYMessages.c:517
msgid "File does not exist - reenter or cancel:"
msgstr "L'arxiu no existeix. Reescriviu-ne el nom o cancel�leu:"
-#: LYMessages.c:517
+#: LYMessages.c:518
msgid "File is not readable."
msgstr "L'arxiu no es pot llegir."
-#: LYMessages.c:518
+#: LYMessages.c:519
msgid "File is not readable - reenter or cancel:"
msgstr "L'arxiu no es pot llegir. Reescriviu-ne el nom o cancel�leu:"
-#: LYMessages.c:519
+#: LYMessages.c:520
msgid "Nothing to insert - file is 0-length."
msgstr "No hi ha res per a inserir: el fitxer t� longitud 0."
-#: LYMessages.c:520
+#: LYMessages.c:521
msgid "Save request cancelled!!!"
msgstr "(Gravar) Operaci� cancel�lada!!"
-#: LYMessages.c:521
+#: LYMessages.c:522
msgid "Mail request cancelled!!!"
msgstr "Sol�licitud de correu cancel�lada!!"
#. #define CONFIRM_MAIL_SOURCE_PREPARSED
-#: LYMessages.c:523
+#: LYMessages.c:524
msgid "Viewing preparsed source. Are you sure you want to mail it?"
msgstr "Font preanalitzada. Segur que voleu enviar-la?"
-#: LYMessages.c:524
+#: LYMessages.c:525
msgid "Please wait..."
msgstr "Per favor, espereu..."
-#: LYMessages.c:525
+#: LYMessages.c:526
msgid "Mailing file. Please wait..."
msgstr "Enviant arxiu. Per favor, espereu..."
-#: LYMessages.c:526
+#: LYMessages.c:527
msgid "ERROR - Unable to mail file"
msgstr "ERROR: ha estat impossible enviar l'arxiu"
#. #define CONFIRM_LONG_SCREEN_PRINT
-#: LYMessages.c:528
+#: LYMessages.c:529
#, c-format
msgid "File is %d screens long. Are you sure you want to print?"
msgstr "L'arxiu ocupa %d pantalles. Esteu segur que voleu imprimir-lo?"
-#: LYMessages.c:529
+#: LYMessages.c:530
msgid "Print request cancelled!!!"
msgstr "Impressi� cancel�lada!!"
-#: LYMessages.c:530
+#: LYMessages.c:531
msgid "Press <return> to begin: "
msgstr "Premeu <return> per comen�ar: "
-#: LYMessages.c:531
+#: LYMessages.c:532
msgid "Press <return> to finish: "
msgstr "Premeu <return> per finalitzar: "
#. #define CONFIRM_LONG_PAGE_PRINT
-#: LYMessages.c:533
+#: LYMessages.c:534
#, c-format
msgid "File is %d pages long. Are you sure you want to print?"
msgstr "L'arxiu ocupa %d p�gines. Esteu segur que voleu imprimir-lo?"
#. #define CHECK_PRINTER
-#: LYMessages.c:535
+#: LYMessages.c:536
msgid "Be sure your printer is on-line. Press <return> to start printing:"
msgstr "Assegureu-vos que la impressora est� connectada. Premeu <intro>per comen�ar:"
-#: LYMessages.c:536
+#: LYMessages.c:537
msgid "ERROR - Unable to allocate file space!!!"
-msgstr ""
+msgstr "ERROR - No s'ha pogut assignar espai per a fitxers!!!"
-#: LYMessages.c:537
+#: LYMessages.c:538
msgid "Unable to open tempfile"
msgstr "No ha estat possible obrir l'arxiu temporal"
-#: LYMessages.c:538
+#: LYMessages.c:539
msgid "Unable to open print options file"
msgstr "No ha estat possible obrir l'arxiu d'opcions d'impressi�"
-#: LYMessages.c:539
+#: LYMessages.c:540
msgid "Printing file. Please wait..."
msgstr "Imprimint l'arxiu. Per favor, espereu..."
-#: LYMessages.c:540
+#: LYMessages.c:541
msgid "Please enter a valid internet mail address: "
msgstr "Per favor, introdu�u una adre�a de correu v�lida: "
-#: LYMessages.c:541
+#: LYMessages.c:542
msgid "ERROR! - printer is misconfigured!"
msgstr "ERROR: la impressora no est� ben configurada!"
-#: LYMessages.c:542
+#: LYMessages.c:543
msgid "Image map from POST response not available!"
-msgstr ""
+msgstr "El mapa d'imatge de la resposta POST no est� disponible!"
-#: LYMessages.c:543
+#: LYMessages.c:544
msgid "Misdirected client-side image MAP request!"
-msgstr ""
+msgstr "Demanda de MAPA d'imatge del costat de client mal dirigida"
-#: LYMessages.c:544
+#: LYMessages.c:545
msgid "Client-side image MAP is not accessible!"
-msgstr ""
+msgstr "El MAPA d'imatge del costat del client no est� accessible!"
-#: LYMessages.c:545
+#: LYMessages.c:546
msgid "No client-side image MAPs are available!"
-msgstr ""
+msgstr "No ha MAPES d'imatge del costat de client disponibles!"
-#: LYMessages.c:546
+#: LYMessages.c:547
msgid "Client-side image MAP is not available!"
-msgstr ""
+msgstr "El MAPA d'imatge de costat de clients no est� disponible!"
#. #define OPTION_SCREEN_NEEDS_24
-#: LYMessages.c:549
+#: LYMessages.c:550
msgid "Screen height must be at least 24 lines for the Options menu!"
msgstr "La pantalla ha de tenir si m�s no 24 l�nies per al men� d'opcions!"
#. #define OPTION_SCREEN_NEEDS_23
-#: LYMessages.c:551
+#: LYMessages.c:552
msgid "Screen height must be at least 23 lines for the Options menu!"
msgstr "La pantalla ha de tenir si m�s no 23 l�nies per al men� d'opcions"
#. #define OPTION_SCREEN_NEEDS_22
-#: LYMessages.c:553
+#: LYMessages.c:554
msgid "Screen height must be at least 22 lines for the Options menu!"
msgstr "La pantalla ha de tenir si m�s no 22 l�nies per al men� d'opcions"
-#: LYMessages.c:555
+#: LYMessages.c:556
msgid "That key requires Advanced User mode."
msgstr "Per a usar aquesta tecla cal activar el mode d'usuari avan�at"
-#: LYMessages.c:556
+#: LYMessages.c:557
#, c-format
msgid "Content-type: %s"
msgstr "Tipus de contingut: %s"
-#: LYMessages.c:557
+#: LYMessages.c:558
msgid "Command: "
msgstr "Ordre: "
-#: LYMessages.c:558
+#: LYMessages.c:559
msgid "Unknown or ambiguous command"
msgstr "Ordre desconeguda o ambigua"
-#: LYMessages.c:559
+#: LYMessages.c:560
msgid " Version "
msgstr " Versi� "
-#: LYMessages.c:560
+#: LYMessages.c:561
msgid " first"
msgstr " primer"
-#: LYMessages.c:561
+#: LYMessages.c:562
msgid ", guessing..."
msgstr ", provant..."
-#: LYMessages.c:562
+#: LYMessages.c:563
msgid "Permissions for "
msgstr "Permisos per a "
-#: LYMessages.c:563
+#: LYMessages.c:564
msgid "Select "
-msgstr ""
+msgstr "Seleccioneu"
-#: LYMessages.c:564
+#: LYMessages.c:565
msgid "capital letter"
-msgstr ""
+msgstr "la lletra maj�scula"
-#: LYMessages.c:565
+#: LYMessages.c:566
msgid " of option line,"
-msgstr ""
+msgstr "de la l�nia d'opcions"
-#: LYMessages.c:566
+#: LYMessages.c:567
msgid " to save,"
-msgstr ""
+msgstr "per desar"
-#: LYMessages.c:567
+#: LYMessages.c:568
msgid " to "
-msgstr ""
+msgstr "a"
-#: LYMessages.c:568
+#: LYMessages.c:569
msgid " or "
msgstr " o "
-#: LYMessages.c:569
+#: LYMessages.c:570
msgid " index"
msgstr " �ndex"
-#: LYMessages.c:570
+#: LYMessages.c:571
msgid " to return to Lynx."
msgstr " per a tornar a Lynx."
-#: LYMessages.c:571
+#: LYMessages.c:572
msgid "Accept Changes"
msgstr "Acceptar els canvis"
-#: LYMessages.c:572
+#: LYMessages.c:573
msgid "Reset Changes"
msgstr "Anul�lar els canvis"
-#: LYMessages.c:573
+#: LYMessages.c:574
msgid "Left Arrow cancels changes"
msgstr "'<-' cancel�la els canvis"
-#: LYMessages.c:574
+#: LYMessages.c:575
msgid "Save options to disk"
msgstr "Gravar les opcions al disc"
-#: LYMessages.c:575
+#: LYMessages.c:576
msgid "Hit RETURN to accept entered data."
msgstr "Premeu <return> per acceptar les dades introdu�des."
#. #define ACCEPT_DATA_OR_DEFAULT
-#: LYMessages.c:577
+#: LYMessages.c:578
msgid "Hit RETURN to accept entered data. Delete data to invoke the default."
msgstr "<intro> accepta les dades. Esborreu-les si voleu els valors preestablerts"
-#: LYMessages.c:578
+#: LYMessages.c:579
msgid "Value accepted!"
msgstr "Valor acceptat!"
#. #define VALUE_ACCEPTED_WARNING_X
-#: LYMessages.c:580
+#: LYMessages.c:581
msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!"
msgstr "Valor acceptat! ALERTA: Lynx est� configurat per a XWINDOWS!"
#. #define VALUE_ACCEPTED_WARNING_NONX
-#: LYMessages.c:582
+#: LYMessages.c:583
msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!"
msgstr "Valor acceptat! ALERTA: Lynx no est� configurat per a XWINDOWS!"
-#: LYMessages.c:583
+#: LYMessages.c:584
msgid "You are not allowed to change which editor to use!"
msgstr "No teniu perm�s per a canviar l'editor!"
-#: LYMessages.c:584
+#: LYMessages.c:585
msgid "Failed to set DISPLAY variable!"
msgstr "Ha estat impossible especificar el nou valor de la variable DISPLAY!"
-#: LYMessages.c:585
+#: LYMessages.c:586
msgid "Failed to clear DISPLAY variable!"
msgstr "Ha estat impossible eliminar el valor de la variable DISPLAY!"
#. #define BOOKMARK_CHANGE_DISALLOWED
-#: LYMessages.c:587
+#: LYMessages.c:588
msgid "You are not allowed to change the bookmark file!"
msgstr "No teniu perm�s per a canviar l'arxiu d'adreces!"
-#: LYMessages.c:588
+#: LYMessages.c:589
msgid "Terminal does not support color"
msgstr "El terminal no pot mostrar colors"
-#: LYMessages.c:589
+#: LYMessages.c:590
#, c-format
msgid "Your '%s' terminal does not support color."
msgstr "El terminal '%s' no pot mostrar colors."
-#: LYMessages.c:590
+#: LYMessages.c:591
msgid "Access to dot files is disabled!"
msgstr "L'acc�s als arxius que comencen amb un punt no est� activat!"
#. #define UA_NO_LYNX_WARNING
-#: LYMessages.c:592
+#: LYMessages.c:593
msgid "User-Agent string does not contain \"Lynx\" or \"L_y_n_x\""
msgstr "La cadena que identifica el navegador no cont� ni \"Lynx\" ni \"L_y_n_x\""
#. #define UA_PLEASE_USE_LYNX
-#: LYMessages.c:594
+#: LYMessages.c:595
msgid "Use \"L_y_n_x\" or \"Lynx\" in User-Agent, or it looks like intentional deception!"
msgstr "Useu \"L_y_n_x\" o \"Lynx\" en l'identificador o semblareu desertors!"
#. #define UA_CHANGE_DISABLED
-#: LYMessages.c:596
+#: LYMessages.c:597
msgid "Changing of the User-Agent string is disabled!"
msgstr "El canvi de la cadena identificadora del navegador est� desactivat!"
#. #define CHANGE_OF_SETTING_DISALLOWED
-#: LYMessages.c:598
+#: LYMessages.c:599
msgid "You are not allowed to change this setting."
msgstr "No teniu perm�s per a canviar aquesta opci�."
-#: LYMessages.c:599
+#: LYMessages.c:600
msgid "Saving Options..."
msgstr "Gravant les opcions..."
-#: LYMessages.c:600
+#: LYMessages.c:601
msgid "Options saved!"
msgstr "Opcions gravades!"
-#: LYMessages.c:601
+#: LYMessages.c:602
msgid "Unable to save Options!"
msgstr "No ha estat possible gravar les opcions!"
-#: LYMessages.c:602
+#: LYMessages.c:603
msgid " 'r' to return to Lynx "
msgstr " 'r' per tornar a Lynx "
-#: LYMessages.c:603
+#: LYMessages.c:604
msgid " '>' to save, or 'r' to return to Lynx "
msgstr " '>' per gravar, 'r' per tornar a Lynx "
#. #define ANY_KEY_CHANGE_RET_ACCEPT
-#: LYMessages.c:605
+#: LYMessages.c:606
msgid "Hit any key to change value; RETURN to accept."
msgstr "Premeu qualsevol tecla per canviar el valor; <intro> per acceptar."
-#: LYMessages.c:606
+#: LYMessages.c:607
msgid "Error uncompressing temporary file!"
msgstr "Error descomprimint l'arxiu temporal!"
-#: LYMessages.c:607
+#: LYMessages.c:608
msgid "Unsupported URL scheme!"
msgstr "URL no suportada!"
-#: LYMessages.c:608
+#: LYMessages.c:609
msgid "Unsupported data: URL! Use SHOWINFO, for now."
-msgstr ""
+msgstr "Dades no suportades: URL! Useu SHOWINFO, per ara."
-#: LYMessages.c:609
+#: LYMessages.c:610
msgid "Redirection limit of 10 URL's reached."
msgstr "S'ha assolit el l�mit de redireccions: 10 URLs."
-#: LYMessages.c:610
+#: LYMessages.c:611
msgid "Illegal redirection URL received from server!"
msgstr "S'ha rebut del servidor una URL de redirecci� il�legal!"
#. #define SERVER_ASKED_FOR_REDIRECTION
-#: LYMessages.c:612
+#: LYMessages.c:613
#, c-format
msgid "Server asked for %d redirection of POST content to"
-msgstr ""
+msgstr "El servidor ha demanat una redirecci� %d per a contingut POST a"
-#: LYMessages.c:615
+#: LYMessages.c:616
msgid "P)roceed, use G)ET or C)ancel "
msgstr "P)rocedir, usar G)ET o C)ancel�lar "
-#: LYMessages.c:616
+#: LYMessages.c:617
msgid "P)roceed, or C)ancel "
msgstr "P)rocedir o C)ancel�lar "
#. #define ADVANCED_POST_GET_REDIRECT
-#: LYMessages.c:618
+#: LYMessages.c:619
msgid "Redirection of POST content. P)roceed, see U)RL, use G)ET or C)ancel"
-msgstr ""
+msgstr "Redirecci� de contingut POST. P)rocedeix, vegeu U)RL, usa G)ET o C)ancel�la"
#. #define ADVANCED_POST_REDIRECT
-#: LYMessages.c:620
+#: LYMessages.c:621
msgid "Redirection of POST content. P)roceed, see U)RL, or C)ancel"
-msgstr ""
+msgstr "Redirecci� de contingut POST. P)rocedeix, vegeu U)RL, o C)ancel�la<"
#. #define CONFIRM_POST_RESUBMISSION
-#: LYMessages.c:622
+#: LYMessages.c:623
msgid "Document from Form with POST content. Resubmit?"
msgstr "El document procedeix d'un formulari amb contingut POST. Reenviar?"
#. #define CONFIRM_POST_RESUBMISSION_TO
-#: LYMessages.c:624
+#: LYMessages.c:625
#, c-format
msgid "Resubmit POST content to %s ?"
msgstr "Reenviar el contingut del POST a %s?"
#. #define CONFIRM_POST_LIST_RELOAD
-#: LYMessages.c:626
+#: LYMessages.c:627
#, c-format
msgid "List from document with POST data. Reload %s ?"
msgstr "La llista prov� d'un document amb dades POST. Voleu recarregar %s?"
#. #define CONFIRM_POST_DOC_HEAD
-#: LYMessages.c:628
+#: LYMessages.c:629
msgid "Document from POST action, HEAD may not be understood. Proceed?"
-msgstr ""
+msgstr "Document de l'acci� POST, potser HEAD no s'ent�n. Voleu procedir?"
#. #define CONFIRM_POST_LINK_HEAD
-#: LYMessages.c:630
+#: LYMessages.c:631
msgid "Form submit action is POST, HEAD may not be understood. Proceed?"
-msgstr ""
+msgstr "L'acci� de lliurament del formulari �s POST, potser HEAD no s'ent�n. Voleu procedir?"
-#: LYMessages.c:631
+#: LYMessages.c:632
msgid "Proceed without a username and password?"
msgstr "Continuar sense nom d'usuari i sense contrasenya?"
-#: LYMessages.c:632
+#: LYMessages.c:633
#, c-format
msgid "Proceed (%s)?"
msgstr "Continuar (%s)?"
-#: LYMessages.c:633
+#: LYMessages.c:634
msgid "Cannot POST to this host."
-msgstr ""
+msgstr "No es pot fer POST a aquest amfriti�."
-#: LYMessages.c:634
+#: LYMessages.c:635
msgid "POST not supported for this URL - ignoring POST data!"
-msgstr ""
+msgstr "POST no est� suportat per a aquesta URL - s'ignoraran les dades POST!"
-#: LYMessages.c:635
+#: LYMessages.c:636
msgid "Discarding POST data..."
msgstr "Descartant les dades del POST..."
-#: LYMessages.c:636
+#: LYMessages.c:637
msgid "Document will not be reloaded!"
msgstr "No es recarregar� el document!"
-#: LYMessages.c:637
+#: LYMessages.c:638
msgid "Location: "
msgstr "Ubicaci�: "
-#: LYMessages.c:638
+#: LYMessages.c:639
#, c-format
msgid "'%s' not found!"
msgstr "no s'ha trobat \"%s\""
-#: LYMessages.c:639
+#: LYMessages.c:640
msgid "Default Bookmark File"
msgstr "Fitxer de favorits predeterminat"
-#: LYMessages.c:640
+#: LYMessages.c:641
msgid "Screen too small! (8x35 min)"
msgstr "Pantalla massa xicoteta! (8x35 min)"
-#: LYMessages.c:641
+#: LYMessages.c:642
msgid "Select destination or ^G to Cancel: "
msgstr "Trieu destinaci� o ^G per cancel�lar: "
#. #define MULTIBOOKMARKS_SELECT
-#: LYMessages.c:643
+#: LYMessages.c:644
msgid "Select subbookmark, '=' for menu, or ^G to cancel: "
msgstr "Trieu fitxer de favorits, \"=\" mostra el men� i ^G cancel�la: "
#. #define MULTIBOOKMARKS_SELF
-#: LYMessages.c:645
+#: LYMessages.c:646
msgid "Reproduce L)ink in this bookmark file or C)ancel? (l,c): "
msgstr "Reproduir l'en(L)la� en aquest fitxer de favorits o C)ancel�lar? (l,c):"
-#: LYMessages.c:646
+#: LYMessages.c:647
msgid "Multiple bookmark support is not available."
msgstr "El suport per a m�s d'un fitxer d'adreces no est� activat."
-#: LYMessages.c:647
+#: LYMessages.c:648
#, c-format
msgid " Select Bookmark (screen %d of %d)"
msgstr " Trieu el fitxer de favorits (pantalla %d de %d)"
-#: LYMessages.c:648
+#: LYMessages.c:649
msgid " Select Bookmark"
msgstr " Trieu fitxer de favorits"
#. #define MULTIBOOKMARKS_EHEAD_MASK
-#: LYMessages.c:650
+#: LYMessages.c:651
#, c-format
msgid "Editing Bookmark DESCRIPTION and FILEPATH (%d of 2)"
msgstr "Edici� de la descripci� i del cam� del fitxer d'adreces interessants (%d de 2)"
#. #define MULTIBOOKMARKS_EHEAD
-#: LYMessages.c:652
+#: LYMessages.c:653
msgid " Editing Bookmark DESCRIPTION and FILEPATH"
msgstr "Edici� de la descripci� i el cam� del fitxer d'adreces d'inter�s"
-#: LYMessages.c:653
+#: LYMessages.c:654
msgid "Letter: "
msgstr "Lletra: "
#. #define USE_PATH_OFF_HOME
-#: LYMessages.c:656
+#: LYMessages.c:657
msgid "Use a filepath off your login directory in SHELL syntax!"
-msgstr ""
+msgstr "Useu un cam� per al fitxers fora del vostre directori d'inici a la sintaxi de l'int�rpret d'ordres "
-#: LYMessages.c:658
+#: LYMessages.c:659
msgid "Use a filepath off your home directory!"
msgstr "Useu un cam� que no pertanga al vostre directori!"
#. #define MAXLINKS_REACHED
-#: LYMessages.c:661
+#: LYMessages.c:662
msgid "Maximum links per page exceeded! Use half-page or two-line scrolling."
msgstr "Superat el nre. d'enlla�os/p�g.! Useu mitja p�g. o despla�ament de dues l�nies."
-#: LYMessages.c:662
+#: LYMessages.c:663
msgid "No previously visited links available!"
msgstr "No hi ha disponible cap enlla� anterior!"
-#: LYMessages.c:663
+#: LYMessages.c:664
msgid "Memory exhausted! Program aborted!"
msgstr "Mem�ria exhaurida! Programa vortat!"
-#: LYMessages.c:664
+#: LYMessages.c:665
msgid "Memory exhausted! Aborting..."
msgstr "Mem�ria exhaurida! Avortant..."
-#: LYMessages.c:665
+#: LYMessages.c:666
msgid "Not enough memory!"
msgstr "No hi ha prou mem�ria!"
-#: LYMessages.c:666
+#: LYMessages.c:667
msgid "Directory/File Manager not available"
msgstr "No hi ha cap administrador de fitxers disponible"
-#: LYMessages.c:667
+#: LYMessages.c:668
msgid "HREF in BASE tag is not an absolute URL."
msgstr "La refer�ncia (HREF) en l'etiqueta BASE no �s una URL absoluta."
-#: LYMessages.c:668
+#: LYMessages.c:669
msgid "Location URL is not absolute."
msgstr "La URL no �s absoluta."
-#: LYMessages.c:669
+#: LYMessages.c:670
msgid "Refresh URL is not absolute."
msgstr "La URL de refresc no �s absoluta."
#. #define SENDING_MESSAGE_WITH_BODY_TO
-#: LYMessages.c:671
+#: LYMessages.c:672
msgid ""
"You are sending a message with body to:\n"
" "
@@ -2064,7 +2051,7 @@ msgstr ""
"Esteu enviant un missatge no buit a:\n"
" "
-#: LYMessages.c:672
+#: LYMessages.c:673
msgid ""
"You are sending a comment to:\n"
" "
@@ -2072,7 +2059,7 @@ msgstr ""
"Esteu enviant un comentari a:\n"
" "
-#: LYMessages.c:673
+#: LYMessages.c:674
msgid ""
"\n"
" With copy to:\n"
@@ -2082,7 +2069,7 @@ msgstr ""
" Amb c�pia a:\n"
" "
-#: LYMessages.c:674
+#: LYMessages.c:675
msgid ""
"\n"
" With copies to:\n"
@@ -2093,7 +2080,7 @@ msgstr ""
" "
#. #define CTRL_G_TO_CANCEL_SEND
-#: LYMessages.c:676
+#: LYMessages.c:677
msgid ""
"\n"
"\n"
@@ -2104,7 +2091,7 @@ msgstr ""
"Useu Ctrl-G per a cancel�lar si no voleu enviar el missatge\n"
#. #define ENTER_NAME_OR_BLANK
-#: LYMessages.c:678
+#: LYMessages.c:679
msgid ""
"\n"
" Please enter your name, or leave it blank to remain anonymous\n"
@@ -2113,7 +2100,7 @@ msgstr ""
" Escriviu el vostre nom o deixeu l'espai en blanc si voleu que siga an�nim\n"
#. #define ENTER_MAIL_ADDRESS_OR_OTHER
-#: LYMessages.c:680
+#: LYMessages.c:681
msgid ""
"\n"
" Please enter a mail address or some other\n"
@@ -2122,11 +2109,11 @@ msgstr ""
" Introdu�u una adre�a de correu o alguna altra\n"
#. #define MEANS_TO_CONTACT_FOR_RESPONSE
-#: LYMessages.c:682
+#: LYMessages.c:683
msgid " means to contact you, if you desire a response.\n"
msgstr " forma de contactar, si voleu resposta.\n"
-#: LYMessages.c:683
+#: LYMessages.c:684
msgid ""
"\n"
" Please enter a subject line.\n"
@@ -2135,7 +2122,7 @@ msgstr ""
" Introdu�u l'assumpte.\n"
#. #define ENTER_ADDRESS_FOR_CC
-#: LYMessages.c:685
+#: LYMessages.c:686
msgid ""
"\n"
" Enter a mail address for a CC of your message.\n"
@@ -2143,11 +2130,11 @@ msgstr ""
"\n"
" Escriviu l'adre�a a qu� voleu enviar una c�pia del missatge.\n"
-#: LYMessages.c:686
+#: LYMessages.c:687
msgid " (Leave blank if you don't want a copy.)\n"
msgstr " (Deixeu la l�nia en blanc si no en voleu enviar c�pia.)\n"
-#: LYMessages.c:687
+#: LYMessages.c:688
msgid ""
"\n"
" Please review the message body:\n"
@@ -2157,7 +2144,7 @@ msgstr ""
" Per favor, reviseu el cos del missatge:\n"
"\n"
-#: LYMessages.c:688
+#: LYMessages.c:689
msgid ""
"\n"
"Press RETURN to continue: "
@@ -2165,7 +2152,7 @@ msgstr ""
"\n"
"Premeu <intro> per continuar: "
-#: LYMessages.c:689
+#: LYMessages.c:690
msgid ""
"\n"
"Press RETURN to clean up: "
@@ -2173,11 +2160,11 @@ msgstr ""
"\n"
"Premeu <intro> per esborrar: "
-#: LYMessages.c:690
+#: LYMessages.c:691
msgid " Use Control-U to erase the default.\n"
msgstr " Premeu Ctrl-U per esborrar el valor suggerit.\n"
-#: LYMessages.c:691
+#: LYMessages.c:692
msgid ""
"\n"
" Please enter your message below."
@@ -2186,7 +2173,7 @@ msgstr ""
" Escriviu el missatge a partir d'ac�."
#. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:693 src/LYNews.c:360
+#: LYMessages.c:694 src/LYNews.c:360
msgid ""
"\n"
" When you are done, press enter and put a single period (.)"
@@ -2195,7 +2182,7 @@ msgstr ""
" Quan acabeu, premeu <intro> i escriviu nom�s un punt (.)"
#. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:695 src/LYNews.c:361
+#: LYMessages.c:696 src/LYNews.c:361
msgid ""
"\n"
" on a line and press enter again."
@@ -2205,274 +2192,272 @@ msgstr ""
#. Cookies messages
#. #define ADVANCED_COOKIE_CONFIRMATION
-#: LYMessages.c:699
+#: LYMessages.c:700
#, c-format
msgid "%s cookie: %.*s=%.*s Allow? (Y/N/Always/neVer)"
msgstr "Cookie de %s: %.*s=%.*s Admetre-la? (S/N/semPre/Mai)"
#. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
-#: LYMessages.c:701
+#: LYMessages.c:702
#, c-format
msgid "Accept invalid cookie domain=%s for '%s'?"
msgstr "Voleu acceptar la cookie amb el domini inv�lid %s en comptes de '%s'?"
#. #define INVALID_COOKIE_PATH_CONFIRMATION
-#: LYMessages.c:703
+#: LYMessages.c:704
#, c-format
msgid "Accept invalid cookie path=%s as a prefix of '%s'?"
msgstr "Accepteu la cookie amb el cam� (no v�lid) %s com a prefix de '%s'?"
-#: LYMessages.c:704
+#: LYMessages.c:705
msgid "Allowing this cookie."
msgstr "Tolerant aquesta cookie."
-#: LYMessages.c:705
+#: LYMessages.c:706
msgid "Rejecting this cookie."
msgstr "Rebutjant aquesta cookie."
-#: LYMessages.c:706
+#: LYMessages.c:707
msgid "The Cookie Jar is empty."
msgstr "El recipient de les cookies �s buit."
-#: LYMessages.c:707
-#, fuzzy
-#| msgid "The Cookie Jar is empty."
+#: LYMessages.c:708
msgid "The Cache Jar is empty."
-msgstr "El recipient de les cookies �s buit."
+msgstr "El recipient de mem�ria cau �s buit."
#. #define ACTIVATE_TO_GOBBLE
-#: LYMessages.c:709
+#: LYMessages.c:710
msgid "Activate links to gobble up cookies or entire domains,"
msgstr "Seguiu els enlla�os per eliminar les cookies o els dominis,"
-#: LYMessages.c:710
+#: LYMessages.c:711
msgid "or to change a domain's 'allow' setting."
msgstr "o per a canviar l\"�ndex de toler�ncia\"."
-#: LYMessages.c:711
+#: LYMessages.c:712
msgid "(Cookies never allowed.)"
msgstr "(Cookies sempre prohibides)"
-#: LYMessages.c:712
+#: LYMessages.c:713
msgid "(Cookies always allowed.)"
msgstr "(Cookies sempre tolerades)"
-#: LYMessages.c:713
+#: LYMessages.c:714
msgid "(Cookies allowed via prompt.)"
msgstr "(Es pregunta abans d'acceptar cookies)"
-#: LYMessages.c:714
+#: LYMessages.c:715
msgid "(Persistent Cookies.)"
msgstr "(Cookies persistents)"
-#: LYMessages.c:715
+#: LYMessages.c:716
msgid "(No title.)"
msgstr "(Sense t�tol)"
-#: LYMessages.c:716
+#: LYMessages.c:717
msgid "(No name.)"
msgstr "(Sense nom)"
-#: LYMessages.c:717
+#: LYMessages.c:718
msgid "(No value.)"
msgstr "(Sense valor)"
-#: LYMessages.c:718 src/LYOptions.c:2409
+#: LYMessages.c:719 src/LYOptions.c:2424
msgid "None"
-msgstr ""
+msgstr "Cap"
-#: LYMessages.c:719
+#: LYMessages.c:720
msgid "(End of session.)"
msgstr "(Fi de la sessi�)"
-#: LYMessages.c:720
+#: LYMessages.c:721
msgid "Delete this cookie?"
msgstr "Esborrar aquesta cookie?"
-#: LYMessages.c:721
+#: LYMessages.c:722
msgid "The cookie has been eaten!"
msgstr "La cookie ha estat esborrada!"
-#: LYMessages.c:722
+#: LYMessages.c:723
msgid "Delete this empty domain?"
msgstr "Esborrar aquest domini buit?"
-#: LYMessages.c:723
+#: LYMessages.c:724
msgid "The domain has been eaten!"
msgstr "El domini ha estat esborrat!"
#. #define DELETE_COOKIES_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:725
+#: LYMessages.c:726
msgid "D)elete domain's cookies, set allow A)lways/P)rompt/neV)er, or C)ancel? "
msgstr "D esborrar el domini, admetre A sempre/P)reguntar/V mai, o C)ancel�lar? "
#. #define DELETE_DOMAIN_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:727
+#: LYMessages.c:728
msgid "D)elete domain, set allow A)lways/P)rompt/neV)er, or C)ancel? "
msgstr "D esborrar domini, admetre A sempre/P)reguntar/V mai, o C)ancel�lar?"
-#: LYMessages.c:728
+#: LYMessages.c:729
msgid "All cookies in the domain have been eaten!"
msgstr "Totes les cookies del domini han estat esborrades!"
-#: LYMessages.c:729
+#: LYMessages.c:730
#, c-format
msgid "'A'lways allowing from domain '%s'."
msgstr "Toler(A)r-les sempre que provinguen del domini '%s'."
-#: LYMessages.c:730
+#: LYMessages.c:731
#, c-format
msgid "ne'V'er allowing from domain '%s'."
msgstr "Rebutjar-les sempre que provinguen del domini '%s'."
-#: LYMessages.c:731
+#: LYMessages.c:732
#, c-format
msgid "'P'rompting to allow from domain '%s'."
msgstr "(P)reguntar sempre que provinguen del domini '%s'."
-#: LYMessages.c:732
+#: LYMessages.c:733
msgid "Delete all cookies in this domain?"
msgstr "Esborrar totes les cookies del domini?"
-#: LYMessages.c:733
+#: LYMessages.c:734
msgid "All of the cookies in the jar have been eaten!"
msgstr "Totes les cookies han estat esborrades!"
-#: LYMessages.c:735
+#: LYMessages.c:736
msgid "Port 19 not permitted in URLs."
msgstr "El port 19 no est� perm�s en les URLs."
-#: LYMessages.c:736
+#: LYMessages.c:737
msgid "Port 25 not permitted in URLs."
msgstr "El port 25 no est� perm�s en les URLs."
-#: LYMessages.c:737
+#: LYMessages.c:738
#, c-format
msgid "Port %lu not permitted in URLs."
msgstr "El port %lu no est� perm�s en les URLs."
-#: LYMessages.c:738
+#: LYMessages.c:739
msgid "URL has a bad port field."
-msgstr ""
+msgstr "L'URL t� un camp incorrecte de port."
-#: LYMessages.c:739
+#: LYMessages.c:740
msgid "Maximum nesting of HTML elements exceeded."
msgstr "S'ha excedit el m�xim nombre d'anidaments perm�s per a l'HTML."
-#: LYMessages.c:740
+#: LYMessages.c:741
msgid "Bad partial reference! Stripping lead dots."
-msgstr ""
+msgstr "Refer�ncia parcial incorrecta! S'esborraran els punts inicials."
-#: LYMessages.c:741
+#: LYMessages.c:742
msgid "Trace Log open failed. Trace off!"
msgstr "No s'ha pogut obrir el fitxer de rastreig. Rastreig desactivat!"
-#: LYMessages.c:742
+#: LYMessages.c:743
msgid "Lynx Trace Log"
msgstr "Rastreig (Lynx Trace Log)"
-#: LYMessages.c:743
+#: LYMessages.c:744
msgid "No trace log has been started for this session."
msgstr "No s'ha iniciat el rastreig en aquesta sessi�."
#. #define MAX_TEMPCOUNT_REACHED
-#: LYMessages.c:745
+#: LYMessages.c:746
msgid "The maximum temporary file count has been reached!"
msgstr "S'ha assolit el nombre m�xim de fitxers temporals!"
#. #define FORM_VALUE_TOO_LONG
-#: LYMessages.c:747
+#: LYMessages.c:748
msgid "Form field value exceeds buffer length! Trim the tail."
msgstr "El valor del camp excedeix la longitud de la mem�ria interm�dia! Es tallar�."
#. #define FORM_TAIL_COMBINED_WITH_HEAD
-#: LYMessages.c:749
+#: LYMessages.c:750
msgid "Modified tail combined with head of form field value."
-msgstr ""
+msgstr "Es combina la cua modificada amb la cap�alera del valor del camp del formulari."
#. HTFile.c
-#: LYMessages.c:752
+#: LYMessages.c:753
msgid "Directory"
msgstr "Directori"
-#: LYMessages.c:753
+#: LYMessages.c:754
msgid "Directory browsing is not allowed."
msgstr "La navegaci� pel directori est� prohibida."
-#: LYMessages.c:754
+#: LYMessages.c:755
msgid "Selective access is not enabled for this directory"
msgstr "No est� habilitat l'acc�s selectiu a aquest directori"
-#: LYMessages.c:755
+#: LYMessages.c:756
msgid "Multiformat: directory scan failed."
-msgstr ""
+msgstr "Format m�ltiple: l'escaneig del directori ha fallat."
-#: LYMessages.c:756
+#: LYMessages.c:757
msgid "This directory is not readable."
msgstr "No es pot llegir el directori."
-#: LYMessages.c:757
+#: LYMessages.c:758
msgid "Can't access requested file."
msgstr "No es pot accedir al fitxer sol�licitat."
-#: LYMessages.c:758
+#: LYMessages.c:759
msgid "Could not find suitable representation for transmission."
-msgstr ""
+msgstr "No s'ha pogut trobar una representaci� adequada per a la transmissi�."
-#: LYMessages.c:759
+#: LYMessages.c:760
msgid "Could not open file for decompression!"
msgstr "No s'ha pogut obrir el fitxer per a descomprimir-lo!"
-#: LYMessages.c:760
+#: LYMessages.c:761
msgid "Files:"
msgstr "Arxius:"
-#: LYMessages.c:761
+#: LYMessages.c:762
msgid "Subdirectories:"
msgstr "Subdirectoris:"
-#: LYMessages.c:762
+#: LYMessages.c:763
msgid " directory"
msgstr " directori"
-#: LYMessages.c:763
+#: LYMessages.c:764
msgid "Up to "
msgstr "De "
-#: LYMessages.c:764
+#: LYMessages.c:765
msgid "Current directory is "
msgstr "El directori actual �s "
#. HTFTP.c
-#: LYMessages.c:767
+#: LYMessages.c:768
msgid "Symbolic Link"
msgstr "Enlla� simb�lic"
#. HTGopher.c
-#: LYMessages.c:770
+#: LYMessages.c:771
msgid "No response from server!"
msgstr "El servidor no respon!"
-#: LYMessages.c:771
+#: LYMessages.c:772
msgid "CSO index"
msgstr "�ndex CSO"
-#: LYMessages.c:772
+#: LYMessages.c:773
msgid ""
"\n"
"This is a searchable index of a CSO database.\n"
msgstr "\n"
-#: LYMessages.c:773
+#: LYMessages.c:774
msgid "CSO Search Results"
msgstr "Resultats de la recerca CSO"
-#: LYMessages.c:774
+#: LYMessages.c:775
#, c-format
msgid "Seek fail on %s\n"
-msgstr ""
+msgstr "Ha fallat la cerca sobre %s\n"
-#: LYMessages.c:775
+#: LYMessages.c:776
msgid ""
"\n"
"Press the 's' key and enter search keywords.\n"
@@ -2480,41 +2465,41 @@ msgstr ""
"\n"
"Premeu 's' i introdu�u els mots que voleu cercar.\n"
-#: LYMessages.c:776
+#: LYMessages.c:777
msgid ""
"\n"
"This is a searchable Gopher index.\n"
msgstr "\n"
-#: LYMessages.c:777
+#: LYMessages.c:778
msgid "Gopher index"
msgstr "�"
-#: LYMessages.c:778
+#: LYMessages.c:779
msgid "Gopher Menu"
msgstr "Men� gopher"
-#: LYMessages.c:779
+#: LYMessages.c:780
msgid " Search Results"
msgstr " Resultats de la recerca"
-#: LYMessages.c:780
+#: LYMessages.c:781
msgid "Sending CSO/PH request."
msgstr "S'est� enviant una sol�licitud CSO/PH."
-#: LYMessages.c:781
+#: LYMessages.c:782
msgid "Sending Gopher request."
msgstr "S'est� enviant la sol�licitud gopher"
-#: LYMessages.c:782
+#: LYMessages.c:783
msgid "CSO/PH request sent; waiting for response."
msgstr "Sol�licitud COS/PH enviada; s'est� esperant resposta."
-#: LYMessages.c:783
+#: LYMessages.c:784
msgid "Gopher request sent; waiting for response."
msgstr "S'ha enviat la sol�licitud gopher; s'est� esperant resposta."
-#: LYMessages.c:784
+#: LYMessages.c:785
msgid ""
"\n"
"Please enter search keywords.\n"
@@ -2522,7 +2507,7 @@ msgstr ""
"\n"
"Per favor, introdu�u els mots que voleu cercar.\n"
-#: LYMessages.c:785
+#: LYMessages.c:786
msgid ""
"\n"
"The keywords that you enter will allow you to search on a"
@@ -2530,205 +2515,205 @@ msgstr ""
"\n"
"Els mots que heu introdu�t us permetran cercar en un"
-#: LYMessages.c:786
+#: LYMessages.c:787
msgid " person's name in the database.\n"
msgstr " nom de persona en una base de dades.\n"
#. HTNews.c
-#: LYMessages.c:789
+#: LYMessages.c:790
msgid "Connection closed ???"
msgstr "Connexi� tancada ??"
-#: LYMessages.c:790
+#: LYMessages.c:791
msgid "Cannot open temporary file for news POST."
msgstr "No ha estat possible obrir el fitxer temporal per enviar el missatge."
-#: LYMessages.c:791
+#: LYMessages.c:792
msgid "This client does not contain support for posting to news with SSL."
msgstr "Aquest client no pot enviar missatges als f�rums amb SSL."
#. HTStyle.c
-#: LYMessages.c:794
+#: LYMessages.c:795
#, c-format
msgid "Style %d `%s' SGML:%s. Font %s %.1f point.\n"
-msgstr ""
+msgstr "Estil %d `%s' SGML:%s. Font %s %.1f punt.\n"
-#: LYMessages.c:796
+#: LYMessages.c:797
#, c-format
msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n"
-msgstr ""
+msgstr "\tAlinea=%d, %d tabulacions. (%.0f abans, %.0f despr�s)\n"
-#: LYMessages.c:797
+#: LYMessages.c:798
#, c-format
msgid "\t\tTab kind=%d at %.0f\n"
-msgstr ""
+msgstr "\t\tTipus de tabulaci�=%d a %.0f\n"
#. HTTP.c
-#: LYMessages.c:800
+#: LYMessages.c:801
msgid "Can't proceed without a username and password."
msgstr "No es pot continuar sense un nom d'usuari i una contrasenya."
-#: LYMessages.c:801
+#: LYMessages.c:802
msgid "Can't retry with authorization! Contact the server's WebMaster."
msgstr "No es pot reintentar sense autoritzaci�! Poseu-vos en contacte amb el webmestre."
-#: LYMessages.c:802
+#: LYMessages.c:803
msgid "Can't retry with proxy authorization! Contact the server's WebMaster."
msgstr "No es pot reintentar sense autoritzaci� del proxy! Poseu-vos en contacte amb el webmestre."
-#: LYMessages.c:803
+#: LYMessages.c:804
msgid "Retrying with proxy authorization information."
msgstr "Reintent amb la informaci� de autoritzaci� del servidor intermediari (proxy)."
-#: LYMessages.c:804
-#, fuzzy, c-format
-#| msgid "SSL error:host(%s)!=cert(%s)-Continue?"
+#: LYMessages.c:805
+#, c-format
msgid "SSL error:%s-Continue?"
-msgstr "Error SSL: servidor(%s)!=cert(%s). Voleu continuar?"
+msgstr "Error SSL:%s-Voleu continuar?"
#. HTWAIS.c
-#: LYMessages.c:807
+#: LYMessages.c:808
msgid "HTWAIS: Return message too large."
msgstr "HTWAIS: El missatge de retorn �s massa llarg."
-#: LYMessages.c:808
+#: LYMessages.c:809
msgid "Enter WAIS query: "
msgstr "Introdu�u la consulta de tipus WAIS:"
#. Miscellaneous status
-#: LYMessages.c:811
+#: LYMessages.c:812
msgid "Retrying as HTTP0 request."
msgstr "Reintentant com a sol�licitud HTTP0."
-#: LYMessages.c:812
+#: LYMessages.c:813
#, c-format
msgid "Transferred %d bytes"
msgstr "%d bytes transferits"
-#: LYMessages.c:813
+#: LYMessages.c:814
msgid "Data transfer complete"
msgstr "Transfer�ncia completa"
-#: LYMessages.c:814
+#: LYMessages.c:815
#, c-format
msgid "Error processing line %d of %s\n"
msgstr "Error mentre es processava la l�nia %d de %s\n"
#. Lynx internal page titles
-#: LYMessages.c:817
+#: LYMessages.c:818
msgid "Address List Page"
msgstr "P�gina d'adreces"
-#: LYMessages.c:818
+#: LYMessages.c:819
msgid "Bookmark file"
msgstr "Agenda d'adreces d'inter�s"
-#: LYMessages.c:819
+#: LYMessages.c:820
msgid "Configuration Definitions"
msgstr "Configuraci�"
-#: LYMessages.c:820
+#: LYMessages.c:821
msgid "Cookie Jar"
msgstr "Pot de les galetes (cookie jar) :-)"
-#: LYMessages.c:821
+#: LYMessages.c:822
+msgid "Current Edit-Key Map"
+msgstr "Mapa actual de tecles d'edici�"
+
+#: LYMessages.c:823
msgid "Current Key Map"
msgstr "Combinacions de tecles actual"
-#: LYMessages.c:822
+#: LYMessages.c:824
msgid "File Management Options"
msgstr "Opcions d'administraci� de fitxers"
-#: LYMessages.c:823
+#: LYMessages.c:825
msgid "Download Options"
msgstr "Opcions de desc�rrega"
-#: LYMessages.c:824
+#: LYMessages.c:826
msgid "History Page"
msgstr "Historial"
-#: LYMessages.c:825
-#, fuzzy
-#| msgid "Cookie Jar"
+#: LYMessages.c:827
msgid "Cache Jar"
-msgstr "Pot de les galetes (cookie jar) :-)"
+msgstr "Jar en mem�ria cau"
-#: LYMessages.c:826
+#: LYMessages.c:828
msgid "List Page"
-msgstr ""
+msgstr "P�gina de llista"
-#: LYMessages.c:827
+#: LYMessages.c:829
msgid "Lynx.cfg Information"
msgstr "Informaci� del fitxer lynx.cfg"
-#: LYMessages.c:828
+#: LYMessages.c:830
msgid "Converted Mosaic Hotlist"
msgstr "Fitxer d'adreces d'inter�s de Mosaic convertit"
-#: LYMessages.c:829
+#: LYMessages.c:831
msgid "Options Menu"
msgstr "Men� d'opcions"
-#: LYMessages.c:830
+#: LYMessages.c:832
msgid "File Permission Options"
msgstr "Opcions dels permissos dels fitxers"
-#: LYMessages.c:831
+#: LYMessages.c:833
msgid "Printing Options"
msgstr "Opcions d'impressi�"
-#: LYMessages.c:832
+#: LYMessages.c:834
msgid "Information about the current document"
msgstr "Informaci� del document actual"
-#: LYMessages.c:833
+#: LYMessages.c:835
msgid "Your recent statusline messages"
msgstr "Missatges recents apareguts en la l�nia d'estat"
-#: LYMessages.c:834
+#: LYMessages.c:836
msgid "Upload Options"
msgstr "Opcions de c�rrega"
-#: LYMessages.c:835
+#: LYMessages.c:837
msgid "Visited Links Page"
msgstr "P�gina dels enlla�os visitats"
#. CONFIG_DEF_TITLE subtitles
-#: LYMessages.c:838
+#: LYMessages.c:840
msgid "See also"
msgstr "Vegeu tamb�"
-#: LYMessages.c:839
+#: LYMessages.c:841
msgid "your"
-msgstr ""
+msgstr "el vostre"
-#: LYMessages.c:840
+#: LYMessages.c:842
msgid "for runtime options"
msgstr "opcions en temps d'execuci�"
-#: LYMessages.c:841
+#: LYMessages.c:843
msgid "compile time options"
msgstr "opcions en temps de compilaci�"
-#: LYMessages.c:842
-#, fuzzy
+#: LYMessages.c:844
msgid "color-style configuration"
-msgstr "Configuraci� prim�ria"
+msgstr "configuraci� d'estil de colors"
-#: LYMessages.c:843
+#: LYMessages.c:845
msgid "latest release"
msgstr "�ltima versi�"
-#: LYMessages.c:844
+#: LYMessages.c:846
msgid "pre-release version"
msgstr "versi� de prova"
-#: LYMessages.c:845
+#: LYMessages.c:847
msgid "development version"
msgstr "versi� de desenvolupament"
#. #define AUTOCONF_CONFIG_CACHE
-#: LYMessages.c:847
+#: LYMessages.c:849
msgid ""
"The following data were derived during the automatic configuration/build\n"
"process of this copy of Lynx. When reporting a bug, please include a copy\n"
@@ -2739,7 +2724,7 @@ msgstr ""
"per favor, incloeu una c�pia d'aquesta p�gina."
#. #define AUTOCONF_LYNXCFG_H
-#: LYMessages.c:851
+#: LYMessages.c:853
msgid ""
"The following data were used as automatically-configured compile-time\n"
"definitions when this copy of Lynx was built."
@@ -2748,56 +2733,56 @@ msgstr ""
"quan es va compilar aquesta c�pia de Lynx."
#. #define DIRED_NOVICELINE
-#: LYMessages.c:856
+#: LYMessages.c:858
msgid " C)reate D)ownload E)dit F)ull menu M)odify R)emove T)ag U)pload \n"
-msgstr ""
+msgstr " C)rea D)escarrega E)dita M)en� complet C)anvia R)emou S)enyalado P)uja \n"
-#: LYMessages.c:857
+#: LYMessages.c:859
msgid "Failed to obtain status of current link!"
msgstr "Ha estat impossible obtenir l'estat de l'enlla� actual!"
#. #define INVALID_PERMIT_URL
-#: LYMessages.c:860
+#: LYMessages.c:862
msgid "Special URL only valid from current File Permission menu!"
msgstr "URL especial que nom�s �s v�lida des del men� permisos de fitxer actual!"
-#: LYMessages.c:864
+#: LYMessages.c:866
msgid "External support is currently disabled."
-msgstr ""
+msgstr "El suport extern est� deshabilitat actualment."
#. new with 2.8.4dev.21
-#: LYMessages.c:868
+#: LYMessages.c:870
msgid "Changing working-directory is currently disabled."
msgstr "El canvi de directori de treball est� desactivat."
-#: LYMessages.c:869
+#: LYMessages.c:871
msgid "Linewrap OFF!"
msgstr "Salt de l�nia autom�tic desactivat!"
-#: LYMessages.c:870
+#: LYMessages.c:872
msgid "Linewrap ON!"
msgstr "Salt de l�nia autom�tic activat!"
-#: LYMessages.c:871
+#: LYMessages.c:873
msgid "Parsing nested-tables toggled OFF! Reloading..."
msgstr "An�lisi de taules imbricades desactivat! Rec�rrega..."
-#: LYMessages.c:872
+#: LYMessages.c:874
msgid "Parsing nested-tables toggled ON! Reloading..."
msgstr "Analisi de taules imbricades activat! Rec�rrega..."
-#: LYMessages.c:873
+#: LYMessages.c:875
msgid "Shifting is disabled while line-wrap is in effect"
-msgstr ""
+msgstr "El despla�ament est� deshabilitat mentre l'ajustament de l�nies est� en efecte"
-#: LYMessages.c:874
+#: LYMessages.c:876
msgid "Trace not supported"
msgstr "Rastreig no suportat"
-#: LYMessages.c:795
+#: LYMessages.c:796
#, c-format
msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
-msgstr ""
+msgstr "\tSagnats: primer=%.0f altres=%.0f, Al�ada=%.1f Desc=%.1f\n"
#.
#. * Set up the message for the username prompt, and then issue the
@@ -2812,18 +2797,18 @@ msgstr "Nom d'usuari per a '%s' en %s '%s%s':"
#: WWW/Library/Implementation/HTAABrow.c:904
msgid "This client doesn't know how to compose proxy authorization information for scheme"
-msgstr ""
+msgstr "Aquest client no sap com composar la informaci� d'autoritzaci� del servidor intermediari per a l'esquema"
#: WWW/Library/Implementation/HTAABrow.c:983
msgid "This client doesn't know how to compose authorization information for scheme"
-msgstr ""
+msgstr "Aquest client no sap com composar la informaci� d'autoritzaci� per a l'esquema"
-#: WWW/Library/Implementation/HTAABrow.c:1093
+#: WWW/Library/Implementation/HTAABrow.c:1094
#, c-format
msgid "Invalid header '%s%s%s%s%s'"
msgstr "Cap�alera inv�lida '%s%s%s%s%s'"
-#: WWW/Library/Implementation/HTAABrow.c:1198
+#: WWW/Library/Implementation/HTAABrow.c:1200
msgid "Proxy authorization required -- retrying"
msgstr "Cal autorizaci� del proxy: reintentant"
@@ -2839,93 +2824,94 @@ msgstr "Acc
msgid "Document with POST content not found in cache. Resubmit?"
msgstr "El document amb contingut POST no s'ha trobat en la mem�ria cau. Reenviar?"
-#: WWW/Library/Implementation/HTAccess.c:949
+#: WWW/Library/Implementation/HTAccess.c:947
msgid "Loading failed, use a previous copy."
-msgstr ""
+msgstr "Ha fallat la c�rrega, useu un c�pia pr�via."
-#: WWW/Library/Implementation/HTAccess.c:1058 src/GridText.c:8867
+#: WWW/Library/Implementation/HTAccess.c:1056 src/GridText.c:8875
msgid "Loading incomplete."
msgstr "C�rrega incompleta."
-#: WWW/Library/Implementation/HTAccess.c:1089
+#: WWW/Library/Implementation/HTAccess.c:1087
#, c-format
msgid "**** HTAccess: socket or file number returned by obsolete load routine!\n"
-msgstr ""
+msgstr "**** HTAccess: s'ha retornat un s�col o un n�mero de fitxer per una rutina de c�rrega obsoleta!\n"
-#: WWW/Library/Implementation/HTAccess.c:1091
-#, fuzzy, c-format
-#| msgid "**** HTAccess: Internal software error. Please mail lynx-dev at sig.net!\n"
+#: WWW/Library/Implementation/HTAccess.c:1089
+#, c-format
msgid "**** HTAccess: Internal software error. Please mail lynx-dev at nongnu.org!\n"
-msgstr "**** HTAccess: Error intern. Per favor escriviu a lynx-dev at sig.net!\n"
+msgstr ""
+"**** HTAccess: Error intern de programari. Si us plau escriviu a lynx-dev at nongnu.org!\n"
+"\n"
-#: WWW/Library/Implementation/HTAccess.c:1092
+#: WWW/Library/Implementation/HTAccess.c:1090
#, c-format
msgid "**** HTAccess: Status returned was: %d\n"
-msgstr ""
+msgstr "**** HTAccess: L'estat retornat ha estat: %d\n"
#.
#. * hack: if we fail in HTAccess.c
#. * avoid duplicating URL, oh.
#.
-#: WWW/Library/Implementation/HTAccess.c:1098 src/LYMainLoop.c:8050
+#: WWW/Library/Implementation/HTAccess.c:1096 src/LYMainLoop.c:8074
msgid "Can't Access"
msgstr "No ha estat possible accedir-hi"
-#: WWW/Library/Implementation/HTAccess.c:1106
+#: WWW/Library/Implementation/HTAccess.c:1104
msgid "Unable to access document."
msgstr "No ha estat possible accedir al document."
-#: WWW/Library/Implementation/HTFTP.c:849
+#: WWW/Library/Implementation/HTFTP.c:875
#, c-format
msgid "Enter password for user %s@%s:"
msgstr "Contrasenya de l'usuari %s@%s:"
-#: WWW/Library/Implementation/HTFTP.c:877
+#: WWW/Library/Implementation/HTFTP.c:903
msgid "Unable to connect to FTP host."
msgstr "No ha estat possible connectar amb el servidor FTP"
-#: WWW/Library/Implementation/HTFTP.c:1158
+#: WWW/Library/Implementation/HTFTP.c:1142
msgid "close master socket"
-msgstr ""
+msgstr "tanca el s�col mestre"
-#: WWW/Library/Implementation/HTFTP.c:1220
+#: WWW/Library/Implementation/HTFTP.c:1204
msgid "socket for master socket"
-msgstr ""
+msgstr "s�col per al s�col mestre"
-#: WWW/Library/Implementation/HTFTP.c:2986
+#: WWW/Library/Implementation/HTFTP.c:2952
msgid "Receiving FTP directory."
msgstr "Rebent directori d'FTP"
-#: WWW/Library/Implementation/HTFTP.c:3122
+#: WWW/Library/Implementation/HTFTP.c:3090
#, c-format
msgid "Transferred %d bytes (%5d)"
msgstr "%d (%5d) bytes transferits"
-#: WWW/Library/Implementation/HTFTP.c:3480
+#: WWW/Library/Implementation/HTFTP.c:3448
msgid "connect for data"
-msgstr ""
+msgstr "connecta per a dades"
-#: WWW/Library/Implementation/HTFTP.c:4141
+#: WWW/Library/Implementation/HTFTP.c:4120
msgid "Receiving FTP file."
msgstr "Rebent arxiu d'FTP"
-#: WWW/Library/Implementation/HTFinger.c:278
+#: WWW/Library/Implementation/HTFinger.c:274
msgid "Could not set up finger connection."
msgstr "No ha estat possible establir la connexi� finger"
-#: WWW/Library/Implementation/HTFinger.c:325
+#: WWW/Library/Implementation/HTFinger.c:321
msgid "Could not load data (no sitename in finger URL)"
-msgstr ""
+msgstr "No s'han pogut carregar les dades (no hi ha un nom de lloc al URL del finger)"
-#: WWW/Library/Implementation/HTFinger.c:329
+#: WWW/Library/Implementation/HTFinger.c:325
msgid "Invalid port number - will only use port 79!"
msgstr "N�mero de port inv�lid: s'usar� �nicament el port 79!"
-#: WWW/Library/Implementation/HTFinger.c:395
+#: WWW/Library/Implementation/HTFinger.c:391
msgid "Could not access finger host."
msgstr "No ha estat possible accedir al servidor finger."
-#: WWW/Library/Implementation/HTFinger.c:403
+#: WWW/Library/Implementation/HTFinger.c:399
msgid "No response from finger server."
msgstr "El servidor finger no respon."
@@ -3012,7 +2998,7 @@ msgstr "Aquest client no t
#: WWW/Library/Implementation/HTNews.c:2545
msgid "No target for raw text!"
-msgstr ""
+msgstr "No hi ha un dest� per al text en brut!"
#: WWW/Library/Implementation/HTNews.c:2575
msgid "Connecting to NewsHost ..."
@@ -3055,16 +3041,16 @@ msgstr "Llegint article."
msgid "Sorry, could not load requested news."
msgstr "No ha estat possible carregar els missatges sol�licitats."
-#: WWW/Library/Implementation/HTTCP.c:1286
+#: WWW/Library/Implementation/HTTCP.c:1323
msgid "Address has invalid port"
msgstr "L'adre�a cont� un port que no �s v�lid"
-#: WWW/Library/Implementation/HTTCP.c:1362
+#: WWW/Library/Implementation/HTTCP.c:1397
msgid "Address length looks invalid"
msgstr "La longitud de l'adre�a sembla inv�lida"
-#: WWW/Library/Implementation/HTTCP.c:1622
-#: WWW/Library/Implementation/HTTCP.c:1640
+#: WWW/Library/Implementation/HTTCP.c:1845
+#: WWW/Library/Implementation/HTTCP.c:1863
#, c-format
msgid "Unable to locate remote host %s."
msgstr "Ha estat impossible trobar el servidor %s."
@@ -3073,138 +3059,136 @@ msgstr "Ha estat impossible trobar el servidor %s."
#. * but not HTAlert, because typically there will be other
#. * alerts from the callers. - kw
#.
-#: WWW/Library/Implementation/HTTCP.c:1637
+#: WWW/Library/Implementation/HTTCP.c:1860
#: WWW/Library/Implementation/HTTelnet.c:115
#, c-format
msgid "Invalid hostname %s"
msgstr "Servidor %s no v�lid"
-#: WWW/Library/Implementation/HTTCP.c:1651
+#: WWW/Library/Implementation/HTTCP.c:1874
#, c-format
msgid "Making %s connection to %s"
msgstr "Establint una connexi� %s amb %s"
-#: WWW/Library/Implementation/HTTCP.c:1662
+#: WWW/Library/Implementation/HTTCP.c:1885
msgid "socket failed."
-msgstr ""
+msgstr "ha fallat el s�col."
-#: WWW/Library/Implementation/HTTCP.c:1676
+#: WWW/Library/Implementation/HTTCP.c:1899
#, c-format
msgid "socket failed: family %d addr %s port %s."
-msgstr ""
+msgstr "ha fallat el s�col: fam�lia %d addr %s port %s."
-#: WWW/Library/Implementation/HTTCP.c:1700
+#: WWW/Library/Implementation/HTTCP.c:1923
msgid "Could not make connection non-blocking."
-msgstr ""
+msgstr "No s'ha pogut fer que la connexi� no sigui bloquejadora."
-#: WWW/Library/Implementation/HTTCP.c:1768
+#: WWW/Library/Implementation/HTTCP.c:1991
msgid "Connection failed (too many retries)."
msgstr "La connexi� ha fallat (massa reintents)."
-#: WWW/Library/Implementation/HTTCP.c:1955
+#: WWW/Library/Implementation/HTTCP.c:2180
msgid "Could not restore socket to blocking."
-msgstr ""
+msgstr "No s'ha pogut restaurar el s�col perqu� sigui bloquejador."
-#: WWW/Library/Implementation/HTTCP.c:2021
-#, fuzzy
-#| msgid "Connection failed (too many retries)."
+#: WWW/Library/Implementation/HTTCP.c:2248
msgid "Socket read failed (too many tries)."
-msgstr "La connexi� ha fallat (massa reintents)."
+msgstr "La lectura del s�col ha fallat (massa intents)."
#: WWW/Library/Implementation/HTTP.c:81
#, c-format
msgid "SSL callback:%s, preverify_ok=%d, ssl_okay=%d"
-msgstr ""
+msgstr "Crida de retorn SSL:%s, preverify_ok=%d, ssl_okay=%d"
-#: WWW/Library/Implementation/HTTP.c:432
+#: WWW/Library/Implementation/HTTP.c:438
#, c-format
msgid "Address contains a username: %s"
msgstr "L'adre�a cont� un nom d'usuari: %s"
-#: WWW/Library/Implementation/HTTP.c:486
+#: WWW/Library/Implementation/HTTP.c:492
#, c-format
msgid "Certificate issued by: %s"
-msgstr ""
+msgstr "El certificat ha estat expedit per: %s"
-#: WWW/Library/Implementation/HTTP.c:673
+#: WWW/Library/Implementation/HTTP.c:679
msgid "This client does not contain support for HTTPS URLs."
msgstr "Aquest client no admet adreces HTTPS."
-#: WWW/Library/Implementation/HTTP.c:698
+#: WWW/Library/Implementation/HTTP.c:704
msgid "Unable to connect to remote host."
msgstr "No ha estat possible connectar amb el servidor."
-#: WWW/Library/Implementation/HTTP.c:730
+#: WWW/Library/Implementation/HTTP.c:744
msgid "Retrying connection without TLS."
msgstr "S'est� reintentant la connexi� sense TLS."
-#: WWW/Library/Implementation/HTTP.c:773
+#: WWW/Library/Implementation/HTTP.c:794
+msgid "GnuTLS error when trying to verify certificate."
+msgstr "S'ha produ�t un error GnuTLS quan s'estava intentant verificar el certificat"
+
+#: WWW/Library/Implementation/HTTP.c:806
+msgid "the certificate has no known issuer"
+msgstr "el certificat no t� un emissor conegut"
+
+#: WWW/Library/Implementation/HTTP.c:808
msgid "no issuer was found"
-msgstr ""
+msgstr "no s'ha trobat cap emissor"
-#: WWW/Library/Implementation/HTTP.c:775
+#: WWW/Library/Implementation/HTTP.c:810
msgid "issuer is not a CA"
-msgstr ""
-
-#: WWW/Library/Implementation/HTTP.c:777
-msgid "the certificate has no known issuer"
-msgstr ""
+msgstr "l'emissor no �s un CA"
-#: WWW/Library/Implementation/HTTP.c:779
-#, fuzzy
-#| msgid "The cookie has been eaten!"
+#: WWW/Library/Implementation/HTTP.c:812
msgid "the certificate has been revoked"
-msgstr "La cookie ha estat esborrada!"
+msgstr "el certificat ha estat revocat"
-#: WWW/Library/Implementation/HTTP.c:781
+#: WWW/Library/Implementation/HTTP.c:814
msgid "the certificate is not trusted"
-msgstr ""
+msgstr "el certificat no �s de confian�a"
-#: WWW/Library/Implementation/HTTP.c:855
+#: WWW/Library/Implementation/HTTP.c:889
#, c-format
msgid "Verified connection to %s (cert=%s)"
-msgstr ""
+msgstr "Connexi� verificada a %s (cert=%s)"
-#: WWW/Library/Implementation/HTTP.c:903 WWW/Library/Implementation/HTTP.c:945
+#: WWW/Library/Implementation/HTTP.c:937 WWW/Library/Implementation/HTTP.c:979
#, c-format
msgid "Verified connection to %s (subj=%s)"
-msgstr ""
+msgstr "Connexi� verificada a %s (subj=%s)"
-#: WWW/Library/Implementation/HTTP.c:975
-#, fuzzy
-#| msgid "SSL error:Can't find common name in certificate-Continue?"
+#: WWW/Library/Implementation/HTTP.c:1009
msgid "Can't find common name in certificate"
-msgstr "Error SSL: no s'ha pogut trobar el nom com� en el certificat. Continuem?"
+msgstr "No es pot trobar el nom com� al certificat"
-#: WWW/Library/Implementation/HTTP.c:978
+#: WWW/Library/Implementation/HTTP.c:1012
#, c-format
msgid "SSL error:host(%s)!=cert(%s)-Continue?"
msgstr "Error SSL: servidor(%s)!=cert(%s). Voleu continuar?"
-#: WWW/Library/Implementation/HTTP.c:991
+#: WWW/Library/Implementation/HTTP.c:1025
#, c-format
msgid "UNVERIFIED connection to %s (cert=%s)"
-msgstr ""
+msgstr "Connexi� NO VERIFICADA a %s (cert=%s)"
-#: WWW/Library/Implementation/HTTP.c:1000
+#: WWW/Library/Implementation/HTTP.c:1034
#, c-format
msgid "Secure %d-bit %s (%s) HTTP connection"
-msgstr ""
+msgstr "%d-bit %s segur (%s) connexi� HTTP"
-#: WWW/Library/Implementation/HTTP.c:1467
+#: WWW/Library/Implementation/HTTP.c:1497
msgid "Sending HTTP request."
msgstr "Enviant sol�licitud HTTP."
-#: WWW/Library/Implementation/HTTP.c:1509
+#: WWW/Library/Implementation/HTTP.c:1539
msgid "Unexpected network write error; connection aborted."
msgstr "Error inesperat d'escriptura "
-#: WWW/Library/Implementation/HTTP.c:1515
+#: WWW/Library/Implementation/HTTP.c:1545
msgid "HTTP request sent; waiting for response."
msgstr "Sol�licitud HTTP enviada; esperant resposta."
-#: WWW/Library/Implementation/HTTP.c:1588
-#: WWW/Library/Implementation/HTTP.c:1598
+#: WWW/Library/Implementation/HTTP.c:1618
+#: WWW/Library/Implementation/HTTP.c:1628
msgid "Unexpected network read error; connection aborted."
msgstr "Error inesperat de lectura en la xarxa; s'ha avortat la connexi�."
@@ -3217,9 +3201,9 @@ msgstr "Error inesperat de lectura en la xarxa; s'ha avortat la connexi
#. * line and possibly other headers, so we'll deal with them by
#. * showing the full header to the user as text/plain. - FM
#.
-#: WWW/Library/Implementation/HTTP.c:1800
+#: WWW/Library/Implementation/HTTP.c:1830
msgid "Got unexpected Informational Status."
-msgstr ""
+msgstr "S'ha obtingut un estat d'informaci� no esperat"
#.
#. * Reset Content. The server has fulfilled the request but
@@ -3227,9 +3211,9 @@ msgstr ""
#. * content. We'll instruct the user to do that, and
#. * restore the current document. - FM
#.
-#: WWW/Library/Implementation/HTTP.c:1834
+#: WWW/Library/Implementation/HTTP.c:1864
msgid "Request fulfilled. Reset Content."
-msgstr ""
+msgstr "S'ha completat la demanda. Restablaix el contingut."
#. Not Modified
#.
@@ -3237,27 +3221,27 @@ msgstr ""
#. * status is inappropriate. We'll deal with it by showing
#. * the full header to the user as text/plain. - FM
#.
-#: WWW/Library/Implementation/HTTP.c:1949
+#: WWW/Library/Implementation/HTTP.c:1979
msgid "Got unexpected 304 Not Modified status."
msgstr "S'ha obtingut un codi 304 Not Modified inesperat (el document no ha estat modificat)."
-#: WWW/Library/Implementation/HTTP.c:2012
+#: WWW/Library/Implementation/HTTP.c:2042
msgid "Redirection of POST content requires user approval."
-msgstr ""
+msgstr "La redirecci� del contingut POST requereix l'aprovaci� de l'usuari."
-#: WWW/Library/Implementation/HTTP.c:2027
+#: WWW/Library/Implementation/HTTP.c:2057
msgid "Have POST content. Treating Permanent Redirection as Temporary.\n"
-msgstr ""
+msgstr "Hi ha un contingut POST. Es tractar� la redirecci� permanent com a tempor�ria.\n"
-#: WWW/Library/Implementation/HTTP.c:2071
+#: WWW/Library/Implementation/HTTP.c:2101
msgid "Retrying with access authorization information."
msgstr "Estic reintentant amb la informaci� d'acc�s."
-#: WWW/Library/Implementation/HTTP.c:2083
+#: WWW/Library/Implementation/HTTP.c:2113
msgid "Show the 401 message body?"
msgstr "Mostrar el cos del missatge d'error 401?"
-#: WWW/Library/Implementation/HTTP.c:2127
+#: WWW/Library/Implementation/HTTP.c:2157
msgid "Show the 407 message body?"
msgstr "Mostrar el cos del missatge d'error 407?"
@@ -3265,14 +3249,14 @@ msgstr "Mostrar el cos del missatge d'error 407?"
#. * Bad or unknown server_status number. Take a chance and hope
#. * there is something to display. - FM
#.
-#: WWW/Library/Implementation/HTTP.c:2227
+#: WWW/Library/Implementation/HTTP.c:2257
msgid "Unknown status reply from server!"
msgstr "Resposta desconeguda del servidor!"
#: WWW/Library/Implementation/HTTelnet.c:113
#, c-format
msgid "remote %s session:"
-msgstr ""
+msgstr "sessi� %s remota:"
#: WWW/Library/Implementation/HTWAIS.c:163
msgid "Could not connect to WAIS server."
@@ -3286,80 +3270,88 @@ msgstr "No s'ha pogut obrir cap connexi
msgid "Diagnostic code is "
msgstr "El codi de diagn�stic �s "
-#: WWW/Library/Implementation/HTWAIS.c:464
+#: WWW/Library/Implementation/HTWAIS.c:460
msgid "Index "
msgstr "�ndex "
-#: WWW/Library/Implementation/HTWAIS.c:468
+#: WWW/Library/Implementation/HTWAIS.c:464
#, c-format
msgid " contains the following %d item%s relevant to \""
-msgstr ""
+msgstr " cont� els seg�ents %d �tem%s relevant per a \""
-#: WWW/Library/Implementation/HTWAIS.c:476
+#: WWW/Library/Implementation/HTWAIS.c:472
msgid "The first figure after each entry is its relative score, "
msgstr "La primera xifra despr�s de cada entrada �s la puntuaci� relativa, "
-#: WWW/Library/Implementation/HTWAIS.c:477
+#: WWW/Library/Implementation/HTWAIS.c:473
msgid "the second is the number of lines in the item."
msgstr "la segona �s el nombre de l�nies."
-#: WWW/Library/Implementation/HTWAIS.c:519
+#: WWW/Library/Implementation/HTWAIS.c:515
msgid " (bad file name)"
msgstr " (nom de fitxer incorrecte)"
-#: WWW/Library/Implementation/HTWAIS.c:545
+#: WWW/Library/Implementation/HTWAIS.c:541
msgid "(bad doc id)"
msgstr " (identificador de document incorrecte)"
-#: WWW/Library/Implementation/HTWAIS.c:561
+#: WWW/Library/Implementation/HTWAIS.c:557
msgid "(Short Header record, can't display)"
-msgstr ""
+msgstr "(Registre curt de cap�alera, no es pot mostrar)"
-#: WWW/Library/Implementation/HTWAIS.c:568
+#: WWW/Library/Implementation/HTWAIS.c:564
msgid ""
"\n"
"Long Header record, can't display\n"
msgstr ""
+"\n"
+"Registre llarg de cap�alera, no es pot mostrar\n"
-#: WWW/Library/Implementation/HTWAIS.c:575
+#: WWW/Library/Implementation/HTWAIS.c:571
msgid ""
"\n"
"Text record\n"
msgstr ""
+"\n"
+"Registre de text\n"
-#: WWW/Library/Implementation/HTWAIS.c:584
+#: WWW/Library/Implementation/HTWAIS.c:580
msgid ""
"\n"
"Headline record, can't display\n"
msgstr ""
+"\n"
+"Registre d'encap�alament, no es pot mostrar\n"
-#: WWW/Library/Implementation/HTWAIS.c:592
+#: WWW/Library/Implementation/HTWAIS.c:588
msgid ""
"\n"
"Code record, can't display\n"
msgstr ""
+"\n"
+"Registre de codi, no es pot mostrar\n"
-#: WWW/Library/Implementation/HTWAIS.c:696
+#: WWW/Library/Implementation/HTWAIS.c:692
msgid "Syntax error in WAIS URL"
msgstr "Error sint�ctic en la URL WAIS"
-#: WWW/Library/Implementation/HTWAIS.c:768
+#: WWW/Library/Implementation/HTWAIS.c:764
msgid " (WAIS Index)"
msgstr " (�ndex WAIS)"
-#: WWW/Library/Implementation/HTWAIS.c:775
+#: WWW/Library/Implementation/HTWAIS.c:771
msgid "WAIS Index: "
msgstr "�ndex WAIS: "
-#: WWW/Library/Implementation/HTWAIS.c:781
+#: WWW/Library/Implementation/HTWAIS.c:777
msgid "This is a link for searching the "
msgstr "Aquest �s un enlla� per a cercar en "
-#: WWW/Library/Implementation/HTWAIS.c:785
+#: WWW/Library/Implementation/HTWAIS.c:781
msgid " WAIS Index.\n"
msgstr " l'�ndex WAIS.\n"
-#: WWW/Library/Implementation/HTWAIS.c:814
+#: WWW/Library/Implementation/HTWAIS.c:810
msgid ""
"\n"
"Enter the 's'earch command and then specify search words.\n"
@@ -3367,190 +3359,188 @@ msgstr ""
"\n"
"Introdu�u l'ordre de recerca ('s') i especifiqueu els mots que voleu cercar.\n"
-#: WWW/Library/Implementation/HTWAIS.c:836
+#: WWW/Library/Implementation/HTWAIS.c:832
msgid " (in "
-msgstr ""
+msgstr " (a "
-#: WWW/Library/Implementation/HTWAIS.c:845
+#: WWW/Library/Implementation/HTWAIS.c:841
msgid "WAIS Search of \""
-msgstr ""
+msgstr "Cerca WAIS de "
-#: WWW/Library/Implementation/HTWAIS.c:849
+#: WWW/Library/Implementation/HTWAIS.c:845
msgid "\" in: "
-msgstr ""
+msgstr "\" a: "
-#: WWW/Library/Implementation/HTWAIS.c:864
+#: WWW/Library/Implementation/HTWAIS.c:860
msgid "HTWAIS: Request too large."
msgstr "HTWAIS: Sol�licitud massa gran."
-#: WWW/Library/Implementation/HTWAIS.c:873
+#: WWW/Library/Implementation/HTWAIS.c:869
msgid "Searching WAIS database..."
msgstr "Cercant en la base de dades WAIS..."
-#: WWW/Library/Implementation/HTWAIS.c:883
+#: WWW/Library/Implementation/HTWAIS.c:879
msgid "Search interrupted."
msgstr "Recerca interrompuda."
-#: WWW/Library/Implementation/HTWAIS.c:934
+#: WWW/Library/Implementation/HTWAIS.c:930
msgid "Can't convert format of WAIS document"
msgstr "No es pot convertir el format del document WAIS"
-#: WWW/Library/Implementation/HTWAIS.c:978
+#: WWW/Library/Implementation/HTWAIS.c:974
msgid "HTWAIS: Request too long."
msgstr "HTWAIS: Sol�licitud massa llarga."
#.
#. * Actually do the transaction given by request_message.
#.
-#: WWW/Library/Implementation/HTWAIS.c:992
+#: WWW/Library/Implementation/HTWAIS.c:988
msgid "Fetching WAIS document..."
msgstr "Descarregant el document WAIS..."
#. display_search_response(target, retrieval_response,
#. wais_database, keywords);
-#: WWW/Library/Implementation/HTWAIS.c:1031
+#: WWW/Library/Implementation/HTWAIS.c:1027
msgid "No text was returned!\n"
msgstr "No s'ha tornat cap text!\n"
-#: WWW/Library/Implementation/HTWSRC.c:301
+#: WWW/Library/Implementation/HTWSRC.c:302
msgid " NOT GIVEN in source file; "
-msgstr ""
+msgstr " NO S'HA DONAT al fitxer font; "
-#: WWW/Library/Implementation/HTWSRC.c:324
+#: WWW/Library/Implementation/HTWSRC.c:325
msgid " WAIS source file"
-msgstr ""
+msgstr "fitxer font WAIS"
-#: WWW/Library/Implementation/HTWSRC.c:331
+#: WWW/Library/Implementation/HTWSRC.c:332
msgid " description"
-msgstr ""
+msgstr "descripci�"
-#: WWW/Library/Implementation/HTWSRC.c:341
+#: WWW/Library/Implementation/HTWSRC.c:342
msgid "Access links"
-msgstr ""
+msgstr "Enlla�os d'acc�s"
-#: WWW/Library/Implementation/HTWSRC.c:362
+#: WWW/Library/Implementation/HTWSRC.c:363
msgid "Direct access"
msgstr "Acc�s directe"
#. * Proxy will be used if defined, so let user know that - FM *
-#: WWW/Library/Implementation/HTWSRC.c:365
+#: WWW/Library/Implementation/HTWSRC.c:366
msgid " (or via proxy server, if defined)"
msgstr " (o a trav�s d'un proxy, si est� definit aix�)"
-#: WWW/Library/Implementation/HTWSRC.c:380
+#: WWW/Library/Implementation/HTWSRC.c:381
msgid "Maintainer"
msgstr "Mantenidor"
-#: WWW/Library/Implementation/HTWSRC.c:388
+#: WWW/Library/Implementation/HTWSRC.c:389
msgid "Host"
msgstr "Servidor"
-#: src/GridText.c:699
+#: src/GridText.c:691
msgid "Memory exhausted, display interrupted!"
msgstr "Mem�ria exhaurida, visualitzaci� interrompuda!"
-#: src/GridText.c:704
+#: src/GridText.c:696
msgid "Memory exhausted, will interrupt transfer!"
msgstr "Mem�ria exhaurida, la transfer�ncia s'interrompr�!"
-#: src/GridText.c:3685
+#: src/GridText.c:3674
msgid " *** MEMORY EXHAUSTED ***"
msgstr " *** MEM�RIA EXHAURIDA ***"
-#: src/GridText.c:6146
+#: src/GridText.c:6152
msgid "text entry field"
msgstr "camp de text"
-#: src/GridText.c:6149
+#: src/GridText.c:6155
msgid "password entry field"
msgstr "camp de contrasenya"
-#: src/GridText.c:6152
+#: src/GridText.c:6158
msgid "checkbox"
msgstr "quadre de verificaci�"
-#: src/GridText.c:6155
+#: src/GridText.c:6161
msgid "radio button"
msgstr "bot� de grup"
-#: src/GridText.c:6158
+#: src/GridText.c:6164
msgid "submit button"
msgstr "bot� d'enviament"
-#: src/GridText.c:6161
+#: src/GridText.c:6167
msgid "reset button"
msgstr "bot� de reinici"
-#: src/GridText.c:6164
-#, fuzzy
-#| msgid "submit button"
+#: src/GridText.c:6170
msgid "script button"
-msgstr "bot� d'enviament"
+msgstr "bot� d'script"
-#: src/GridText.c:6167
+#: src/GridText.c:6173
msgid "popup menu"
msgstr "men� emergent"
-#: src/GridText.c:6170
+#: src/GridText.c:6176
msgid "hidden form field"
msgstr "camp de formulari ocult"
-#: src/GridText.c:6173
+#: src/GridText.c:6179
msgid "text entry area"
msgstr "�rea de text"
-#: src/GridText.c:6176
+#: src/GridText.c:6182
msgid "range entry field"
msgstr "camp d'entrada d'interval"
-#: src/GridText.c:6179
+#: src/GridText.c:6185
msgid "file entry field"
msgstr "camp de fitxer"
-#: src/GridText.c:6182
+#: src/GridText.c:6188
msgid "text-submit field"
msgstr "camp d'enviament de text"
-#: src/GridText.c:6185
+#: src/GridText.c:6191
msgid "image-submit button"
msgstr "bot� d'enviament d'imatges"
-#: src/GridText.c:6188
+#: src/GridText.c:6194
msgid "keygen field"
-msgstr ""
+msgstr "camp keygen"
-#: src/GridText.c:6191
+#: src/GridText.c:6197
msgid "unknown form field"
msgstr "camp de formulari desconegut"
-#: src/GridText.c:6211 src/GridText.c:6218 src/LYList.c:248
+#: src/GridText.c:6217 src/GridText.c:6224 src/LYList.c:249
msgid "unknown field or link"
msgstr "camp o enlla� desconegut"
-#: src/GridText.c:10649
+#: src/GridText.c:10650
msgid "Can't open file for uploading"
msgstr "No ha estat possible obrir el fitxer que voleu carregar."
-#: src/GridText.c:11837
+#: src/GridText.c:11843
#, c-format
msgid "Submitting %s"
msgstr "Enviant %s"
#. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12894
+#: src/GridText.c:12919
msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
-msgstr ""
+msgstr "S'ha detectat un bloqueig: l'struct TextAnchor est� corrupte - es suggereix avortar!"
#. don't show previous state
-#: src/GridText.c:13056
+#: src/GridText.c:13083
msgid "Wrap lines to fit displayed area?"
msgstr "Trencar les l�nies per a ajustar a l'espai disponible?"
-#: src/GridText.c:13696
+#: src/GridText.c:13719
msgid "Very long lines have been truncated!"
msgstr "Les l�nies molt llargues han estat truncades!"
-#: src/HTAlert.c:164 src/LYShowInfo.c:364 src/LYShowInfo.c:368
+#: src/HTAlert.c:164 src/LYShowInfo.c:386 src/LYShowInfo.c:390
msgid "bytes"
msgstr "bytes"
@@ -3558,32 +3548,32 @@ msgstr "bytes"
#. * If we know the total size of the file, we can compute
#. * a percentage, and show a corresponding progress bar.
#.
-#: src/HTAlert.c:303 src/HTAlert.c:329
+#: src/HTAlert.c:328 src/HTAlert.c:354
#, c-format
msgid "Read %s of data"
msgstr "Llegits %s"
-#: src/HTAlert.c:326
+#: src/HTAlert.c:351
#, c-format
msgid "Read %s of %s of data"
msgstr "Llegits %s de %s."
-#: src/HTAlert.c:335
+#: src/HTAlert.c:360
#, c-format
msgid ", %s/sec"
msgstr ", %s/sec"
-#: src/HTAlert.c:347
+#: src/HTAlert.c:374
#, c-format
msgid " (stalled for %s)"
msgstr " (aturat durant %s)"
-#: src/HTAlert.c:351
+#: src/HTAlert.c:378
#, c-format
msgid ", ETA %s"
-msgstr ""
+msgstr ", ETA %s"
-#: src/HTAlert.c:373
+#: src/HTAlert.c:400
msgid " (Press 'z' to abort)"
msgstr " (Premeu 'z' per avortar)"
@@ -3612,11 +3602,11 @@ msgstr " (Premeu 'z' per avortar)"
#. * Lynx will also accept y Y n N as responses unless there is a conflict
#. * with the first letter of the "yes" or "no" translation.
#.
-#: src/HTAlert.c:411 src/HTAlert.c:459
+#: src/HTAlert.c:438 src/HTAlert.c:486
msgid "yes"
msgstr "s�"
-#: src/HTAlert.c:414 src/HTAlert.c:460
+#: src/HTAlert.c:441 src/HTAlert.c:487
msgid "no"
msgstr "no"
@@ -3636,7 +3626,7 @@ msgstr "no"
#. * (Y/N/Always/neVer) - English (original)
#. * (O/N/Toujours/Jamais) - French
#.
-#: src/HTAlert.c:913
+#: src/HTAlert.c:940
msgid "Y/N/A/V"
msgstr "S/N/P/M"
@@ -3646,7 +3636,7 @@ msgstr "Descripci
#: src/HTML.c:5920
msgid "(none)"
-msgstr ""
+msgstr "(cap)"
#: src/HTML.c:5924
msgid "Filepath:"
@@ -3679,7 +3669,7 @@ msgstr ""
" Mosaic. Els enlla�os obsolets es poden eliminar amb l'ordre \"eliminar adre�a\", que normalment s'executa prement la tecla R per� l'usuari o\n"
" l'administrador del sistema pot haver-la remapat."
-#: src/LYBookmark.c:376
+#: src/LYBookmark.c:378
#, c-format
msgid ""
" You can delete links by the 'R' key<br>\n"
@@ -3688,7 +3678,7 @@ msgstr ""
" Podeu esborrar enlla�os amb la tecla 'R'<br>\n"
"<ol>\n"
-#: src/LYBookmark.c:379
+#: src/LYBookmark.c:381
msgid ""
" You can delete links using the remove bookmark command. It is usually\n"
" the 'R' key but may have been remapped by you or your system\n"
@@ -3698,16 +3688,15 @@ msgstr ""
" correspon a la tecla R, per� pot ser remapada per l'usuari o l'administrador\n"
" del sistema."
-#: src/LYBookmark.c:383
-#, fuzzy
+#: src/LYBookmark.c:385
msgid ""
" This file also may be edited with a standard text editor to delete\n"
" outdated or invalid links, or to change their order."
msgstr ""
-" Tamb� es pot editar aquest fitxer amb un editor qualsevol per esborrar\n"
-" enlla�os obsolets o inv�lids, o per canviar-ne l'ordre.\n"
+" Tamb� es pot editar aquest fitxer amb un editor est�ndard per esborrar\n"
+" enlla�os obsolets o inv�lids, o per canviar-ne l'ordre."
-#: src/LYBookmark.c:386
+#: src/LYBookmark.c:388
msgid ""
"Note: if you edit this file manually\n"
" you should not change the format within the lines\n"
@@ -3724,80 +3713,84 @@ msgstr ""
msgid "File may be recoverable from %s during this session"
msgstr "El fitxer es podr� recuperar des de %s durant aquesta sessi�"
-#: src/LYCgi.c:158
+#: src/LYCgi.c:162
#, c-format
msgid "Do you want to execute \"%s\"?"
-msgstr ""
+msgstr "Voleu executar �%s�?"
#.
#. * Neither the path as given nor any components examined by backing up
#. * were stat()able. - kw
#.
-#: src/LYCgi.c:273
+#: src/LYCgi.c:277
msgid "Unable to access cgi script"
msgstr "Ha estat impossible d'accedir al script cgi"
-#: src/LYCgi.c:707 src/LYCgi.c:710
+#: src/LYCgi.c:711 src/LYCgi.c:714
msgid "Good Advice"
msgstr "Bon consell"
-#: src/LYCgi.c:714
+#: src/LYCgi.c:718
msgid "An excellent http server for VMS is available via"
msgstr "Un servidor http excel�lent per a VMS est� disponible "
-#: src/LYCgi.c:721
+#: src/LYCgi.c:725
msgid "this link"
msgstr "ac�"
-#: src/LYCgi.c:725
+#: src/LYCgi.c:729
msgid "It provides state of the art CGI script support.\n"
msgstr "D�na informaci� del estat actual del suport per a scripts CGI.\n"
-#: src/LYClean.c:122
+#: src/LYClean.c:115
msgid "Exiting via interrupt:"
msgstr "Eixint a causa de la interrupci�:"
-#: src/LYCookie.c:2537
+#: src/LYCookie.c:2538
msgid "(from a previous session)"
msgstr "(d'una sessi� anterior)"
-#: src/LYCookie.c:2598
+#: src/LYCookie.c:2599
msgid "Maximum Gobble Date:"
msgstr "Data l�mit d'eliminaci�:"
-#: src/LYCookie.c:2637
+#: src/LYCookie.c:2638
msgid "Internal"
-msgstr ""
+msgstr "Intern"
-#: src/LYCookie.c:2638
+#: src/LYCookie.c:2639
msgid "cookie_domain_flag_set error, aborting program"
-msgstr ""
+msgstr "error cookie_domain_flag_see, s'avortar� el programa"
-#: src/LYCurses.c:1297
+#: src/LYCurses.c:1170
+msgid "Terminal reinitialisation failed - unknown terminal type?"
+msgstr "Ha fallat la reinicialitzaci� del terminal: �s un tipus de terminal desconegut?"
+
+#: src/LYCurses.c:1377
msgid "Terminal initialisation failed - unknown terminal type?"
msgstr "Ha fallat la inicialitzaci� del terminal: potser �s un tipus de terminal desconegut."
-#: src/LYCurses.c:1780
+#: src/LYCurses.c:1863
msgid "Terminal ="
msgstr "Terminal ="
-#: src/LYCurses.c:1784
+#: src/LYCurses.c:1867
msgid "You must use a vt100, 200, etc. terminal with this program."
msgstr "Heu d'usar un terminal vt100, 300, etc. amb aquest programa."
-#: src/LYCurses.c:1833
+#: src/LYCurses.c:1916
msgid "Your Terminal type is unknown!"
msgstr "El terminal especificat �s desconegut!"
-#: src/LYCurses.c:1834
+#: src/LYCurses.c:1917
msgid "Enter a terminal type:"
msgstr "Introdu�u un tipus de terminal:"
-#: src/LYCurses.c:1848
+#: src/LYCurses.c:1931
msgid "TERMINAL TYPE IS SET TO"
msgstr "EL TIPUS DE TERMINAL EST� FIXAT A"
-#: src/LYCurses.c:2398
+#: src/LYCurses.c:2483
#, c-format
msgid ""
"\n"
@@ -3806,7 +3799,7 @@ msgstr ""
"\n"
"S'ha produ�t un error fatal en %s Ver. %s\n"
-#: src/LYCurses.c:2401
+#: src/LYCurses.c:2486
#, c-format
msgid ""
"\n"
@@ -3821,20 +3814,18 @@ msgstr ""
"si escau, per \n"
#: src/LYEdit.c:272
-#, fuzzy, c-format
-#| msgid "Error processing line %d of %s\n"
+#, c-format
msgid "Error starting editor, %s"
-msgstr "Error mentre es processava la l�nia %d de %s\n"
+msgstr "�rror mentre s'iniciava l'editor, %s"
#: src/LYEdit.c:275
msgid "Editor killed by signal"
msgstr "Editor mort pel senyal"
#: src/LYEdit.c:280
-#, fuzzy, c-format
-#| msgid "Editor returned with error status, %s"
+#, c-format
msgid "Editor returned with error status %s"
-msgstr "L'editor ha finalitzat amb l'error \"%s\""
+msgstr "L'editor ha retornat l'estat d'error %s"
#: src/LYDownload.c:509
msgid "Downloaded link:"
@@ -3857,48 +3848,46 @@ msgid "Save to disk"
msgstr "Guardar al disc"
#: src/LYDownload.c:550
-#, fuzzy
-#| msgid "View the file "
msgid "View temporary file"
-msgstr "Veure el fitxer"
+msgstr "Visualitza el fitxer temporari"
#: src/LYDownload.c:557
msgid "Save to disk disabled."
msgstr "La gravaci� en disc est� desactivada."
-#: src/LYDownload.c:561 src/LYPrint.c:1322
+#: src/LYDownload.c:561 src/LYPrint.c:1330
msgid "Local additions:"
msgstr "Addicions locals:"
-#: src/LYDownload.c:572 src/LYUpload.c:209
+#: src/LYDownload.c:572 src/LYUpload.c:206
msgid "No Name Given"
msgstr "No heu donat cap nom"
-#: src/LYHistory.c:679
+#: src/LYHistory.c:680
msgid "You selected:"
msgstr "Heu triat:"
-#: src/LYHistory.c:703 src/LYHistory.c:932
+#: src/LYHistory.c:704 src/LYHistory.c:933
msgid "(no address)"
msgstr "(cap adre�a)"
-#: src/LYHistory.c:707
+#: src/LYHistory.c:708
msgid " (internal)"
msgstr " (intern)"
-#: src/LYHistory.c:709
+#: src/LYHistory.c:710
msgid " (was internal)"
msgstr " (era intern)"
-#: src/LYHistory.c:807
+#: src/LYHistory.c:808
msgid " (From History)"
msgstr " (De l'historial)"
-#: src/LYHistory.c:852
+#: src/LYHistory.c:853
msgid "You visited (POSTs, bookmark, menu and list files excluded):"
msgstr "Heu visitat (excepte POSTs, adreces d'inter�s, fitxers del men�i de la llista:"
-#: src/LYHistory.c:1154
+#: src/LYHistory.c:1155
msgid "(No messages yet)"
msgstr "(Cap missatge encara)"
@@ -3908,7 +3897,7 @@ msgstr "S'ha detectat un punter inv
#: src/LYLeaks.c:224 src/LYLeaks.c:262
msgid "Sequence:"
-msgstr ""
+msgstr "Seq��ncia:"
#: src/LYLeaks.c:227 src/LYLeaks.c:265
msgid "Pointer:"
@@ -3932,11 +3921,11 @@ msgstr "Cont
#: src/LYLeaks.c:281
msgid "ByteSize:"
-msgstr ""
+msgstr "Mida en bytes:"
#: src/LYLeaks.c:295
msgid "realloced:"
-msgstr ""
+msgstr "reassignat:"
#: src/LYLeaks.c:316
msgid "Total memory leakage this run:"
@@ -3944,41 +3933,41 @@ msgstr "P
#: src/LYLeaks.c:320
msgid "Peak allocation"
-msgstr ""
+msgstr "Assignaci� de pic"
#: src/LYLeaks.c:322
msgid "Bytes allocated"
-msgstr ""
+msgstr "Bytes assignats"
#: src/LYLeaks.c:324
msgid "Total mallocs"
-msgstr ""
+msgstr "Mallocs totals"
#: src/LYLeaks.c:326
msgid "Total frees"
-msgstr ""
+msgstr "Lliures totals"
-#: src/LYList.c:88
+#: src/LYList.c:89
msgid "References in "
msgstr "Refer�ncies en "
-#: src/LYList.c:91
+#: src/LYList.c:92
msgid "this document:"
msgstr "aquest document:"
-#: src/LYList.c:97
+#: src/LYList.c:98
msgid "Visible links:"
msgstr "Enlla�os visibles:"
-#: src/LYList.c:201 src/LYList.c:312
+#: src/LYList.c:202 src/LYList.c:321
msgid "Hidden links:"
msgstr "Enlla�os ocults:"
-#: src/LYList.c:349
+#: src/LYList.c:358
msgid "References"
msgstr "Refer�ncies"
-#: src/LYList.c:353
+#: src/LYList.c:362
msgid "Visible links"
msgstr "Enlla�os visibles"
@@ -3991,325 +3980,316 @@ msgstr "Ha estat impossible obtenir l'estat de \"%s\"."
msgid "The selected item is not a file or a directory! Request ignored."
msgstr "L'element triat no �s ni un fitxer ni un directori! Sol�licitud ignorada."
-#: src/LYLocal.c:455
+#: src/LYLocal.c:456
#, c-format
msgid "Unable to %s due to system error!"
msgstr "Ha estat impossible %s a causa d'un error del sistema!"
-#: src/LYLocal.c:489
+#: src/LYLocal.c:490
#, c-format
msgid "Probable failure to %s due to system error!"
-msgstr ""
+msgstr "Fallada probable a %s degut a un error de sistema!"
-#: src/LYLocal.c:554 src/LYLocal.c:577
+#: src/LYLocal.c:555 src/LYLocal.c:578
#, c-format
msgid "remove %s"
msgstr "eliminar %s"
-#: src/LYLocal.c:597
+#: src/LYLocal.c:598
#, c-format
msgid "touch %s"
-msgstr ""
+msgstr "fes touch a %s"
-#: src/LYLocal.c:627
+#: src/LYLocal.c:628
#, c-format
msgid "move %s to %s"
msgstr "moure %s a %s"
-#: src/LYLocal.c:675
+#: src/LYLocal.c:676
msgid "There is already a directory with that name! Request ignored."
msgstr "Ja existeig un directori amb aqueix nom! Sol�licitud ignorada."
-#: src/LYLocal.c:677
+#: src/LYLocal.c:678
msgid "There is already a file with that name! Request ignored."
msgstr "Ja existeix un fitxer amb aqueix nom! Sol�licitud ignorada."
-#: src/LYLocal.c:679
+#: src/LYLocal.c:680
msgid "The specified name is already in use! Request ignored."
msgstr "El nom especificat ja s'est� usant! Sol�licitud ignorada. "
-#: src/LYLocal.c:691
+#: src/LYLocal.c:692
msgid "Destination has different owner! Request denied."
msgstr "La destinaci� t� un propietari diferent! Sol�licitud denegada."
-#: src/LYLocal.c:694
+#: src/LYLocal.c:695
msgid "Destination is not a valid directory! Request denied."
msgstr "La destinaci� no �s un directori v�lid! Sol�licitud denegada."
-#: src/LYLocal.c:710
+#: src/LYLocal.c:711
msgid "Source and destination are the same location! Request ignored!"
msgstr "L'origen i la destinaci� coincideixen! Sol�licitud ignorada!"
-#: src/LYLocal.c:734
+#: src/LYLocal.c:735
msgid "Remove all tagged files and directories?"
msgstr "Esborrar tots els fitxers i directoris indicats?"
-#: src/LYLocal.c:807
+#: src/LYLocal.c:808
msgid "Enter new location for tagged items: "
msgstr "Introdu�u la nova ubicaci� per als elements indicats: "
-#: src/LYLocal.c:905
+#: src/LYLocal.c:906
msgid "Enter new name for directory: "
msgstr "Introdu�u el nou nom del directori: "
-#: src/LYLocal.c:907
+#: src/LYLocal.c:908
msgid "Enter new name for file: "
msgstr "Introdu�u el nou nom del directori: "
-#: src/LYLocal.c:919
+#: src/LYLocal.c:920
msgid "Illegal character (path-separator) found! Request ignored."
msgstr "S'ha trobat un car�cter il�legal (separador de cam�). Sol�licitudignorada"
-#: src/LYLocal.c:969
+#: src/LYLocal.c:970
msgid "Enter new location for directory: "
msgstr "Introdu�u la nova ubicaci� per al directori: "
-#: src/LYLocal.c:971
+#: src/LYLocal.c:972
msgid "Enter new location for file: "
msgstr "Introdu�u la nova ubicaci� per al fitxer: "
-#: src/LYLocal.c:998
+#: src/LYLocal.c:999
msgid "Unexpected failure - unable to find trailing path separator"
msgstr "Error inesperat: ha estat impossible trobar el separador de cam�"
-#: src/LYLocal.c:1060
+#: src/LYLocal.c:1061
msgid "Modify name, location, or permission (n, l, or p): "
msgstr "Modificar nom, ubicaci� o permisos (n, l, p): "
-#: src/LYLocal.c:1062
+#: src/LYLocal.c:1063
msgid "Modify name or location (n or l): "
msgstr "Modificar nom o ubicaci� (n, l): "
#.
#. * Code for changing ownership needed here.
#.
-#: src/LYLocal.c:1091
+#: src/LYLocal.c:1092
msgid "This feature not yet implemented!"
msgstr "Aquesta caracter�stica no est� encara disponible!"
-#: src/LYLocal.c:1112
+#: src/LYLocal.c:1113
msgid "Enter name of file to create: "
msgstr "Introdu�u el nom del fitxer que voleu crear: "
-#: src/LYLocal.c:1115 src/LYLocal.c:1152
+#: src/LYLocal.c:1116 src/LYLocal.c:1153
msgid "Illegal redirection \"//\" found! Request ignored."
msgstr "S'ha trobat una redirecci� il�legal \"//\"! Sol�licitud ignorada."
-#: src/LYLocal.c:1149
+#: src/LYLocal.c:1150
msgid "Enter name for new directory: "
msgstr "Introdu�u el nom del nou directori: "
-#: src/LYLocal.c:1190
+#: src/LYLocal.c:1191
msgid "Create file or directory (f or d): "
msgstr "Crear un fitxer o un directori (f, d): "
-#: src/LYLocal.c:1232
-#, fuzzy, c-format
-#| msgid "Remove file '%s'?"
+#: src/LYLocal.c:1233
+#, c-format
msgid "Remove directory '%s'?"
-msgstr "Voleu eliminar l'arxiu '%s'?"
+msgstr "Voleu eliminar el directori �%s�?"
-#: src/LYLocal.c:1235
-#, fuzzy
-#| msgid " directory"
+#: src/LYLocal.c:1236
msgid "Remove directory?"
-msgstr " directori"
+msgstr "Voleu eliminar el directori?"
-#: src/LYLocal.c:1240
+#: src/LYLocal.c:1241
#, c-format
msgid "Remove file '%s'?"
msgstr "Voleu eliminar l'arxiu '%s'?"
-#: src/LYLocal.c:1242
+#: src/LYLocal.c:1243
msgid "Remove file?"
msgstr "Voleu eliminar l'arxiu?"
-#: src/LYLocal.c:1247
+#: src/LYLocal.c:1248
#, c-format
msgid "Remove symbolic link '%s'?"
msgstr "Voleu eliminar l'enlla� simb�lic '%s'?"
-#: src/LYLocal.c:1249
+#: src/LYLocal.c:1250
msgid "Remove symbolic link?"
msgstr "Voleu eliminar l'enlla� simb�lic?"
-#: src/LYLocal.c:1347
+#: src/LYLocal.c:1348
msgid "Sorry, don't know how to permit non-UNIX files yet."
msgstr "Lynx, de moment, no pot gestionar els permisos de fitxers no-UNIX."
-#: src/LYLocal.c:1376
+#: src/LYLocal.c:1377
msgid "Unable to open permit options file"
msgstr "No s'ha pogut obrir el fitxer d'opcions de permisos"
-#: src/LYLocal.c:1404
+#: src/LYLocal.c:1405
msgid "Specify permissions below:"
msgstr "Especifiqueu els permisos:"
-#: src/LYLocal.c:1405 src/LYShowInfo.c:265
+#: src/LYLocal.c:1406 src/LYShowInfo.c:287
msgid "Owner:"
msgstr "Propietari:"
-#: src/LYLocal.c:1421
+#: src/LYLocal.c:1422
msgid "Group"
msgstr "Grup"
-#: src/LYLocal.c:1437
+#: src/LYLocal.c:1438
msgid "Others:"
msgstr "Altres:"
-#: src/LYLocal.c:1455
+#: src/LYLocal.c:1456
msgid "form to permit"
-msgstr ""
+msgstr "formulari a perm�s"
-#: src/LYLocal.c:1551
+#: src/LYLocal.c:1552
msgid "Invalid mode format."
msgstr "Format inv�lid."
-#: src/LYLocal.c:1555
+#: src/LYLocal.c:1556
msgid "Invalid syntax format."
msgstr "Sintaxi incorrecta."
-#: src/LYLocal.c:1742
+#: src/LYLocal.c:1743
msgid "Warning! UUDecoded file will exist in the directory you started Lynx."
-msgstr ""
+msgstr "Advertiment! El fitxer tractat amb l'UUDecode existir� al directori on heu iniciat el Lynx."
-#: src/LYLocal.c:1932
+#: src/LYLocal.c:1933
msgid "NULL URL pointer"
-msgstr ""
+msgstr "Punter URL NULL"
-#: src/LYLocal.c:2014
+#: src/LYLocal.c:2015
#, c-format
msgid "Executing %s "
msgstr "Executant %s "
-#: src/LYLocal.c:2017
+#: src/LYLocal.c:2018
msgid "Executing system command. This might take a while."
msgstr "Executant una ordre del sistema. Pot tardar una mica."
-#: src/LYLocal.c:2091
+#: src/LYLocal.c:2092
msgid "Current directory:"
msgstr "Directori actual:"
-#: src/LYLocal.c:2094 src/LYLocal.c:2112
+#: src/LYLocal.c:2095 src/LYLocal.c:2113
msgid "Current selection:"
msgstr "Selecci� actual:"
-#: src/LYLocal.c:2098
+#: src/LYLocal.c:2099
msgid "Nothing currently selected."
msgstr "Actualment no hi ha res seleccionat."
-#: src/LYLocal.c:2114
+#: src/LYLocal.c:2115
msgid "tagged item:"
msgstr "element marcat:"
-#: src/LYLocal.c:2115
+#: src/LYLocal.c:2116
msgid "tagged items:"
msgstr "elements marcats:"
-#: src/LYLocal.c:2215 src/LYLocal.c:2224
+#: src/LYLocal.c:2216 src/LYLocal.c:2225
msgid "Illegal filename; request ignored."
msgstr "Nom de fitxer il�legal; sol�licitud ignorada."
#. directory not writable
-#: src/LYLocal.c:2322 src/LYLocal.c:2381
+#: src/LYLocal.c:2323 src/LYLocal.c:2382
msgid "Install in the selected directory not permitted."
msgstr "Est� prohibida la instal�laci� en el directori que heu triat."
-#: src/LYLocal.c:2377
+#: src/LYLocal.c:2378
msgid "The selected item is not a directory! Request ignored."
msgstr "L'element que heu triat no �s un directori! Solicitud ignorada."
-#: src/LYLocal.c:2386
+#: src/LYLocal.c:2387
msgid "Just a moment, ..."
msgstr "Un moment..."
-#: src/LYLocal.c:2403
+#: src/LYLocal.c:2404
msgid "Error building install args"
-msgstr ""
+msgstr "S'ha produ�t un error quan s'estaven construint els arguments d'instal�laci�"
-#: src/LYLocal.c:2418 src/LYLocal.c:2449
+#: src/LYLocal.c:2419 src/LYLocal.c:2450
#, c-format
msgid "Source and target are the same: %s"
msgstr "L'origen i la destinaci� s�n el mateix: %s"
-#: src/LYLocal.c:2425 src/LYLocal.c:2456
+#: src/LYLocal.c:2426 src/LYLocal.c:2457
#, c-format
msgid "Already in target directory: %s"
msgstr "�s aquest, el directori de destinaci�: %s"
-#: src/LYLocal.c:2474
+#: src/LYLocal.c:2475
msgid "Installation complete"
msgstr "Instal�laci� completada"
-#: src/LYLocal.c:2666
+#: src/LYLocal.c:2680
msgid "Temporary URL or list would be too long."
msgstr "La URL temporal o la llista serien massa llargues."
-#: src/LYMail.c:544
+#: src/LYMail.c:566
msgid "Sending"
msgstr "Enviant"
-#: src/LYMail.c:1030
+#: src/LYMail.c:1050
#, c-format
msgid "The link %s :?: %s \n"
-msgstr ""
+msgstr "L'enlla� %s :?: %s \n"
-#: src/LYMail.c:1032
+#: src/LYMail.c:1052
#, c-format
msgid "called \"%s\"\n"
-msgstr ""
+msgstr "s'ha cridat �%s�\n"
-#: src/LYMail.c:1033
+#: src/LYMail.c:1053
#, c-format
msgid "in the file \"%s\" called \"%s\"\n"
-msgstr ""
+msgstr "al fitxer �%s� s'ha cridat �%s�\n"
-#: src/LYMail.c:1034
+#: src/LYMail.c:1054
msgid "was requested but was not available."
-msgstr ""
+msgstr "s'ha demanat per� no estava disponible."
-#: src/LYMail.c:1035
+#: src/LYMail.c:1055
msgid "Thought you might want to know."
msgstr "Potser ho volieu saber."
-#: src/LYMail.c:1037
+#: src/LYMail.c:1057
msgid "This message was automatically generated by"
msgstr "Aquest missatge va ser generat autom�ticament per"
-#: src/LYMail.c:1751
+#: src/LYMail.c:1770
msgid "No system mailer configured"
-msgstr ""
+msgstr "No hi ha cap servidor de correu de sistema configurat"
-#: src/LYMain.c:1049
+#: src/LYMain.c:1069
msgid "No Winsock found, sorry."
msgstr "No s'ha trobat Winsock."
-#: src/LYMain.c:1240
-#, fuzzy
-#| msgid "You MUST define a valid TMP or TEMP area!\n"
+#: src/LYMain.c:1260
msgid "You MUST define a valid TMP or TEMP area!"
-msgstr "Heu de definir una �rea TMP o TEMP v�lida!\n"
+msgstr "Heu de definir una �rea TMP o TEMP v�lida!"
-#: src/LYMain.c:1293 src/LYMainLoop.c:5260
+#: src/LYMain.c:1313 src/LYMainLoop.c:5283
msgid "No such directory"
msgstr "No existeix el directori"
-#: src/LYMain.c:1487
-#, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Configuration file %s is not available.\n"
-#| "\n"
+#: src/LYMain.c:1507
+#, c-format
msgid ""
"\n"
"Configuration file \"%s\" is not available.\n"
"\n"
msgstr ""
"\n"
-"El fitxer de configuraci� %s no est� disponible\n"
+"El fitxer de configuraci� �%s� no est� disponible\n"
"\n"
-#: src/LYMain.c:1497
+#: src/LYMain.c:1517
#, c-format
msgid ""
"\n"
@@ -4319,220 +4299,184 @@ msgstr ""
"\n"
"Els jocs de car�cters no estan declarats.\n"
-#: src/LYMain.c:1526
-#, c-format
-msgid ""
-"\n"
-"Lynx edit map not declared.\n"
-"\n"
-msgstr ""
-
-#: src/LYMain.c:1608
-#, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Lynx file %s is not available.\n"
-#| "\n"
-msgid ""
-"\n"
-"Lynx file \"%s\" is not available.\n"
-"\n"
-msgstr ""
-"\n"
-"El fitxer %s no est� disponible.\n"
-"\n"
-
-#: src/LYMain.c:1683
+#: src/LYMain.c:1654
#, c-format
msgid "Ignored %d characters from standard input.\n"
-msgstr ""
+msgstr "S'han ignorat %d car�cters de l'entrada est�ndard.\n"
-#: src/LYMain.c:1685
+#: src/LYMain.c:1656
#, c-format
msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
-msgstr ""
+msgstr "Useu �-stdin� o �-� per especificar com gestionar l'entrada canalitzada.\n"
-#: src/LYMain.c:1843
+#: src/LYMain.c:1814
msgid "Warning:"
msgstr "Alerta:"
-#: src/LYMain.c:2408
+#: src/LYMain.c:2384
msgid "persistent cookies state will be changed in next session only."
msgstr "l'estat de les cookies persistents no es canviar� fins la seg�ent sessi�"
-#: src/LYMain.c:2644 src/LYMain.c:2689
+#: src/LYMain.c:2621 src/LYMain.c:2666
#, c-format
msgid "Lynx: ignoring unrecognized charset=%s\n"
msgstr "Lynx: joc de car�cters %s no reconegut. S'ignorar�.\n"
-#: src/LYMain.c:3208
-#, fuzzy, c-format
-#| msgid "%s Version %s (%s)\n"
+#: src/LYMain.c:3185
+#, c-format
msgid "%s Version %s (%s)"
-msgstr "%s Versi� %s (%s)\n"
+msgstr "%s Versi� %s (%s)"
-#: src/LYMain.c:3246
+#: src/LYMain.c:3223
#, c-format
msgid "Built on %s %s %s\n"
msgstr "Compilat per a %s el %s a les %s\n"
-#: src/LYMain.c:3268
+#: src/LYMain.c:3245
msgid "Copyrights held by the Lynx Developers Group,"
-msgstr ""
+msgstr "Els Copyright els mant� el Lynx Developers Group."
-#: src/LYMain.c:3269
-#, fuzzy
-#| msgid "Copyrights held by the University of Kansas, CERN, and other contributors.\n"
+#: src/LYMain.c:3246
msgid "the University of Kansas, CERN, and other contributors."
-msgstr ""
-"Els drets de c�pia pertanyen a la Universitat de Kansas, el CERN i altres\n"
-"contribu�dors.\n"
+msgstr "la Universitat de Kansas, el CERN i altres contribu�dors."
-#: src/LYMain.c:3270
-#, fuzzy
-#| msgid "Distributed under the GNU General Public License.\n"
+#: src/LYMain.c:3247
msgid "Distributed under the GNU General Public License (Version 2)."
-msgstr "Distribu�t sota la Llic�ncia P�blica General.\n"
+msgstr "Distribu�t sota la Llic�ncia P�blica General GNU (Versi� 2)."
-#: src/LYMain.c:3271
-#, fuzzy
-#| msgid ""
-#| "See http://lynx.browser.org/ and the online help for more information.\n"
-#| "\n"
+#: src/LYMain.c:3248
msgid "See http://lynx.isc.org/ and the online help for more information."
-msgstr ""
-"Vegeu http://lynx.browser.org/ i l'ajuda en l�nia per a m�s informaci�.\n"
-"\n"
+msgstr "Vegeu http://lynx.isc.org/ i l'ajuda en l�nia per a m�s informaci�."
-#: src/LYMain.c:4104
+#: src/LYMain.c:4091
#, c-format
msgid "USAGE: %s [options] [file]\n"
msgstr "UTILITZACI�: %s [opcions] [arxiu]\n"
-#: src/LYMain.c:4105
+#: src/LYMain.c:4092
#, c-format
msgid "Options are:\n"
msgstr "Les opcions s�n:\n"
-#: src/LYMain.c:4406
+#: src/LYMain.c:4395
#, c-format
msgid "%s: Invalid Option: %s\n"
msgstr "%s: l'opci� no �s v�lida: %s\n"
-#: src/LYMainLoop.c:575
+#: src/LYMainLoop.c:572
#, c-format
msgid "Internal error: Invalid mouse link %d!"
msgstr "Error intern: l'enlla� del ratol� no �s v�lid: %d!"
-#: src/LYMainLoop.c:696 src/LYMainLoop.c:5282
+#: src/LYMainLoop.c:693 src/LYMainLoop.c:5305
msgid "A URL specified by the user"
msgstr "Una URL especificada per l'usuari"
-#: src/LYMainLoop.c:1148
+#: src/LYMainLoop.c:1142
msgid "Enctype multipart/form-data not yet supported! Cannot submit."
-msgstr ""
+msgstr "Les dades de formulari de m�ltiples parts i format enctype encara no estan suportades."
#.
#. * Make a name for this help file.
#.
-#: src/LYMainLoop.c:3177
+#: src/LYMainLoop.c:3196
msgid "Help Screen"
msgstr "Pantalla d'ajuda"
-#: src/LYMainLoop.c:3308
+#: src/LYMainLoop.c:3327
msgid "System Index"
msgstr "�ndex del sistema"
-#: src/LYMainLoop.c:3556
+#: src/LYMainLoop.c:3575
#, c-format
msgid "Query parameter %d: "
-msgstr ""
+msgstr "Demana el parametre %d: "
-#: src/LYMainLoop.c:3781 src/LYMainLoop.c:5558
+#: src/LYMainLoop.c:3804 src/LYMainLoop.c:5581
msgid "Entry into main screen"
msgstr "Entrar en la pantalla principal"
-#: src/LYMainLoop.c:4039
+#: src/LYMainLoop.c:4062
msgid "No next document present"
msgstr "No hi ha cap document m�s"
-#: src/LYMainLoop.c:4334
+#: src/LYMainLoop.c:4357
msgid "charset for this document specified explicitly, sorry..."
msgstr "el joc de car�cters per a aquest document est� especificat explicitament"
-#: src/LYMainLoop.c:5240
+#: src/LYMainLoop.c:5263
msgid "cd to:"
msgstr "canvia al directori:"
-#: src/LYMainLoop.c:5263
+#: src/LYMainLoop.c:5286
msgid "A component of path is not a directory"
msgstr "Un component del cam� no �s un directori"
-#: src/LYMainLoop.c:5266
+#: src/LYMainLoop.c:5289
msgid "failed to change directory"
msgstr "no ha estat possible canviar de directori"
-#: src/LYMainLoop.c:6496
+#: src/LYMainLoop.c:6515
msgid "Reparsing document under current settings..."
msgstr "Tornant a analitzar el document amb les opcions actuals..."
-#: src/LYMainLoop.c:6790
+#: src/LYMainLoop.c:6809
#, c-format
msgid "Fatal error - could not open output file %s\n"
msgstr "Error fatal: no s'ha pogut obrir el fitxer d'eixida %s\n"
-#: src/LYMainLoop.c:7128
+#: src/LYMainLoop.c:7151
msgid "TABLE center enable."
-msgstr ""
+msgstr "Habilita el centrat de la taula."
-#: src/LYMainLoop.c:7131
+#: src/LYMainLoop.c:7154
msgid "TABLE center disable."
-msgstr ""
+msgstr "Deshabilita el centrat de la taula."
-#: src/LYMainLoop.c:7211
+#: src/LYMainLoop.c:7234
msgid "Current URL is empty."
msgstr "La URL actual �s buida."
-#: src/LYMainLoop.c:7213 src/LYUtils.c:1881
+#: src/LYMainLoop.c:7236 src/LYUtils.c:1917
msgid "Copy to clipboard failed."
msgstr "No s'ha pogut copiar al porta-retalls."
-#: src/LYMainLoop.c:7215
+#: src/LYMainLoop.c:7238
msgid "Document URL put to clipboard."
msgstr "La URL del document s'ha copiat al porta-retalls."
-#: src/LYMainLoop.c:7217
+#: src/LYMainLoop.c:7240
msgid "Link URL put to clipboard."
msgstr "La URL de l'enlla� s'ha copiat al porta-retalls."
-#: src/LYMainLoop.c:7244
+#: src/LYMainLoop.c:7267
msgid "No URL in the clipboard."
msgstr "No hi ha cap URL al porta-retalls."
-#: src/LYMainLoop.c:7936 src/LYMainLoop.c:8105
+#: src/LYMainLoop.c:7960 src/LYMainLoop.c:8131
msgid "-index-"
msgstr "-�ndex-"
-#: src/LYMainLoop.c:8045
+#: src/LYMainLoop.c:8069
msgid "lynx: Can't access startfile"
msgstr "lynx: No s'ha pogut accedir al fitxer inicial"
-#: src/LYMainLoop.c:8057
+#: src/LYMainLoop.c:8081
msgid "lynx: Start file could not be found or is not text/html or text/plain"
msgstr "lynx: No s'ha trobat el fitxer o no �s text/html ni text/plain"
-#: src/LYMainLoop.c:8058
+#: src/LYMainLoop.c:8082
msgid " Exiting..."
msgstr " Eixint..."
-#: src/LYMainLoop.c:8099
+#: src/LYMainLoop.c:8125
msgid "-more-"
msgstr "-m�s-"
#. Enable scrolling.
#: src/LYNews.c:186
msgid "You will be posting to:"
-msgstr ""
+msgstr "Estareu publicant a:"
#.
#. * Get the mail address for the From header, offering personal_mail_address
@@ -4589,392 +4533,374 @@ msgstr ""
msgid "Message has no original text!"
msgstr "El missatge no cont� text original!"
-#: src/LYOptions.c:770
+#: src/LYOptions.c:774
msgid "review/edit B)ookmarks files"
msgstr "B revisar/editar fixers de favorits"
-#: src/LYOptions.c:772
+#: src/LYOptions.c:776
msgid "B)ookmark file: "
msgstr "B fitxer de favorits:"
-#: src/LYOptions.c:2120 src/LYOptions.c:2127
+#: src/LYOptions.c:2123 src/LYOptions.c:2130
msgid "ON"
-msgstr ""
+msgstr "Activat"
#. verbose_img variable
-#: src/LYOptions.c:2121 src/LYOptions.c:2126 src/LYOptions.c:2289
-#: src/LYOptions.c:2300
+#: src/LYOptions.c:2124 src/LYOptions.c:2129 src/LYOptions.c:2302
+#: src/LYOptions.c:2313
msgid "OFF"
-msgstr ""
+msgstr "Desactivat"
-#: src/LYOptions.c:2122
+#: src/LYOptions.c:2125
msgid "NEVER"
-msgstr ""
+msgstr "Mai"
-#: src/LYOptions.c:2123
+#: src/LYOptions.c:2126
msgid "ALWAYS"
-msgstr ""
+msgstr "Sempre"
-#: src/LYOptions.c:2139 src/LYOptions.c:2281
+#: src/LYOptions.c:2142 src/LYOptions.c:2294
msgid "ignore"
-msgstr ""
+msgstr "ignora"
-#: src/LYOptions.c:2140
+#: src/LYOptions.c:2143
msgid "ask user"
-msgstr ""
+msgstr "pregunta l'usuari"
-#: src/LYOptions.c:2141
+#: src/LYOptions.c:2144
msgid "accept all"
-msgstr ""
+msgstr "accepta tot"
-#: src/LYOptions.c:2153
+#: src/LYOptions.c:2156
msgid "ALWAYS OFF"
-msgstr ""
+msgstr "sempre desactivat"
-#: src/LYOptions.c:2154
+#: src/LYOptions.c:2157
msgid "FOR LOCAL FILES ONLY"
-msgstr ""
+msgstr "sols per fitxers locals"
-#: src/LYOptions.c:2156
+#: src/LYOptions.c:2159
msgid "ALWAYS ON"
-msgstr ""
+msgstr "sempre activat"
-#: src/LYOptions.c:2168
+#: src/LYOptions.c:2171
msgid "Numbers act as arrows"
-msgstr ""
+msgstr "Els n�meros actuen com a fletxes"
-#: src/LYOptions.c:2170
+#: src/LYOptions.c:2173
msgid "Links are numbered"
-msgstr ""
+msgstr "Els enlla�os estan numerats"
-#: src/LYOptions.c:2173
+#: src/LYOptions.c:2176
msgid "Links and form fields are numbered"
-msgstr ""
+msgstr "Els enlla�os i els camps de formulari estan numerats"
-#: src/LYOptions.c:2176
+#: src/LYOptions.c:2179
msgid "Form fields are numbered"
-msgstr ""
+msgstr "Els camps de formulari estan numerats"
-#: src/LYOptions.c:2191
+#: src/LYOptions.c:2194
msgid "Case insensitive"
-msgstr ""
+msgstr "Insensible a maj�scules/min�scules"
-#: src/LYOptions.c:2192
+#: src/LYOptions.c:2195
msgid "Case sensitive"
-msgstr ""
+msgstr "Sensible a maj�scules/min�scules<"
-#: src/LYOptions.c:2216
+#: src/LYOptions.c:2229
msgid "prompt normally"
-msgstr ""
+msgstr "pregunta normalment"
-#: src/LYOptions.c:2217
+#: src/LYOptions.c:2230
msgid "force yes-response"
-msgstr ""
+msgstr "for�a una resposta afirmativa"
-#: src/LYOptions.c:2218
+#: src/LYOptions.c:2231
msgid "force no-response"
-msgstr ""
+msgstr "for�a una resposta negativa"
-#: src/LYOptions.c:2236
+#: src/LYOptions.c:2249
msgid "Novice"
-msgstr ""
+msgstr "Novat"
-#: src/LYOptions.c:2237
+#: src/LYOptions.c:2250
msgid "Intermediate"
-msgstr ""
+msgstr "Intermedi"
-#: src/LYOptions.c:2238
+#: src/LYOptions.c:2251
msgid "Advanced"
-msgstr ""
+msgstr "Avan�at"
-#: src/LYOptions.c:2247
+#: src/LYOptions.c:2260
msgid "By First Visit"
-msgstr ""
+msgstr "Per primer visita"
-#: src/LYOptions.c:2249
+#: src/LYOptions.c:2262
msgid "By First Visit Reversed"
-msgstr ""
+msgstr "Per primera vista en sentit invers"
-#: src/LYOptions.c:2250
+#: src/LYOptions.c:2263
msgid "As Visit Tree"
-msgstr ""
+msgstr "Com a arbre de visites"
-#: src/LYOptions.c:2251
+#: src/LYOptions.c:2264
msgid "By Last Visit"
-msgstr ""
+msgstr "Per l'�ltima visita"
-#: src/LYOptions.c:2253
+#: src/LYOptions.c:2266
msgid "By Last Visit Reversed"
-msgstr ""
+msgstr "Per l'�ltima visita en sentit invers"
#. Old_DTD variable
-#: src/LYOptions.c:2264
+#: src/LYOptions.c:2277
msgid "relaxed (TagSoup mode)"
-msgstr ""
+msgstr "relaxat (mode TagSoup)"
-#: src/LYOptions.c:2265
+#: src/LYOptions.c:2278
msgid "strict (SortaSGML mode)"
-msgstr ""
+msgstr "estricte (mode SortaSGML)"
-#: src/LYOptions.c:2272
+#: src/LYOptions.c:2285
msgid "Ignore"
-msgstr ""
+msgstr "Ignora"
-#: src/LYOptions.c:2273
+#: src/LYOptions.c:2286
msgid "Add to trace-file"
-msgstr ""
+msgstr "Afegeix al fitxer de tra�a"
-#: src/LYOptions.c:2274
+#: src/LYOptions.c:2287
msgid "Add to LYNXMESSAGES"
-msgstr ""
+msgstr "Afegeix a LYNXMESSAGES"
-#: src/LYOptions.c:2275
-#, fuzzy
-#| msgid "Points to file:"
+#: src/LYOptions.c:2288
msgid "Warn, point to trace-file"
-msgstr "Apunta al fitxer:"
+msgstr "Adverteix, apunta al fitxer de rastre"
-#: src/LYOptions.c:2282
+#: src/LYOptions.c:2295
msgid "as labels"
-msgstr ""
+msgstr "com a etiquetes"
-#: src/LYOptions.c:2283
-#, fuzzy
-#| msgid "this link"
+#: src/LYOptions.c:2296
msgid "as links"
-msgstr "ac�"
+msgstr "com a enlla�os"
-#: src/LYOptions.c:2290
-#, fuzzy
-#| msgid " (bad file name)"
+#: src/LYOptions.c:2303
msgid "show filename"
-msgstr " (nom de fitxer incorrecte)"
+msgstr "mostra el nom del fitxer"
-#: src/LYOptions.c:2301
+#: src/LYOptions.c:2314
msgid "STANDARD"
-msgstr ""
+msgstr "ESTANDARD"
-#: src/LYOptions.c:2302
+#: src/LYOptions.c:2315
msgid "ADVANCED"
-msgstr ""
+msgstr "AVAN�AT"
-#: src/LYOptions.c:2336
-#, fuzzy
-#| msgid "Subdirectories:"
+#: src/LYOptions.c:2349
msgid "Directories first"
-msgstr "Subdirectoris:"
+msgstr "Primer els directoris"
-#: src/LYOptions.c:2337
-#, fuzzy
-#| msgid " first"
+#: src/LYOptions.c:2350
msgid "Files first"
-msgstr " primer"
+msgstr "Primer els fitxers"
-#: src/LYOptions.c:2338
+#: src/LYOptions.c:2351
msgid "Mixed style"
-msgstr ""
+msgstr "Estile barrejat"
-#: src/LYOptions.c:2346 src/LYOptions.c:2366
-#, fuzzy
-#| msgid "Name:"
+#: src/LYOptions.c:2359 src/LYOptions.c:2379
msgid "By Name"
-msgstr "Nom:"
+msgstr "Per nom"
-#: src/LYOptions.c:2347 src/LYOptions.c:2367
+#: src/LYOptions.c:2360 src/LYOptions.c:2380
msgid "By Type"
-msgstr ""
+msgstr "Per tipus"
-#: src/LYOptions.c:2348 src/LYOptions.c:2368
+#: src/LYOptions.c:2361 src/LYOptions.c:2381
msgid "By Size"
-msgstr ""
+msgstr "Per Mida"
-#: src/LYOptions.c:2349 src/LYOptions.c:2369
-#, fuzzy
-#| msgid "Date:"
+#: src/LYOptions.c:2362 src/LYOptions.c:2382
msgid "By Date"
-msgstr "Data:"
+msgstr "Per data"
-#: src/LYOptions.c:2350
+#: src/LYOptions.c:2363
msgid "By Mode"
-msgstr ""
+msgstr "Per mode"
-#: src/LYOptions.c:2352
+#: src/LYOptions.c:2365
msgid "By User"
-msgstr ""
+msgstr "Per usuari"
-#: src/LYOptions.c:2353
-#, fuzzy
-#| msgid "Group"
+#: src/LYOptions.c:2366
msgid "By Group"
-msgstr "Grup"
+msgstr "Per grup"
-#: src/LYOptions.c:2378
+#: src/LYOptions.c:2391
msgid "Do not show rate"
-msgstr ""
+msgstr "No mostris la taxa"
-#: src/LYOptions.c:2379 src/LYOptions.c:2380
-#, fuzzy, c-format
-#| msgid "Show transfer rate"
+#: src/LYOptions.c:2392 src/LYOptions.c:2393
+#, c-format
msgid "Show %s/sec rate"
-msgstr "Mostrar taxa de transfer�ncia"
+msgstr "Mostra la taxa de %s/segons"
-#: src/LYOptions.c:2382 src/LYOptions.c:2383
+#: src/LYOptions.c:2395 src/LYOptions.c:2396
#, c-format
msgid "Show %s/sec, ETA"
-msgstr ""
+msgstr "Mostra %s/segons, ETA"
+
+#: src/LYOptions.c:2397 src/LYOptions.c:2398
+#, c-format
+msgid "Show %s/sec (2-digits), ETA"
+msgstr "Mostra %s/segons (2-d�gits), ETA"
-#: src/LYOptions.c:2386
-#, fuzzy
-#| msgid "Show scrollbar"
+#: src/LYOptions.c:2401
msgid "Show progressbar"
-msgstr "Mostrar la barra de despla�ament"
+msgstr "Mostrar la barra de progr�s"
-#: src/LYOptions.c:2398
+#: src/LYOptions.c:2413
msgid "Accept lynx's internal types"
-msgstr ""
+msgstr "Accpta els tipus interns del Lynx"
-#: src/LYOptions.c:2399
+#: src/LYOptions.c:2414
msgid "Also accept lynx.cfg's types"
-msgstr ""
+msgstr "Accepta tamb� els tipus de lynx.cfg"
-#: src/LYOptions.c:2400
+#: src/LYOptions.c:2415
msgid "Also accept user's types"
-msgstr ""
+msgstr "Accepta tamb� els tipus de l'usuari"
-#: src/LYOptions.c:2401
+#: src/LYOptions.c:2416
msgid "Also accept system's types"
-msgstr ""
+msgstr "Accepta tamb� els tipus del sistema"
-#: src/LYOptions.c:2402
-#, fuzzy
-#| msgid "Accept Changes"
+#: src/LYOptions.c:2417
msgid "Accept all types"
-msgstr "Acceptar els canvis"
+msgstr "Accepta tots els tipus"
-#: src/LYOptions.c:2411
+#: src/LYOptions.c:2426
msgid "gzip"
-msgstr ""
+msgstr "gzip"
-#: src/LYOptions.c:2412
+#: src/LYOptions.c:2427
msgid "deflate"
-msgstr ""
+msgstr "deflacta"
-#: src/LYOptions.c:2415
+#: src/LYOptions.c:2430
msgid "compress"
-msgstr ""
+msgstr "comprimeix"
-#: src/LYOptions.c:2418
+#: src/LYOptions.c:2433
msgid "bzip2"
-msgstr ""
+msgstr "bzip2"
-#: src/LYOptions.c:2420
+#: src/LYOptions.c:2435
msgid "All"
-msgstr ""
+msgstr "Tot"
-#: src/LYOptions.c:2699 src/LYOptions.c:2728
+#: src/LYOptions.c:2798 src/LYOptions.c:2827
#, c-format
msgid "Use %s to invoke the Options menu!"
msgstr "Useu %s per a invocar el men� d'opcions"
-#: src/LYOptions.c:3541
+#: src/LYOptions.c:3675
msgid "(options marked with (!) will not be saved)"
msgstr "(les opcions marcades amb (!) no es desen)"
-#: src/LYOptions.c:3549
+#: src/LYOptions.c:3683
msgid "General Preferences"
msgstr "Prefer�ncies generals"
#. ***************************************************************
#. User Mode: SELECT
-#: src/LYOptions.c:3553
+#: src/LYOptions.c:3687
msgid "User mode"
msgstr "Tipus d'usuari"
#. Editor: INPUT
-#: src/LYOptions.c:3559
+#: src/LYOptions.c:3693
msgid "Editor"
msgstr "Editor"
#. Search Type: SELECT
-#: src/LYOptions.c:3564
+#: src/LYOptions.c:3698
msgid "Type of Search"
msgstr "Tipus de recerca"
-#: src/LYOptions.c:3569
+#: src/LYOptions.c:3703
msgid "Security and Privacy"
-msgstr ""
+msgstr "Seguretat i privacitat"
#. ***************************************************************
#. Cookies: SELECT
-#: src/LYOptions.c:3573
+#: src/LYOptions.c:3707
msgid "Cookies"
msgstr "Cookies"
#. Cookie Prompting: SELECT
-#: src/LYOptions.c:3587
+#: src/LYOptions.c:3721
msgid "Invalid-Cookie Prompting"
-msgstr ""
+msgstr "Demanda de cookie no v�lida"
#. SSL Prompting: SELECT
-#: src/LYOptions.c:3594
+#: src/LYOptions.c:3728
msgid "SSL Prompting"
-msgstr ""
+msgstr "Demanda de SSL"
-#: src/LYOptions.c:3600
+#: src/LYOptions.c:3734
msgid "Keyboard Input"
msgstr "Teclat"
#. ***************************************************************
#. Keypad Mode: SELECT
-#: src/LYOptions.c:3604
+#: src/LYOptions.c:3738
msgid "Keypad mode"
msgstr "Mode del teclat"
#. Emacs keys: ON/OFF
-#: src/LYOptions.c:3610
+#: src/LYOptions.c:3744
msgid "Emacs keys"
msgstr "Tecles d'emacs"
#. VI Keys: ON/OFF
-#: src/LYOptions.c:3616
+#: src/LYOptions.c:3750
msgid "VI keys"
msgstr "Tecles de VI"
#. Line edit style: SELECT
#. well, at least 2 line edit styles available
-#: src/LYOptions.c:3623
+#: src/LYOptions.c:3757
msgid "Line edit style"
-msgstr ""
+msgstr "Estil d'edici� de la l�nia"
#. Keyboard layout: SELECT
-#: src/LYOptions.c:3635
+#: src/LYOptions.c:3769
msgid "Keyboard layout"
msgstr "Configuraci� del teclat"
#.
#. * Display and Character Set
#.
-#: src/LYOptions.c:3649
+#: src/LYOptions.c:3783
msgid "Display and Character Set"
msgstr "Pantalla i joc de car�cters"
#. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3654
-#, fuzzy
-#| msgid "Display character set"
+#: src/LYOptions.c:3788
msgid "Use locale-based character set"
-msgstr "Joc de car�cters"
+msgstr "Usa el conjunt de car�cters basats en el locale"
-#: src/LYOptions.c:3661
+#: src/LYOptions.c:3795
msgid "Use HTML5 charset replacements"
-msgstr ""
+msgstr "Usa reempla�aments del conjunt de car�cters de l'HTML5"
#. Display Character Set: SELECT
-#: src/LYOptions.c:3667
+#: src/LYOptions.c:3801
msgid "Display character set"
msgstr "Joc de car�cters"
-#: src/LYOptions.c:3698
+#: src/LYOptions.c:3832
msgid "Assumed document character set"
msgstr "Joc de car�cters predeterminat"
@@ -4983,276 +4909,272 @@ msgstr "Joc de car
#. * we split the header to make it more readable:
#. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
#.
-#: src/LYOptions.c:3718
+#: src/LYOptions.c:3852
msgid "CJK mode"
msgstr "mode CJK"
-#: src/LYOptions.c:3720
+#: src/LYOptions.c:3854
msgid "Raw 8-bit"
msgstr "8-bits cru"
#. X Display: INPUT
-#: src/LYOptions.c:3728
+#: src/LYOptions.c:3862
msgid "X Display"
-msgstr ""
+msgstr "Pantalla X"
#.
#. * Document Appearance
#.
-#: src/LYOptions.c:3734
+#: src/LYOptions.c:3868
msgid "Document Appearance"
msgstr "Apari�ncia dels documents"
-#: src/LYOptions.c:3740
+#: src/LYOptions.c:3874
msgid "Show color"
msgstr "En color"
+#. Color style: ON/OFF
+#: src/LYOptions.c:3899
+msgid "Color style"
+msgstr "Estil de color"
+
+#: src/LYOptions.c:3908
+msgid "Default colors"
+msgstr "Color predeterminats"
+
#. Show cursor: ON/OFF
-#: src/LYOptions.c:3764
+#: src/LYOptions.c:3916
msgid "Show cursor"
msgstr "Mostrar cursor"
#. Underline links: ON/OFF
-#: src/LYOptions.c:3770
-#, fuzzy
-#| msgid "Hidden links:"
+#: src/LYOptions.c:3922
msgid "Underline links"
-msgstr "Enlla�os ocults:"
+msgstr "Subratlla els enlla�os"
#. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3777
+#: src/LYOptions.c:3929
msgid "Show scrollbar"
msgstr "Mostrar la barra de despla�ament"
#. Select Popups: ON/OFF
-#: src/LYOptions.c:3784
+#: src/LYOptions.c:3936
msgid "Popups for select fields"
-msgstr ""
+msgstr "Finestres emergents per a camps de selecci�"
#. HTML error recovery: SELECT
-#: src/LYOptions.c:3790
+#: src/LYOptions.c:3942
msgid "HTML error recovery"
msgstr "Recuperaci� d'errors de HTML"
#. Bad HTML messages: SELECT
-#: src/LYOptions.c:3796
+#: src/LYOptions.c:3948
msgid "Bad HTML messages"
-msgstr ""
+msgstr "Missatges incorrectes d'HTML"
#. Show Images: SELECT
-#: src/LYOptions.c:3802
+#: src/LYOptions.c:3954
msgid "Show images"
-msgstr "Mostrar imatges"
+msgstr "Mostra les imatges"
#. Verbose Images: ON/OFF
-#: src/LYOptions.c:3816
+#: src/LYOptions.c:3968
msgid "Verbose images"
msgstr "Detalls sobre imatges"
#.
#. * Headers Transferred to Remote Servers
#.
-#: src/LYOptions.c:3824
+#: src/LYOptions.c:3976
msgid "Headers Transferred to Remote Servers"
msgstr "Cap�aleres que es transmeten als servidors remots"
#. ***************************************************************
#. Mail Address: INPUT
-#: src/LYOptions.c:3828
+#: src/LYOptions.c:3980
msgid "Personal mail address"
msgstr "Adre�a electr�nica personal"
-#: src/LYOptions.c:3833
-#, fuzzy
-#| msgid "Enter new name for file: "
+#: src/LYOptions.c:3985
msgid "Personal name for mail"
-msgstr "Introdu�u el nou nom del directori: "
+msgstr "Adre�a personal del correu electr�nic"
-#: src/LYOptions.c:3840
-#, fuzzy
-#| msgid "Password for news host '%s':"
+#: src/LYOptions.c:3992
msgid "Password for anonymous ftp"
-msgstr "Contrasenya per al servidor de not�cies '%s':"
+msgstr "Contrasenya per al ftp an�nimo"
#. Preferred media type: SELECT
-#: src/LYOptions.c:3846
-#, fuzzy
-#| msgid "Transferred %d bytes"
+#: src/LYOptions.c:3998
msgid "Preferred media type"
-msgstr "%d bytes transferits"
+msgstr "Tipus de suport preferit"
#. Preferred encoding: SELECT
-#: src/LYOptions.c:3852
-#, fuzzy
-#| msgid "Preferred document language"
+#: src/LYOptions.c:4004
msgid "Preferred encoding"
-msgstr "Idioma preferit"
+msgstr "Codificaci� preferida"
#. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3858
+#: src/LYOptions.c:4010
msgid "Preferred document character set"
msgstr "Joc de car�cters preferit"
#. Preferred Document Language: INPUT
-#: src/LYOptions.c:3863
+#: src/LYOptions.c:4015
msgid "Preferred document language"
msgstr "Idioma preferit"
-#: src/LYOptions.c:3869
-#, fuzzy
-#| msgid "User-Agent header"
+#: src/LYOptions.c:4021
msgid "Send User-Agent header"
-msgstr "Identificaci� del navegador"
+msgstr "Envia la cap�alera de l'agent d'usuari"
-#: src/LYOptions.c:3871
+#: src/LYOptions.c:4023
msgid "User-Agent header"
msgstr "Identificaci� del navegador"
#.
#. * Listing and Accessing Files
#.
-#: src/LYOptions.c:3879
+#: src/LYOptions.c:4031
msgid "Listing and Accessing Files"
msgstr "Fitxers: llistat i acc�s"
#. FTP sort: SELECT
-#: src/LYOptions.c:3884
+#: src/LYOptions.c:4036
msgid "Use Passive FTP"
-msgstr ""
+msgstr "Usa el FTP passiu"
#. FTP sort: SELECT
-#: src/LYOptions.c:3890
+#: src/LYOptions.c:4042
msgid "FTP sort criteria"
msgstr "Criteri d'ordenaci� per a FTP"
#. Local Directory Sort: SELECT
-#: src/LYOptions.c:3898
+#: src/LYOptions.c:4050
msgid "Local directory sort criteria"
msgstr "Criteri d'ordenaci� local"
#. Local Directory Order: SELECT
-#: src/LYOptions.c:3904
-#, fuzzy
+#: src/LYOptions.c:4056
msgid "Local directory sort order"
-msgstr "Criteri d'ordenaci� local"
+msgstr "Criteri d'ordenaci� de directoris locals"
-#: src/LYOptions.c:3913
+#: src/LYOptions.c:4065
msgid "Show dot files"
msgstr "Mostrar fitxers .*"
-#: src/LYOptions.c:3921
+#: src/LYOptions.c:4073
msgid "Execution links"
msgstr "Enlla�os d'execuci�"
-#: src/LYOptions.c:3939
+#: src/LYOptions.c:4091
msgid "Pause when showing message"
-msgstr ""
+msgstr "Pausa quan s'estiguin mostrant els missatges"
#. Show transfer rate: SELECT
-#: src/LYOptions.c:3946
+#: src/LYOptions.c:4098
msgid "Show transfer rate"
msgstr "Mostrar taxa de transfer�ncia"
#.
#. * Special Files and Screens
#.
-#: src/LYOptions.c:3966
+#: src/LYOptions.c:4118
msgid "Special Files and Screens"
msgstr "Fitxers i pantalles especials"
-#: src/LYOptions.c:3971
+#: src/LYOptions.c:4123
msgid "Multi-bookmarks"
-msgstr ""
+msgstr "Marcadors multiples"
-#: src/LYOptions.c:3979
+#: src/LYOptions.c:4131
msgid "Review/edit Bookmarks files"
msgstr "Editar fitxers de favorits"
-#: src/LYOptions.c:3982
+#: src/LYOptions.c:4134
msgid "Goto multi-bookmark menu"
msgstr "Veure el men� de m�ltiples fitxers d'adreces"
-#: src/LYOptions.c:3984
+#: src/LYOptions.c:4136
msgid "Bookmarks file"
msgstr "Fitxer de favorits"
#. Auto Session: ON/OFF
-#: src/LYOptions.c:3991
+#: src/LYOptions.c:4143
msgid "Auto Session"
-msgstr ""
+msgstr "Sessi� autom�tica"
#. Session File Menu: INPUT
-#: src/LYOptions.c:3997
+#: src/LYOptions.c:4149
msgid "Session file"
-msgstr ""
+msgstr "Fitxer de sessi�"
#. Visited Pages: SELECT
-#: src/LYOptions.c:4003
+#: src/LYOptions.c:4155
msgid "Visited Pages"
msgstr "P�gines visitades"
-#: src/LYOptions.c:4008
+#: src/LYOptions.c:4160
msgid "View the file "
msgstr "Veure el fitxer"
-#: src/LYPrint.c:947
+#: src/LYPrint.c:955
#, c-format
msgid " Print job complete.\n"
msgstr " Imprimir treball complet.\n"
-#: src/LYPrint.c:1274
+#: src/LYPrint.c:1282
msgid "Document:"
msgstr "Document:"
-#: src/LYPrint.c:1275
+#: src/LYPrint.c:1283
msgid "Number of lines:"
msgstr "Nombre de l�nies:"
-#: src/LYPrint.c:1276
+#: src/LYPrint.c:1284
msgid "Number of pages:"
msgstr "Nombre de p�gines:"
-#: src/LYPrint.c:1277
+#: src/LYPrint.c:1285
msgid "pages"
msgstr "p�gines"
-#: src/LYPrint.c:1277
+#: src/LYPrint.c:1285
msgid "page"
msgstr "p�gina"
-#: src/LYPrint.c:1278
+#: src/LYPrint.c:1286
msgid "(approximately)"
msgstr "(aproximadament)"
-#: src/LYPrint.c:1285
+#: src/LYPrint.c:1293
msgid "Some print functions have been disabled!"
msgstr "Algunes funcions d'impressi� han estat desactivades!"
-#: src/LYPrint.c:1289
+#: src/LYPrint.c:1297
msgid "Standard print options:"
msgstr "Opcions est�ndard d'impressi�:"
-#: src/LYPrint.c:1290
+#: src/LYPrint.c:1298
msgid "Print options:"
msgstr "Opcions d'impressi�:"
-#: src/LYPrint.c:1297
+#: src/LYPrint.c:1305
msgid "Save to a local file"
msgstr "Gravar en un arxiu local"
-#: src/LYPrint.c:1299
+#: src/LYPrint.c:1307
msgid "Save to disk disabled"
msgstr "Gravar en disc est� desactivat"
-#: src/LYPrint.c:1306
+#: src/LYPrint.c:1314
msgid "Mail the file"
msgstr "Enviar l'arxiu per correu"
-#: src/LYPrint.c:1313
+#: src/LYPrint.c:1321
msgid "Print to the screen"
msgstr "Imprimir en pantalla"
-#: src/LYPrint.c:1318
+#: src/LYPrint.c:1326
msgid "Print out on a printer attached to your vt100 terminal"
msgstr "Imprimir en una impressora connectada al vostre terminal"
@@ -5278,301 +5200,291 @@ msgstr ""
msgid "Offending line:"
msgstr "L�nia incorrecta:"
-#: src/LYReadCFG.c:757
+#: src/LYReadCFG.c:769
#, c-format
msgid "key remapping of %s to %s for %s failed\n"
msgstr "el remapatge de %s a %s per a %s ha fallat\n"
-#: src/LYReadCFG.c:764
+#: src/LYReadCFG.c:776
#, c-format
msgid "key remapping of %s to %s failed\n"
msgstr "el remapatge de %s a %s ha fallat\n"
-#: src/LYReadCFG.c:785
+#: src/LYReadCFG.c:797
#, c-format
msgid "invalid line-editor selection %s for key %s, selecting all\n"
-msgstr ""
+msgstr "selecci� no v�lida de editor de l�nies %s per a la clau %s, se seleccionar� tot\n"
-#: src/LYReadCFG.c:810 src/LYReadCFG.c:822
+#: src/LYReadCFG.c:822 src/LYReadCFG.c:834
#, c-format
msgid "setting of line-editor binding for key %s (0x%x) to 0x%x for %s failed\n"
-msgstr ""
+msgstr "establiment del vincle de l'editor de l�nies per a la clau %s (0x%x) a 0x%x per a %s ha fallat\n"
-#: src/LYReadCFG.c:826
+#: src/LYReadCFG.c:838
#, c-format
msgid "setting of line-editor binding for key %s (0x%x) for %s failed\n"
-msgstr ""
+msgstr "establiment del vincle de l'editor de l�nies per a la clau %s (0x%x) per a %s ha fallat\n"
-#: src/LYReadCFG.c:922
+#: src/LYReadCFG.c:934
#, c-format
msgid "Lynx: cannot start, CERN rules file %s is not available\n"
msgstr "Lynx: impossible iniciar, el fitxer de regles del CERN %s no est�disponible\n"
-#: src/LYReadCFG.c:923
+#: src/LYReadCFG.c:935
msgid "(no name)"
msgstr "(sense nom)"
-#: src/LYReadCFG.c:2044
+#: src/LYReadCFG.c:2073
#, c-format
msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
msgstr "M�s de %d includes imbricats en lynx.cfg: potser hi ha un bucle?\n"
-#: src/LYReadCFG.c:2046
+#: src/LYReadCFG.c:2075
#, c-format
msgid "Last attempted include was '%s',\n"
msgstr "L'�ltim include ha estat \"%s\", \n"
-#: src/LYReadCFG.c:2047
+#: src/LYReadCFG.c:2076
#, c-format
msgid "included from '%s'.\n"
msgstr "incl�s des de \"%s\".\n"
-#: src/LYReadCFG.c:2450 src/LYReadCFG.c:2463 src/LYReadCFG.c:2521
+#: src/LYReadCFG.c:2479 src/LYReadCFG.c:2492 src/LYReadCFG.c:2550
msgid "The following is read from your lynx.cfg file."
msgstr "Les dades seg�ents s'han llegit del vostre fitxer lynx.cfg."
-#: src/LYReadCFG.c:2451 src/LYReadCFG.c:2464
+#: src/LYReadCFG.c:2480 src/LYReadCFG.c:2493
msgid "Please read the distribution"
msgstr "Per favor, llegiu "
-#: src/LYReadCFG.c:2457 src/LYReadCFG.c:2467
+#: src/LYReadCFG.c:2486 src/LYReadCFG.c:2496
msgid "for more comments."
msgstr "si necessiteu m�s informaci�."
-#: src/LYReadCFG.c:2503
+#: src/LYReadCFG.c:2532
msgid "RELOAD THE CHANGES"
msgstr "RECARREGAR ELS CANVIS"
-#: src/LYReadCFG.c:2511
+#: src/LYReadCFG.c:2540
msgid "Your primary configuration"
msgstr "Configuraci� prim�ria"
-#: src/LYShowInfo.c:177
+#: src/LYShowInfo.c:111
+msgid "URL:"
+msgstr "URL:"
+
+#: src/LYShowInfo.c:196
msgid "Directory that you are currently viewing"
msgstr "Directori que veieu actualment"
-#: src/LYShowInfo.c:180
+#: src/LYShowInfo.c:199
msgid "Name:"
msgstr "Nom:"
-#: src/LYShowInfo.c:183
-msgid "URL:"
-msgstr "URL:"
-
-#: src/LYShowInfo.c:197
+#: src/LYShowInfo.c:216
msgid "Directory that you have currently selected"
msgstr "Directori triat"
-#: src/LYShowInfo.c:199
+#: src/LYShowInfo.c:218
msgid "File that you have currently selected"
msgstr "Arxiu triat"
-#: src/LYShowInfo.c:202
+#: src/LYShowInfo.c:221
msgid "Symbolic link that you have currently selected"
msgstr "Enlla� simb�lic que heu triat"
-#: src/LYShowInfo.c:205
+#: src/LYShowInfo.c:224
msgid "Item that you have currently selected"
msgstr "Element que heu triat"
-#: src/LYShowInfo.c:207
+#: src/LYShowInfo.c:226
msgid "Full name:"
msgstr "Nom complet:"
-#: src/LYShowInfo.c:217
+#: src/LYShowInfo.c:239
msgid "Unable to follow link"
msgstr "Ha estat impossible seguir l'enlla�"
-#: src/LYShowInfo.c:219
+#: src/LYShowInfo.c:241
msgid "Points to file:"
msgstr "Apunta al fitxer:"
-#: src/LYShowInfo.c:224
+#: src/LYShowInfo.c:246
msgid "Name of owner:"
msgstr "Nom del propietari:"
-#: src/LYShowInfo.c:227
+#: src/LYShowInfo.c:249
msgid "Group name:"
msgstr "Nom del grup:"
-#: src/LYShowInfo.c:229
+#: src/LYShowInfo.c:251
msgid "File size:"
msgstr "Grand�ria:"
-#: src/LYShowInfo.c:231
-#, fuzzy
-#| msgid "bytes"
+#: src/LYShowInfo.c:253
msgid "(bytes)"
-msgstr "bytes"
+msgstr "(bytes)"
#.
#. * Include date and time information.
#.
-#: src/LYShowInfo.c:236
+#: src/LYShowInfo.c:258
msgid "Creation date:"
msgstr "Data de creaci�:"
-#: src/LYShowInfo.c:239
+#: src/LYShowInfo.c:261
msgid "Last modified:"
msgstr "�ltima modificaci�:"
-#: src/LYShowInfo.c:242
+#: src/LYShowInfo.c:264
msgid "Last accessed:"
msgstr "�ltim acc�s:"
-#: src/LYShowInfo.c:248
+#: src/LYShowInfo.c:270
msgid "Access Permissions"
msgstr "Permisos d'acc�s"
-#: src/LYShowInfo.c:283
-#, fuzzy
-#| msgid "Group"
+#: src/LYShowInfo.c:305
msgid "Group:"
-msgstr "Grup"
+msgstr "Grup:"
-#: src/LYShowInfo.c:303
+#: src/LYShowInfo.c:325
msgid "World:"
-msgstr ""
+msgstr "M�n:"
-#: src/LYShowInfo.c:310
+#: src/LYShowInfo.c:332
msgid "File that you are currently viewing"
msgstr "Fitxer que veieu actualment"
-#: src/LYShowInfo.c:318 src/LYShowInfo.c:422
+#: src/LYShowInfo.c:340 src/LYShowInfo.c:444
msgid "Linkname:"
msgstr "Nom:"
-#: src/LYShowInfo.c:324 src/LYShowInfo.c:339
+#: src/LYShowInfo.c:346 src/LYShowInfo.c:361
msgid "Charset:"
msgstr "Joc de car�cters:"
-#: src/LYShowInfo.c:338
+#: src/LYShowInfo.c:360
msgid "(assumed)"
-msgstr ""
+msgstr "(suposat)"
-#: src/LYShowInfo.c:345
+#: src/LYShowInfo.c:367
msgid "Server:"
msgstr "Servidor:"
-#: src/LYShowInfo.c:348
+#: src/LYShowInfo.c:370
msgid "Date:"
msgstr "Data:"
-#: src/LYShowInfo.c:351
+#: src/LYShowInfo.c:373
msgid "Last Mod:"
msgstr "�lt. mod.:"
-#: src/LYShowInfo.c:356
-#, fuzzy
-#| msgid " Expires:"
+#: src/LYShowInfo.c:378
msgid "Expires:"
-msgstr " Expira:"
+msgstr "Expira:"
-#: src/LYShowInfo.c:359
+#: src/LYShowInfo.c:381
msgid "Cache-Control:"
-msgstr ""
+msgstr "Control-del-cau:"
-#: src/LYShowInfo.c:362
+#: src/LYShowInfo.c:384
msgid "Content-Length:"
-msgstr ""
+msgstr "Longitud-del-contingut:"
-#: src/LYShowInfo.c:366
+#: src/LYShowInfo.c:388
msgid "Length:"
-msgstr ""
+msgstr "Longitud:"
-#: src/LYShowInfo.c:371
+#: src/LYShowInfo.c:393
msgid "Language:"
msgstr "Idioma:"
-#: src/LYShowInfo.c:378
+#: src/LYShowInfo.c:400
msgid "Post Data:"
-msgstr ""
+msgstr "Data de publicaci�:"
-#: src/LYShowInfo.c:381
+#: src/LYShowInfo.c:403
msgid "Post Content Type:"
-msgstr ""
+msgstr "Tipus de contingut de publicaci�:"
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:406
msgid "Owner(s):"
msgstr "Propietari(s):"
-#: src/LYShowInfo.c:389
+#: src/LYShowInfo.c:411
msgid "size:"
msgstr "grand�ria:"
-#: src/LYShowInfo.c:391
+#: src/LYShowInfo.c:413
msgid "lines"
msgstr "l�nies"
-#: src/LYShowInfo.c:395
+#: src/LYShowInfo.c:417
msgid "forms mode"
-msgstr ""
+msgstr "mode de formularis"
-#: src/LYShowInfo.c:397
+#: src/LYShowInfo.c:419
msgid "source"
msgstr "font"
-#: src/LYShowInfo.c:398
+#: src/LYShowInfo.c:420
msgid "normal"
msgstr "normal"
-#: src/LYShowInfo.c:400
+#: src/LYShowInfo.c:422
msgid ", safe"
-msgstr ""
+msgstr ", segur"
-#: src/LYShowInfo.c:402
+#: src/LYShowInfo.c:424
msgid ", via internal link"
-msgstr ""
+msgstr ", a trav�s de l'enlla� intern"
-#: src/LYShowInfo.c:407
+#: src/LYShowInfo.c:429
msgid ", no-cache"
-msgstr ""
+msgstr ", no-cau"
-#: src/LYShowInfo.c:409
+#: src/LYShowInfo.c:431
msgid ", ISMAP script"
-msgstr ""
+msgstr ", script ISMAP"
-#: src/LYShowInfo.c:411
+#: src/LYShowInfo.c:433
msgid ", bookmark file"
-msgstr ""
+msgstr ", fitxer de marcadors"
-#: src/LYShowInfo.c:415
+#: src/LYShowInfo.c:437
msgid "mode:"
msgstr "mode:"
-#: src/LYShowInfo.c:421
+#: src/LYShowInfo.c:443
msgid "Link that you currently have selected"
msgstr "Enlla� triat"
-#: src/LYShowInfo.c:430
+#: src/LYShowInfo.c:452
msgid "Method:"
msgstr "M�tode:"
-#: src/LYShowInfo.c:434
+#: src/LYShowInfo.c:456
msgid "Enctype:"
-msgstr ""
+msgstr "Enctype:"
-#: src/LYShowInfo.c:440
-#, fuzzy
-#| msgid "Location: "
+#: src/LYShowInfo.c:462
msgid "Action:"
-msgstr "Ubicaci�: "
+msgstr "Acci�:"
-#: src/LYShowInfo.c:446
+#: src/LYShowInfo.c:468
msgid "(Form field)"
msgstr "(Camp de formulari)"
-#: src/LYShowInfo.c:457
+#: src/LYShowInfo.c:478
msgid "No Links on the current page"
msgstr "No hi ha enlla�os en aquesta p�gina"
-#: src/LYShowInfo.c:463
-#, fuzzy
-#| msgid "Server:"
+#: src/LYShowInfo.c:484
msgid "Server Headers:"
-msgstr "Servidor:"
+msgstr "Cap�aleres del servidor:"
-#: src/LYStyle.c:331
+#: src/LYStyle.c:338
#, c-format
msgid ""
"Syntax Error parsing style in lss file:\n"
@@ -5582,10 +5494,27 @@ msgid ""
"where OBJECT is one of EM,STRONG,B,I,U,BLINK etc.\n"
"\n"
msgstr ""
+"Error de sintaxi quan s'estava analitzant l'estil al fitxer lss:\n"
+"[%s]\n"
+"La l�nia ha de ser de la forma:\n"
+"OBJECTE:MONO:COLOR (per exemple em:bold:brightblue:white)\n"
+"on OBJECTE �s un de EM,STRONG,B,I,U,BLINK, etc.\n"
+"\n"
+
+#: src/LYStyle.c:933
+#, c-format
+msgid ""
+"\n"
+"Lynx file \"%s\" is not available.\n"
+"\n"
+msgstr ""
+"\n"
+"El fitxer �%s� de Lynx no est� disponible.\n"
+"\n"
#: src/LYTraversal.c:111
msgid "here is a list of the history stack so that you may rebuild"
-msgstr ""
+msgstr "aqu� hi ha una llista de la pila d'hist�ries de manera que podeu reconstruir"
#: src/LYUpload.c:77
msgid "ERROR! - upload command is misconfigured"
@@ -5607,41 +5536,41 @@ msgstr "Redirecci
msgid "Unable to upload file."
msgstr "Ha estat impossible carregar el fitxer."
-#: src/LYUpload.c:199
+#: src/LYUpload.c:196
msgid "Upload To:"
msgstr "Carregar a:"
-#: src/LYUpload.c:200
+#: src/LYUpload.c:197
msgid "Upload options:"
msgstr "Opcions de c�rrega:"
-#: src/LYUtils.c:1883
+#: src/LYUtils.c:1919
msgid "Download document URL put to clipboard."
-msgstr ""
+msgstr "Descarrega l'URL del document que es va posar al portar-etalls"
-#: src/LYUtils.c:2668
+#: src/LYUtils.c:2666
msgid "Unexpected access protocol for this URL scheme."
-msgstr ""
+msgstr "Protocol inesperat d'acc�s per a aquest esquema URL."
-#: src/LYUtils.c:3492
+#: src/LYUtils.c:3571
msgid "Too many tempfiles"
msgstr "Massa fitxers temporals"
-#: src/LYUtils.c:3792
+#: src/LYUtils.c:3871
msgid "unknown restriction"
msgstr "restricci� desconeguda"
-#: src/LYUtils.c:3823
+#: src/LYUtils.c:3902
#, c-format
msgid "No restrictions set.\n"
msgstr "No s'hi han establert restriccions.\n"
-#: src/LYUtils.c:3826
+#: src/LYUtils.c:3905
#, c-format
msgid "Restrictions set:\n"
msgstr "Restriccions:\n"
-#: src/LYUtils.c:5212
+#: src/LYUtils.c:5279
msgid "Cannot find HOME directory"
msgstr "No s'ha trobat el directori d'inici (HOME)"
@@ -5649,7 +5578,7 @@ msgstr "No s'ha trobat el directori d'inici (HOME)"
msgid "Normally disabled. See ENABLE_LYNXRC in lynx.cfg\n"
msgstr "Normalment desactivat. Veieu ENABLE_LYNXRC en lynx.cfg\n"
-#: src/LYrcFile.c:325
+#: src/LYrcFile.c:327
msgid ""
"accept_all_cookies allows the user to tell Lynx to automatically\n"
"accept all cookies if desired. The default is \"FALSE\" which will\n"
@@ -5661,15 +5590,19 @@ msgstr ""
"que el programa preguntar� abans d'acceptar cap cookie. Doneu a \n"
"accept_all_cookies el valor \"TRUE\" per acceptar qualsevol cookie.\n"
-#: src/LYrcFile.c:333
+#: src/LYrcFile.c:335
msgid ""
"anonftp_password allows the user to tell Lynx to use the personal\n"
"email address as the password for anonymous ftp. If no value is given,\n"
"Lynx will use the personal email address. Set anonftp_password\n"
"to a different value if you choose.\n"
msgstr ""
+"anonftp_password permet l'usuari dir-li al Lynx que usi l'adre�a de correu\n"
+"electr�nic personal com la contrasenya per al ftp an�nim. Si no es d�na cap valor,\n"
+"lynx usar� l'adre�a de correu electr�nic persona. Establiu anonftp_password a un \n"
+"altre valor si aix� ho voleu.\n"
-#: src/LYrcFile.c:342
+#: src/LYrcFile.c:344
msgid ""
"bookmark_file specifies the name and location of the default bookmark\n"
"file into which the user can paste links for easy access at a later\n"
@@ -5679,7 +5612,7 @@ msgstr ""
"d'inter�s predeterminat, en el qual l'usuari pot enganxar enlla�os\n"
"per accedir-hi posteriorment amb facilitat.\n"
-#: src/LYrcFile.c:347
+#: src/LYrcFile.c:349
msgid ""
"If case_sensitive_searching is \"on\" then when the user invokes a search\n"
"using the 's' or '/' keys, the search performed will be case sensitive\n"
@@ -5690,7 +5623,7 @@ msgstr ""
"min�scules seran considerades lletres diferents. El valor predeterminat\n"
"�s \"off\".\n"
-#: src/LYrcFile.c:352
+#: src/LYrcFile.c:354
msgid ""
"The character_set definition controls the representation of 8 bit\n"
"characters for your terminal. If 8 bit characters do not show up\n"
@@ -5702,7 +5635,7 @@ msgstr ""
"representaci� de car�cters de 8 bits en el vostre terminal. Si no hi\n"
"apareixen correctament proveu de canviar-ne a un altre\n"
-#: src/LYrcFile.c:359
+#: src/LYrcFile.c:361
msgid ""
"cookie_accept_domains and cookie_reject_domains are comma-delimited\n"
"lists of domains from which Lynx should automatically accept or reject\n"
@@ -5714,19 +5647,15 @@ msgstr ""
"delimitats per comues dels quals Lynx acceptar� o rebutjar� (respectivament)\n"
"totes les cookies. Si s'especifica un domini en totes dues llistes\n"
-#: src/LYrcFile.c:367
-#, fuzzy
-#| msgid ""
-#| "cookie_file specifies the file from which to read persistent cookies.\n"
-#| "The default is ~/.lynx_cookies.\n"
+#: src/LYrcFile.c:369
msgid ""
"cookie_file specifies the file from which to read persistent cookies.\n"
"The default is ~/"
msgstr ""
"cookie_file especifica el fitxer del qual es llegeixen les cookies\n"
-"persistents. Per omissi� �s ~/.lynx_cookies.\n"
+"persistents. Per omissi� �s ~/"
-#: src/LYrcFile.c:372
+#: src/LYrcFile.c:374
msgid ""
"cookie_loose_invalid_domains, cookie_strict_invalid_domains, and\n"
"cookie_query_invalid_domains are comma-delimited lists of which domains\n"
@@ -5741,7 +5670,7 @@ msgstr ""
"dominis de les quals se sotmeten a diversos graus de comprovaci�\n"
"de validesa. Si un domini \n"
-#: src/LYrcFile.c:386
+#: src/LYrcFile.c:388
msgid ""
"dir_list_order specifies the directory list order under DIRED_SUPPORT\n"
"(if implemented). The default is \"ORDER_BY_NAME\"\n"
@@ -5749,7 +5678,7 @@ msgstr ""
"dir_list_order^indica^l'ordre^en^qu�^s'ha^de^llistar^el^directori^sota\n"
"DIRED_SUPPORT (si est� disponible). Per omissi� �s \"ORDER_BY_NAME\".\n"
-#: src/LYrcFile.c:391
+#: src/LYrcFile.c:393
msgid ""
"dir_list_styles specifies the directory list style under DIRED_SUPPORT\n"
"(if implemented). The default is \"MIXED_STYLE\", which sorts both\n"
@@ -5761,7 +5690,7 @@ msgstr ""
"i^els^directoris^indistintament.^\"FILES_FIRST\"^llista^primer^els^fitxers^i\n"
"\"DIRECTORIES_FIRST\" llista primer els directoris.\n"
-#: src/LYrcFile.c:399
+#: src/LYrcFile.c:401
msgid ""
"If emacs_keys is to \"on\" then the normal EMACS movement keys:\n"
" ^N = down ^P = up\n"
@@ -5773,7 +5702,7 @@ msgstr ""
" ^N = avall ^P = amunt\n"
" ^B = esquerra ^F = dreta\n"
-#: src/LYrcFile.c:405
+#: src/LYrcFile.c:407
msgid ""
"file_editor specifies the editor to be invoked when editing local files\n"
"or sending mail. If no editor is specified, then file editing is disabled\n"
@@ -5784,7 +5713,7 @@ msgstr ""
"enviar correu. Si no se n'especifica cap l'edici� de fitxers quedar�\n"
"desactivada (tret que s'active des de la l�nia d'ordres) i s'usar� l'editor\n"
-#: src/LYrcFile.c:412
+#: src/LYrcFile.c:414
msgid ""
"The file_sorting_method specifies which value to sort on when viewing\n"
"file lists such as FTP directories. The options are:\n"
@@ -5797,7 +5726,7 @@ msgstr ""
"visualitzen^llistes^de^fitxers^com^ara^directoris^FTP.^Les^opcions^s�n:\n"
"^^^BY_FILENAME\n"
-#: src/LYrcFile.c:435
+#: src/LYrcFile.c:437
msgid ""
"lineedit_mode specifies the key binding used for inputting strings in\n"
"prompts and forms. If lineedit_mode is set to \"Default Binding\" then\n"
@@ -5812,15 +5741,19 @@ msgid ""
"Current lineedit modes are:\n"
msgstr "lineedit_mode especifica \n"
-#: src/LYrcFile.c:453
+#: src/LYrcFile.c:455
msgid ""
"The following allow you to define sub-bookmark files and descriptions.\n"
"The format is multi_bookmark<capital_letter>=<filename>,<description>\n"
"Up to 26 bookmark files (for the English capital letters) are allowed.\n"
"We start with \"multi_bookmarkB\" since 'A' is the default (see above).\n"
msgstr ""
+"El que segueix us permet definir fitxers de submarcadors i descripcions.\n"
+"El format �s multi_bookmark<maj�scula>=<fitxer>,<descripci�>\n"
+"Es permeten fins a 26 fitxers de marcadors (per a les maj�scules de l'angl�s).\n"
+"Comencem amb �multi_bookmarkB� at�s que �A� �s el valor predeterminat (vegeu a dalt).\n"
-#: src/LYrcFile.c:459
+#: src/LYrcFile.c:461
msgid ""
"personal_mail_address specifies your personal mail address. The\n"
"address will be sent during HTTP file transfers for authorization and\n"
@@ -5829,9 +5762,16 @@ msgid ""
"to TRUE in lynx.cfg, or use the -nofrom command line switch. You also\n"
"could leave this field blank, but then you won't have it included in\n"
"your mailed comments.\n"
-msgstr "personal_mail_address especifica la vostra adre�a de correu. L'adre\n"
+msgstr ""
+"personal_mail_address especifica la vostra adre�a de correu. L'adre�a\n"
+"s'enviar� durant les transfer�ncies de fitxers HTTP per autoritzaci�n i \n"
+"registre, i per a comentaris enviats per correu electr�nic.\n"
+"Si no voleu que es doni aquesta informaci�, establiur NO_FROM_HEADER a \n"
+"TRUE a lynx.cfg, o useu l'opci� -nofrom a la l�nia d'ordres. Tamb� podr�eu\n"
+"deixar aquest camp en blanc, per� aleshores no el tindreu incl�s als vostres\n"
+"comentaris enviats per correu electr�nic.\n"
-#: src/LYrcFile.c:468
+#: src/LYrcFile.c:470
msgid ""
"personal_mail_name specifies your personal name, for mail. The\n"
"name is sent for mailed comments. Lynx will prompt for this,\n"
@@ -5842,8 +5782,16 @@ msgid ""
"of sending email. To update the default value, you must use the options\n"
"menu, or modify this file directly.\n"
msgstr ""
+"personal_mail_name especifica el vostre nom personal. El nom s'envia\n"
+"per als comentaris enviats per correu electr�nic. El Lynx us demanar�\n"
+"aix�, mostrant el valor configurat com a predeterminat quan s'estigui \n"
+"enviant el correu. Aix� no �s necess�riament el mateix que un nom\n"
+"prove�t com a part de personal_mail_adress.\n"
+"El Lynx no desa els vostres canvis a aquest valor predeterminat com un \n"
+"efecte secundari d'enviar correu. Per actualitzar el valor predeterminat,\n"
+"heu d'usar el men� d'opcions, o modificar aquest fitxer directament.\n"
-#: src/LYrcFile.c:478
+#: src/LYrcFile.c:480
msgid ""
"preferred_charset specifies the character set in MIME notation (e.g.,\n"
"ISO-8859-2, ISO-8859-5) which Lynx will indicate you prefer in requests\n"
@@ -5867,7 +5815,7 @@ msgstr ""
"Si la cap�alera Accept-Charset no est� present, es considera que \n"
"qualsevol joc de car\n"
-#: src/LYrcFile.c:494
+#: src/LYrcFile.c:496
msgid ""
"preferred_language specifies the language in MIME notation (e.g., en,\n"
"fr, may be a comma-separated list in decreasing preference)\n"
@@ -5881,7 +5829,7 @@ msgstr ""
"servidors. Si est� disponible el servidor l'usar�; si no, usar�\n"
"l'idioma que tinga establert per omissi�.\n"
-#: src/LYrcFile.c:505
+#: src/LYrcFile.c:507
msgid ""
"If run_all_execution_links is set \"on\" then all local execution links\n"
"will be executed when they are selected.\n"
@@ -5896,7 +5844,7 @@ msgstr ""
"Si run_all_execution_links est� activat els enlla�os d'execuci� \n"
"s'executen \n"
-#: src/LYrcFile.c:516
+#: src/LYrcFile.c:518
msgid ""
"If run_execution_links_on_local_files is set \"on\" then all local\n"
"execution links that are found in LOCAL files will be executed when they\n"
@@ -5924,7 +5872,7 @@ msgstr ""
" del sistema. Aquesta opci� nom�s hauria d'activar-se si\n"
" veieu informaci� de confian�a.\n"
-#: src/LYrcFile.c:534
+#: src/LYrcFile.c:536
msgid ""
"select_popups specifies whether the OPTIONs in a SELECT block which\n"
"lacks a MULTIPLE attribute are presented as a vertical list of radio\n"
@@ -5934,8 +5882,15 @@ msgid ""
"as the default while a value of \"off\" will set use of radio boxes.\n"
"The default can be overridden via the -popup command line toggle.\n"
msgstr ""
+"select_popups especifica si les l�nies OPTION a un block SELECT al qual \n"
+"li falta un atribut MULTIPLE es presenten com a una llista vertical de \n"
+"botons opcions o com a un men� emergent. Noteu que si l'atribut MULTIPLE\n"
+"�s present a una etiqueta d'inici de SELECT el Lynx sempre crear� una \n"
+"llista vertical de caselles de selecci� per a les l�nis OPTION. Un valor \n"
+"d'�activat� establir� l'�s de botons d'opcions. El valor predeterminat\n"
+"pot anul�lar-se mitjan�ant l'opci� -popup de l�nia d'ordres.\n"
-#: src/LYrcFile.c:545
+#: src/LYrcFile.c:547
msgid ""
"show_color specifies how to set the color mode at startup. A value of\n"
"\"never\" will force color mode off (treat the terminal as monochrome)\n"
@@ -5953,8 +5908,23 @@ msgid ""
"the 'o'ptions menu. If the option settings are saved, the \"on\" and\n"
"\"off\" \"show color\" settings will be treated as \"default\".\n"
msgstr ""
-
-#: src/LYrcFile.c:562
+"show_color especifica com establir el mode de color a l'inici. Un valor de\n"
+"�mai� for�ar� la desactivaci� el mode de color (tracta la terminal com a \n"
+"monocrom) a l'inici tot i que la terminal sembli tenir capacitat de color.\n"
+"Un valor de �sempre� for�ar� el mode de color a activat tot i que el terminal\n"
+"sembli ser monocrom, si aix� se suporta per la llibreria usat per compilar \n"
+"lynx. Un valor de �predeterminat� implicar� el comportament d'assumir un \n"
+"terminal monocrom a no ser que la capacitat de color s'infereixi a l'inici\n"
+"basat en el tipus de terminal, o s'usi l'opci� -color de la l�nia d'ordres, o\n"
+"s'estableixi la variable d'entorn COLORTERM. El comportament predeterminat \n"
+"sempre s'usa a comptes an�nims o si s'estableix la restricci� �option_save�.\n"
+"L'efecte del valor desat es pot anul�lar mitjan�ant les opcions -color i \n"
+"-nocolor de l�nia d'ordres.\n"
+"El mode establert a l'inici es pot canviar mitjan�ant l'opci� �mostra color� \n"
+"al men� 'o'pcions. Si es desa la configuraci� d'opcions, els par�metres\n"
+"�activa�, �desactiva� i �mostra color� es tractaran com a �predeterminat�.\n"
+
+#: src/LYrcFile.c:564
msgid ""
"show_cursor specifies whether to 'hide' the cursor to the right (and\n"
"bottom, if possible) of the screen, or to place it to the left of the\n"
@@ -5971,7 +5941,7 @@ msgstr ""
"de l'enlla� actual en els documents o de l'opci� actual en les finestres\n"
"de sel\n"
-#: src/LYrcFile.c:573
+#: src/LYrcFile.c:575
msgid ""
"show_dotfiles specifies that the directory listing should include\n"
"\"hidden\" (dot) files/directories. If set \"on\", this will be\n"
@@ -5980,7 +5950,7 @@ msgid ""
"is disabled, creation of such files via Lynx also is disabled.\n"
msgstr "L'opci� show_dotfiles indica que s'han d'incloure els \n"
-#: src/LYrcFile.c:584
+#: src/LYrcFile.c:586
msgid ""
"If sub_bookmarks is not turned \"off\", and multiple bookmarks have\n"
"been defined (see below), then all bookmark operations will first\n"
@@ -5992,8 +5962,19 @@ msgid ""
"user modes. When this option is set to \"standard\", the menu will be\n"
"presented regardless of user mode.\n"
msgstr ""
+"Si sub_bookmarks no s'estableix a �desactiva�, i s'han definit marcadors\n"
+"m�ltiples (vegeu m�s avall), llavors totes les operacions de marcadors \n"
+"primer demanar� a l'usuari que seleccioni un fitxer actiu de submarcadors.\n"
+"Si es defineix el lynx_bookmark_file predeterminat (vegeu m�s amunt), s'usar�\n"
+"com a la selecci� predeterminada. Si s'estableix aquesta opci� a �avan�ada�, \n"
+"i el mode d'usuari �s avan�at, l'ordre 'v'isualitza el marcador invocar� \n"
+"un di�leg a la l�nia d'estat en canvi al men� que es veu en modes d'usuari\n"
+"de principiant i intermedi. Quan s'estableix aquesta opci� a �est�ndard�, el \n"
+"men� es presentar� independentment del mode d'usuari.\n"
+"\n"
+"\n"
-#: src/LYrcFile.c:598
+#: src/LYrcFile.c:600
msgid ""
"user_mode specifies the users level of knowledge with Lynx. The\n"
"default is \"NOVICE\" which displays two extra lines of help at the\n"
@@ -6005,7 +5986,7 @@ msgstr ""
"user_mode especifica el nivell d'experi�ncia que t� l'usuari amb Lynx.\n"
"Per omissi� �s \"NOVICE\"\n"
-#: src/LYrcFile.c:607
+#: src/LYrcFile.c:609
msgid ""
"If verbose_images is \"on\", lynx will print the name of the image\n"
"source file in place of [INLINE], [LINK] or [IMAGE]\n"
@@ -6015,7 +5996,7 @@ msgstr ""
"de la imatge en lloc de [INLINE], [LINK] o [IMAGE]\n"
"Vegeu tamb� VERBOSE_IMAGES en el fitxer lynx.cfg\n"
-#: src/LYrcFile.c:612
+#: src/LYrcFile.c:614
msgid ""
"If vi_keys is set to \"on\", then the normal VI movement keys:\n"
" j = down k = up\n"
@@ -6029,7 +6010,7 @@ msgstr ""
" h = esquerra l = dreta\n"
"Nom�s en min�scula. L\n"
-#: src/LYrcFile.c:620
+#: src/LYrcFile.c:622
msgid ""
"The visited_links setting controls how Lynx organizes the information\n"
"in the Visited Links Page.\n"
@@ -6037,7 +6018,7 @@ msgstr ""
"La variable visited_links controla la forma en qu� Lynx organitza la\n"
"informaci� en la p�gina d'enlla�os visitats.\n"
-#: src/LYrcFile.c:845
+#: src/LYrcFile.c:861
msgid ""
"If keypad_mode is set to \"NUMBERS_AS_ARROWS\", then the numbers on\n"
"your keypad when the numlock is on will act as arrow keys:\n"
@@ -6048,7 +6029,7 @@ msgid ""
"regardless of whether numlock is on.\n"
msgstr "Si poseu keypad_mode \n"
-#: src/LYrcFile.c:854
+#: src/LYrcFile.c:870
msgid ""
"If keypad_mode is set to \"LINKS_ARE_NUMBERED\", then numbers will\n"
"appear next to each link and numbers are used to select links.\n"
@@ -6057,7 +6038,7 @@ msgstr ""
"aleshores apareixer� un n�mero al costat de cada enlla� i podreu triar\n"
"l'enlla� desitjat prement la tecla del n�mero corresponent.\n"
-#: src/LYrcFile.c:858
+#: src/LYrcFile.c:874
msgid ""
"If keypad_mode is set to \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\", then\n"
"numbers will appear next to each link and visible form input field.\n"
@@ -6067,8 +6048,17 @@ msgid ""
"a popup menu, even if the option isn't visible on the screen. Reference\n"
"lists and output from the list command also enumerate form inputs.\n"
msgstr ""
+"Si s'estableix keypad_mode a �LINKS_AND_FORM_FIELDS_ARE_NUMBERED�, llavors\n"
+"el apareixeran n�meros al costat de cada enlla� i cada camp visible de \n"
+"formulari. Els n�meros permeten seleccionar enlla�os, o moure l'�enlla� \n"
+"actual� a un camp d'entrada d'un formulari o un bot�. Addicionalment, les\n"
+"opcions de men�s emergents s'indexen perqu� l'usuari pugui escriure un n�mero\n"
+"d'opci� per seleccionar una opci� a un men� emergent, tot i que l'opci� no \n"
+"sigui visible a la pantalla. Les llistes de refer�ncies i la sortida de l'ordre\n"
+"de llista tamb� enumeren les entrades dels formularis.\n"
+"\n"
-#: src/LYrcFile.c:867
+#: src/LYrcFile.c:883
msgid ""
"NOTE: Some fixed format documents may look disfigured when\n"
"\"LINKS_ARE_NUMBERED\" or \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" are\n"
@@ -6079,52 +6069,50 @@ msgstr ""
"\"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" (enlla�os i camps de formulari\n"
"numerats.\n"
-#: src/LYrcFile.c:899
+#: src/LYrcFile.c:915
msgid ""
"Lynx User Defaults File\n"
"\n"
-msgstr ""
+msgstr "Fitxer dels valors predeterminats d'usuari del Lynx\n"
-#: src/LYrcFile.c:908
+#: src/LYrcFile.c:924
msgid ""
"This file contains options saved from the Lynx Options Screen (normally\n"
"with the 'o' key). To save options with that screen, you must select the\n"
"checkbox:\n"
msgstr ""
+"Aquest fitxer cont� opcions desades de la pantalla d'opcions del Lynx (normalment\n"
+"amb la tecla �o�). Per desar opcions amb aquesta pantalla, heu de seleccionar\n"
+"la casella de selecci�:\n"
-#: src/LYrcFile.c:915
+#: src/LYrcFile.c:931
msgid ""
"You must then save the settings using the link on the line above the\n"
"checkbox:\n"
msgstr ""
+"Heu de desar els par�metres usant l'enlla� a la l�nia a sobre de\n"
+"la casella de selecci�:\n"
-#: src/LYrcFile.c:922
+#: src/LYrcFile.c:938
msgid ""
"You may also use the command-line option \"-forms_options\", which displays\n"
"the simpler Options Menu instead. Save options with that using the '>' key.\n"
"\n"
msgstr ""
+"Tamb� podeu usar l'opci� de l�nia d'ordres �-form-opctions�, que mostra \n"
+"el men� m�s simple de Men� d'Opcions. Deseu les opcions amb aix� usant la tecla\n"
+"�>�.\n"
-#: src/LYrcFile.c:929
+#: src/LYrcFile.c:945
msgid ""
"This file contains options saved from the Lynx Options Screen (normally\n"
"with the '>' key).\n"
"\n"
msgstr ""
+"Aquest fitxer cont� opcions desada de la Pantalla d'Opcions del Lynx (normalment\n"
+"amb la tecla �>�)\n"
-#: src/LYrcFile.c:936
-#, fuzzy
-#| msgid ""
-#| "Lynx User Defaults File\n"
-#| "\n"
-#| "This file contains options saved from the Lynx Options Screen (normally\n"
-#| "with the '>' key). There is normally no need to edit this file manually,\n"
-#| "since the defaults here can be controlled from the Options Screen, and the\n"
-#| "next time options are saved from the Options Screen this file will be\n"
-#| "completely rewritten. You have been warned...\n"
-#| "If you are looking for the general configuration file - it is normally\n"
-#| "called lynx.cfg, and it has different content and a different format.\n"
-#| "It is not this file.\n"
+#: src/LYrcFile.c:952
msgid ""
"There is normally no need to edit this file manually, since the defaults\n"
"here can be controlled from the Options Screen, and the next time options\n"
@@ -6135,13 +6123,10 @@ msgid ""
"called \"lynx.cfg\". It has different content and a different format.\n"
"It is not this file.\n"
msgstr ""
-"Fitxer que cont� els valors per omissi� de l'usuari\n"
+"Normalment no cal editar aquest fitxer manualment, at�s que els valors per \n"
+"omissi� es poden canviar des de la pantalla d'opcions i la propera vegada \n"
+"que deseu les opcions aquest fitxer ser� completament reescrit. Ja ho sabeu...\n"
"\n"
-"Aquest fitxer cont� les opcions desades en la pantalla d'opcions\n"
-"(normalment amb la tecla '->'). Normalment no cal editar-lo manualment\n"
-"at�s que els valors per omissi� es poden canviar des de la pantalla\n"
-"d'opcions i la propera vegada que deseu les opcions aquest fitxer ser�\n"
-"completament reescrit. Ja ho sabeu...\n"
"Si busqueu el fitxer de configuraci�: normalment s'anomena lynx.cfg i\n"
"t� format i contingut diferents.\n"
"No �s aquest fitxer.\n"
diff --git a/po/et.po b/po/et.po
index 68af743..c352668 100644
--- a/po/et.po
+++ b/po/et.po
@@ -2201,7 +2201,7 @@ msgstr "%s präänik: %.*s=%.*s Luban? (J/E/Alati/Mitte kunagi)"
#: LYMessages.c:702
#, c-format
msgid "Accept invalid cookie domain=%s for '%s'?"
-msgstr "Aktsepteerin vogast prääniku doomenit=%s, server '%s'?"
+msgstr "Aktsepteerin vigast prääniku doomenit=%s, server '%s'?"
#. #define INVALID_COOKIE_PATH_CONFIRMATION
#: LYMessages.c:704
diff --git a/po/lynx.pot b/po/lynx.pot
index b021592..9700ee2 100644
--- a/po/lynx.pot
+++ b/po/lynx.pot
@@ -1,9 +1,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: lynx 2.8.9dev.5\n"
+"Project-Id-Version: lynx 2.8.9dev.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-14 20:53-0400\n"
+"POT-Creation-Date: 2015-12-14 20:39-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -112,1991 +112,2061 @@ msgid "URL too long"
msgstr ""
#. Inactive input fields, messages used with -tna option - kw
-#. #define FORM_LINK_TEXT_MESSAGE_INA
+#. #define FORM_LINK_TEXT_ADV_MSG_INA
#: LYMessages.c:57
+#, c-format
+msgid "(Textfield \"%s\"); Inactive. Press <return> to activate."
+msgstr ""
+
+#. #define FORM_LINK_TEXT_MESSAGE_INA
+#: LYMessages.c:59
msgid "(Text entry field) Inactive. Press <return> to activate."
msgstr ""
+#. #define FORM_LINK_TEXTAREA_ADV_MSG_INA
+#: LYMessages.c:61
+#, c-format
+msgid "(Textarea \"%s\"); Inactive. Press <return> to activate."
+msgstr ""
+
#. #define FORM_LINK_TEXTAREA_MESSAGE_INA
-#: LYMessages.c:59
+#: LYMessages.c:63
msgid "(Textarea) Inactive. Press <return> to activate."
msgstr ""
+#. #define FORM_LINK_TEXTAREA_ADV_MSG_INA_E
+#: LYMessages.c:65
+#, c-format
+msgid ""
+"(Textarea \"%s\"); Inactive. Press <return> to activate (%s for editor)."
+msgstr ""
+
#. #define FORM_LINK_TEXTAREA_MESSAGE_INA_E
-#: LYMessages.c:61
+#: LYMessages.c:67
#, c-format
msgid "(Textarea) Inactive. Press <return> to activate (%s for editor)."
msgstr ""
#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_INA
-#: LYMessages.c:63
+#: LYMessages.c:69
msgid "(Form field) Inactive. Use <return> to edit."
msgstr ""
#. #define FORM_TEXT_SUBMIT_MESSAGE_INA_X
-#: LYMessages.c:65
+#: LYMessages.c:71
#, c-format
msgid ""
"(Form field) Inactive. Use <return> to edit (%s to submit with no cache)."
msgstr ""
#. #define FORM_TEXT_RESUBMIT_MESSAGE_INA
-#: LYMessages.c:67
+#: LYMessages.c:73
msgid ""
"(Form field) Inactive. Press <return> to edit, press <return> twice to "
"submit."
msgstr ""
#. #define FORM_TEXT_SUBMIT_MAILTO_MSG_INA
-#: LYMessages.c:69
+#: LYMessages.c:75
msgid "(mailto form field) Inactive. Press <return> to change."
msgstr ""
#. #define FORM_LINK_PASSWORD_MESSAGE_INA
-#: LYMessages.c:71
+#: LYMessages.c:77
msgid "(Password entry field) Inactive. Press <return> to activate."
msgstr ""
#. #define FORM_LINK_FILE_UNM_MSG
-#: LYMessages.c:74
+#: LYMessages.c:80
msgid ""
"UNMODIFIABLE file entry field. Use UP or DOWN arrows or tab to move off."
msgstr ""
#. #define FORM_LINK_FILE_MESSAGE
-#: LYMessages.c:76
+#: LYMessages.c:82
msgid ""
"(File entry field) Enter filename. Use UP or DOWN arrows or tab to move off."
msgstr ""
+#. #define FORM_LINK_TEXT_ADV_MSG
#. #define FORM_LINK_TEXT_MESSAGE
-#: LYMessages.c:78
+#: LYMessages.c:84 LYMessages.c:86
+#, c-format
msgid ""
-"(Text entry field) Enter text. Use UP or DOWN arrows or tab to move off."
+"(Textfield \"%s\"); Enter text. Use UP or DOWN arrows or tab to move off."
+msgstr ""
+
+#. #define FORM_LINK_TEXTAREA_ADV_MSG
+#: LYMessages.c:88
+#, c-format
+msgid "(Textarea \"%s\"); Enter text. Use UP/DOWN arrows or TAB to move off."
msgstr ""
#. #define FORM_LINK_TEXTAREA_MESSAGE
-#: LYMessages.c:80
+#: LYMessages.c:90
msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off."
msgstr ""
+#. #define FORM_LINK_TEXTAREA_ADV_MSG_E
+#: LYMessages.c:92
+#, c-format
+msgid ""
+"(Textarea \"%s\"); Enter text. Use UP/DOWN arrows or TAB to move off (%s for "
+"editor)."
+msgstr ""
+
#. #define FORM_LINK_TEXTAREA_MESSAGE_E
-#: LYMessages.c:82
+#: LYMessages.c:94
#, c-format
msgid ""
"(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
msgstr ""
#. #define FORM_LINK_TEXT_UNM_MSG
-#: LYMessages.c:84
+#: LYMessages.c:96
msgid ""
"UNMODIFIABLE form text field. Use UP or DOWN arrows or tab to move off."
msgstr ""
#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE
-#: LYMessages.c:86
+#: LYMessages.c:98
msgid "(Form field) Enter text. Use <return> to submit."
msgstr ""
#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_X
-#: LYMessages.c:88
+#: LYMessages.c:100
#, c-format
msgid "(Form field) Enter text. Use <return> to submit (%s for no cache)."
msgstr ""
#. #define FORM_LINK_TEXT_RESUBMIT_MESSAGE
-#: LYMessages.c:90
+#: LYMessages.c:102
msgid ""
"(Form field) Enter text. Use <return> to submit, arrows or tab to move off."
msgstr ""
#. #define FORM_LINK_TEXT_SUBMIT_UNM_MSG
-#: LYMessages.c:92
+#: LYMessages.c:104
msgid "UNMODIFIABLE form field. Use UP or DOWN arrows or tab to move off."
msgstr ""
#. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG
-#: LYMessages.c:94
+#: LYMessages.c:106
msgid ""
"(mailto form field) Enter text. Use <return> to submit, arrows to move off."
msgstr ""
#. #define FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:96
+#: LYMessages.c:108
msgid "(mailto form field) Mail is disallowed so you cannot submit."
msgstr ""
#. #define FORM_LINK_PASSWORD_MESSAGE
-#: LYMessages.c:98
+#: LYMessages.c:110
msgid ""
"(Password entry field) Enter text. Use UP or DOWN arrows or tab to move off."
msgstr ""
#. #define FORM_LINK_PASSWORD_UNM_MSG
-#: LYMessages.c:100
+#: LYMessages.c:112
msgid "UNMODIFIABLE form password. Use UP or DOWN arrows or tab to move off."
msgstr ""
+#. #define FORM_LINK_CHECKBOX_ADV_MSG
+#: LYMessages.c:114
+#, c-format
+msgid "(Checkbox \"%s\"); Use right-arrow or <return> to toggle."
+msgstr ""
+
#. #define FORM_LINK_CHECKBOX_MESSAGE
-#: LYMessages.c:102
+#: LYMessages.c:116
msgid "(Checkbox Field) Use right-arrow or <return> to toggle."
msgstr ""
#. #define FORM_LINK_CHECKBOX_UNM_MSG
-#: LYMessages.c:104
+#: LYMessages.c:118
msgid "UNMODIFIABLE form checkbox. Use UP or DOWN arrows or tab to move off."
msgstr ""
+#. #define FORM_LINK_RADIO_ADV_MSG
+#: LYMessages.c:120
+#, c-format
+msgid "(Radio Button \"%s\"); Use right-arrow or <return> to toggle."
+msgstr ""
+
#. #define FORM_LINK_RADIO_MESSAGE
-#: LYMessages.c:106
+#: LYMessages.c:122
msgid "(Radio Button) Use right-arrow or <return> to toggle."
msgstr ""
#. #define FORM_LINK_RADIO_UNM_MSG
-#: LYMessages.c:108
+#: LYMessages.c:124
msgid ""
"UNMODIFIABLE form radio button. Use UP or DOWN arrows or tab to move off."
msgstr ""
#. #define FORM_LINK_SUBMIT_PREFIX
-#: LYMessages.c:110
+#: LYMessages.c:126
msgid "Submit ('x' for no cache) to "
msgstr ""
#. #define FORM_LINK_RESUBMIT_PREFIX
-#: LYMessages.c:112
+#: LYMessages.c:128
msgid "Submit to "
msgstr ""
#. #define FORM_LINK_SUBMIT_MESSAGE
-#: LYMessages.c:114
+#: LYMessages.c:130
msgid ""
"(Form submit button) Use right-arrow or <return> to submit ('x' for no "
"cache)."
msgstr ""
#. #define FORM_LINK_RESUBMIT_MESSAGE
-#: LYMessages.c:116
+#: LYMessages.c:132
msgid "(Form submit button) Use right-arrow or <return> to submit."
msgstr ""
#. #define FORM_LINK_SUBMIT_DIS_MSG
-#: LYMessages.c:118
+#: LYMessages.c:134
msgid "DISABLED form submit button. Use UP or DOWN arrows or tab to move off."
msgstr ""
#. #define FORM_LINK_SUBMIT_MAILTO_PREFIX
-#: LYMessages.c:120
+#: LYMessages.c:136
msgid "Submit mailto form to "
msgstr ""
#. #define FORM_LINK_SUBMIT_MAILTO_MSG
-#: LYMessages.c:122
+#: LYMessages.c:138
msgid "(mailto form submit button) Use right-arrow or <return> to submit."
msgstr ""
#. #define FORM_LINK_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:124
+#: LYMessages.c:140
msgid "(mailto form submit button) Mail is disallowed so you cannot submit."
msgstr ""
#. #define FORM_LINK_RESET_MESSAGE
-#: LYMessages.c:126
+#: LYMessages.c:142
msgid ""
"(Form reset button) Use right-arrow or <return> to reset form to defaults."
msgstr ""
#. #define FORM_LINK_RESET_DIS_MSG
-#: LYMessages.c:128
+#: LYMessages.c:144
msgid "DISABLED form reset button. Use UP or DOWN arrows or tab to move off."
msgstr ""
#. #define FORM_LINK_BUTTON_MESSAGE
-#: LYMessages.c:130
+#: LYMessages.c:146
msgid "(Script button) Use UP or DOWN arrows or tab to move off."
msgstr ""
+#. #define FORM_LINK_BUTTON_ADV_MSG
+#: LYMessages.c:148
+#, c-format
+msgid "(Script button \"%s\"); Use UP or DOWN arrows or tab to move off."
+msgstr ""
+
#. #define FORM_LINK_BUTTON_DIS_MSG
-#: LYMessages.c:132
+#: LYMessages.c:150
msgid "DISABLED Script button. Use UP or DOWN arrows or tab to move off."
msgstr ""
+#. #define FORM_LINK_OPTION_LIST_ADV_MSG
+#: LYMessages.c:152
+#, c-format
+msgid "(Option list \"%s\"); Hit return to select option."
+msgstr ""
+
#. #define FORM_LINK_OPTION_LIST_MESSAGE
-#: LYMessages.c:134
+#: LYMessages.c:154
msgid ""
"(Option list) Hit return and use arrow keys and return to select option."
msgstr ""
+#. #define CHOICE_LIST_ADV_MSG
+#: LYMessages.c:156
+#, c-format
+msgid "(Choice entry \"%s\"); Use arrow keys and return to select option."
+msgstr ""
+
#. #define CHOICE_LIST_MESSAGE
-#: LYMessages.c:136
+#: LYMessages.c:158
msgid ""
"(Choice list) Hit return and use arrow keys and return to select option."
msgstr ""
+#. #define MOUSE_CHOICE_MESSAGE
+#: LYMessages.c:160
+msgid "Left mouse button or return to select, arrow keys to scroll."
+msgstr ""
+
#. #define FORM_LINK_OPTION_LIST_UNM_MSG
-#: LYMessages.c:138
+#: LYMessages.c:162
msgid "UNMODIFIABLE option list. Use return or arrow keys to review or leave."
msgstr ""
#. #define CHOICE_LIST_UNM_MSG
-#: LYMessages.c:140
+#: LYMessages.c:164
msgid "UNMODIFIABLE choice list. Use return or arrow keys to review or leave."
msgstr ""
-#: LYMessages.c:141
+#: LYMessages.c:165
msgid "Submitting form..."
msgstr ""
-#: LYMessages.c:142
+#: LYMessages.c:166
msgid "Resetting form..."
msgstr ""
#. #define RELOADING_FORM
-#: LYMessages.c:144
+#: LYMessages.c:168
msgid "Reloading document. Any form entries will be lost!"
msgstr ""
#. #define LINK_NOT_IN_FORM
-#: LYMessages.c:146
+#: LYMessages.c:170
msgid "The current link is not in a FORM"
msgstr ""
-#: LYMessages.c:147
+#: LYMessages.c:171
#, c-format
msgid "Warning: Cannot transcode form data to charset %s!"
msgstr ""
#. #define NORMAL_LINK_MESSAGE
-#: LYMessages.c:150
+#: LYMessages.c:174
msgid "(NORMAL LINK) Use right-arrow or <return> to activate."
msgstr ""
-#: LYMessages.c:151
+#: LYMessages.c:175
msgid "The resource requested is not available at this time."
msgstr ""
-#: LYMessages.c:152
+#: LYMessages.c:176
msgid "Enter Lynx keystroke command: "
msgstr ""
-#: LYMessages.c:153
+#: LYMessages.c:177
msgid "Looking up "
msgstr ""
-#: LYMessages.c:154
+#: LYMessages.c:178
#, c-format
msgid "Getting %s"
msgstr ""
-#: LYMessages.c:155
+#: LYMessages.c:179
#, c-format
msgid "Skipping %s"
msgstr ""
-#: LYMessages.c:156
+#: LYMessages.c:180
#, c-format
msgid "Using %s"
msgstr ""
-#: LYMessages.c:157
+#: LYMessages.c:181
#, c-format
msgid "Illegal URL: %s"
msgstr ""
-#: LYMessages.c:158
+#: LYMessages.c:182
#, c-format
msgid "Badly formed address %s"
msgstr ""
-#: LYMessages.c:159
+#: LYMessages.c:183
#, c-format
msgid "URL: %s"
msgstr ""
-#: LYMessages.c:160
+#: LYMessages.c:184
msgid "Unable to access WWW file!!!"
msgstr ""
-#: LYMessages.c:161
+#: LYMessages.c:185
#, c-format
msgid "This is a searchable index. Use %s to search."
msgstr ""
#. #define WWW_INDEX_MORE_MESSAGE
-#: LYMessages.c:163
+#: LYMessages.c:187
#, c-format
msgid "--More-- This is a searchable index. Use %s to search."
msgstr ""
-#: LYMessages.c:164
+#: LYMessages.c:188
msgid "You have entered an invalid link number."
msgstr ""
#. #define SOURCE_HELP
-#: LYMessages.c:166
+#: LYMessages.c:190
msgid ""
"Currently viewing document source. Press '\\' to return to rendered version."
msgstr ""
#. #define NOVICE_LINE_ONE
-#: LYMessages.c:168
+#: LYMessages.c:192
msgid ""
" Arrow keys: Up and Down to move. Right to follow a link; Left to go "
"back. \n"
msgstr ""
#. #define NOVICE_LINE_TWO
-#: LYMessages.c:170
+#: LYMessages.c:194
msgid ""
" H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history "
"list \n"
msgstr ""
#. #define NOVICE_LINE_TWO_A
-#: LYMessages.c:172
+#: LYMessages.c:196
msgid ""
-" O)ther cmds H)elp K)eymap G)oto P)rint M)ain screen o)ptions "
-"Q)uit \n"
+" O)ther cmds H)elp K)eymap G)oto P)rint M)ain screen o)ptions Q)"
+"uit \n"
msgstr ""
#. #define NOVICE_LINE_TWO_B
-#: LYMessages.c:174
+#: LYMessages.c:198
msgid ""
" O)ther cmds B)ack E)dit D)ownload ^R)eload ^W)ipe screen search "
"doc: / \n"
msgstr ""
#. #define NOVICE_LINE_TWO_C
-#: LYMessages.c:176
+#: LYMessages.c:200
msgid ""
-"O)ther cmds C)omment History: <backspace> Bookmarks: V)iew, A)dd, "
-"R)emove \n"
+"O)ther cmds C)omment History: <backspace> Bookmarks: V)iew, A)dd, R)"
+"emove \n"
msgstr ""
#. #define FORM_NOVICELINE_ONE
-#: LYMessages.c:178
+#: LYMessages.c:202
msgid ""
" Enter text into the field by typing on the keyboard "
msgstr ""
#. #define FORM_NOVICELINE_TWO
-#: LYMessages.c:180
+#: LYMessages.c:204
msgid ""
" Ctrl-U to delete all text in field, [Backspace] to delete a character "
msgstr ""
#. #define FORM_NOVICELINE_TWO_DELBL
-#: LYMessages.c:182
+#: LYMessages.c:206
msgid ""
" Ctrl-U to delete text in field, [Backspace] to delete a character "
msgstr ""
#. #define FORM_NOVICELINE_TWO_VAR
-#: LYMessages.c:184
+#: LYMessages.c:208
#, c-format
msgid ""
" %s to delete all text in field, [Backspace] to delete a character "
msgstr ""
#. #define FORM_NOVICELINE_TWO_DELBL_VAR
-#: LYMessages.c:186
+#: LYMessages.c:210
#, c-format
msgid " %s to delete text in field, [Backspace] to delete a character "
msgstr ""
#. mailto
-#: LYMessages.c:189
+#: LYMessages.c:213
msgid "Malformed mailto form submission! Cancelled!"
msgstr ""
-#: LYMessages.c:190
+#: LYMessages.c:214
msgid "Warning! Control codes in mail address replaced by ?"
msgstr ""
-#: LYMessages.c:191
+#: LYMessages.c:215
msgid "Mail disallowed! Cannot submit."
msgstr ""
-#: LYMessages.c:192
+#: LYMessages.c:216
msgid "Mailto form submission failed!"
msgstr ""
-#: LYMessages.c:193
+#: LYMessages.c:217
msgid "Mailto form submission Cancelled!!!"
msgstr ""
-#: LYMessages.c:194
+#: LYMessages.c:218
msgid "Sending form content..."
msgstr ""
-#: LYMessages.c:195
+#: LYMessages.c:219
msgid "No email address is present in mailto URL!"
msgstr ""
#. #define MAILTO_URL_TEMPOPEN_FAILED
-#: LYMessages.c:197
+#: LYMessages.c:221
msgid "Unable to open temporary file for mailto URL!"
msgstr ""
#. #define INC_ORIG_MSG_PROMPT
-#: LYMessages.c:199
+#: LYMessages.c:223
msgid "Do you wish to include the original message?"
msgstr ""
#. #define INC_PREPARSED_MSG_PROMPT
-#: LYMessages.c:201
+#: LYMessages.c:225
msgid "Do you wish to include the preparsed source?"
msgstr ""
#. #define SPAWNING_EDITOR_FOR_MAIL
-#: LYMessages.c:203
+#: LYMessages.c:227
msgid "Spawning your selected editor to edit mail message"
msgstr ""
#. #define ERROR_SPAWNING_EDITOR
-#: LYMessages.c:205
+#: LYMessages.c:229
msgid "Error spawning editor, check your editor definition in the options menu"
msgstr ""
-#: LYMessages.c:206
+#: LYMessages.c:230
msgid "Send this comment?"
msgstr ""
-#: LYMessages.c:207
+#: LYMessages.c:231
msgid "Send this message?"
msgstr ""
-#: LYMessages.c:208
+#: LYMessages.c:232
msgid "Sending your message..."
msgstr ""
-#: LYMessages.c:209
+#: LYMessages.c:233
msgid "Sending your comment:"
msgstr ""
#. textarea
-#: LYMessages.c:212
+#: LYMessages.c:236
msgid "Not in a TEXTAREA; cannot use external editor."
msgstr ""
-#: LYMessages.c:213
+#: LYMessages.c:237
msgid "Not in a TEXTAREA; cannot use command."
msgstr ""
-#: LYMessages.c:215
+#: LYMessages.c:239
msgid "file: ACTIONs are disallowed!"
msgstr ""
#. #define FILE_SERVED_LINKS_DISALLOWED
-#: LYMessages.c:217
+#: LYMessages.c:241
msgid "file: URLs via served links are disallowed!"
msgstr ""
-#: LYMessages.c:218
+#: LYMessages.c:242
msgid "Access to local files denied."
msgstr ""
-#: LYMessages.c:219
+#: LYMessages.c:243
msgid "file: URLs via bookmarks are disallowed!"
msgstr ""
#. #define SPECIAL_VIA_EXTERNAL_DISALLOWED
-#: LYMessages.c:221
+#: LYMessages.c:245
msgid "This special URL is not allowed in external documents!"
msgstr ""
-#: LYMessages.c:222
+#: LYMessages.c:246
msgid "Press <return> to return to Lynx."
msgstr ""
#. #define SPAWNING_MSG
-#: LYMessages.c:225
+#: LYMessages.c:249
msgid "Spawning DCL subprocess. Use 'logout' to return to Lynx.\n"
msgstr ""
#. #define SPAWNING_MSG
-#: LYMessages.c:229
+#: LYMessages.c:253
msgid "Type EXIT to return to Lynx.\n"
msgstr ""
#. #define SPAWNING_MSG
-#: LYMessages.c:232
+#: LYMessages.c:256
msgid "Spawning your default shell. Use 'exit' to return to Lynx.\n"
msgstr ""
-#: LYMessages.c:235
+#: LYMessages.c:259
msgid "Spawning is currently disabled."
msgstr ""
-#: LYMessages.c:236
+#: LYMessages.c:260
msgid "The 'd'ownload command is currently disabled."
msgstr ""
-#: LYMessages.c:237
+#: LYMessages.c:261
msgid "You cannot download an input field."
msgstr ""
-#: LYMessages.c:238
+#: LYMessages.c:262
msgid "Form has a mailto action! Cannot download."
msgstr ""
-#: LYMessages.c:239
+#: LYMessages.c:263
msgid "You cannot download a mailto: link."
msgstr ""
-#: LYMessages.c:240
+#: LYMessages.c:264
msgid "You cannot download cookies."
msgstr ""
-#: LYMessages.c:241
+#: LYMessages.c:265
msgid "You cannot download a printing option."
msgstr ""
-#: LYMessages.c:242
+#: LYMessages.c:266
msgid "You cannot download an upload option."
msgstr ""
-#: LYMessages.c:243
+#: LYMessages.c:267
msgid "You cannot download an permit option."
msgstr ""
-#: LYMessages.c:244
+#: LYMessages.c:268
msgid "This special URL cannot be downloaded!"
msgstr ""
-#: LYMessages.c:245
+#: LYMessages.c:269
msgid "Nothing to download."
msgstr ""
-#: LYMessages.c:246
+#: LYMessages.c:270
msgid "Trace ON!"
msgstr ""
-#: LYMessages.c:247
+#: LYMessages.c:271
msgid "Trace OFF!"
msgstr ""
#. #define CLICKABLE_IMAGES_ON
-#: LYMessages.c:249
+#: LYMessages.c:273
msgid "Links will be included for all images! Reloading..."
msgstr ""
#. #define CLICKABLE_IMAGES_OFF
-#: LYMessages.c:251
+#: LYMessages.c:275
msgid "Standard image handling restored! Reloading..."
msgstr ""
#. #define PSEUDO_INLINE_ALTS_ON
-#: LYMessages.c:253
+#: LYMessages.c:277
msgid ""
"Pseudo_ALTs will be inserted for inlines without ALT strings! Reloading..."
msgstr ""
#. #define PSEUDO_INLINE_ALTS_OFF
-#: LYMessages.c:255
+#: LYMessages.c:279
msgid "Inlines without an ALT string specified will be ignored! Reloading..."
msgstr ""
-#: LYMessages.c:256
+#: LYMessages.c:280
msgid "Raw 8-bit or CJK mode toggled OFF! Reloading..."
msgstr ""
-#: LYMessages.c:257
+#: LYMessages.c:281
msgid "Raw 8-bit or CJK mode toggled ON! Reloading..."
msgstr ""
#. #define HEAD_D_L_OR_CANCEL
-#: LYMessages.c:259
+#: LYMessages.c:283
msgid "Send HEAD request for D)ocument or L)ink, or C)ancel? (d,l,c): "
msgstr ""
#. #define HEAD_D_OR_CANCEL
-#: LYMessages.c:261
+#: LYMessages.c:285
msgid "Send HEAD request for D)ocument, or C)ancel? (d,c): "
msgstr ""
-#: LYMessages.c:262
+#: LYMessages.c:286
msgid "Sorry, the document is not an http URL."
msgstr ""
-#: LYMessages.c:263
+#: LYMessages.c:287
msgid "Sorry, the link is not an http URL."
msgstr ""
-#: LYMessages.c:264
+#: LYMessages.c:288
msgid "Sorry, the ACTION for this form is disabled."
msgstr ""
#. #define FORM_ACTION_NOT_HTTP_URL
-#: LYMessages.c:266
+#: LYMessages.c:290
msgid "Sorry, the ACTION for this form is not an http URL."
msgstr ""
-#: LYMessages.c:267
+#: LYMessages.c:291
msgid "Not an http URL or form ACTION!"
msgstr ""
-#: LYMessages.c:268
+#: LYMessages.c:292
msgid "This special URL cannot be a form ACTION!"
msgstr ""
-#: LYMessages.c:269
+#: LYMessages.c:293
msgid "URL is not in starting realm!"
msgstr ""
-#: LYMessages.c:270
+#: LYMessages.c:294
msgid "News posting is disabled!"
msgstr ""
-#: LYMessages.c:271
+#: LYMessages.c:295
msgid "File management support is disabled!"
msgstr ""
-#: LYMessages.c:272
+#: LYMessages.c:296
msgid "No jump file is currently available."
msgstr ""
-#: LYMessages.c:273
+#: LYMessages.c:297
msgid "Jump to (use '?' for list): "
msgstr ""
-#: LYMessages.c:274
+#: LYMessages.c:298
msgid "Jumping to a shortcut URL is disallowed!"
msgstr ""
-#: LYMessages.c:275
+#: LYMessages.c:299
msgid "Random URL is disallowed! Use a shortcut."
msgstr ""
-#: LYMessages.c:276
+#: LYMessages.c:300
msgid "No random URLs have been used thus far."
msgstr ""
-#: LYMessages.c:277
+#: LYMessages.c:301
msgid "Bookmark features are currently disabled."
msgstr ""
-#: LYMessages.c:278
+#: LYMessages.c:302
msgid "Execution via bookmarks is disabled."
msgstr ""
#. #define BOOKMARK_FILE_NOT_DEFINED
-#: LYMessages.c:280
+#: LYMessages.c:304
#, c-format
msgid "Bookmark file is not defined. Use %s to see options."
msgstr ""
#. #define NO_TEMP_FOR_HOTLIST
-#: LYMessages.c:282
+#: LYMessages.c:306
msgid "Unable to open tempfile for X Mosaic hotlist conversion."
msgstr ""
-#: LYMessages.c:283
+#: LYMessages.c:307
msgid "ERROR - unable to open bookmark file."
msgstr ""
#. #define BOOKMARK_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:285
+#: LYMessages.c:309
msgid "Unable to open bookmark file for deletion of link."
msgstr ""
#. #define BOOKSCRA_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:287
+#: LYMessages.c:311
msgid "Unable to open scratch file for deletion of link."
msgstr ""
-#: LYMessages.c:289
+#: LYMessages.c:313
msgid "Error renaming scratch file."
msgstr ""
-#: LYMessages.c:291
+#: LYMessages.c:315
msgid "Error renaming temporary file."
msgstr ""
#. #define BOOKTEMP_COPY_FAIL
-#: LYMessages.c:293
+#: LYMessages.c:317
msgid "Unable to copy temporary file for deletion of link."
msgstr ""
#. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL
-#: LYMessages.c:295
+#: LYMessages.c:319
msgid "Unable to reopen temporary file for deletion of link."
msgstr ""
#. #define BOOKMARK_LINK_NOT_ONE_LINE
-#: LYMessages.c:298
+#: LYMessages.c:322
msgid "Link is not by itself all on one line in bookmark file."
msgstr ""
-#: LYMessages.c:299
+#: LYMessages.c:323
msgid "Bookmark deletion failed."
msgstr ""
#. #define BOOKMARKS_NOT_TRAVERSED
-#: LYMessages.c:301
+#: LYMessages.c:325
msgid "Bookmark files cannot be traversed (only http URLs)."
msgstr ""
#. #define BOOKMARKS_NOT_OPEN
-#: LYMessages.c:303
+#: LYMessages.c:327
msgid "Unable to open bookmark file, use 'a' to save a link first"
msgstr ""
-#: LYMessages.c:304
+#: LYMessages.c:328
msgid "There are no links in this bookmark file!"
msgstr ""
#. #define CACHE_D_OR_CANCEL
-#: LYMessages.c:306
+#: LYMessages.c:330
msgid "D)elete cached document or C)ancel? (d,c): "
msgstr ""
#. #define BOOK_D_L_OR_CANCEL
-#: LYMessages.c:308
+#: LYMessages.c:332
msgid "Save D)ocument or L)ink to bookmark file or C)ancel? (d,l,c): "
msgstr ""
-#: LYMessages.c:309
+#: LYMessages.c:333
msgid "Save D)ocument to bookmark file or C)ancel? (d,c): "
msgstr ""
-#: LYMessages.c:310
+#: LYMessages.c:334
msgid "Save L)ink to bookmark file or C)ancel? (l,c): "
msgstr ""
#. #define NOBOOK_POST_FORM
-#: LYMessages.c:312
+#: LYMessages.c:336
msgid "Documents from forms with POST content cannot be saved as bookmarks."
msgstr ""
-#: LYMessages.c:313
+#: LYMessages.c:337
msgid "Cannot save form fields/links"
msgstr ""
#. #define NOBOOK_HSML
-#: LYMessages.c:315
+#: LYMessages.c:339
msgid "History, showinfo, menu and list files cannot be saved as bookmarks."
msgstr ""
#. #define CONFIRM_BOOKMARK_DELETE
-#: LYMessages.c:317
+#: LYMessages.c:341
msgid "Do you really want to delete this link from your bookmark file?"
msgstr ""
-#: LYMessages.c:318
+#: LYMessages.c:342
msgid "Malformed address."
msgstr ""
#. #define HISTORICAL_ON_MINIMAL_OFF
-#: LYMessages.c:320
+#: LYMessages.c:344
msgid "Historical comment parsing ON (Minimal is overridden)!"
msgstr ""
#. #define HISTORICAL_OFF_MINIMAL_ON
-#: LYMessages.c:322
+#: LYMessages.c:346
msgid "Historical comment parsing OFF (Minimal is in effect)!"
msgstr ""
#. #define HISTORICAL_ON_VALID_OFF
-#: LYMessages.c:324
+#: LYMessages.c:348
msgid "Historical comment parsing ON (Valid is overridden)!"
msgstr ""
#. #define HISTORICAL_OFF_VALID_ON
-#: LYMessages.c:326
+#: LYMessages.c:350
msgid "Historical comment parsing OFF (Valid is in effect)!"
msgstr ""
#. #define MINIMAL_ON_IN_EFFECT
-#: LYMessages.c:328
+#: LYMessages.c:352
msgid "Minimal comment parsing ON (and in effect)!"
msgstr ""
#. #define MINIMAL_OFF_VALID_ON
-#: LYMessages.c:330
+#: LYMessages.c:354
msgid "Minimal comment parsing OFF (Valid is in effect)!"
msgstr ""
#. #define MINIMAL_ON_BUT_HISTORICAL
-#: LYMessages.c:332
+#: LYMessages.c:356
msgid "Minimal comment parsing ON (but Historical is in effect)!"
msgstr ""
#. #define MINIMAL_OFF_HISTORICAL_ON
-#: LYMessages.c:334
+#: LYMessages.c:358
msgid "Minimal comment parsing OFF (Historical is in effect)!"
msgstr ""
-#: LYMessages.c:335
+#: LYMessages.c:359
msgid "Soft double-quote parsing ON!"
msgstr ""
-#: LYMessages.c:336
+#: LYMessages.c:360
msgid "Soft double-quote parsing OFF!"
msgstr ""
-#: LYMessages.c:337
+#: LYMessages.c:361
msgid "Now using TagSoup parsing of HTML."
msgstr ""
-#: LYMessages.c:338
+#: LYMessages.c:362
msgid "Now using SortaSGML parsing of HTML!"
msgstr ""
-#: LYMessages.c:339
+#: LYMessages.c:363
msgid "You are already at the end of this document."
msgstr ""
-#: LYMessages.c:340
+#: LYMessages.c:364
msgid "You are already at the beginning of this document."
msgstr ""
-#: LYMessages.c:341
+#: LYMessages.c:365
#, c-format
msgid "You are already at page %d of this document."
msgstr ""
-#: LYMessages.c:342
+#: LYMessages.c:366
#, c-format
msgid "Link number %d already is current."
msgstr ""
-#: LYMessages.c:343
+#: LYMessages.c:367
msgid "You are already at the first document"
msgstr ""
-#: LYMessages.c:344
+#: LYMessages.c:368
msgid "There are no links above this line of the document."
msgstr ""
-#: LYMessages.c:345
+#: LYMessages.c:369
msgid "There are no links below this line of the document."
msgstr ""
#. #define MAXLEN_REACHED_DEL_OR_MOV
-#: LYMessages.c:347
+#: LYMessages.c:371
msgid "Maximum length reached! Delete text or move off field."
msgstr ""
#. #define NOT_ON_SUBMIT_OR_LINK
-#: LYMessages.c:349
+#: LYMessages.c:373
msgid "You are not on a form submission button or normal link."
msgstr ""
#. #define NEED_CHECKED_RADIO_BUTTON
-#: LYMessages.c:351
+#: LYMessages.c:375
msgid "One radio button must be checked at all times!"
msgstr ""
-#: LYMessages.c:352
+#: LYMessages.c:376
msgid "No submit button for this form, submit single text field?"
msgstr ""
-#: LYMessages.c:353
+#: LYMessages.c:377
msgid "Do you want to go back to the previous document?"
msgstr ""
-#: LYMessages.c:354
+#: LYMessages.c:378
msgid "Use arrows or tab to move off of field."
msgstr ""
#. #define ENTER_TEXT_ARROWS_OR_TAB
-#: LYMessages.c:356
+#: LYMessages.c:380
msgid "Enter text. Use arrows or tab to move off of field."
msgstr ""
-#: LYMessages.c:357
+#: LYMessages.c:381
msgid "** Bad HTML!! No form action defined. **"
msgstr ""
-#: LYMessages.c:358
+#: LYMessages.c:382
msgid "Bad HTML!! Unable to create popup window!"
msgstr ""
-#: LYMessages.c:359
+#: LYMessages.c:383
msgid "Unable to create popup window!"
msgstr ""
-#: LYMessages.c:360
+#: LYMessages.c:384
msgid "Goto a random URL is disallowed!"
msgstr ""
-#: LYMessages.c:361
+#: LYMessages.c:385
msgid "Goto a non-http URL is disallowed!"
msgstr ""
-#: LYMessages.c:362
+#: LYMessages.c:386
#, c-format
msgid "You are not allowed to goto \"%s\" URLs"
msgstr ""
-#: LYMessages.c:363
+#: LYMessages.c:387
msgid "URL to open: "
msgstr ""
-#: LYMessages.c:364
+#: LYMessages.c:388
msgid "Edit the current Goto URL: "
msgstr ""
-#: LYMessages.c:365
+#: LYMessages.c:389
msgid "Edit the previous Goto URL: "
msgstr ""
-#: LYMessages.c:366
+#: LYMessages.c:390
msgid "Edit a previous Goto URL: "
msgstr ""
-#: LYMessages.c:367
+#: LYMessages.c:391
msgid "Current document has POST data."
msgstr ""
-#: LYMessages.c:368
+#: LYMessages.c:392
msgid "Edit this document's URL: "
msgstr ""
-#: LYMessages.c:369
+#: LYMessages.c:393
msgid "Edit the current link's URL: "
msgstr ""
-#: LYMessages.c:370
+#: LYMessages.c:394
msgid "Edit the form's submit-URL: "
msgstr ""
-#: LYMessages.c:371
+#: LYMessages.c:395
msgid "You cannot edit File Management URLs"
msgstr ""
-#: LYMessages.c:372
+#: LYMessages.c:396
msgid "Enter a database query: "
msgstr ""
-#: LYMessages.c:373
+#: LYMessages.c:397
msgid "Enter a whereis query: "
msgstr ""
-#: LYMessages.c:374
+#: LYMessages.c:398
msgid "Edit the current query: "
msgstr ""
-#: LYMessages.c:375
+#: LYMessages.c:399
msgid "Edit the previous query: "
msgstr ""
-#: LYMessages.c:376
+#: LYMessages.c:400
msgid "Edit a previous query: "
msgstr ""
#. #define USE_C_R_TO_RESUB_CUR_QUERY
-#: LYMessages.c:378
+#: LYMessages.c:402
msgid "Use Control-R to resubmit the current query."
msgstr ""
-#: LYMessages.c:379
+#: LYMessages.c:403
msgid "Edit the current shortcut: "
msgstr ""
-#: LYMessages.c:380
+#: LYMessages.c:404
msgid "Edit the previous shortcut: "
msgstr ""
-#: LYMessages.c:381
+#: LYMessages.c:405
msgid "Edit a previous shortcut: "
msgstr ""
-#: LYMessages.c:382
+#: LYMessages.c:406
#, c-format
msgid "Key '%c' is not mapped to a jump file!"
msgstr ""
-#: LYMessages.c:383
+#: LYMessages.c:407
msgid "Cannot locate jump file!"
msgstr ""
-#: LYMessages.c:384
+#: LYMessages.c:408
msgid "Cannot open jump file!"
msgstr ""
-#: LYMessages.c:385
+#: LYMessages.c:409
msgid "Error reading jump file!"
msgstr ""
-#: LYMessages.c:386
+#: LYMessages.c:410
msgid "Out of memory reading jump file!"
msgstr ""
-#: LYMessages.c:387
+#: LYMessages.c:411
msgid "Out of memory reading jump table!"
msgstr ""
-#: LYMessages.c:388
+#: LYMessages.c:412
msgid "No index is currently available."
msgstr ""
#. #define CONFIRM_MAIN_SCREEN
-#: LYMessages.c:390
+#: LYMessages.c:414
msgid "Do you really want to go to the Main screen?"
msgstr ""
-#: LYMessages.c:391
+#: LYMessages.c:415
msgid "You are already at main screen!"
msgstr ""
#. #define NOT_ISINDEX
-#: LYMessages.c:393
+#: LYMessages.c:417
msgid ""
"Not a searchable indexed document -- press '/' to search for a text string"
msgstr ""
#. #define NO_OWNER
-#: LYMessages.c:395
+#: LYMessages.c:419
msgid "No owner is defined for this file so you cannot send a comment"
msgstr ""
-#: LYMessages.c:396
+#: LYMessages.c:420
#, c-format
msgid "No owner is defined. Use %s?"
msgstr ""
-#: LYMessages.c:397
+#: LYMessages.c:421
msgid "Do you wish to send a comment?"
msgstr ""
-#: LYMessages.c:398
+#: LYMessages.c:422
msgid "Mail is disallowed so you cannot send a comment"
msgstr ""
-#: LYMessages.c:399
+#: LYMessages.c:423
msgid "The 'e'dit command is currently disabled."
msgstr ""
-#: LYMessages.c:400
+#: LYMessages.c:424
msgid "External editing is currently disabled."
msgstr ""
-#: LYMessages.c:401
+#: LYMessages.c:425
msgid "System error - failure to get status."
msgstr ""
-#: LYMessages.c:402
+#: LYMessages.c:426
msgid "No editor is defined!"
msgstr ""
-#: LYMessages.c:403
+#: LYMessages.c:427
msgid "The 'p'rint command is currently disabled."
msgstr ""
-#: LYMessages.c:404
+#: LYMessages.c:428
msgid "Document has no Toolbar links or Banner."
msgstr ""
-#: LYMessages.c:405
+#: LYMessages.c:429
msgid "Unable to open traversal file."
msgstr ""
-#: LYMessages.c:406
+#: LYMessages.c:430
msgid "Unable to open traversal found file."
msgstr ""
-#: LYMessages.c:407
+#: LYMessages.c:431
msgid "Unable to open reject file."
msgstr ""
-#: LYMessages.c:408
+#: LYMessages.c:432
msgid "Unable to open traversal errors output file"
msgstr ""
-#: LYMessages.c:409
+#: LYMessages.c:433
msgid "TRAVERSAL WAS INTERRUPTED"
msgstr ""
-#: LYMessages.c:410
+#: LYMessages.c:434
msgid "Follow link (or goto link or page) number: "
msgstr ""
-#: LYMessages.c:411
+#: LYMessages.c:435
msgid "Select option (or page) number: "
msgstr ""
-#: LYMessages.c:412
+#: LYMessages.c:436
#, c-format
msgid "Option number %d already is current."
msgstr ""
#. #define ALREADY_AT_OPTION_END
-#: LYMessages.c:414
+#: LYMessages.c:438
msgid "You are already at the end of this option list."
msgstr ""
#. #define ALREADY_AT_OPTION_BEGIN
-#: LYMessages.c:416
+#: LYMessages.c:440
msgid "You are already at the beginning of this option list."
msgstr ""
#. #define ALREADY_AT_OPTION_PAGE
-#: LYMessages.c:418
+#: LYMessages.c:442
#, c-format
msgid "You are already at page %d of this option list."
msgstr ""
-#: LYMessages.c:419
+#: LYMessages.c:443
msgid "You have entered an invalid option number."
msgstr ""
-#: LYMessages.c:420
+#: LYMessages.c:444
msgid "** Bad HTML!! Use -trace to diagnose. **"
msgstr ""
-#: LYMessages.c:421
+#: LYMessages.c:445
msgid "Give name of file to save in"
msgstr ""
-#: LYMessages.c:422
+#: LYMessages.c:446
msgid "Can't save data to file -- please run WWW locally"
msgstr ""
-#: LYMessages.c:423
+#: LYMessages.c:447
msgid "Can't open temporary file!"
msgstr ""
-#: LYMessages.c:424
+#: LYMessages.c:448
msgid "Can't open output file! Cancelling!"
msgstr ""
-#: LYMessages.c:425
+#: LYMessages.c:449
msgid "Execution is disabled."
msgstr ""
#. #define EXECUTION_DISABLED_FOR_FILE
-#: LYMessages.c:427
+#: LYMessages.c:451
#, c-format
msgid "Execution is not enabled for this file. See the Options menu (use %s)."
msgstr ""
#. #define EXECUTION_NOT_COMPILED
-#: LYMessages.c:429
+#: LYMessages.c:453
msgid "Execution capabilities are not compiled into this version."
msgstr ""
-#: LYMessages.c:430
+#: LYMessages.c:454
msgid "This file cannot be displayed on this terminal."
msgstr ""
#. #define CANNOT_DISPLAY_FILE_D_OR_C
-#: LYMessages.c:432
+#: LYMessages.c:456
msgid "This file cannot be displayed on this terminal: D)ownload, or C)ancel"
msgstr ""
-#: LYMessages.c:433
+#: LYMessages.c:457
#, c-format
msgid "%s D)ownload, or C)ancel"
msgstr ""
-#: LYMessages.c:434
+#: LYMessages.c:458
msgid "Cancelling file."
msgstr ""
-#: LYMessages.c:435
+#: LYMessages.c:459
msgid "Retrieving file. - PLEASE WAIT -"
msgstr ""
-#: LYMessages.c:436
+#: LYMessages.c:460
msgid "Enter a filename: "
msgstr ""
-#: LYMessages.c:437
+#: LYMessages.c:461
msgid "Edit the previous filename: "
msgstr ""
-#: LYMessages.c:438
+#: LYMessages.c:462
msgid "Edit a previous filename: "
msgstr ""
-#: LYMessages.c:439
+#: LYMessages.c:463
msgid "Enter a new filename: "
msgstr ""
-#: LYMessages.c:440
+#: LYMessages.c:464
msgid "File name may not begin with a dot."
msgstr ""
-#: LYMessages.c:442
+#: LYMessages.c:466
msgid "File exists. Create higher version?"
msgstr ""
-#: LYMessages.c:444
+#: LYMessages.c:468
msgid "File exists. Overwrite?"
msgstr ""
-#: LYMessages.c:446
+#: LYMessages.c:470
msgid "Cannot write to file."
msgstr ""
-#: LYMessages.c:447
+#: LYMessages.c:471
msgid "ERROR! - download command is misconfigured."
msgstr ""
-#: LYMessages.c:448
+#: LYMessages.c:472
msgid "Unable to download file."
msgstr ""
-#: LYMessages.c:449
+#: LYMessages.c:473
msgid "Reading directory..."
msgstr ""
-#: LYMessages.c:450
+#: LYMessages.c:474
msgid "Building directory listing..."
msgstr ""
-#: LYMessages.c:451
+#: LYMessages.c:475
msgid "Saving..."
msgstr ""
-#: LYMessages.c:452
+#: LYMessages.c:476
#, c-format
msgid "Could not edit file '%s'."
msgstr ""
-#: LYMessages.c:453
+#: LYMessages.c:477
msgid "Unable to access document!"
msgstr ""
-#: LYMessages.c:454
+#: LYMessages.c:478
msgid "Could not access file."
msgstr ""
-#: LYMessages.c:455
+#: LYMessages.c:479
msgid "Could not access directory."
msgstr ""
-#: LYMessages.c:456
+#: LYMessages.c:480
msgid "Could not load data."
msgstr ""
#. #define CANNOT_EDIT_REMOTE_FILES
-#: LYMessages.c:458
+#: LYMessages.c:482
msgid "Lynx cannot currently (e)dit remote WWW files."
msgstr ""
#. #define CANNOT_EDIT_FIELD
-#: LYMessages.c:460
+#: LYMessages.c:484
msgid "This field cannot be (e)dited with an external editor."
msgstr ""
-#: LYMessages.c:461
+#: LYMessages.c:485
msgid "Bad rule"
msgstr ""
-#: LYMessages.c:462
+#: LYMessages.c:486
msgid "Insufficient operands:"
msgstr ""
-#: LYMessages.c:463
+#: LYMessages.c:487
msgid "You are not authorized to edit this file."
msgstr ""
-#: LYMessages.c:464
+#: LYMessages.c:488
msgid "Title: "
msgstr ""
-#: LYMessages.c:465
+#: LYMessages.c:489
msgid "Subject: "
msgstr ""
-#: LYMessages.c:466
+#: LYMessages.c:490
msgid "Username: "
msgstr ""
-#: LYMessages.c:467
+#: LYMessages.c:491
msgid "Password: "
msgstr ""
-#: LYMessages.c:468
+#: LYMessages.c:492
msgid "lynx: Username and Password required!!!"
msgstr ""
-#: LYMessages.c:469
+#: LYMessages.c:493
msgid "lynx: Password required!!!"
msgstr ""
-#: LYMessages.c:470
+#: LYMessages.c:494
msgid "Clear all authorization info for this session?"
msgstr ""
-#: LYMessages.c:471
+#: LYMessages.c:495
msgid "Authorization info cleared."
msgstr ""
-#: LYMessages.c:472
+#: LYMessages.c:496
msgid "Authorization failed. Retry?"
msgstr ""
-#: LYMessages.c:473
+#: LYMessages.c:497
msgid "cgi support has been disabled."
msgstr ""
#. #define CGI_NOT_COMPILED
-#: LYMessages.c:475
+#: LYMessages.c:499
msgid "Lynxcgi capabilities are not compiled into this version."
msgstr ""
-#: LYMessages.c:476
+#: LYMessages.c:500
#, c-format
msgid "Sorry, no known way of converting %s to %s."
msgstr ""
-#: LYMessages.c:477
+#: LYMessages.c:501
msgid "Unable to set up connection."
msgstr ""
-#: LYMessages.c:478
+#: LYMessages.c:502
msgid "Unable to make connection"
msgstr ""
#. #define MALFORMED_EXEC_REQUEST
-#: LYMessages.c:480
+#: LYMessages.c:504
msgid "Executable link rejected due to malformed request."
msgstr ""
#. #define BADCHAR_IN_EXEC_LINK
-#: LYMessages.c:482
+#: LYMessages.c:506
#, c-format
msgid "Executable link rejected due to `%c' character."
msgstr ""
#. #define RELPATH_IN_EXEC_LINK
-#: LYMessages.c:484
+#: LYMessages.c:508
msgid "Executable link rejected due to relative path string ('../')."
msgstr ""
#. #define BADLOCPATH_IN_EXEC_LINK
-#: LYMessages.c:486
+#: LYMessages.c:510
msgid "Executable link rejected due to location or path."
msgstr ""
-#: LYMessages.c:487
+#: LYMessages.c:511
msgid "Mail access is disabled!"
msgstr ""
#. #define ACCESS_ONLY_LOCALHOST
-#: LYMessages.c:489
+#: LYMessages.c:513
msgid "Only files and servers on the local host can be accessed."
msgstr ""
-#: LYMessages.c:490
+#: LYMessages.c:514
msgid "Telnet access is disabled!"
msgstr ""
#. #define TELNET_PORT_SPECS_DISABLED
-#: LYMessages.c:492
+#: LYMessages.c:516
msgid "Telnet port specifications are disabled."
msgstr ""
-#: LYMessages.c:493
+#: LYMessages.c:517
msgid "USENET news access is disabled!"
msgstr ""
-#: LYMessages.c:494
+#: LYMessages.c:518
msgid "Rlogin access is disabled!"
msgstr ""
-#: LYMessages.c:495
+#: LYMessages.c:519
msgid "Ftp access is disabled!"
msgstr ""
-#: LYMessages.c:496
+#: LYMessages.c:520
msgid "There are no references from this document."
msgstr ""
-#: LYMessages.c:497
+#: LYMessages.c:521
msgid "There are only hidden links from this document."
msgstr ""
-#: LYMessages.c:499
+#: LYMessages.c:523
msgid "Unable to open command file."
msgstr ""
-#: LYMessages.c:501
+#: LYMessages.c:525
msgid "News Post Cancelled!!!"
msgstr ""
#. #define SPAWNING_EDITOR_FOR_NEWS
-#: LYMessages.c:503
+#: LYMessages.c:527
msgid "Spawning your selected editor to edit news message"
msgstr ""
-#: LYMessages.c:504
+#: LYMessages.c:528
msgid "Post this message?"
msgstr ""
-#: LYMessages.c:505
+#: LYMessages.c:529
#, c-format
msgid "Append '%s'?"
msgstr ""
-#: LYMessages.c:506
+#: LYMessages.c:530
msgid "Posting to newsgroup(s)..."
msgstr ""
-#: LYMessages.c:508
+#: LYMessages.c:532
msgid "*** You have unread mail. ***"
msgstr ""
-#: LYMessages.c:510
+#: LYMessages.c:534
msgid "*** You have mail. ***"
msgstr ""
-#: LYMessages.c:512
+#: LYMessages.c:536
msgid "*** You have new mail. ***"
msgstr ""
-#: LYMessages.c:513
+#: LYMessages.c:537
msgid "File insert cancelled!!!"
msgstr ""
-#: LYMessages.c:514
+#: LYMessages.c:538
msgid "Not enough memory for file!"
msgstr ""
-#: LYMessages.c:515
+#: LYMessages.c:539
msgid "Can't open file for reading."
msgstr ""
-#: LYMessages.c:516
+#: LYMessages.c:540
msgid "File does not exist."
msgstr ""
-#: LYMessages.c:517
+#: LYMessages.c:541
msgid "File does not exist - reenter or cancel:"
msgstr ""
-#: LYMessages.c:518
+#: LYMessages.c:542
msgid "File is not readable."
msgstr ""
-#: LYMessages.c:519
+#: LYMessages.c:543
msgid "File is not readable - reenter or cancel:"
msgstr ""
-#: LYMessages.c:520
+#: LYMessages.c:544
msgid "Nothing to insert - file is 0-length."
msgstr ""
-#: LYMessages.c:521
+#: LYMessages.c:545
msgid "Save request cancelled!!!"
msgstr ""
-#: LYMessages.c:522
+#: LYMessages.c:546
msgid "Mail request cancelled!!!"
msgstr ""
#. #define CONFIRM_MAIL_SOURCE_PREPARSED
-#: LYMessages.c:524
+#: LYMessages.c:548
msgid "Viewing preparsed source. Are you sure you want to mail it?"
msgstr ""
-#: LYMessages.c:525
+#: LYMessages.c:549
msgid "Please wait..."
msgstr ""
-#: LYMessages.c:526
+#: LYMessages.c:550
msgid "Mailing file. Please wait..."
msgstr ""
-#: LYMessages.c:527
+#: LYMessages.c:551
msgid "ERROR - Unable to mail file"
msgstr ""
#. #define CONFIRM_LONG_SCREEN_PRINT
-#: LYMessages.c:529
+#: LYMessages.c:553
#, c-format
msgid "File is %d screens long. Are you sure you want to print?"
msgstr ""
-#: LYMessages.c:530
+#: LYMessages.c:554
msgid "Print request cancelled!!!"
msgstr ""
-#: LYMessages.c:531
+#: LYMessages.c:555
msgid "Press <return> to begin: "
msgstr ""
-#: LYMessages.c:532
+#: LYMessages.c:556
msgid "Press <return> to finish: "
msgstr ""
#. #define CONFIRM_LONG_PAGE_PRINT
-#: LYMessages.c:534
+#: LYMessages.c:558
#, c-format
msgid "File is %d pages long. Are you sure you want to print?"
msgstr ""
#. #define CHECK_PRINTER
-#: LYMessages.c:536
+#: LYMessages.c:560
msgid "Be sure your printer is on-line. Press <return> to start printing:"
msgstr ""
-#: LYMessages.c:537
+#: LYMessages.c:561
msgid "ERROR - Unable to allocate file space!!!"
msgstr ""
-#: LYMessages.c:538
+#: LYMessages.c:562
msgid "Unable to open tempfile"
msgstr ""
-#: LYMessages.c:539
+#: LYMessages.c:563
msgid "Unable to open print options file"
msgstr ""
-#: LYMessages.c:540
+#: LYMessages.c:564
msgid "Printing file. Please wait..."
msgstr ""
-#: LYMessages.c:541
+#: LYMessages.c:565
msgid "Please enter a valid internet mail address: "
msgstr ""
-#: LYMessages.c:542
+#: LYMessages.c:566
msgid "ERROR! - printer is misconfigured!"
msgstr ""
-#: LYMessages.c:543
+#: LYMessages.c:567
msgid "Image map from POST response not available!"
msgstr ""
-#: LYMessages.c:544
+#: LYMessages.c:568
msgid "Misdirected client-side image MAP request!"
msgstr ""
-#: LYMessages.c:545
+#: LYMessages.c:569
msgid "Client-side image MAP is not accessible!"
msgstr ""
-#: LYMessages.c:546
+#: LYMessages.c:570
msgid "No client-side image MAPs are available!"
msgstr ""
-#: LYMessages.c:547
+#: LYMessages.c:571
msgid "Client-side image MAP is not available!"
msgstr ""
#. #define OPTION_SCREEN_NEEDS_24
-#: LYMessages.c:550
+#: LYMessages.c:574
msgid "Screen height must be at least 24 lines for the Options menu!"
msgstr ""
#. #define OPTION_SCREEN_NEEDS_23
-#: LYMessages.c:552
+#: LYMessages.c:576
msgid "Screen height must be at least 23 lines for the Options menu!"
msgstr ""
#. #define OPTION_SCREEN_NEEDS_22
-#: LYMessages.c:554
+#: LYMessages.c:578
msgid "Screen height must be at least 22 lines for the Options menu!"
msgstr ""
-#: LYMessages.c:556
+#: LYMessages.c:580
msgid "That key requires Advanced User mode."
msgstr ""
-#: LYMessages.c:557
+#: LYMessages.c:581
#, c-format
msgid "Content-type: %s"
msgstr ""
-#: LYMessages.c:558
+#: LYMessages.c:582
msgid "Command: "
msgstr ""
-#: LYMessages.c:559
+#: LYMessages.c:583
msgid "Unknown or ambiguous command"
msgstr ""
-#: LYMessages.c:560
+#: LYMessages.c:584
msgid " Version "
msgstr ""
-#: LYMessages.c:561
+#: LYMessages.c:585
msgid " first"
msgstr ""
-#: LYMessages.c:562
+#: LYMessages.c:586
msgid ", guessing..."
msgstr ""
-#: LYMessages.c:563
+#: LYMessages.c:587
msgid "Permissions for "
msgstr ""
-#: LYMessages.c:564
+#: LYMessages.c:588
msgid "Select "
msgstr ""
-#: LYMessages.c:565
+#: LYMessages.c:589
msgid "capital letter"
msgstr ""
-#: LYMessages.c:566
+#: LYMessages.c:590
msgid " of option line,"
msgstr ""
-#: LYMessages.c:567
+#: LYMessages.c:591
msgid " to save,"
msgstr ""
-#: LYMessages.c:568
+#: LYMessages.c:592
msgid " to "
msgstr ""
-#: LYMessages.c:569
+#: LYMessages.c:593
msgid " or "
msgstr ""
-#: LYMessages.c:570
+#: LYMessages.c:594
msgid " index"
msgstr ""
-#: LYMessages.c:571
+#: LYMessages.c:595
msgid " to return to Lynx."
msgstr ""
-#: LYMessages.c:572
+#: LYMessages.c:596
msgid "Accept Changes"
msgstr ""
-#: LYMessages.c:573
+#: LYMessages.c:597
msgid "Reset Changes"
msgstr ""
-#: LYMessages.c:574
+#: LYMessages.c:598
msgid "Left Arrow cancels changes"
msgstr ""
-#: LYMessages.c:575
+#: LYMessages.c:599
msgid "Save options to disk"
msgstr ""
-#: LYMessages.c:576
+#: LYMessages.c:600
msgid "Hit RETURN to accept entered data."
msgstr ""
#. #define ACCEPT_DATA_OR_DEFAULT
-#: LYMessages.c:578
+#: LYMessages.c:602
msgid "Hit RETURN to accept entered data. Delete data to invoke the default."
msgstr ""
-#: LYMessages.c:579
+#: LYMessages.c:603
msgid "Value accepted!"
msgstr ""
#. #define VALUE_ACCEPTED_WARNING_X
-#: LYMessages.c:581
+#: LYMessages.c:605
msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!"
msgstr ""
#. #define VALUE_ACCEPTED_WARNING_NONX
-#: LYMessages.c:583
+#: LYMessages.c:607
msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!"
msgstr ""
-#: LYMessages.c:584
+#: LYMessages.c:608
msgid "You are not allowed to change which editor to use!"
msgstr ""
-#: LYMessages.c:585
+#: LYMessages.c:609
msgid "Failed to set DISPLAY variable!"
msgstr ""
-#: LYMessages.c:586
+#: LYMessages.c:610
msgid "Failed to clear DISPLAY variable!"
msgstr ""
#. #define BOOKMARK_CHANGE_DISALLOWED
-#: LYMessages.c:588
+#: LYMessages.c:612
msgid "You are not allowed to change the bookmark file!"
msgstr ""
-#: LYMessages.c:589
+#: LYMessages.c:613
msgid "Terminal does not support color"
msgstr ""
-#: LYMessages.c:590
+#: LYMessages.c:614
#, c-format
msgid "Your '%s' terminal does not support color."
msgstr ""
-#: LYMessages.c:591
+#: LYMessages.c:615
msgid "Access to dot files is disabled!"
msgstr ""
#. #define UA_NO_LYNX_WARNING
-#: LYMessages.c:593
+#: LYMessages.c:617
msgid "User-Agent string does not contain \"Lynx\" or \"L_y_n_x\""
msgstr ""
#. #define UA_PLEASE_USE_LYNX
-#: LYMessages.c:595
+#: LYMessages.c:619
msgid ""
"Use \"L_y_n_x\" or \"Lynx\" in User-Agent, or it looks like intentional "
"deception!"
msgstr ""
#. #define UA_CHANGE_DISABLED
-#: LYMessages.c:597
+#: LYMessages.c:621
msgid "Changing of the User-Agent string is disabled!"
msgstr ""
#. #define CHANGE_OF_SETTING_DISALLOWED
-#: LYMessages.c:599
+#: LYMessages.c:623
msgid "You are not allowed to change this setting."
msgstr ""
-#: LYMessages.c:600
+#: LYMessages.c:624
msgid "Saving Options..."
msgstr ""
-#: LYMessages.c:601
+#: LYMessages.c:625
msgid "Options saved!"
msgstr ""
-#: LYMessages.c:602
+#: LYMessages.c:626
msgid "Unable to save Options!"
msgstr ""
-#: LYMessages.c:603
+#: LYMessages.c:627
msgid " 'r' to return to Lynx "
msgstr ""
-#: LYMessages.c:604
+#: LYMessages.c:628
msgid " '>' to save, or 'r' to return to Lynx "
msgstr ""
#. #define ANY_KEY_CHANGE_RET_ACCEPT
-#: LYMessages.c:606
+#: LYMessages.c:630
msgid "Hit any key to change value; RETURN to accept."
msgstr ""
-#: LYMessages.c:607
+#: LYMessages.c:631
msgid "Error uncompressing temporary file!"
msgstr ""
-#: LYMessages.c:608
+#: LYMessages.c:632
msgid "Unsupported URL scheme!"
msgstr ""
-#: LYMessages.c:609
+#: LYMessages.c:633
msgid "Unsupported data: URL! Use SHOWINFO, for now."
msgstr ""
-#: LYMessages.c:610
+#: LYMessages.c:634
msgid "Redirection limit of 10 URL's reached."
msgstr ""
-#: LYMessages.c:611
+#: LYMessages.c:635
msgid "Illegal redirection URL received from server!"
msgstr ""
#. #define SERVER_ASKED_FOR_REDIRECTION
-#: LYMessages.c:613
+#: LYMessages.c:637
#, c-format
msgid "Server asked for %d redirection of POST content to"
msgstr ""
-#: LYMessages.c:616
+#: LYMessages.c:640
msgid "P)roceed, use G)ET or C)ancel "
msgstr ""
-#: LYMessages.c:617
+#: LYMessages.c:641
msgid "P)roceed, or C)ancel "
msgstr ""
#. #define ADVANCED_POST_GET_REDIRECT
-#: LYMessages.c:619
+#: LYMessages.c:643
msgid "Redirection of POST content. P)roceed, see U)RL, use G)ET or C)ancel"
msgstr ""
#. #define ADVANCED_POST_REDIRECT
-#: LYMessages.c:621
+#: LYMessages.c:645
msgid "Redirection of POST content. P)roceed, see U)RL, or C)ancel"
msgstr ""
#. #define CONFIRM_POST_RESUBMISSION
-#: LYMessages.c:623
+#: LYMessages.c:647
msgid "Document from Form with POST content. Resubmit?"
msgstr ""
#. #define CONFIRM_POST_RESUBMISSION_TO
-#: LYMessages.c:625
+#: LYMessages.c:649
#, c-format
msgid "Resubmit POST content to %s ?"
msgstr ""
#. #define CONFIRM_POST_LIST_RELOAD
-#: LYMessages.c:627
+#: LYMessages.c:651
#, c-format
msgid "List from document with POST data. Reload %s ?"
msgstr ""
#. #define CONFIRM_POST_DOC_HEAD
-#: LYMessages.c:629
+#: LYMessages.c:653
msgid "Document from POST action, HEAD may not be understood. Proceed?"
msgstr ""
#. #define CONFIRM_POST_LINK_HEAD
-#: LYMessages.c:631
+#: LYMessages.c:655
msgid "Form submit action is POST, HEAD may not be understood. Proceed?"
msgstr ""
-#: LYMessages.c:632
+#: LYMessages.c:656
msgid "Proceed without a username and password?"
msgstr ""
-#: LYMessages.c:633
+#: LYMessages.c:657
#, c-format
msgid "Proceed (%s)?"
msgstr ""
-#: LYMessages.c:634
+#: LYMessages.c:658
msgid "Cannot POST to this host."
msgstr ""
-#: LYMessages.c:635
+#: LYMessages.c:659
msgid "POST not supported for this URL - ignoring POST data!"
msgstr ""
-#: LYMessages.c:636
+#: LYMessages.c:660
msgid "Discarding POST data..."
msgstr ""
-#: LYMessages.c:637
+#: LYMessages.c:661
msgid "Document will not be reloaded!"
msgstr ""
-#: LYMessages.c:638
+#: LYMessages.c:662
msgid "Location: "
msgstr ""
-#: LYMessages.c:639
+#: LYMessages.c:663
#, c-format
msgid "'%s' not found!"
msgstr ""
-#: LYMessages.c:640
+#: LYMessages.c:664
msgid "Default Bookmark File"
msgstr ""
-#: LYMessages.c:641
+#: LYMessages.c:665
msgid "Screen too small! (8x35 min)"
msgstr ""
-#: LYMessages.c:642
+#: LYMessages.c:666
msgid "Select destination or ^G to Cancel: "
msgstr ""
#. #define MULTIBOOKMARKS_SELECT
-#: LYMessages.c:644
+#: LYMessages.c:668
msgid "Select subbookmark, '=' for menu, or ^G to cancel: "
msgstr ""
#. #define MULTIBOOKMARKS_SELF
-#: LYMessages.c:646
+#: LYMessages.c:670
msgid "Reproduce L)ink in this bookmark file or C)ancel? (l,c): "
msgstr ""
-#: LYMessages.c:647
+#: LYMessages.c:671
msgid "Multiple bookmark support is not available."
msgstr ""
-#: LYMessages.c:648
+#: LYMessages.c:672
#, c-format
msgid " Select Bookmark (screen %d of %d)"
msgstr ""
-#: LYMessages.c:649
+#: LYMessages.c:673
msgid " Select Bookmark"
msgstr ""
#. #define MULTIBOOKMARKS_EHEAD_MASK
-#: LYMessages.c:651
+#: LYMessages.c:675
#, c-format
msgid "Editing Bookmark DESCRIPTION and FILEPATH (%d of 2)"
msgstr ""
#. #define MULTIBOOKMARKS_EHEAD
-#: LYMessages.c:653
+#: LYMessages.c:677
msgid " Editing Bookmark DESCRIPTION and FILEPATH"
msgstr ""
-#: LYMessages.c:654
+#: LYMessages.c:678
msgid "Letter: "
msgstr ""
#. #define USE_PATH_OFF_HOME
-#: LYMessages.c:657
+#: LYMessages.c:681
msgid "Use a filepath off your login directory in SHELL syntax!"
msgstr ""
-#: LYMessages.c:659
+#: LYMessages.c:683
msgid "Use a filepath off your home directory!"
msgstr ""
#. #define MAXLINKS_REACHED
-#: LYMessages.c:662
+#: LYMessages.c:686
msgid "Maximum links per page exceeded! Use half-page or two-line scrolling."
msgstr ""
-#: LYMessages.c:663
+#: LYMessages.c:687
msgid "No previously visited links available!"
msgstr ""
-#: LYMessages.c:664
+#: LYMessages.c:688
msgid "Memory exhausted! Program aborted!"
msgstr ""
-#: LYMessages.c:665
+#: LYMessages.c:689
msgid "Memory exhausted! Aborting..."
msgstr ""
-#: LYMessages.c:666
+#: LYMessages.c:690
msgid "Not enough memory!"
msgstr ""
-#: LYMessages.c:667
+#: LYMessages.c:691
msgid "Directory/File Manager not available"
msgstr ""
-#: LYMessages.c:668
+#: LYMessages.c:692
msgid "HREF in BASE tag is not an absolute URL."
msgstr ""
-#: LYMessages.c:669
+#: LYMessages.c:693
msgid "Location URL is not absolute."
msgstr ""
-#: LYMessages.c:670
+#: LYMessages.c:694
msgid "Refresh URL is not absolute."
msgstr ""
#. #define SENDING_MESSAGE_WITH_BODY_TO
-#: LYMessages.c:672
+#: LYMessages.c:696
msgid ""
"You are sending a message with body to:\n"
" "
msgstr ""
-#: LYMessages.c:673
+#: LYMessages.c:697
msgid ""
"You are sending a comment to:\n"
" "
msgstr ""
-#: LYMessages.c:674
+#: LYMessages.c:698
msgid ""
"\n"
" With copy to:\n"
" "
msgstr ""
-#: LYMessages.c:675
+#: LYMessages.c:699
msgid ""
"\n"
" With copies to:\n"
@@ -2104,7 +2174,7 @@ msgid ""
msgstr ""
#. #define CTRL_G_TO_CANCEL_SEND
-#: LYMessages.c:677
+#: LYMessages.c:701
msgid ""
"\n"
"\n"
@@ -2112,79 +2182,79 @@ msgid ""
msgstr ""
#. #define ENTER_NAME_OR_BLANK
-#: LYMessages.c:679
+#: LYMessages.c:703
msgid ""
"\n"
" Please enter your name, or leave it blank to remain anonymous\n"
msgstr ""
#. #define ENTER_MAIL_ADDRESS_OR_OTHER
-#: LYMessages.c:681
+#: LYMessages.c:705
msgid ""
"\n"
" Please enter a mail address or some other\n"
msgstr ""
#. #define MEANS_TO_CONTACT_FOR_RESPONSE
-#: LYMessages.c:683
+#: LYMessages.c:707
msgid " means to contact you, if you desire a response.\n"
msgstr ""
-#: LYMessages.c:684
+#: LYMessages.c:708
msgid ""
"\n"
" Please enter a subject line.\n"
msgstr ""
#. #define ENTER_ADDRESS_FOR_CC
-#: LYMessages.c:686
+#: LYMessages.c:710
msgid ""
"\n"
" Enter a mail address for a CC of your message.\n"
msgstr ""
-#: LYMessages.c:687
+#: LYMessages.c:711
msgid " (Leave blank if you don't want a copy.)\n"
msgstr ""
-#: LYMessages.c:688
+#: LYMessages.c:712
msgid ""
"\n"
" Please review the message body:\n"
"\n"
msgstr ""
-#: LYMessages.c:689
+#: LYMessages.c:713
msgid ""
"\n"
"Press RETURN to continue: "
msgstr ""
-#: LYMessages.c:690
+#: LYMessages.c:714
msgid ""
"\n"
"Press RETURN to clean up: "
msgstr ""
-#: LYMessages.c:691
+#: LYMessages.c:715
msgid " Use Control-U to erase the default.\n"
msgstr ""
-#: LYMessages.c:692
+#: LYMessages.c:716
msgid ""
"\n"
" Please enter your message below."
msgstr ""
#. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:694 src/LYNews.c:360
+#: LYMessages.c:718 src/LYNews.c:360
msgid ""
"\n"
" When you are done, press enter and put a single period (.)"
msgstr ""
#. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:696 src/LYNews.c:361
+#: LYMessages.c:720 src/LYNews.c:361
msgid ""
"\n"
" on a line and press enter again."
@@ -2192,523 +2262,523 @@ msgstr ""
#. Cookies messages
#. #define ADVANCED_COOKIE_CONFIRMATION
-#: LYMessages.c:700
+#: LYMessages.c:724
#, c-format
msgid "%s cookie: %.*s=%.*s Allow? (Y/N/Always/neVer)"
msgstr ""
#. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
-#: LYMessages.c:702
+#: LYMessages.c:726
#, c-format
msgid "Accept invalid cookie domain=%s for '%s'?"
msgstr ""
#. #define INVALID_COOKIE_PATH_CONFIRMATION
-#: LYMessages.c:704
+#: LYMessages.c:728
#, c-format
msgid "Accept invalid cookie path=%s as a prefix of '%s'?"
msgstr ""
-#: LYMessages.c:705
+#: LYMessages.c:729
msgid "Allowing this cookie."
msgstr ""
-#: LYMessages.c:706
+#: LYMessages.c:730
msgid "Rejecting this cookie."
msgstr ""
-#: LYMessages.c:707
+#: LYMessages.c:731
msgid "The Cookie Jar is empty."
msgstr ""
-#: LYMessages.c:708
+#: LYMessages.c:732
msgid "The Cache Jar is empty."
msgstr ""
#. #define ACTIVATE_TO_GOBBLE
-#: LYMessages.c:710
+#: LYMessages.c:734
msgid "Activate links to gobble up cookies or entire domains,"
msgstr ""
-#: LYMessages.c:711
+#: LYMessages.c:735
msgid "or to change a domain's 'allow' setting."
msgstr ""
-#: LYMessages.c:712
+#: LYMessages.c:736
msgid "(Cookies never allowed.)"
msgstr ""
-#: LYMessages.c:713
+#: LYMessages.c:737
msgid "(Cookies always allowed.)"
msgstr ""
-#: LYMessages.c:714
+#: LYMessages.c:738
msgid "(Cookies allowed via prompt.)"
msgstr ""
-#: LYMessages.c:715
+#: LYMessages.c:739
msgid "(Persistent Cookies.)"
msgstr ""
-#: LYMessages.c:716
+#: LYMessages.c:740
msgid "(No title.)"
msgstr ""
-#: LYMessages.c:717
+#: LYMessages.c:741
msgid "(No name.)"
msgstr ""
-#: LYMessages.c:718
+#: LYMessages.c:742
msgid "(No value.)"
msgstr ""
-#: LYMessages.c:719 src/LYOptions.c:2424
+#: LYMessages.c:743 src/LYOptions.c:2424
msgid "None"
msgstr ""
-#: LYMessages.c:720
+#: LYMessages.c:744
msgid "(End of session.)"
msgstr ""
-#: LYMessages.c:721
+#: LYMessages.c:745
msgid "Delete this cookie?"
msgstr ""
-#: LYMessages.c:722
+#: LYMessages.c:746
msgid "The cookie has been eaten!"
msgstr ""
-#: LYMessages.c:723
+#: LYMessages.c:747
msgid "Delete this empty domain?"
msgstr ""
-#: LYMessages.c:724
+#: LYMessages.c:748
msgid "The domain has been eaten!"
msgstr ""
#. #define DELETE_COOKIES_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:726
+#: LYMessages.c:750
msgid ""
"D)elete domain's cookies, set allow A)lways/P)rompt/neV)er, or C)ancel? "
msgstr ""
#. #define DELETE_DOMAIN_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:728
+#: LYMessages.c:752
msgid "D)elete domain, set allow A)lways/P)rompt/neV)er, or C)ancel? "
msgstr ""
-#: LYMessages.c:729
+#: LYMessages.c:753
msgid "All cookies in the domain have been eaten!"
msgstr ""
-#: LYMessages.c:730
+#: LYMessages.c:754
#, c-format
msgid "'A'lways allowing from domain '%s'."
msgstr ""
-#: LYMessages.c:731
+#: LYMessages.c:755
#, c-format
msgid "ne'V'er allowing from domain '%s'."
msgstr ""
-#: LYMessages.c:732
+#: LYMessages.c:756
#, c-format
msgid "'P'rompting to allow from domain '%s'."
msgstr ""
-#: LYMessages.c:733
+#: LYMessages.c:757
msgid "Delete all cookies in this domain?"
msgstr ""
-#: LYMessages.c:734
+#: LYMessages.c:758
msgid "All of the cookies in the jar have been eaten!"
msgstr ""
-#: LYMessages.c:736
+#: LYMessages.c:760
msgid "Port 19 not permitted in URLs."
msgstr ""
-#: LYMessages.c:737
+#: LYMessages.c:761
msgid "Port 25 not permitted in URLs."
msgstr ""
-#: LYMessages.c:738
+#: LYMessages.c:762
#, c-format
msgid "Port %lu not permitted in URLs."
msgstr ""
-#: LYMessages.c:739
+#: LYMessages.c:763
msgid "URL has a bad port field."
msgstr ""
-#: LYMessages.c:740
+#: LYMessages.c:764
msgid "Maximum nesting of HTML elements exceeded."
msgstr ""
-#: LYMessages.c:741
+#: LYMessages.c:765
msgid "Bad partial reference! Stripping lead dots."
msgstr ""
-#: LYMessages.c:742
+#: LYMessages.c:766
msgid "Trace Log open failed. Trace off!"
msgstr ""
-#: LYMessages.c:743
+#: LYMessages.c:767
msgid "Lynx Trace Log"
msgstr ""
-#: LYMessages.c:744
+#: LYMessages.c:768
msgid "No trace log has been started for this session."
msgstr ""
#. #define MAX_TEMPCOUNT_REACHED
-#: LYMessages.c:746
+#: LYMessages.c:770
msgid "The maximum temporary file count has been reached!"
msgstr ""
#. #define FORM_VALUE_TOO_LONG
-#: LYMessages.c:748
+#: LYMessages.c:772
msgid "Form field value exceeds buffer length! Trim the tail."
msgstr ""
#. #define FORM_TAIL_COMBINED_WITH_HEAD
-#: LYMessages.c:750
+#: LYMessages.c:774
msgid "Modified tail combined with head of form field value."
msgstr ""
#. HTFile.c
-#: LYMessages.c:753
+#: LYMessages.c:777
msgid "Directory"
msgstr ""
-#: LYMessages.c:754
+#: LYMessages.c:778
msgid "Directory browsing is not allowed."
msgstr ""
-#: LYMessages.c:755
+#: LYMessages.c:779
msgid "Selective access is not enabled for this directory"
msgstr ""
-#: LYMessages.c:756
+#: LYMessages.c:780
msgid "Multiformat: directory scan failed."
msgstr ""
-#: LYMessages.c:757
+#: LYMessages.c:781
msgid "This directory is not readable."
msgstr ""
-#: LYMessages.c:758
+#: LYMessages.c:782
msgid "Can't access requested file."
msgstr ""
-#: LYMessages.c:759
+#: LYMessages.c:783
msgid "Could not find suitable representation for transmission."
msgstr ""
-#: LYMessages.c:760
+#: LYMessages.c:784
msgid "Could not open file for decompression!"
msgstr ""
-#: LYMessages.c:761
+#: LYMessages.c:785
msgid "Files:"
msgstr ""
-#: LYMessages.c:762
+#: LYMessages.c:786
msgid "Subdirectories:"
msgstr ""
-#: LYMessages.c:763
+#: LYMessages.c:787
msgid " directory"
msgstr ""
-#: LYMessages.c:764
+#: LYMessages.c:788
msgid "Up to "
msgstr ""
-#: LYMessages.c:765
+#: LYMessages.c:789
msgid "Current directory is "
msgstr ""
#. HTFTP.c
-#: LYMessages.c:768
+#: LYMessages.c:792
msgid "Symbolic Link"
msgstr ""
#. HTGopher.c
-#: LYMessages.c:771
+#: LYMessages.c:795
msgid "No response from server!"
msgstr ""
-#: LYMessages.c:772
+#: LYMessages.c:796
msgid "CSO index"
msgstr ""
-#: LYMessages.c:773
+#: LYMessages.c:797
msgid ""
"\n"
"This is a searchable index of a CSO database.\n"
msgstr ""
-#: LYMessages.c:774
+#: LYMessages.c:798
msgid "CSO Search Results"
msgstr ""
-#: LYMessages.c:775
+#: LYMessages.c:799
#, c-format
msgid "Seek fail on %s\n"
msgstr ""
-#: LYMessages.c:776
+#: LYMessages.c:800
msgid ""
"\n"
"Press the 's' key and enter search keywords.\n"
msgstr ""
-#: LYMessages.c:777
+#: LYMessages.c:801
msgid ""
"\n"
"This is a searchable Gopher index.\n"
msgstr ""
-#: LYMessages.c:778
+#: LYMessages.c:802
msgid "Gopher index"
msgstr ""
-#: LYMessages.c:779
+#: LYMessages.c:803
msgid "Gopher Menu"
msgstr ""
-#: LYMessages.c:780
+#: LYMessages.c:804
msgid " Search Results"
msgstr ""
-#: LYMessages.c:781
+#: LYMessages.c:805
msgid "Sending CSO/PH request."
msgstr ""
-#: LYMessages.c:782
+#: LYMessages.c:806
msgid "Sending Gopher request."
msgstr ""
-#: LYMessages.c:783
+#: LYMessages.c:807
msgid "CSO/PH request sent; waiting for response."
msgstr ""
-#: LYMessages.c:784
+#: LYMessages.c:808
msgid "Gopher request sent; waiting for response."
msgstr ""
-#: LYMessages.c:785
+#: LYMessages.c:809
msgid ""
"\n"
"Please enter search keywords.\n"
msgstr ""
-#: LYMessages.c:786
+#: LYMessages.c:810
msgid ""
"\n"
"The keywords that you enter will allow you to search on a"
msgstr ""
-#: LYMessages.c:787
+#: LYMessages.c:811
msgid " person's name in the database.\n"
msgstr ""
#. HTNews.c
-#: LYMessages.c:790
+#: LYMessages.c:814
msgid "Connection closed ???"
msgstr ""
-#: LYMessages.c:791
+#: LYMessages.c:815
msgid "Cannot open temporary file for news POST."
msgstr ""
-#: LYMessages.c:792
+#: LYMessages.c:816
msgid "This client does not contain support for posting to news with SSL."
msgstr ""
#. HTStyle.c
-#: LYMessages.c:795
+#: LYMessages.c:819
#, c-format
msgid "Style %d `%s' SGML:%s. Font %s %.1f point.\n"
msgstr ""
-#: LYMessages.c:797
+#: LYMessages.c:821
#, c-format
msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n"
msgstr ""
-#: LYMessages.c:798
+#: LYMessages.c:822
#, c-format
msgid "\t\tTab kind=%d at %.0f\n"
msgstr ""
#. HTTP.c
-#: LYMessages.c:801
+#: LYMessages.c:825
msgid "Can't proceed without a username and password."
msgstr ""
-#: LYMessages.c:802
+#: LYMessages.c:826
msgid "Can't retry with authorization! Contact the server's WebMaster."
msgstr ""
-#: LYMessages.c:803
+#: LYMessages.c:827
msgid "Can't retry with proxy authorization! Contact the server's WebMaster."
msgstr ""
-#: LYMessages.c:804
+#: LYMessages.c:828
msgid "Retrying with proxy authorization information."
msgstr ""
-#: LYMessages.c:805
+#: LYMessages.c:829
#, c-format
msgid "SSL error:%s-Continue?"
msgstr ""
#. HTWAIS.c
-#: LYMessages.c:808
+#: LYMessages.c:832
msgid "HTWAIS: Return message too large."
msgstr ""
-#: LYMessages.c:809
+#: LYMessages.c:833
msgid "Enter WAIS query: "
msgstr ""
#. Miscellaneous status
-#: LYMessages.c:812
+#: LYMessages.c:836
msgid "Retrying as HTTP0 request."
msgstr ""
-#: LYMessages.c:813
+#: LYMessages.c:837
#, c-format
msgid "Transferred %d bytes"
msgstr ""
-#: LYMessages.c:814
+#: LYMessages.c:838
msgid "Data transfer complete"
msgstr ""
-#: LYMessages.c:815
+#: LYMessages.c:839
#, c-format
msgid "Error processing line %d of %s\n"
msgstr ""
#. Lynx internal page titles
-#: LYMessages.c:818
+#: LYMessages.c:842
msgid "Address List Page"
msgstr ""
-#: LYMessages.c:819
+#: LYMessages.c:843
msgid "Bookmark file"
msgstr ""
-#: LYMessages.c:820
+#: LYMessages.c:844
msgid "Configuration Definitions"
msgstr ""
-#: LYMessages.c:821
+#: LYMessages.c:845
msgid "Cookie Jar"
msgstr ""
-#: LYMessages.c:822
+#: LYMessages.c:846
msgid "Current Edit-Key Map"
msgstr ""
-#: LYMessages.c:823
+#: LYMessages.c:847
msgid "Current Key Map"
msgstr ""
-#: LYMessages.c:824
+#: LYMessages.c:848
msgid "File Management Options"
msgstr ""
-#: LYMessages.c:825
+#: LYMessages.c:849
msgid "Download Options"
msgstr ""
-#: LYMessages.c:826
+#: LYMessages.c:850
msgid "History Page"
msgstr ""
-#: LYMessages.c:827
+#: LYMessages.c:851
msgid "Cache Jar"
msgstr ""
-#: LYMessages.c:828
+#: LYMessages.c:852
msgid "List Page"
msgstr ""
-#: LYMessages.c:829
+#: LYMessages.c:853
msgid "Lynx.cfg Information"
msgstr ""
-#: LYMessages.c:830
+#: LYMessages.c:854
msgid "Converted Mosaic Hotlist"
msgstr ""
-#: LYMessages.c:831
+#: LYMessages.c:855
msgid "Options Menu"
msgstr ""
-#: LYMessages.c:832
+#: LYMessages.c:856
msgid "File Permission Options"
msgstr ""
-#: LYMessages.c:833
+#: LYMessages.c:857
msgid "Printing Options"
msgstr ""
-#: LYMessages.c:834
+#: LYMessages.c:858
msgid "Information about the current document"
msgstr ""
-#: LYMessages.c:835
+#: LYMessages.c:859
msgid "Your recent statusline messages"
msgstr ""
-#: LYMessages.c:836
+#: LYMessages.c:860
msgid "Upload Options"
msgstr ""
-#: LYMessages.c:837
+#: LYMessages.c:861
msgid "Visited Links Page"
msgstr ""
#. CONFIG_DEF_TITLE subtitles
-#: LYMessages.c:840
+#: LYMessages.c:864
msgid "See also"
msgstr ""
-#: LYMessages.c:841
+#: LYMessages.c:865
msgid "your"
msgstr ""
-#: LYMessages.c:842
+#: LYMessages.c:866
msgid "for runtime options"
msgstr ""
-#: LYMessages.c:843
+#: LYMessages.c:867
msgid "compile time options"
msgstr ""
-#: LYMessages.c:844
+#: LYMessages.c:868
msgid "color-style configuration"
msgstr ""
-#: LYMessages.c:845
+#: LYMessages.c:869
msgid "latest release"
msgstr ""
-#: LYMessages.c:846
+#: LYMessages.c:870
msgid "pre-release version"
msgstr ""
-#: LYMessages.c:847
+#: LYMessages.c:871
msgid "development version"
msgstr ""
#. #define AUTOCONF_CONFIG_CACHE
-#: LYMessages.c:849
+#: LYMessages.c:873
msgid ""
"The following data were derived during the automatic configuration/build\n"
"process of this copy of Lynx. When reporting a bug, please include a copy\n"
@@ -2716,62 +2786,62 @@ msgid ""
msgstr ""
#. #define AUTOCONF_LYNXCFG_H
-#: LYMessages.c:853
+#: LYMessages.c:877
msgid ""
"The following data were used as automatically-configured compile-time\n"
"definitions when this copy of Lynx was built."
msgstr ""
#. #define DIRED_NOVICELINE
-#: LYMessages.c:858
+#: LYMessages.c:882
msgid ""
-" C)reate D)ownload E)dit F)ull menu M)odify R)emove T)ag "
-"U)pload \n"
+" C)reate D)ownload E)dit F)ull menu M)odify R)emove T)ag U)"
+"pload \n"
msgstr ""
-#: LYMessages.c:859
+#: LYMessages.c:883
msgid "Failed to obtain status of current link!"
msgstr ""
#. #define INVALID_PERMIT_URL
-#: LYMessages.c:862
+#: LYMessages.c:886
msgid "Special URL only valid from current File Permission menu!"
msgstr ""
-#: LYMessages.c:866
+#: LYMessages.c:890
msgid "External support is currently disabled."
msgstr ""
#. new with 2.8.4dev.21
-#: LYMessages.c:870
+#: LYMessages.c:894
msgid "Changing working-directory is currently disabled."
msgstr ""
-#: LYMessages.c:871
+#: LYMessages.c:895
msgid "Linewrap OFF!"
msgstr ""
-#: LYMessages.c:872
+#: LYMessages.c:896
msgid "Linewrap ON!"
msgstr ""
-#: LYMessages.c:873
+#: LYMessages.c:897
msgid "Parsing nested-tables toggled OFF! Reloading..."
msgstr ""
-#: LYMessages.c:874
+#: LYMessages.c:898
msgid "Parsing nested-tables toggled ON! Reloading..."
msgstr ""
-#: LYMessages.c:875
+#: LYMessages.c:899
msgid "Shifting is disabled while line-wrap is in effect"
msgstr ""
-#: LYMessages.c:876
+#: LYMessages.c:900
msgid "Trace not supported"
msgstr ""
-#: LYMessages.c:796
+#: LYMessages.c:820
#, c-format
msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
msgstr ""
@@ -3084,100 +3154,105 @@ msgstr ""
msgid "Socket read failed (too many tries)."
msgstr ""
-#: WWW/Library/Implementation/HTTP.c:81
+#: WWW/Library/Implementation/HTTP.c:136
#, c-format
msgid "SSL callback:%s, preverify_ok=%d, ssl_okay=%d"
msgstr ""
-#: WWW/Library/Implementation/HTTP.c:438
+#: WWW/Library/Implementation/HTTP.c:516
#, c-format
msgid "Address contains a username: %s"
msgstr ""
-#: WWW/Library/Implementation/HTTP.c:492
+#: WWW/Library/Implementation/HTTP.c:570
#, c-format
msgid "Certificate issued by: %s"
msgstr ""
-#: WWW/Library/Implementation/HTTP.c:679
+#: WWW/Library/Implementation/HTTP.c:757
msgid "This client does not contain support for HTTPS URLs."
msgstr ""
-#: WWW/Library/Implementation/HTTP.c:704
+#: WWW/Library/Implementation/HTTP.c:782
msgid "Unable to connect to remote host."
msgstr ""
-#: WWW/Library/Implementation/HTTP.c:744
+#: WWW/Library/Implementation/HTTP.c:825
msgid "Retrying connection without TLS."
msgstr ""
-#: WWW/Library/Implementation/HTTP.c:794
+#: WWW/Library/Implementation/HTTP.c:877
msgid "GnuTLS error when trying to verify certificate."
msgstr ""
-#: WWW/Library/Implementation/HTTP.c:806
+#: WWW/Library/Implementation/HTTP.c:889
msgid "the certificate has no known issuer"
msgstr ""
-#: WWW/Library/Implementation/HTTP.c:808
+#: WWW/Library/Implementation/HTTP.c:891
msgid "no issuer was found"
msgstr ""
-#: WWW/Library/Implementation/HTTP.c:810
+#: WWW/Library/Implementation/HTTP.c:893
msgid "issuer is not a CA"
msgstr ""
-#: WWW/Library/Implementation/HTTP.c:812
+#: WWW/Library/Implementation/HTTP.c:895
msgid "the certificate has been revoked"
msgstr ""
-#: WWW/Library/Implementation/HTTP.c:814
+#: WWW/Library/Implementation/HTTP.c:897
msgid "the certificate is not trusted"
msgstr ""
-#: WWW/Library/Implementation/HTTP.c:889
+#: WWW/Library/Implementation/HTTP.c:972
#, c-format
msgid "Verified connection to %s (cert=%s)"
msgstr ""
-#: WWW/Library/Implementation/HTTP.c:937 WWW/Library/Implementation/HTTP.c:979
+#: WWW/Library/Implementation/HTTP.c:1022
+#: WWW/Library/Implementation/HTTP.c:1064
#, c-format
msgid "Verified connection to %s (subj=%s)"
msgstr ""
-#: WWW/Library/Implementation/HTTP.c:1009
+#: WWW/Library/Implementation/HTTP.c:1094
msgid "Can't find common name in certificate"
msgstr ""
-#: WWW/Library/Implementation/HTTP.c:1012
+#: WWW/Library/Implementation/HTTP.c:1097
#, c-format
msgid "SSL error:host(%s)!=cert(%s)-Continue?"
msgstr ""
-#: WWW/Library/Implementation/HTTP.c:1025
+#: WWW/Library/Implementation/HTTP.c:1104
+msgid "SSL error"
+msgstr ""
+
+#: WWW/Library/Implementation/HTTP.c:1112
#, c-format
msgid "UNVERIFIED connection to %s (cert=%s)"
msgstr ""
-#: WWW/Library/Implementation/HTTP.c:1034
+#: WWW/Library/Implementation/HTTP.c:1121
#, c-format
msgid "Secure %d-bit %s (%s) HTTP connection"
msgstr ""
-#: WWW/Library/Implementation/HTTP.c:1497
+#: WWW/Library/Implementation/HTTP.c:1584
msgid "Sending HTTP request."
msgstr ""
-#: WWW/Library/Implementation/HTTP.c:1539
+#: WWW/Library/Implementation/HTTP.c:1626
msgid "Unexpected network write error; connection aborted."
msgstr ""
-#: WWW/Library/Implementation/HTTP.c:1545
+#: WWW/Library/Implementation/HTTP.c:1632
msgid "HTTP request sent; waiting for response."
msgstr ""
-#: WWW/Library/Implementation/HTTP.c:1618
-#: WWW/Library/Implementation/HTTP.c:1628
+#: WWW/Library/Implementation/HTTP.c:1705
+#: WWW/Library/Implementation/HTTP.c:1715
msgid "Unexpected network read error; connection aborted."
msgstr ""
@@ -3190,7 +3265,7 @@ msgstr ""
#. * line and possibly other headers, so we'll deal with them by
#. * showing the full header to the user as text/plain. - FM
#.
-#: WWW/Library/Implementation/HTTP.c:1830
+#: WWW/Library/Implementation/HTTP.c:1917
msgid "Got unexpected Informational Status."
msgstr ""
@@ -3200,7 +3275,7 @@ msgstr ""
#. * content. We'll instruct the user to do that, and
#. * restore the current document. - FM
#.
-#: WWW/Library/Implementation/HTTP.c:1864
+#: WWW/Library/Implementation/HTTP.c:1951
msgid "Request fulfilled. Reset Content."
msgstr ""
@@ -3210,27 +3285,27 @@ msgstr ""
#. * status is inappropriate. We'll deal with it by showing
#. * the full header to the user as text/plain. - FM
#.
-#: WWW/Library/Implementation/HTTP.c:1979
+#: WWW/Library/Implementation/HTTP.c:2066
msgid "Got unexpected 304 Not Modified status."
msgstr ""
-#: WWW/Library/Implementation/HTTP.c:2042
+#: WWW/Library/Implementation/HTTP.c:2129
msgid "Redirection of POST content requires user approval."
msgstr ""
-#: WWW/Library/Implementation/HTTP.c:2057
+#: WWW/Library/Implementation/HTTP.c:2144
msgid "Have POST content. Treating Permanent Redirection as Temporary.\n"
msgstr ""
-#: WWW/Library/Implementation/HTTP.c:2101
+#: WWW/Library/Implementation/HTTP.c:2188
msgid "Retrying with access authorization information."
msgstr ""
-#: WWW/Library/Implementation/HTTP.c:2113
+#: WWW/Library/Implementation/HTTP.c:2200
msgid "Show the 401 message body?"
msgstr ""
-#: WWW/Library/Implementation/HTTP.c:2157
+#: WWW/Library/Implementation/HTTP.c:2244
msgid "Show the 407 message body?"
msgstr ""
@@ -3238,7 +3313,7 @@ msgstr ""
#. * Bad or unknown server_status number. Take a chance and hope
#. * there is something to display. - FM
#.
-#: WWW/Library/Implementation/HTTP.c:2257
+#: WWW/Library/Implementation/HTTP.c:2344
msgid "Unknown status reply from server!"
msgstr ""
@@ -3609,31 +3684,31 @@ msgstr ""
msgid "Y/N/A/V"
msgstr ""
-#: src/HTML.c:5915
+#: src/HTML.c:5931
msgid "Description:"
msgstr ""
-#: src/HTML.c:5920
+#: src/HTML.c:5936
msgid "(none)"
msgstr ""
-#: src/HTML.c:5924
+#: src/HTML.c:5940
msgid "Filepath:"
msgstr ""
-#: src/HTML.c:5930
+#: src/HTML.c:5946
msgid "(unknown)"
msgstr ""
-#: src/HTML.c:7370
+#: src/HTML.c:7386
msgid "Document has only hidden links. Use the 'l'ist command."
msgstr ""
-#: src/HTML.c:7869
+#: src/HTML.c:7885
msgid "Source cache error - disk full?"
msgstr ""
-#: src/HTML.c:7882
+#: src/HTML.c:7898
msgid "Source cache error - not enough memory!"
msgstr ""
@@ -3711,19 +3786,19 @@ msgstr ""
msgid "Exiting via interrupt:"
msgstr ""
-#: src/LYCookie.c:2538
+#: src/LYCookie.c:2541
msgid "(from a previous session)"
msgstr ""
-#: src/LYCookie.c:2599
+#: src/LYCookie.c:2602
msgid "Maximum Gobble Date:"
msgstr ""
-#: src/LYCookie.c:2638
+#: src/LYCookie.c:2641
msgid "Internal"
msgstr ""
-#: src/LYCookie.c:2639
+#: src/LYCookie.c:2642
msgid "cookie_domain_flag_set error, aborting program"
msgstr ""
@@ -4226,19 +4301,19 @@ msgstr ""
msgid "No system mailer configured"
msgstr ""
-#: src/LYMain.c:1069
+#: src/LYMain.c:1071
msgid "No Winsock found, sorry."
msgstr ""
-#: src/LYMain.c:1260
+#: src/LYMain.c:1262
msgid "You MUST define a valid TMP or TEMP area!"
msgstr ""
-#: src/LYMain.c:1313 src/LYMainLoop.c:5283
+#: src/LYMain.c:1315 src/LYMainLoop.c:5283
msgid "No such directory"
msgstr ""
-#: src/LYMain.c:1507
+#: src/LYMain.c:1509
#, c-format
msgid ""
"\n"
@@ -4246,7 +4321,7 @@ msgid ""
"\n"
msgstr ""
-#: src/LYMain.c:1517
+#: src/LYMain.c:1519
#, c-format
msgid ""
"\n"
@@ -4254,66 +4329,68 @@ msgid ""
"\n"
msgstr ""
-#: src/LYMain.c:1654
+#: src/LYMain.c:1675
#, c-format
msgid "Ignored %d characters from standard input.\n"
msgstr ""
-#: src/LYMain.c:1656
+#: src/LYMain.c:1677
#, c-format
msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
msgstr ""
-#: src/LYMain.c:1814
+#: src/LYMain.c:1835
msgid "Warning:"
msgstr ""
-#: src/LYMain.c:2384
+#: src/LYMain.c:2405
msgid "persistent cookies state will be changed in next session only."
msgstr ""
-#: src/LYMain.c:2621 src/LYMain.c:2666
+#: src/LYMain.c:2642 src/LYMain.c:2687
#, c-format
msgid "Lynx: ignoring unrecognized charset=%s\n"
msgstr ""
-#: src/LYMain.c:3185
+#: src/LYMain.c:3206
#, c-format
msgid "%s Version %s (%s)"
msgstr ""
-#: src/LYMain.c:3223
+#: src/LYMain.c:3247
#, c-format
-msgid "Built on %s %s %s\n"
+msgid "Built on %s%s.\n"
msgstr ""
-#: src/LYMain.c:3245
+#: src/LYMain.c:3261
msgid "Copyrights held by the Lynx Developers Group,"
msgstr ""
-#: src/LYMain.c:3246
+#: src/LYMain.c:3262
msgid "the University of Kansas, CERN, and other contributors."
msgstr ""
-#: src/LYMain.c:3247
+#: src/LYMain.c:3263
msgid "Distributed under the GNU General Public License (Version 2)."
msgstr ""
-#: src/LYMain.c:3248
-msgid "See http://lynx.isc.org/ and the online help for more information."
+#: src/LYMain.c:3264
+msgid ""
+"See http://lynx.invisible-island.net/ and the online help for more "
+"information."
msgstr ""
-#: src/LYMain.c:4091
+#: src/LYMain.c:4107
#, c-format
msgid "USAGE: %s [options] [file]\n"
msgstr ""
-#: src/LYMain.c:4092
+#: src/LYMain.c:4108
#, c-format
msgid "Options are:\n"
msgstr ""
-#: src/LYMain.c:4395
+#: src/LYMain.c:4411
#, c-format
msgid "%s: Invalid Option: %s\n"
msgstr ""
@@ -4742,108 +4819,116 @@ msgstr ""
msgid "All"
msgstr ""
-#: src/LYOptions.c:2798 src/LYOptions.c:2827
+#: src/LYOptions.c:2801 src/LYOptions.c:2830
#, c-format
msgid "Use %s to invoke the Options menu!"
msgstr ""
-#: src/LYOptions.c:3675
+#: src/LYOptions.c:3688
msgid "(options marked with (!) will not be saved)"
msgstr ""
-#: src/LYOptions.c:3683
+#: src/LYOptions.c:3696
msgid "General Preferences"
msgstr ""
#. ***************************************************************
#. User Mode: SELECT
-#: src/LYOptions.c:3687
+#: src/LYOptions.c:3700
msgid "User mode"
msgstr ""
#. Editor: INPUT
-#: src/LYOptions.c:3693
+#: src/LYOptions.c:3706
msgid "Editor"
msgstr ""
#. Search Type: SELECT
-#: src/LYOptions.c:3698
+#: src/LYOptions.c:3711
msgid "Type of Search"
msgstr ""
-#: src/LYOptions.c:3703
+#: src/LYOptions.c:3716
msgid "Security and Privacy"
msgstr ""
#. ***************************************************************
#. Cookies: SELECT
-#: src/LYOptions.c:3707
+#: src/LYOptions.c:3720
msgid "Cookies"
msgstr ""
#. Cookie Prompting: SELECT
-#: src/LYOptions.c:3721
+#: src/LYOptions.c:3734
msgid "Invalid-Cookie Prompting"
msgstr ""
#. SSL Prompting: SELECT
-#: src/LYOptions.c:3728
+#: src/LYOptions.c:3741
msgid "SSL Prompting"
msgstr ""
-#: src/LYOptions.c:3734
+#: src/LYOptions.c:3746
+msgid "SSL client certificate file"
+msgstr ""
+
+#: src/LYOptions.c:3750
+msgid "SSL client key file"
+msgstr ""
+
+#: src/LYOptions.c:3756
msgid "Keyboard Input"
msgstr ""
#. ***************************************************************
#. Keypad Mode: SELECT
-#: src/LYOptions.c:3738
+#: src/LYOptions.c:3760
msgid "Keypad mode"
msgstr ""
#. Emacs keys: ON/OFF
-#: src/LYOptions.c:3744
+#: src/LYOptions.c:3766
msgid "Emacs keys"
msgstr ""
#. VI Keys: ON/OFF
-#: src/LYOptions.c:3750
+#: src/LYOptions.c:3772
msgid "VI keys"
msgstr ""
#. Line edit style: SELECT
#. well, at least 2 line edit styles available
-#: src/LYOptions.c:3757
+#: src/LYOptions.c:3779
msgid "Line edit style"
msgstr ""
#. Keyboard layout: SELECT
-#: src/LYOptions.c:3769
+#: src/LYOptions.c:3791
msgid "Keyboard layout"
msgstr ""
#.
#. * Display and Character Set
#.
-#: src/LYOptions.c:3783
+#: src/LYOptions.c:3805
msgid "Display and Character Set"
msgstr ""
#. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3788
+#: src/LYOptions.c:3810
msgid "Use locale-based character set"
msgstr ""
-#: src/LYOptions.c:3795
+#: src/LYOptions.c:3817
msgid "Use HTML5 charset replacements"
msgstr ""
#. Display Character Set: SELECT
-#: src/LYOptions.c:3801
+#: src/LYOptions.c:3823
msgid "Display character set"
msgstr ""
-#: src/LYOptions.c:3832
+#: src/LYOptions.c:3854
msgid "Assumed document character set"
msgstr ""
@@ -4852,211 +4937,211 @@ msgstr ""
#. * we split the header to make it more readable:
#. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
#.
-#: src/LYOptions.c:3852
+#: src/LYOptions.c:3874
msgid "CJK mode"
msgstr ""
-#: src/LYOptions.c:3854
+#: src/LYOptions.c:3876
msgid "Raw 8-bit"
msgstr ""
#. X Display: INPUT
-#: src/LYOptions.c:3862
+#: src/LYOptions.c:3884
msgid "X Display"
msgstr ""
#.
#. * Document Appearance
#.
-#: src/LYOptions.c:3868
+#: src/LYOptions.c:3890
msgid "Document Appearance"
msgstr ""
-#: src/LYOptions.c:3874
+#: src/LYOptions.c:3896
msgid "Show color"
msgstr ""
#. Color style: ON/OFF
-#: src/LYOptions.c:3899
+#: src/LYOptions.c:3921
msgid "Color style"
msgstr ""
-#: src/LYOptions.c:3908
+#: src/LYOptions.c:3930
msgid "Default colors"
msgstr ""
#. Show cursor: ON/OFF
-#: src/LYOptions.c:3916
+#: src/LYOptions.c:3938
msgid "Show cursor"
msgstr ""
#. Underline links: ON/OFF
-#: src/LYOptions.c:3922
+#: src/LYOptions.c:3944
msgid "Underline links"
msgstr ""
#. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3929
+#: src/LYOptions.c:3951
msgid "Show scrollbar"
msgstr ""
#. Select Popups: ON/OFF
-#: src/LYOptions.c:3936
+#: src/LYOptions.c:3958
msgid "Popups for select fields"
msgstr ""
#. HTML error recovery: SELECT
-#: src/LYOptions.c:3942
+#: src/LYOptions.c:3964
msgid "HTML error recovery"
msgstr ""
#. Bad HTML messages: SELECT
-#: src/LYOptions.c:3948
+#: src/LYOptions.c:3970
msgid "Bad HTML messages"
msgstr ""
#. Show Images: SELECT
-#: src/LYOptions.c:3954
+#: src/LYOptions.c:3976
msgid "Show images"
msgstr ""
#. Verbose Images: ON/OFF
-#: src/LYOptions.c:3968
+#: src/LYOptions.c:3990
msgid "Verbose images"
msgstr ""
#.
#. * Headers Transferred to Remote Servers
#.
-#: src/LYOptions.c:3976
+#: src/LYOptions.c:3998
msgid "Headers Transferred to Remote Servers"
msgstr ""
#. ***************************************************************
#. Mail Address: INPUT
-#: src/LYOptions.c:3980
+#: src/LYOptions.c:4002
msgid "Personal mail address"
msgstr ""
-#: src/LYOptions.c:3985
+#: src/LYOptions.c:4007
msgid "Personal name for mail"
msgstr ""
-#: src/LYOptions.c:3992
+#: src/LYOptions.c:4014
msgid "Password for anonymous ftp"
msgstr ""
#. Preferred media type: SELECT
-#: src/LYOptions.c:3998
+#: src/LYOptions.c:4020
msgid "Preferred media type"
msgstr ""
#. Preferred encoding: SELECT
-#: src/LYOptions.c:4004
+#: src/LYOptions.c:4026
msgid "Preferred encoding"
msgstr ""
#. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:4010
+#: src/LYOptions.c:4032
msgid "Preferred document character set"
msgstr ""
#. Preferred Document Language: INPUT
-#: src/LYOptions.c:4015
+#: src/LYOptions.c:4037
msgid "Preferred document language"
msgstr ""
-#: src/LYOptions.c:4021
+#: src/LYOptions.c:4043
msgid "Send User-Agent header"
msgstr ""
-#: src/LYOptions.c:4023
+#: src/LYOptions.c:4045
msgid "User-Agent header"
msgstr ""
#.
#. * Listing and Accessing Files
#.
-#: src/LYOptions.c:4031
+#: src/LYOptions.c:4053
msgid "Listing and Accessing Files"
msgstr ""
#. FTP sort: SELECT
-#: src/LYOptions.c:4036
+#: src/LYOptions.c:4058
msgid "Use Passive FTP"
msgstr ""
#. FTP sort: SELECT
-#: src/LYOptions.c:4042
+#: src/LYOptions.c:4064
msgid "FTP sort criteria"
msgstr ""
#. Local Directory Sort: SELECT
-#: src/LYOptions.c:4050
+#: src/LYOptions.c:4072
msgid "Local directory sort criteria"
msgstr ""
#. Local Directory Order: SELECT
-#: src/LYOptions.c:4056
+#: src/LYOptions.c:4078
msgid "Local directory sort order"
msgstr ""
-#: src/LYOptions.c:4065
+#: src/LYOptions.c:4087
msgid "Show dot files"
msgstr ""
-#: src/LYOptions.c:4073
+#: src/LYOptions.c:4095
msgid "Execution links"
msgstr ""
-#: src/LYOptions.c:4091
+#: src/LYOptions.c:4113
msgid "Pause when showing message"
msgstr ""
#. Show transfer rate: SELECT
-#: src/LYOptions.c:4098
+#: src/LYOptions.c:4120
msgid "Show transfer rate"
msgstr ""
#.
#. * Special Files and Screens
#.
-#: src/LYOptions.c:4118
+#: src/LYOptions.c:4140
msgid "Special Files and Screens"
msgstr ""
-#: src/LYOptions.c:4123
+#: src/LYOptions.c:4145
msgid "Multi-bookmarks"
msgstr ""
-#: src/LYOptions.c:4131
+#: src/LYOptions.c:4153
msgid "Review/edit Bookmarks files"
msgstr ""
-#: src/LYOptions.c:4134
+#: src/LYOptions.c:4156
msgid "Goto multi-bookmark menu"
msgstr ""
-#: src/LYOptions.c:4136
+#: src/LYOptions.c:4158
msgid "Bookmarks file"
msgstr ""
#. Auto Session: ON/OFF
-#: src/LYOptions.c:4143
+#: src/LYOptions.c:4165
msgid "Auto Session"
msgstr ""
#. Session File Menu: INPUT
-#: src/LYOptions.c:4149
+#: src/LYOptions.c:4171
msgid "Session file"
msgstr ""
#. Visited Pages: SELECT
-#: src/LYOptions.c:4155
+#: src/LYOptions.c:4177
msgid "Visited Pages"
msgstr ""
-#: src/LYOptions.c:4160
+#: src/LYOptions.c:4182
msgid "View the file "
msgstr ""
@@ -5171,38 +5256,38 @@ msgstr ""
msgid "(no name)"
msgstr ""
-#: src/LYReadCFG.c:2073
+#: src/LYReadCFG.c:2075
#, c-format
msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
msgstr ""
-#: src/LYReadCFG.c:2075
+#: src/LYReadCFG.c:2077
#, c-format
msgid "Last attempted include was '%s',\n"
msgstr ""
-#: src/LYReadCFG.c:2076
+#: src/LYReadCFG.c:2078
#, c-format
msgid "included from '%s'.\n"
msgstr ""
-#: src/LYReadCFG.c:2479 src/LYReadCFG.c:2492 src/LYReadCFG.c:2550
+#: src/LYReadCFG.c:2481 src/LYReadCFG.c:2494 src/LYReadCFG.c:2552
msgid "The following is read from your lynx.cfg file."
msgstr ""
-#: src/LYReadCFG.c:2480 src/LYReadCFG.c:2493
+#: src/LYReadCFG.c:2482 src/LYReadCFG.c:2495
msgid "Please read the distribution"
msgstr ""
-#: src/LYReadCFG.c:2486 src/LYReadCFG.c:2496
+#: src/LYReadCFG.c:2488 src/LYReadCFG.c:2498
msgid "for more comments."
msgstr ""
-#: src/LYReadCFG.c:2532
+#: src/LYReadCFG.c:2534
msgid "RELOAD THE CHANGES"
msgstr ""
-#: src/LYReadCFG.c:2540
+#: src/LYReadCFG.c:2542
msgid "Your primary configuration"
msgstr ""
@@ -5809,7 +5894,7 @@ msgid ""
"in the Visited Links Page.\n"
msgstr ""
-#: src/LYrcFile.c:861
+#: src/LYrcFile.c:863
msgid ""
"If keypad_mode is set to \"NUMBERS_AS_ARROWS\", then the numbers on\n"
"your keypad when the numlock is on will act as arrow keys:\n"
@@ -5820,13 +5905,13 @@ msgid ""
"regardless of whether numlock is on.\n"
msgstr ""
-#: src/LYrcFile.c:870
+#: src/LYrcFile.c:872
msgid ""
"If keypad_mode is set to \"LINKS_ARE_NUMBERED\", then numbers will\n"
"appear next to each link and numbers are used to select links.\n"
msgstr ""
-#: src/LYrcFile.c:874
+#: src/LYrcFile.c:876
msgid ""
"If keypad_mode is set to \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\", then\n"
"numbers will appear next to each link and visible form input field.\n"
@@ -5837,33 +5922,33 @@ msgid ""
"lists and output from the list command also enumerate form inputs.\n"
msgstr ""
-#: src/LYrcFile.c:883
+#: src/LYrcFile.c:885
msgid ""
"NOTE: Some fixed format documents may look disfigured when\n"
"\"LINKS_ARE_NUMBERED\" or \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" are\n"
"enabled.\n"
msgstr ""
-#: src/LYrcFile.c:915
+#: src/LYrcFile.c:917
msgid ""
"Lynx User Defaults File\n"
"\n"
msgstr ""
-#: src/LYrcFile.c:924
+#: src/LYrcFile.c:926
msgid ""
"This file contains options saved from the Lynx Options Screen (normally\n"
"with the 'o' key). To save options with that screen, you must select the\n"
"checkbox:\n"
msgstr ""
-#: src/LYrcFile.c:931
+#: src/LYrcFile.c:933
msgid ""
"You must then save the settings using the link on the line above the\n"
"checkbox:\n"
msgstr ""
-#: src/LYrcFile.c:938
+#: src/LYrcFile.c:940
msgid ""
"You may also use the command-line option \"-forms_options\", which displays\n"
"the simpler Options Menu instead. Save options with that using the '>' "
@@ -5871,14 +5956,14 @@ msgid ""
"\n"
msgstr ""
-#: src/LYrcFile.c:945
+#: src/LYrcFile.c:947
msgid ""
"This file contains options saved from the Lynx Options Screen (normally\n"
"with the '>' key).\n"
"\n"
msgstr ""
-#: src/LYrcFile.c:952
+#: src/LYrcFile.c:954
msgid ""
"There is normally no need to edit this file manually, since the defaults\n"
"here can be controlled from the Options Screen, and the next time options\n"
diff --git a/po/makefile.inn b/po/makefile.inn
index c4c7adf..55887e1 100644
--- a/po/makefile.inn
+++ b/po/makefile.inn
@@ -1,11 +1,13 @@
-# $LynxId: makefile.inn,v 1.21 2014/12/22 00:09:52 tom Exp $
+# $LynxId: makefile.inn,v 1.22 2015/10/02 11:12:57 tom Exp $
#
# Makefile for program source directory in GNU NLS utilities package.
# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
#
# This file may be copied and used freely without restrictions. It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
+# be used in projects which are not available under the GNU General
+# Public License but which still want to provide support for the GNU
+# gettext functionality.
+#
# Please note that the actual code is *not* freely available.
SHELL = /bin/sh
diff --git a/po/sl.po b/po/sl.po
index e44c664..5daf73e 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,8 +1,8 @@
# Slovenian translation of Lynx WWW browser.
# Copyright (C) 1999 Free Software Foundation, Inc.
# Roman Maurer <roman.maurer at hermes.si>, 1999.
-# $Id: sl.po 1.35 Sun, 12 Apr 2015 17:52:36 -0700 dickey $
-# $Source: po/sl.po $
+# $Id: sl.po,v 1.42 2015/04/09 20:37:00 tom Exp $
+# $Source: /usr/build/lynx/lynx2.8.9dev.6k/po/RCS/sl.po,v $
#
msgid ""
msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 8e684b5..0848e41 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,20 +1,22 @@
# Swedish translation for Lynx
-# Copyright © 2000, 2001, 2002, 2003, 2004, 2008 Free Software Foundation, Inc.
+# Copyright © 2000, 2001, 2002, 2003, 2004, 2008, 2015 Free Software Foundation, Inc.
# This file is distributed under the same license as the lynx package.
-# Peter Krefting <peter at softwolves.pp.se>, 2000-2012.
+# Peter Krefting <peter at softwolves.pp.se>, 2000-2015, 2015.
#
msgid ""
msgstr ""
-"Project-Id-Version: lynx 2.8.8-dev9\n"
+"Project-Id-Version: lynx 2.8.9-dev5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-12 19:13-0500\n"
-"PO-Revision-Date: 2012-03-21 22:35+0100\n"
+"POT-Creation-Date: 2015-04-14 20:53-0400\n"
+"PO-Revision-Date: 2015-05-31 17:55+0100\n"
"Last-Translator: Peter Krefting <peter at softwolves.pp.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
"Language: sv\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Gtranslator 2.91.6\n"
#. ******************************************************************
#. * The following definitions are for status line prompts, messages, or
@@ -30,2020 +32,2020 @@ msgstr ""
#. * translations. When no translation is available, the English default is
#. * used.
#.
-#: LYMessages.c:27
+#: LYMessages.c:28
#, c-format
msgid "Alert!: %s"
msgstr "Varning!: %s"
-#: LYMessages.c:28
+#: LYMessages.c:29
msgid "Welcome"
msgstr "Välkommen"
-#: LYMessages.c:29
+#: LYMessages.c:30
msgid "Are you sure you want to quit?"
msgstr "Är du säker att du vill avsluta?"
-#: LYMessages.c:31
+#: LYMessages.c:32
msgid "Really exit from Lynx?"
msgstr "Verkligen avsluta Lynx?"
-#: LYMessages.c:33
+#: LYMessages.c:34
msgid "Connection interrupted."
msgstr "Anslutningen avbröts."
-#: LYMessages.c:34
+#: LYMessages.c:35
msgid "Data transfer interrupted."
msgstr "Dataöverföringen avbröts."
-#: LYMessages.c:35
+#: LYMessages.c:36
msgid "Cancelled!!!"
msgstr "Avbruten!!!"
-#: LYMessages.c:36
+#: LYMessages.c:37
msgid "Cancelling!"
msgstr "Avbryter!"
-#: LYMessages.c:37
+#: LYMessages.c:38
msgid "Excellent!!!"
msgstr "Underbart!!!"
-#: LYMessages.c:38
+#: LYMessages.c:39
msgid "OK"
msgstr "OK"
-#: LYMessages.c:39
+#: LYMessages.c:40
msgid "Done!"
msgstr "Klar!"
-#: LYMessages.c:40
+#: LYMessages.c:41
msgid "Bad request!"
msgstr "Felaktig förfrågan!"
-#: LYMessages.c:41
+#: LYMessages.c:42
msgid "previous"
msgstr "föregående"
-#: LYMessages.c:42
+#: LYMessages.c:43
msgid "next screen"
msgstr "nästa skärm"
-#: LYMessages.c:43
+#: LYMessages.c:44
msgid "HELP!"
msgstr "HJÄLP!"
-#: LYMessages.c:44
+#: LYMessages.c:45
msgid ", help on "
msgstr ", hjälp om "
#. #define HELP
-#: LYMessages.c:46
+#: LYMessages.c:47
msgid "Commands: Use arrow keys to move, '?' for help, 'q' to quit, '<-' to go back."
msgstr "Kommandon: Piltangenter flyttar, \"?\" ger hjälp, \"q\" avslutar, \"<-\" återgår."
#. #define MOREHELP
-#: LYMessages.c:48
+#: LYMessages.c:49
msgid "-- press space for more, use arrow keys to move, '?' for help, 'q' to quit."
msgstr "-- tryck blanksteg för mer, piltangenter flyttar, \"?\" ger hjälp, \"q\" avslutar."
-#: LYMessages.c:49
+#: LYMessages.c:50
msgid "-- press space for next page --"
msgstr "-- tryck blanksteg för nästa sida --"
-#: LYMessages.c:50
+#: LYMessages.c:51
msgid "URL too long"
msgstr "Adressen för lång"
#. Inactive input fields, messages used with -tna option - kw
#. #define FORM_LINK_TEXT_MESSAGE_INA
-#: LYMessages.c:56
+#: LYMessages.c:57
msgid "(Text entry field) Inactive. Press <return> to activate."
msgstr "(Textinmatningsfält) Inaktivt. Tryck <Enter> för att aktivera."
#. #define FORM_LINK_TEXTAREA_MESSAGE_INA
-#: LYMessages.c:58
+#: LYMessages.c:59
msgid "(Textarea) Inactive. Press <return> to activate."
msgstr "(Textfält) Inaktivt. Tryck <Enter> för att aktivera."
#. #define FORM_LINK_TEXTAREA_MESSAGE_INA_E
-#: LYMessages.c:60
+#: LYMessages.c:61
#, c-format
msgid "(Textarea) Inactive. Press <return> to activate (%s for editor)."
msgstr "(Textfält) Inaktivt. Tryck <Enter> för att aktivera (%s för redigeringsprogram)."
#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_INA
-#: LYMessages.c:62
+#: LYMessages.c:63
msgid "(Form field) Inactive. Use <return> to edit."
msgstr "(Formulärfält) Inaktivt. Tryck <Enter> för att redigera."
#. #define FORM_TEXT_SUBMIT_MESSAGE_INA_X
-#: LYMessages.c:64
+#: LYMessages.c:65
#, c-format
msgid "(Form field) Inactive. Use <return> to edit (%s to submit with no cache)."
msgstr "(Formulärfält) Inaktivt. Tryck <Enter> för att redigera (%s skickar utan cache)."
#. #define FORM_TEXT_RESUBMIT_MESSAGE_INA
-#: LYMessages.c:66
+#: LYMessages.c:67
msgid "(Form field) Inactive. Press <return> to edit, press <return> twice to submit."
msgstr "(Formulärfält) Inaktivt. Redigera med <Enter>, två gånger för att skicka."
#. #define FORM_TEXT_SUBMIT_MAILTO_MSG_INA
-#: LYMessages.c:68
+#: LYMessages.c:69
msgid "(mailto form field) Inactive. Press <return> to change."
msgstr "(e-postformulärfält) Inaktivt. Tryck <Enter> för att ändra."
#. #define FORM_LINK_PASSWORD_MESSAGE_INA
-#: LYMessages.c:70
+#: LYMessages.c:71
msgid "(Password entry field) Inactive. Press <return> to activate."
msgstr "(Lösenordsinmatningsfält) Inaktivt. Tryck <Enter> för att aktivera."
#. #define FORM_LINK_FILE_UNM_MSG
-#: LYMessages.c:73
+#: LYMessages.c:74
msgid "UNMODIFIABLE file entry field. Use UP or DOWN arrows or tab to move off."
msgstr "SKRIVSKYDDAT filinmatningsfält. Använd UPP-/NED-pil eller tabb för att lämna."
#. #define FORM_LINK_FILE_MESSAGE
-#: LYMessages.c:75
+#: LYMessages.c:76
msgid "(File entry field) Enter filename. Use UP or DOWN arrows or tab to move off."
msgstr "(Filinmatningsfält) Ange filnamn. Använd UPP-/NED-pil eller tabb för att lämna."
#. #define FORM_LINK_TEXT_MESSAGE
-#: LYMessages.c:77
+#: LYMessages.c:78
msgid "(Text entry field) Enter text. Use UP or DOWN arrows or tab to move off."
msgstr "(Textinmatningsfält) Ange text. Använd UPP-/NED-pil eller tabb för att lämna."
#. #define FORM_LINK_TEXTAREA_MESSAGE
-#: LYMessages.c:79
+#: LYMessages.c:80
msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off."
msgstr "(Textfält) Ange text. Använd UPP-/NED-pil eller tabb för att lämna."
#. #define FORM_LINK_TEXTAREA_MESSAGE_E
-#: LYMessages.c:81
+#: LYMessages.c:82
#, c-format
msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
msgstr "(Textfält) Ange text. UPP-/NED-pil eller tabb lämnar (%s redigerar med program)."
#. #define FORM_LINK_TEXT_UNM_MSG
-#: LYMessages.c:83
+#: LYMessages.c:84
msgid "UNMODIFIABLE form text field. Use UP or DOWN arrows or tab to move off."
msgstr "SKRIVSKYDDAT formulärtextfält. Använd UPP-/NED-pil eller tabb för att lämna."
#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE
-#: LYMessages.c:85
+#: LYMessages.c:86
msgid "(Form field) Enter text. Use <return> to submit."
msgstr "(Formulärfält) Ange text. Tryck <Enter> för att skicka."
#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_X
-#: LYMessages.c:87
+#: LYMessages.c:88
#, c-format
msgid "(Form field) Enter text. Use <return> to submit (%s for no cache)."
msgstr "(Formulärfält) Ange text. Tryck <Enter> för att skicka (%s förbigår cache)."
#. #define FORM_LINK_TEXT_RESUBMIT_MESSAGE
-#: LYMessages.c:89
+#: LYMessages.c:90
msgid "(Form field) Enter text. Use <return> to submit, arrows or tab to move off."
msgstr "(Formulärfält) Ange text. <Enter> skickar, pilar eller tabb lämnar."
#. #define FORM_LINK_TEXT_SUBMIT_UNM_MSG
-#: LYMessages.c:91
+#: LYMessages.c:92
msgid "UNMODIFIABLE form field. Use UP or DOWN arrows or tab to move off."
msgstr "SKRIVSKYDDAT formulärfält. Använd UPP-/NED-pil eller tabb för att lämna."
#. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG
-#: LYMessages.c:93
+#: LYMessages.c:94
msgid "(mailto form field) Enter text. Use <return> to submit, arrows to move off."
msgstr "(e-postformulärfält) Ange text. <Enter> skickar, pilar lämnar."
#. #define FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:95
+#: LYMessages.c:96
msgid "(mailto form field) Mail is disallowed so you cannot submit."
msgstr "(e-postformulärfält) E-post tillåts ej, så du kan inte skicka."
#. #define FORM_LINK_PASSWORD_MESSAGE
-#: LYMessages.c:97
+#: LYMessages.c:98
msgid "(Password entry field) Enter text. Use UP or DOWN arrows or tab to move off."
msgstr "(Lösenordsfält) Ange text. Använd UPP-/NED-pil eller tabb för att lämna."
#. #define FORM_LINK_PASSWORD_UNM_MSG
-#: LYMessages.c:99
+#: LYMessages.c:100
msgid "UNMODIFIABLE form password. Use UP or DOWN arrows or tab to move off."
msgstr "SKRIVSKYDDAT formulärlösenord. Använd UPP-/NED-pil eller tabb för att lämna."
#. #define FORM_LINK_CHECKBOX_MESSAGE
-#: LYMessages.c:101
+#: LYMessages.c:102
msgid "(Checkbox Field) Use right-arrow or <return> to toggle."
msgstr "(Kryssruta) Använd högerpil eller <Enter> för att ställa om."
#. #define FORM_LINK_CHECKBOX_UNM_MSG
-#: LYMessages.c:103
+#: LYMessages.c:104
msgid "UNMODIFIABLE form checkbox. Use UP or DOWN arrows or tab to move off."
msgstr "SKRIVSKYDDAD kryssruta. Använd UPP-/NED-pil eller tabb för att lämna."
#. #define FORM_LINK_RADIO_MESSAGE
-#: LYMessages.c:105
+#: LYMessages.c:106
msgid "(Radio Button) Use right-arrow or <return> to toggle."
msgstr "(Radioknapp) Använd högerpil eller <Enter> för att ställa om."
#. #define FORM_LINK_RADIO_UNM_MSG
-#: LYMessages.c:107
+#: LYMessages.c:108
msgid "UNMODIFIABLE form radio button. Use UP or DOWN arrows or tab to move off."
msgstr "SKRIVSKYDDAD radioknapp. Använd UPP-/NED-pil eller tabb för att lämna."
#. #define FORM_LINK_SUBMIT_PREFIX
-#: LYMessages.c:109
+#: LYMessages.c:110
msgid "Submit ('x' for no cache) to "
msgstr "Skicka (\"x\" förbigår cache) till "
#. #define FORM_LINK_RESUBMIT_PREFIX
-#: LYMessages.c:111
+#: LYMessages.c:112
msgid "Submit to "
msgstr "Skicka till "
#. #define FORM_LINK_SUBMIT_MESSAGE
-#: LYMessages.c:113
+#: LYMessages.c:114
msgid "(Form submit button) Use right-arrow or <return> to submit ('x' for no cache)."
msgstr "(Sändknapp) Använd högerpil eller <Enter> för att skicka (\"x\" förbigår cache)."
#. #define FORM_LINK_RESUBMIT_MESSAGE
-#: LYMessages.c:115
+#: LYMessages.c:116
msgid "(Form submit button) Use right-arrow or <return> to submit."
msgstr "(Sändknapp) Använd högerpil eller <Enter> för att skicka."
#. #define FORM_LINK_SUBMIT_DIS_MSG
-#: LYMessages.c:117
+#: LYMessages.c:118
msgid "DISABLED form submit button. Use UP or DOWN arrows or tab to move off."
msgstr "INAKTIV sändknapp. Använd UPP-/NED-pil eller tabb för att lämna."
#. #define FORM_LINK_SUBMIT_MAILTO_PREFIX
-#: LYMessages.c:119
+#: LYMessages.c:120
msgid "Submit mailto form to "
msgstr "Skicka e-postformulär till "
#. #define FORM_LINK_SUBMIT_MAILTO_MSG
-#: LYMessages.c:121
+#: LYMessages.c:122
msgid "(mailto form submit button) Use right-arrow or <return> to submit."
msgstr "(sändknapp i e-postformulär) Använd högerpil eller <Enter> för att skicka."
#. #define FORM_LINK_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:123
+#: LYMessages.c:124
msgid "(mailto form submit button) Mail is disallowed so you cannot submit."
msgstr "(sändknapp i e-postformulär) E-post tillåts ej, så du kan inte skicka."
#. #define FORM_LINK_RESET_MESSAGE
-#: LYMessages.c:125
+#: LYMessages.c:126
msgid "(Form reset button) Use right-arrow or <return> to reset form to defaults."
msgstr "(Nollställningsknapp) Använd högerpil eller <Enter> för att återställa förval."
#. #define FORM_LINK_RESET_DIS_MSG
-#: LYMessages.c:127
+#: LYMessages.c:128
msgid "DISABLED form reset button. Use UP or DOWN arrows or tab to move off."
msgstr "INAKTIV nollställningsknapp. Använd UPP-/NED-pil eller tabb för att lämna."
#. #define FORM_LINK_BUTTON_MESSAGE
-#: LYMessages.c:129
+#: LYMessages.c:130
msgid "(Script button) Use UP or DOWN arrows or tab to move off."
msgstr "(Skriptknapp) Använd UPP-/NED-pil eller tabb för att lämna."
#. #define FORM_LINK_BUTTON_DIS_MSG
-#: LYMessages.c:131
+#: LYMessages.c:132
msgid "DISABLED Script button. Use UP or DOWN arrows or tab to move off."
msgstr "INAKTIV skriptknapp. Använd UPP-/NED-pil eller tabb för att lämna."
#. #define FORM_LINK_OPTION_LIST_MESSAGE
-#: LYMessages.c:133
+#: LYMessages.c:134
msgid "(Option list) Hit return and use arrow keys and return to select option."
msgstr "(Alternativlista) Tryck Enter och använd pilar och Enter för att välja."
#. #define CHOICE_LIST_MESSAGE
-#: LYMessages.c:135
+#: LYMessages.c:136
msgid "(Choice list) Hit return and use arrow keys and return to select option."
msgstr "(Vallista) Tryck Enter och använd piltangenter och Enter för att välja."
#. #define FORM_LINK_OPTION_LIST_UNM_MSG
-#: LYMessages.c:137
+#: LYMessages.c:138
msgid "UNMODIFIABLE option list. Use return or arrow keys to review or leave."
msgstr "SKRIVSKYDDAD alternativlista. Använd Enter och pilar för att visa eller lämna."
#. #define CHOICE_LIST_UNM_MSG
-#: LYMessages.c:139
+#: LYMessages.c:140
msgid "UNMODIFIABLE choice list. Use return or arrow keys to review or leave."
msgstr "SKRIVSKYDDAD vallista. Använd Enter och piltangenter för att visa eller lämna."
-#: LYMessages.c:140
+#: LYMessages.c:141
msgid "Submitting form..."
msgstr "Skickar formulär..."
-#: LYMessages.c:141
+#: LYMessages.c:142
msgid "Resetting form..."
msgstr "Nollställer formulär..."
#. #define RELOADING_FORM
-#: LYMessages.c:143
+#: LYMessages.c:144
msgid "Reloading document. Any form entries will be lost!"
msgstr "Hämtar om dokument. Eventuellt formulärinnehåll förkastas!"
#. #define LINK_NOT_IN_FORM
-#: LYMessages.c:145
+#: LYMessages.c:146
msgid "The current link is not in a FORM"
msgstr "Aktuell länk är inte i ett FORMULÄR"
-#: LYMessages.c:146
+#: LYMessages.c:147
#, c-format
msgid "Warning: Cannot transcode form data to charset %s!"
msgstr "Varning: Kan inte koda formulärdata i teckenuppsättningen %s!"
#. #define NORMAL_LINK_MESSAGE
-#: LYMessages.c:149
+#: LYMessages.c:150
msgid "(NORMAL LINK) Use right-arrow or <return> to activate."
msgstr "(VANLIG LÄNK) Använd högerpil eller <Enter> för att aktivera."
-#: LYMessages.c:150
+#: LYMessages.c:151
msgid "The resource requested is not available at this time."
msgstr "Resursen du begärt är inte tillgänglig just nu."
-#: LYMessages.c:151
+#: LYMessages.c:152
msgid "Enter Lynx keystroke command: "
msgstr "Ange Lynxtangentkommando: "
-#: LYMessages.c:152
+#: LYMessages.c:153
msgid "Looking up "
msgstr "Slår upp "
-#: LYMessages.c:153
+#: LYMessages.c:154
#, c-format
msgid "Getting %s"
msgstr "Hämtar %s"
-#: LYMessages.c:154
+#: LYMessages.c:155
#, c-format
msgid "Skipping %s"
msgstr "Hoppas över %s"
-#: LYMessages.c:155
+#: LYMessages.c:156
#, c-format
msgid "Using %s"
msgstr "Använder %s"
-#: LYMessages.c:156
+#: LYMessages.c:157
#, c-format
msgid "Illegal URL: %s"
msgstr "Felaktig adress: %s"
-#: LYMessages.c:157
+#: LYMessages.c:158
#, c-format
msgid "Badly formed address %s"
msgstr "Trasig adress %s"
-#: LYMessages.c:158
+#: LYMessages.c:159
#, c-format
msgid "URL: %s"
msgstr "Adress: %s"
-#: LYMessages.c:159
+#: LYMessages.c:160
msgid "Unable to access WWW file!!!"
msgstr "Kan inte komma åt webbfil!!!"
-#: LYMessages.c:160
+#: LYMessages.c:161
#, c-format
msgid "This is a searchable index. Use %s to search."
msgstr "Detta är ett sökbart index. Använd %s för att söka."
#. #define WWW_INDEX_MORE_MESSAGE
-#: LYMessages.c:162
+#: LYMessages.c:163
#, c-format
msgid "--More-- This is a searchable index. Use %s to search."
msgstr "--Mer-- Detta är ett sökbart index. Använd %s för att söka."
-#: LYMessages.c:163
+#: LYMessages.c:164
msgid "You have entered an invalid link number."
msgstr "Du har angett ett felaktigt länknummer."
#. #define SOURCE_HELP
-#: LYMessages.c:165
+#: LYMessages.c:166
msgid "Currently viewing document source. Press '\\' to return to rendered version."
msgstr "Visar dokumentkällkod. Tryck \"\\\" för att återgå till tolkad version."
#. #define NOVICE_LINE_ONE
-#: LYMessages.c:167
+#: LYMessages.c:168
msgid " Arrow keys: Up and Down to move. Right to follow a link; Left to go back. \n"
msgstr " Piltangenter: Upp och ned flyttar. Höger följer länk; vänster återgår. \n"
#. #define NOVICE_LINE_TWO
-#: LYMessages.c:169
+#: LYMessages.c:170
msgid " H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list \n"
msgstr " H=Hjälp O=Val P=Utskrift G=Gå M=Huvudskärm Q=Avsluta /=sök Del=Historik \n"
#. #define NOVICE_LINE_TWO_A
-#: LYMessages.c:171
+#: LYMessages.c:172
msgid " O)ther cmds H)elp K)eymap G)oto P)rint M)ain screen o)ptions Q)uit \n"
msgstr " O=Fler H=Hjälp K=Tangenter G=Gå P=Utskrift M=Huvudskärm O=Val Q=Avsluta \n"
#. #define NOVICE_LINE_TWO_B
-#: LYMessages.c:173
+#: LYMessages.c:174
msgid " O)ther cmds B)ack E)dit D)ownload ^R)eload ^W)ipe screen search doc: / \n"
msgstr " O=Fler B=Bakåt E=Redigera D=Hämta ^R=Hämta om ^W=Rita om sök dokument: / \n"
#. #define NOVICE_LINE_TWO_C
-#: LYMessages.c:175
+#: LYMessages.c:176
msgid "O)ther cmds C)omment History: <backspace> Bookmarks: V)iew, A)dd, R)emove \n"
msgstr "O=Fler C=Kommentera Historik: backsteg Bokmärken: V=Visa A=Nytt R=Ta bort \n"
#. #define FORM_NOVICELINE_ONE
-#: LYMessages.c:177
+#: LYMessages.c:178
msgid " Enter text into the field by typing on the keyboard "
msgstr " Ange text i fältet genom att skriva på tangentbordet "
#. #define FORM_NOVICELINE_TWO
-#: LYMessages.c:179
+#: LYMessages.c:180
msgid " Ctrl-U to delete all text in field, [Backspace] to delete a character "
msgstr " Ctrl-U tömmer inmatningsfältet, [Backsteg] tar bort en bokstav "
#. #define FORM_NOVICELINE_TWO_DELBL
-#: LYMessages.c:181
+#: LYMessages.c:182
msgid " Ctrl-U to delete text in field, [Backspace] to delete a character "
msgstr " Ctrl-U tömmer inmatningsfältet, [Backsteg] tar bort en bokstav "
#. #define FORM_NOVICELINE_TWO_VAR
-#: LYMessages.c:183
+#: LYMessages.c:184
#, c-format
msgid " %s to delete all text in field, [Backspace] to delete a character "
msgstr " %s tömmer inmatningsfältet, [Backsteg] tar bort en bokstav "
#. #define FORM_NOVICELINE_TWO_DELBL_VAR
-#: LYMessages.c:185
+#: LYMessages.c:186
#, c-format
msgid " %s to delete text in field, [Backspace] to delete a character "
msgstr " %s tömmer inmatningsfältet, [Backsteg] tar bort en bokstav "
#. mailto
-#: LYMessages.c:188
+#: LYMessages.c:189
msgid "Malformed mailto form submission! Cancelled!"
msgstr "Trasig \"mailto\" i formulär! Avbryter!"
-#: LYMessages.c:189
+#: LYMessages.c:190
msgid "Warning! Control codes in mail address replaced by ?"
msgstr "Varning! Kontrollkoder i e-postadress ersatta med frågetecken"
-#: LYMessages.c:190
+#: LYMessages.c:191
msgid "Mail disallowed! Cannot submit."
msgstr "E-post tillåts ej! Kan inte skicka."
-#: LYMessages.c:191
+#: LYMessages.c:192
msgid "Mailto form submission failed!"
msgstr "Misslyckades att skicka e-postformulär!"
-#: LYMessages.c:192
+#: LYMessages.c:193
msgid "Mailto form submission Cancelled!!!"
msgstr "Insändning av e-postformulär avbruten!!!"
-#: LYMessages.c:193
+#: LYMessages.c:194
msgid "Sending form content..."
msgstr "Skickar formulärdata..."
-#: LYMessages.c:194
+#: LYMessages.c:195
msgid "No email address is present in mailto URL!"
msgstr "Ingen e-postadress i \"mailto\"-fältet!"
#. #define MAILTO_URL_TEMPOPEN_FAILED
-#: LYMessages.c:196
+#: LYMessages.c:197
msgid "Unable to open temporary file for mailto URL!"
msgstr "Kan inte öppna temporärfil för \"mailto\"-adress!"
#. #define INC_ORIG_MSG_PROMPT
-#: LYMessages.c:198
+#: LYMessages.c:199
msgid "Do you wish to include the original message?"
msgstr "Vill du inkludera originalmeddelandet?"
#. #define INC_PREPARSED_MSG_PROMPT
-#: LYMessages.c:200
+#: LYMessages.c:201
msgid "Do you wish to include the preparsed source?"
msgstr "Vill du inkludera den färdigtolkade källkoden?"
#. #define SPAWNING_EDITOR_FOR_MAIL
-#: LYMessages.c:202
+#: LYMessages.c:203
msgid "Spawning your selected editor to edit mail message"
msgstr "Startar ditt valda textredigeringsprogram för att skriva brevet"
#. #define ERROR_SPAWNING_EDITOR
-#: LYMessages.c:204
+#: LYMessages.c:205
msgid "Error spawning editor, check your editor definition in the options menu"
msgstr "Fel vid start av textredigeringsprogram, se inställningar i valmenyn"
-#: LYMessages.c:205
+#: LYMessages.c:206
msgid "Send this comment?"
msgstr "Skicka denna kommentar?"
-#: LYMessages.c:206
+#: LYMessages.c:207
msgid "Send this message?"
msgstr "Skicka detta meddelande?"
-#: LYMessages.c:207
+#: LYMessages.c:208
msgid "Sending your message..."
msgstr "Skickar ditt meddelande..."
-#: LYMessages.c:208
+#: LYMessages.c:209
msgid "Sending your comment:"
msgstr "Skickar din kommentar:"
#. textarea
-#: LYMessages.c:211
+#: LYMessages.c:212
msgid "Not in a TEXTAREA; cannot use external editor."
msgstr "Inte i en TEXTAREA; kan inte använda externt redigeringsprogram."
-#: LYMessages.c:212
+#: LYMessages.c:213
msgid "Not in a TEXTAREA; cannot use command."
msgstr "Inte i en TEXTAREA; kan inte använda kommando."
-#: LYMessages.c:214
+#: LYMessages.c:215
msgid "file: ACTIONs are disallowed!"
msgstr "file:-formulärmål tillåts inte!"
#. #define FILE_SERVED_LINKS_DISALLOWED
-#: LYMessages.c:216
+#: LYMessages.c:217
msgid "file: URLs via served links are disallowed!"
msgstr "file:-adresser i givna adresser tillåts ej!"
-#: LYMessages.c:217
+#: LYMessages.c:218
msgid "Access to local files denied."
msgstr "Åtkomst till lokala filer nekas."
-#: LYMessages.c:218
+#: LYMessages.c:219
msgid "file: URLs via bookmarks are disallowed!"
msgstr "file:-adresser i bokmärken tillåts ej!"
#. #define SPECIAL_VIA_EXTERNAL_DISALLOWED
-#: LYMessages.c:220
+#: LYMessages.c:221
msgid "This special URL is not allowed in external documents!"
msgstr "Denna specialadress tillåts ej i externa dokument!"
-#: LYMessages.c:221
+#: LYMessages.c:222
msgid "Press <return> to return to Lynx."
msgstr "Tryck <Enter> för att återgå till Lynx."
#. #define SPAWNING_MSG
-#: LYMessages.c:224
+#: LYMessages.c:225
msgid "Spawning DCL subprocess. Use 'logout' to return to Lynx.\n"
msgstr "Startar DCL-underprocess. Använd \"logout\" för att återgå till Lynx.\n"
#. #define SPAWNING_MSG
-#: LYMessages.c:228
+#: LYMessages.c:229
msgid "Type EXIT to return to Lynx.\n"
msgstr "Skriv EXIT för att återgå till Lynx.\n"
#. #define SPAWNING_MSG
-#: LYMessages.c:231
+#: LYMessages.c:232
msgid "Spawning your default shell. Use 'exit' to return to Lynx.\n"
msgstr "Startar ditt valda skal. Skriv \"exit\" för att återgå till Lynx.\n"
-#: LYMessages.c:234
+#: LYMessages.c:235
msgid "Spawning is currently disabled."
msgstr "Start av externa program tillåts ej just nu."
-#: LYMessages.c:235
+#: LYMessages.c:236
msgid "The 'd'ownload command is currently disabled."
msgstr "Hämtningskommandot (\"d\") tillåts ej just nu."
-#: LYMessages.c:236
+#: LYMessages.c:237
msgid "You cannot download an input field."
msgstr "Du kan inte hämta ett indatafält."
-#: LYMessages.c:237
+#: LYMessages.c:238
msgid "Form has a mailto action! Cannot download."
msgstr "Detta är ett e-postformulär! Kan inte hämta."
-#: LYMessages.c:238
+#: LYMessages.c:239
msgid "You cannot download a mailto: link."
msgstr "Du kan inte hämta en mailto:-länk."
-#: LYMessages.c:239
+#: LYMessages.c:240
msgid "You cannot download cookies."
msgstr "Du kan inte hämta kakor."
-#: LYMessages.c:240
+#: LYMessages.c:241
msgid "You cannot download a printing option."
msgstr "Du kan inte hämta ett utskriftsval."
-#: LYMessages.c:241
+#: LYMessages.c:242
msgid "You cannot download an upload option."
msgstr "Du kan inte hämta ett sändningsalternativ."
-#: LYMessages.c:242
+#: LYMessages.c:243
msgid "You cannot download an permit option."
msgstr "Du kan inte hämta en inställning."
-#: LYMessages.c:243
+#: LYMessages.c:244
msgid "This special URL cannot be downloaded!"
msgstr "Denna specialadress kan inte hämtas!"
-#: LYMessages.c:244
+#: LYMessages.c:245
msgid "Nothing to download."
msgstr "Inget att hämta."
-#: LYMessages.c:245
+#: LYMessages.c:246
msgid "Trace ON!"
msgstr "Spårning AKTIV!"
-#: LYMessages.c:246
+#: LYMessages.c:247
msgid "Trace OFF!"
msgstr "Spårning INAKTIV!"
#. #define CLICKABLE_IMAGES_ON
-#: LYMessages.c:248
+#: LYMessages.c:249
msgid "Links will be included for all images! Reloading..."
msgstr "Länkar skapas för alla bilder! Hämtar om..."
#. #define CLICKABLE_IMAGES_OFF
-#: LYMessages.c:250
+#: LYMessages.c:251
msgid "Standard image handling restored! Reloading..."
msgstr "Normal bildhantering återställd! Hämtar om..."
#. #define PSEUDO_INLINE_ALTS_ON
-#: LYMessages.c:252
+#: LYMessages.c:253
msgid "Pseudo_ALTs will be inserted for inlines without ALT strings! Reloading..."
msgstr "\"Pseudo-ALT\" sätts in för bilder som saknar ALT-strängar! Hämtar om..."
#. #define PSEUDO_INLINE_ALTS_OFF
-#: LYMessages.c:254
+#: LYMessages.c:255
msgid "Inlines without an ALT string specified will be ignored! Reloading..."
msgstr "Bilder utan ALT-strängar ignoreras! Hämtar om..."
-#: LYMessages.c:255
+#: LYMessages.c:256
msgid "Raw 8-bit or CJK mode toggled OFF! Reloading..."
msgstr "Rått 8-bitars- eller CJK-läge AV! Hämtar om..."
-#: LYMessages.c:256
+#: LYMessages.c:257
msgid "Raw 8-bit or CJK mode toggled ON! Reloading..."
msgstr "Rått 8-bitars- eller CJK-läge PÅ! Hämtar om..."
#. #define HEAD_D_L_OR_CANCEL
-#: LYMessages.c:258
+#: LYMessages.c:259
msgid "Send HEAD request for D)ocument or L)ink, or C)ancel? (d,l,c): "
msgstr "Sänd \"HEAD\" för D=dokument eller L=länk; C=Avbryt? (d,l,c): "
#. #define HEAD_D_OR_CANCEL
-#: LYMessages.c:260
+#: LYMessages.c:261
msgid "Send HEAD request for D)ocument, or C)ancel? (d,c): "
msgstr "Sänd \"HEAD\" för D=dokument; C=Avbryt? (d,c): "
-#: LYMessages.c:261
+#: LYMessages.c:262
msgid "Sorry, the document is not an http URL."
msgstr "Tyvärr, dokumentet har inte en http-adress."
-#: LYMessages.c:262
+#: LYMessages.c:263
msgid "Sorry, the link is not an http URL."
msgstr "Tyvärr, länken har inte en http-adress."
-#: LYMessages.c:263
+#: LYMessages.c:264
msgid "Sorry, the ACTION for this form is disabled."
msgstr "Tyvärr, formulärmålet detta formulär är avstängt."
#. #define FORM_ACTION_NOT_HTTP_URL
-#: LYMessages.c:265
+#: LYMessages.c:266
msgid "Sorry, the ACTION for this form is not an http URL."
msgstr "Tyvärr, formulärmålet för detta formulär är inte en http-adress."
-#: LYMessages.c:266
+#: LYMessages.c:267
msgid "Not an http URL or form ACTION!"
msgstr "Inte en http-adress eller formulärmål!"
-#: LYMessages.c:267
+#: LYMessages.c:268
msgid "This special URL cannot be a form ACTION!"
msgstr "Denna speciella adress kan inte vara formulärmål!"
-#: LYMessages.c:268
+#: LYMessages.c:269
msgid "URL is not in starting realm!"
msgstr "Adressen är inte i startmängden!"
-#: LYMessages.c:269
+#: LYMessages.c:270
msgid "News posting is disabled!"
msgstr "Postning av artiklar deaktiverad!"
-#: LYMessages.c:270
+#: LYMessages.c:271
msgid "File management support is disabled!"
msgstr "Filhanteringsstödet är deaktiverat!"
-#: LYMessages.c:271
+#: LYMessages.c:272
msgid "No jump file is currently available."
msgstr "Ingen hoppfil finns just nu att tillgå."
-#: LYMessages.c:272
+#: LYMessages.c:273
msgid "Jump to (use '?' for list): "
msgstr "Hoppa till (\"?\"=lista): "
-#: LYMessages.c:273
+#: LYMessages.c:274
msgid "Jumping to a shortcut URL is disallowed!"
msgstr "Hopp till genvägsadress ej tillåtet!"
-#: LYMessages.c:274
+#: LYMessages.c:275
msgid "Random URL is disallowed! Use a shortcut."
msgstr "Slumpmässig adress ej tillåten! Använd en genväg."
-#: LYMessages.c:275
+#: LYMessages.c:276
msgid "No random URLs have been used thus far."
msgstr "Inga slumpmässiga adresser har ännu används."
-#: LYMessages.c:276
+#: LYMessages.c:277
msgid "Bookmark features are currently disabled."
-msgstr "Bomärkesfunktionerna är just nu deaktiverade."
+msgstr "Bokmärkesfunktionerna är just nu deaktiverade."
-#: LYMessages.c:277
+#: LYMessages.c:278
msgid "Execution via bookmarks is disabled."
msgstr "Programkörning via bokmärken är deaktiverat."
#. #define BOOKMARK_FILE_NOT_DEFINED
-#: LYMessages.c:279
+#: LYMessages.c:280
#, c-format
msgid "Bookmark file is not defined. Use %s to see options."
msgstr "Bokmärkesfil ej definierad. Använd %s för att se alternativ."
#. #define NO_TEMP_FOR_HOTLIST
-#: LYMessages.c:281
+#: LYMessages.c:282
msgid "Unable to open tempfile for X Mosaic hotlist conversion."
msgstr "Kan inte öppna temporärfil för konvertering av X Mosaics bokmärken."
-#: LYMessages.c:282
+#: LYMessages.c:283
msgid "ERROR - unable to open bookmark file."
msgstr "FEL - kan inte öppna bokmärkesfil."
#. #define BOOKMARK_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:284
+#: LYMessages.c:285
msgid "Unable to open bookmark file for deletion of link."
msgstr "Kan inte öppna bokmärkesfil för borttagning av länk."
#. #define BOOKSCRA_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:286
+#: LYMessages.c:287
msgid "Unable to open scratch file for deletion of link."
msgstr "Kan inte öppna skräpfil för borttagning av länk."
-#: LYMessages.c:288
+#: LYMessages.c:289
msgid "Error renaming scratch file."
msgstr "Fel vid namnändring av skräpfil."
-#: LYMessages.c:290
+#: LYMessages.c:291
msgid "Error renaming temporary file."
msgstr "Fel vid namnändring av temporärfil."
#. #define BOOKTEMP_COPY_FAIL
-#: LYMessages.c:292
+#: LYMessages.c:293
msgid "Unable to copy temporary file for deletion of link."
msgstr "Kan inte kopiera temporärfil för borttagning av länk."
#. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL
-#: LYMessages.c:294
+#: LYMessages.c:295
msgid "Unable to reopen temporary file for deletion of link."
msgstr "Kan inte återöppna temporärfil för borttagning av länk."
#. #define BOOKMARK_LINK_NOT_ONE_LINE
-#: LYMessages.c:297
+#: LYMessages.c:298
msgid "Link is not by itself all on one line in bookmark file."
msgstr "Länk är inte själv helt på en rad i bokmärkesfilen."
-#: LYMessages.c:298
+#: LYMessages.c:299
msgid "Bookmark deletion failed."
msgstr "Borttagning av bokmärke misslyckades."
#. #define BOOKMARKS_NOT_TRAVERSED
-#: LYMessages.c:300
+#: LYMessages.c:301
msgid "Bookmark files cannot be traversed (only http URLs)."
msgstr "Bokmärkesfiler kan inte traverseras (endast http-adresser)."
#. #define BOOKMARKS_NOT_OPEN
-#: LYMessages.c:302
+#: LYMessages.c:303
msgid "Unable to open bookmark file, use 'a' to save a link first"
msgstr "Kan inte öppna bokmärkesfil, använd 'a' för att spara en länk först"
-#: LYMessages.c:303
+#: LYMessages.c:304
msgid "There are no links in this bookmark file!"
msgstr "Det finns inga länkar i denna bokmärkesfil!"
#. #define CACHE_D_OR_CANCEL
-#: LYMessages.c:305
+#: LYMessages.c:306
msgid "D)elete cached document or C)ancel? (d,c): "
msgstr "D=Ta bort cachat dokument; C=Avbryt? (d,c): "
#. #define BOOK_D_L_OR_CANCEL
-#: LYMessages.c:307
+#: LYMessages.c:308
msgid "Save D)ocument or L)ink to bookmark file or C)ancel? (d,l,c): "
msgstr "Spara D)okument eller L)änk till bokmärkesfil? C=Avbryt (d,l,c): "
-#: LYMessages.c:308
+#: LYMessages.c:309
msgid "Save D)ocument to bookmark file or C)ancel? (d,c): "
msgstr "Spara D)okument till bokmärkesfil? C=Avbryt (d,c): "
-#: LYMessages.c:309
+#: LYMessages.c:310
msgid "Save L)ink to bookmark file or C)ancel? (l,c): "
msgstr "Spara L)änk till bokmärkesfil? C=Avbryt (l,c): "
#. #define NOBOOK_POST_FORM
-#: LYMessages.c:311
+#: LYMessages.c:312
msgid "Documents from forms with POST content cannot be saved as bookmarks."
msgstr "Dokument från \"POST\"-formulär kan inte lagras som bokmärken."
-#: LYMessages.c:312
+#: LYMessages.c:313
msgid "Cannot save form fields/links"
msgstr "Kan inte spara formulärfält/länkar"
#. #define NOBOOK_HSML
-#: LYMessages.c:314
+#: LYMessages.c:315
msgid "History, showinfo, menu and list files cannot be saved as bookmarks."
msgstr "Historik, \"showinfo\", menyer och listfiler kan inte lagras som bokmärken."
#. #define CONFIRM_BOOKMARK_DELETE
-#: LYMessages.c:316
+#: LYMessages.c:317
msgid "Do you really want to delete this link from your bookmark file?"
msgstr "Vill du verkligen ta bort denna länk från din bokmärkesfil?"
-#: LYMessages.c:317
+#: LYMessages.c:318
msgid "Malformed address."
msgstr "Trasig adress."
#. #define HISTORICAL_ON_MINIMAL_OFF
-#: LYMessages.c:319
+#: LYMessages.c:320
msgid "Historical comment parsing ON (Minimal is overridden)!"
msgstr "Historisk tolkning av kommentarer PÅ (minimal undertryckt)!"
#. #define HISTORICAL_OFF_MINIMAL_ON
-#: LYMessages.c:321
+#: LYMessages.c:322
msgid "Historical comment parsing OFF (Minimal is in effect)!"
-msgstr "Historisk tolkning av kommentarer AV (minmal aktiv)!"
+msgstr "Historisk tolkning av kommentarer AV (minimal aktiv)!"
#. #define HISTORICAL_ON_VALID_OFF
-#: LYMessages.c:323
+#: LYMessages.c:324
msgid "Historical comment parsing ON (Valid is overridden)!"
msgstr "Historisk tolkning av kommentarer PÅ (korrekt undertryckt)!"
#. #define HISTORICAL_OFF_VALID_ON
-#: LYMessages.c:325
+#: LYMessages.c:326
msgid "Historical comment parsing OFF (Valid is in effect)!"
msgstr "Historisk tolkning av kommentarer AV (korrekt aktiv)!"
#. #define MINIMAL_ON_IN_EFFECT
-#: LYMessages.c:327
+#: LYMessages.c:328
msgid "Minimal comment parsing ON (and in effect)!"
msgstr "Minimal tolkning av kommentarer PÅ (och aktiv)!"
#. #define MINIMAL_OFF_VALID_ON
-#: LYMessages.c:329
+#: LYMessages.c:330
msgid "Minimal comment parsing OFF (Valid is in effect)!"
msgstr "Minimal tolkning av kommentarer AV (korrekt aktiv)!"
#. #define MINIMAL_ON_BUT_HISTORICAL
-#: LYMessages.c:331
+#: LYMessages.c:332
msgid "Minimal comment parsing ON (but Historical is in effect)!"
msgstr "Minimal tolkning av kommentarer PÅ (men historisk aktiv)!"
#. #define MINIMAL_OFF_HISTORICAL_ON
-#: LYMessages.c:333
+#: LYMessages.c:334
msgid "Minimal comment parsing OFF (Historical is in effect)!"
msgstr "Minimal tolkning av kommentarer AV (historisk aktiv)!"
-#: LYMessages.c:334
+#: LYMessages.c:335
msgid "Soft double-quote parsing ON!"
msgstr "Mjuk citationsteckenstolkning PÅ!"
-#: LYMessages.c:335
+#: LYMessages.c:336
msgid "Soft double-quote parsing OFF!"
msgstr "Mjuk citationsteckenstolkning AV!"
-#: LYMessages.c:336
+#: LYMessages.c:337
msgid "Now using TagSoup parsing of HTML."
msgstr "Tolkar nu HTML enligt \"TagSoup\"-modellen."
-#: LYMessages.c:337
+#: LYMessages.c:338
msgid "Now using SortaSGML parsing of HTML!"
msgstr "Tolkar nu HTML enligt \"SortaSGML\"-modellen."
-#: LYMessages.c:338
+#: LYMessages.c:339
msgid "You are already at the end of this document."
msgstr "Du är redan i slutet av dokumentet."
-#: LYMessages.c:339
+#: LYMessages.c:340
msgid "You are already at the beginning of this document."
msgstr "Du är redan i början av dokumentet."
-#: LYMessages.c:340
+#: LYMessages.c:341
#, c-format
msgid "You are already at page %d of this document."
msgstr "Du är redan på sida %d av dokumentet."
-#: LYMessages.c:341
+#: LYMessages.c:342
#, c-format
msgid "Link number %d already is current."
msgstr "Länk nummer %d är redan nuvarande."
-#: LYMessages.c:342
+#: LYMessages.c:343
msgid "You are already at the first document"
msgstr "Du är redan i det första dokumentet."
-#: LYMessages.c:343
+#: LYMessages.c:344
msgid "There are no links above this line of the document."
msgstr "Det finns inga länkar över denna rad i dokumentet."
-#: LYMessages.c:344
+#: LYMessages.c:345
msgid "There are no links below this line of the document."
msgstr "Det finns inga länkar nedanför denna rad i dokumentet."
#. #define MAXLEN_REACHED_DEL_OR_MOV
-#: LYMessages.c:346
+#: LYMessages.c:347
msgid "Maximum length reached! Delete text or move off field."
msgstr "Maximal längd nådd! Ta bort text eller lämna fältet."
#. #define NOT_ON_SUBMIT_OR_LINK
-#: LYMessages.c:348
+#: LYMessages.c:349
msgid "You are not on a form submission button or normal link."
msgstr "Du är inte på en formulärsändknapp eller normal länk."
#. #define NEED_CHECKED_RADIO_BUTTON
-#: LYMessages.c:350
+#: LYMessages.c:351
msgid "One radio button must be checked at all times!"
msgstr "En radioknapp måste alltid vara markerad!"
-#: LYMessages.c:351
+#: LYMessages.c:352
msgid "No submit button for this form, submit single text field?"
msgstr "Ingen insändningsknapp i formuläret, skicka ensamt textfält?"
-#: LYMessages.c:352
+#: LYMessages.c:353
msgid "Do you want to go back to the previous document?"
msgstr "Vill du gå tillbaka till föregående dokument?"
-#: LYMessages.c:353
+#: LYMessages.c:354
msgid "Use arrows or tab to move off of field."
msgstr "Använd pilar eller tabb för att lämna."
#. #define ENTER_TEXT_ARROWS_OR_TAB
-#: LYMessages.c:355
+#: LYMessages.c:356
msgid "Enter text. Use arrows or tab to move off of field."
msgstr "Ange text. Använd pilar eller tabb för att lämna."
-#: LYMessages.c:356
+#: LYMessages.c:357
msgid "** Bad HTML!! No form action defined. **"
msgstr "** Trasig HTML!! Inget formulärmål angivet. **"
-#: LYMessages.c:357
+#: LYMessages.c:358
msgid "Bad HTML!! Unable to create popup window!"
msgstr "Trasig HTML!! Kan inte skapa popupfönster!"
-#: LYMessages.c:358
+#: LYMessages.c:359
msgid "Unable to create popup window!"
msgstr "Kan inte skapa popupfönster!"
-#: LYMessages.c:359
+#: LYMessages.c:360
msgid "Goto a random URL is disallowed!"
msgstr "Slumpmässig adress ej tillåten!"
-#: LYMessages.c:360
+#: LYMessages.c:361
msgid "Goto a non-http URL is disallowed!"
msgstr "Icke-http-adress ej tillåten!"
-#: LYMessages.c:361
+#: LYMessages.c:362
#, c-format
msgid "You are not allowed to goto \"%s\" URLs"
msgstr "Du tillåts inte gå till \"%s\"-adresser"
-#: LYMessages.c:362
+#: LYMessages.c:363
msgid "URL to open: "
msgstr "Adress att öppna: "
-#: LYMessages.c:363
+#: LYMessages.c:364
msgid "Edit the current Goto URL: "
msgstr "Redigera aktuell gåadress: "
-#: LYMessages.c:364
+#: LYMessages.c:365
msgid "Edit the previous Goto URL: "
msgstr "Redigera föregående gåadress: "
-#: LYMessages.c:365
+#: LYMessages.c:366
msgid "Edit a previous Goto URL: "
msgstr "Redigera en tidigare gåadress: "
-#: LYMessages.c:366
+#: LYMessages.c:367
msgid "Current document has POST data."
msgstr "Aktuellt dokument har \"POST\"-data."
-#: LYMessages.c:367
+#: LYMessages.c:368
msgid "Edit this document's URL: "
msgstr "Redigera dokumentets adress: "
-#: LYMessages.c:368
+#: LYMessages.c:369
msgid "Edit the current link's URL: "
-msgstr "Redigera aktull länkadress: "
+msgstr "Redigera aktuell länkadress: "
-#: LYMessages.c:369
+#: LYMessages.c:370
msgid "Edit the form's submit-URL: "
msgstr "Redigera formulärets mottagaradress: "
-#: LYMessages.c:370
+#: LYMessages.c:371
msgid "You cannot edit File Management URLs"
msgstr "Du kan inte redigera filhanteringsadresser"
-#: LYMessages.c:371
+#: LYMessages.c:372
msgid "Enter a database query: "
msgstr "Ange en databasfråga: "
-#: LYMessages.c:372
+#: LYMessages.c:373
msgid "Enter a whereis query: "
msgstr "Ange en \"whereis\"-fråga: "
-#: LYMessages.c:373
+#: LYMessages.c:374
msgid "Edit the current query: "
msgstr "Redigera aktuell fråga: "
-#: LYMessages.c:374
+#: LYMessages.c:375
msgid "Edit the previous query: "
msgstr "Redigera föregående fråga: "
-#: LYMessages.c:375
+#: LYMessages.c:376
msgid "Edit a previous query: "
msgstr "Redigera en tidigare fråga: "
#. #define USE_C_R_TO_RESUB_CUR_QUERY
-#: LYMessages.c:377
+#: LYMessages.c:378
msgid "Use Control-R to resubmit the current query."
msgstr "Använd Control-R för att skicka frågan på nytt."
-#: LYMessages.c:378
+#: LYMessages.c:379
msgid "Edit the current shortcut: "
msgstr "Redigera aktuell genväg: "
-#: LYMessages.c:379
+#: LYMessages.c:380
msgid "Edit the previous shortcut: "
msgstr "Redigera föregående genväg: "
-#: LYMessages.c:380
+#: LYMessages.c:381
msgid "Edit a previous shortcut: "
msgstr "Redigera en tidigare genväg:"
-#: LYMessages.c:381
+#: LYMessages.c:382
#, c-format
msgid "Key '%c' is not mapped to a jump file!"
msgstr "Tangenten \"%c\" är inte kopplad till en hoppfil!"
-#: LYMessages.c:382
+#: LYMessages.c:383
msgid "Cannot locate jump file!"
msgstr "Kan inte lokalisera hoppfil!"
-#: LYMessages.c:383
+#: LYMessages.c:384
msgid "Cannot open jump file!"
msgstr "Kan inte öppna hoppfil!"
-#: LYMessages.c:384
+#: LYMessages.c:385
msgid "Error reading jump file!"
msgstr "Fel vid läsning av hoppfil!"
-#: LYMessages.c:385
+#: LYMessages.c:386
msgid "Out of memory reading jump file!"
msgstr "Slut på minne vid läsning av hoppfil!"
-#: LYMessages.c:386
+#: LYMessages.c:387
msgid "Out of memory reading jump table!"
msgstr "Slut på minne vid läsning av hopptabell!"
-#: LYMessages.c:387
+#: LYMessages.c:388
msgid "No index is currently available."
msgstr "Inget index är tillgängligt."
#. #define CONFIRM_MAIN_SCREEN
-#: LYMessages.c:389
+#: LYMessages.c:390
msgid "Do you really want to go to the Main screen?"
msgstr "Vill du verkligen gå till huvudskärmen?"
-#: LYMessages.c:390
+#: LYMessages.c:391
msgid "You are already at main screen!"
msgstr "Du är redan på huvudskärmen!"
#. #define NOT_ISINDEX
-#: LYMessages.c:392
+#: LYMessages.c:393
msgid "Not a searchable indexed document -- press '/' to search for a text string"
msgstr "Inte ett sökbart index -- tryck \"/\" för att söka efter en textsträng"
#. #define NO_OWNER
-#: LYMessages.c:394
+#: LYMessages.c:395
msgid "No owner is defined for this file so you cannot send a comment"
msgstr "Ingen ägare är angiven för denna fil, så du kan inte skicka en kommentar"
-#: LYMessages.c:395
+#: LYMessages.c:396
#, c-format
msgid "No owner is defined. Use %s?"
msgstr "Ingen ägaren är angiven. Använda %s?"
-#: LYMessages.c:396
+#: LYMessages.c:397
msgid "Do you wish to send a comment?"
msgstr "Vill du skicka en kommentar?"
-#: LYMessages.c:397
+#: LYMessages.c:398
msgid "Mail is disallowed so you cannot send a comment"
msgstr "E-post tillåts ej, så du kan inte skicka en kommentar"
-#: LYMessages.c:398
+#: LYMessages.c:399
msgid "The 'e'dit command is currently disabled."
msgstr "Redigeringskommandot är just nu deaktiverat."
-#: LYMessages.c:399
+#: LYMessages.c:400
msgid "External editing is currently disabled."
msgstr "Extern redigering är just nu deaktiverad."
-#: LYMessages.c:400
+#: LYMessages.c:401
msgid "System error - failure to get status."
msgstr "Systemfel - kunde inte hämta status."
-#: LYMessages.c:401
+#: LYMessages.c:402
msgid "No editor is defined!"
msgstr "Inget textredigeringsprogram har angivits!"
-#: LYMessages.c:402
+#: LYMessages.c:403
msgid "The 'p'rint command is currently disabled."
msgstr "Utskriftskommandot är just nu deaktiverat."
-#: LYMessages.c:403
+#: LYMessages.c:404
msgid "Document has no Toolbar links or Banner."
msgstr "Dokumentet har varken verktygsradslänkar eller baner."
-#: LYMessages.c:404
+#: LYMessages.c:405
msgid "Unable to open traversal file."
msgstr "Kan inte öppna traverseringsfil."
-#: LYMessages.c:405
+#: LYMessages.c:406
msgid "Unable to open traversal found file."
msgstr "Kan inte öppna traverseringens resultatfil."
-#: LYMessages.c:406
+#: LYMessages.c:407
msgid "Unable to open reject file."
msgstr "Kan inte öppna avvisningsfilen."
-#: LYMessages.c:407
+#: LYMessages.c:408
msgid "Unable to open traversal errors output file"
msgstr "Kan inte öppna traverseringens felfil."
-#: LYMessages.c:408
+#: LYMessages.c:409
msgid "TRAVERSAL WAS INTERRUPTED"
msgstr "TRAVERSERINGEN AVBRÖTS"
-#: LYMessages.c:409
+#: LYMessages.c:410
msgid "Follow link (or goto link or page) number: "
msgstr "Följ länk (eller gå till länk eller sida) nummer: "
-#: LYMessages.c:410
+#: LYMessages.c:411
msgid "Select option (or page) number: "
msgstr "Välj val- (eller sid-)nummer: "
-#: LYMessages.c:411
+#: LYMessages.c:412
#, c-format
msgid "Option number %d already is current."
msgstr "Alternativ %d är redan markerat."
#. #define ALREADY_AT_OPTION_END
-#: LYMessages.c:413
+#: LYMessages.c:414
msgid "You are already at the end of this option list."
msgstr "Du är redan i slutet av alternativlistan."
#. #define ALREADY_AT_OPTION_BEGIN
-#: LYMessages.c:415
+#: LYMessages.c:416
msgid "You are already at the beginning of this option list."
msgstr "Du är redan i början av alternativlistan."
#. #define ALREADY_AT_OPTION_PAGE
-#: LYMessages.c:417
+#: LYMessages.c:418
#, c-format
msgid "You are already at page %d of this option list."
msgstr "Du är redan på sida %d i alternativlistan."
-#: LYMessages.c:418
+#: LYMessages.c:419
msgid "You have entered an invalid option number."
msgstr "Du har angett ett felaktigt alternativnummer."
-#: LYMessages.c:419
+#: LYMessages.c:420
msgid "** Bad HTML!! Use -trace to diagnose. **"
msgstr "** Trasig HTML!! Använd -trace för att diagnostisera. **"
-#: LYMessages.c:420
+#: LYMessages.c:421
msgid "Give name of file to save in"
msgstr "Ange filnamn att spara till"
-#: LYMessages.c:421
+#: LYMessages.c:422
msgid "Can't save data to file -- please run WWW locally"
msgstr "Kan inte spara data till fil -- kör lokal webbläsare"
-#: LYMessages.c:422
+#: LYMessages.c:423
msgid "Can't open temporary file!"
msgstr "Kan inte öppna temporärfil!"
-#: LYMessages.c:423
+#: LYMessages.c:424
msgid "Can't open output file! Cancelling!"
msgstr "Kan inte öppna utdatafil! Avbryter!"
-#: LYMessages.c:424
+#: LYMessages.c:425
msgid "Execution is disabled."
msgstr "Programkörning deaktiverad."
#. #define EXECUTION_DISABLED_FOR_FILE
-#: LYMessages.c:426
+#: LYMessages.c:427
#, c-format
msgid "Execution is not enabled for this file. See the Options menu (use %s)."
msgstr "Programkörning inte aktiverad för denna fil. Se alternativmeny (använd %s)."
#. #define EXECUTION_NOT_COMPILED
-#: LYMessages.c:428
+#: LYMessages.c:429
msgid "Execution capabilities are not compiled into this version."
msgstr "Programkörningsmöjligheter inte inkompilerade i denna version."
-#: LYMessages.c:429
+#: LYMessages.c:430
msgid "This file cannot be displayed on this terminal."
msgstr "Denna fil kan inte visas på terminalen."
#. #define CANNOT_DISPLAY_FILE_D_OR_C
-#: LYMessages.c:431
+#: LYMessages.c:432
msgid "This file cannot be displayed on this terminal: D)ownload, or C)ancel"
msgstr "Denna fil kan inte visas på terminalen. D=Hämta, C=Avbryt"
-#: LYMessages.c:432
+#: LYMessages.c:433
#, c-format
msgid "%s D)ownload, or C)ancel"
msgstr "%s D=Hämta, C=Avbryt"
-#: LYMessages.c:433
+#: LYMessages.c:434
msgid "Cancelling file."
msgstr "Avbryter fil."
-#: LYMessages.c:434
+#: LYMessages.c:435
msgid "Retrieving file. - PLEASE WAIT -"
msgstr "Hämtar fil. - VÄNLIGEN VÄNTA -"
-#: LYMessages.c:435
+#: LYMessages.c:436
msgid "Enter a filename: "
msgstr "Ange ett filnamn: "
-#: LYMessages.c:436
+#: LYMessages.c:437
msgid "Edit the previous filename: "
msgstr "Redigera föregående filnamn: "
-#: LYMessages.c:437
+#: LYMessages.c:438
msgid "Edit a previous filename: "
msgstr "Redigera ett tidigare filnamn: "
-#: LYMessages.c:438
+#: LYMessages.c:439
msgid "Enter a new filename: "
msgstr "Ange ett nytt filnamn: "
-#: LYMessages.c:439
+#: LYMessages.c:440
msgid "File name may not begin with a dot."
msgstr "Filnamnet får inte börja med en punkt."
-#: LYMessages.c:441
+#: LYMessages.c:442
msgid "File exists. Create higher version?"
msgstr "Filen existerar. Skapa en högre version?"
-#: LYMessages.c:443
+#: LYMessages.c:444
msgid "File exists. Overwrite?"
msgstr "Filen existerar. Skriva över?"
-#: LYMessages.c:445
+#: LYMessages.c:446
msgid "Cannot write to file."
msgstr "Kan inte skriva till fil."
-#: LYMessages.c:446
+#: LYMessages.c:447
msgid "ERROR! - download command is misconfigured."
msgstr "FEL! - hämtkommandot är felkonfigurerat."
-#: LYMessages.c:447
+#: LYMessages.c:448
msgid "Unable to download file."
msgstr "Kan inte hämta fil."
-#: LYMessages.c:448
+#: LYMessages.c:449
msgid "Reading directory..."
msgstr "Läser katalog..."
-#: LYMessages.c:449
+#: LYMessages.c:450
msgid "Building directory listing..."
msgstr "Bygger kataloglista..."
-#: LYMessages.c:450
+#: LYMessages.c:451
msgid "Saving..."
msgstr "Sparar..."
-#: LYMessages.c:451
+#: LYMessages.c:452
#, c-format
msgid "Could not edit file '%s'."
msgstr "Kan inte redigera filen \"%s\"."
-#: LYMessages.c:452
+#: LYMessages.c:453
msgid "Unable to access document!"
msgstr "Kan inte komma åt dokument!"
-#: LYMessages.c:453
+#: LYMessages.c:454
msgid "Could not access file."
msgstr "Kan inte komma åt fil."
-#: LYMessages.c:454
+#: LYMessages.c:455
msgid "Could not access directory."
msgstr "Kan inte komma åt katalog."
-#: LYMessages.c:455
+#: LYMessages.c:456
msgid "Could not load data."
msgstr "Kan inte läsa in data."
#. #define CANNOT_EDIT_REMOTE_FILES
-#: LYMessages.c:457
+#: LYMessages.c:458
msgid "Lynx cannot currently (e)dit remote WWW files."
msgstr "Lynx kan ännu inte redigera fjärrwebbfiler."
#. #define CANNOT_EDIT_FIELD
-#: LYMessages.c:459
+#: LYMessages.c:460
msgid "This field cannot be (e)dited with an external editor."
msgstr "Detta fält kan inte redigeras med en extern redigerare."
-#: LYMessages.c:460
+#: LYMessages.c:461
msgid "Bad rule"
msgstr "Felaktig regel"
-#: LYMessages.c:461
+#: LYMessages.c:462
msgid "Insufficient operands:"
msgstr "Otillräckliga operander:"
-#: LYMessages.c:462
+#: LYMessages.c:463
msgid "You are not authorized to edit this file."
msgstr "Du har inte rättighet att redigera filen."
-#: LYMessages.c:463
+#: LYMessages.c:464
msgid "Title: "
msgstr "Titel: "
-#: LYMessages.c:464
+#: LYMessages.c:465
msgid "Subject: "
msgstr "Ärende: "
-#: LYMessages.c:465
+#: LYMessages.c:466
msgid "Username: "
msgstr "Användar-id: "
-#: LYMessages.c:466
+#: LYMessages.c:467
msgid "Password: "
msgstr "Lösenord: "
-#: LYMessages.c:467
+#: LYMessages.c:468
msgid "lynx: Username and Password required!!!"
msgstr "lynx: Användar-id och lösenord krävs!!!"
-#: LYMessages.c:468
+#: LYMessages.c:469
msgid "lynx: Password required!!!"
msgstr "lynx: Lösenord krävs!!!"
-#: LYMessages.c:469
+#: LYMessages.c:470
msgid "Clear all authorization info for this session?"
msgstr "Rensa all auktoriseringsinformation från denna session?"
-#: LYMessages.c:470
+#: LYMessages.c:471
msgid "Authorization info cleared."
msgstr "Auktoriseringsinformation rensad."
-#: LYMessages.c:471
+#: LYMessages.c:472
msgid "Authorization failed. Retry?"
msgstr "Auktorisering misslyckades. Försök igen?"
-#: LYMessages.c:472
+#: LYMessages.c:473
msgid "cgi support has been disabled."
msgstr "cgi-stöd har deaktiverats."
#. #define CGI_NOT_COMPILED
-#: LYMessages.c:474
+#: LYMessages.c:475
msgid "Lynxcgi capabilities are not compiled into this version."
msgstr "Lynxcgi-stöd är inte inkompilerade i denna version."
-#: LYMessages.c:475
+#: LYMessages.c:476
#, c-format
msgid "Sorry, no known way of converting %s to %s."
msgstr "Tyvärr, kan inte konvertera %s till %s."
-#: LYMessages.c:476
+#: LYMessages.c:477
msgid "Unable to set up connection."
msgstr "Kan inte ställa in anslutning."
-#: LYMessages.c:477
+#: LYMessages.c:478
msgid "Unable to make connection"
msgstr "Kan inte skapa anslutning"
#. #define MALFORMED_EXEC_REQUEST
-#: LYMessages.c:479
+#: LYMessages.c:480
msgid "Executable link rejected due to malformed request."
msgstr "Körbar länk förkastad på grund av trasig förfrågan."
#. #define BADCHAR_IN_EXEC_LINK
-#: LYMessages.c:481
+#: LYMessages.c:482
#, c-format
msgid "Executable link rejected due to `%c' character."
msgstr "Körbar länk förkastad på grund av tecknet \"%c\"."
#. #define RELPATH_IN_EXEC_LINK
-#: LYMessages.c:483
+#: LYMessages.c:484
msgid "Executable link rejected due to relative path string ('../')."
msgstr "Körbar länk förkastad på grund av relativ sökvägssträng (\"../\")."
#. #define BADLOCPATH_IN_EXEC_LINK
-#: LYMessages.c:485
+#: LYMessages.c:486
msgid "Executable link rejected due to location or path."
msgstr "Körbar länk förkastad på grund av placering eller sökväg."
-#: LYMessages.c:486
+#: LYMessages.c:487
msgid "Mail access is disabled!"
msgstr "Åtkomst till e-post deaktiverad!"
#. #define ACCESS_ONLY_LOCALHOST
-#: LYMessages.c:488
+#: LYMessages.c:489
msgid "Only files and servers on the local host can be accessed."
msgstr "Endast filer och servrar på den lokala värden kan nås."
-#: LYMessages.c:489
+#: LYMessages.c:490
msgid "Telnet access is disabled!"
msgstr "Telnetåtkomst är deaktiverad!"
#. #define TELNET_PORT_SPECS_DISABLED
-#: LYMessages.c:491
+#: LYMessages.c:492
msgid "Telnet port specifications are disabled."
msgstr "Specificering av telnetport är deaktiverad."
-#: LYMessages.c:492
+#: LYMessages.c:493
msgid "USENET news access is disabled!"
msgstr "Åtkomst till Usenet news är deaktiverad!"
-#: LYMessages.c:493
+#: LYMessages.c:494
msgid "Rlogin access is disabled!"
msgstr "Rloginåtkomst är deaktiverad!"
-#: LYMessages.c:494
+#: LYMessages.c:495
msgid "Ftp access is disabled!"
msgstr "Ftpåtkomst är deaktiverad!"
-#: LYMessages.c:495
+#: LYMessages.c:496
msgid "There are no references from this document."
msgstr "Det finns inga referenser i detta dokument."
-#: LYMessages.c:496
+#: LYMessages.c:497
msgid "There are only hidden links from this document."
msgstr "Det finns inga dolda länkar i detta dokument."
-#: LYMessages.c:498
+#: LYMessages.c:499
msgid "Unable to open command file."
msgstr "Kan inte öppna kommandofil."
-#: LYMessages.c:500
+#: LYMessages.c:501
msgid "News Post Cancelled!!!"
msgstr "Postning av inlägg avbruten!!!"
#. #define SPAWNING_EDITOR_FOR_NEWS
-#: LYMessages.c:502
+#: LYMessages.c:503
msgid "Spawning your selected editor to edit news message"
msgstr "Startar ditt valda textredigeringsprogram för att redigera inlägg"
-#: LYMessages.c:503
+#: LYMessages.c:504
msgid "Post this message?"
msgstr "Posta inlägget?"
-#: LYMessages.c:504
+#: LYMessages.c:505
#, c-format
msgid "Append '%s'?"
msgstr "Lägga till \"%s\"?"
-#: LYMessages.c:505
+#: LYMessages.c:506
msgid "Posting to newsgroup(s)..."
msgstr "Postar till diskussionsgrupp(er)..."
-#: LYMessages.c:507
+#: LYMessages.c:508
msgid "*** You have unread mail. ***"
msgstr "*** Du har oläst e-post. ***"
-#: LYMessages.c:509
+#: LYMessages.c:510
msgid "*** You have mail. ***"
msgstr "*** Du har e-post. ***"
-#: LYMessages.c:511
+#: LYMessages.c:512
msgid "*** You have new mail. ***"
msgstr "*** Du har ny e-post. ***"
-#: LYMessages.c:512
+#: LYMessages.c:513
msgid "File insert cancelled!!!"
msgstr "Filinläggning avbruten!!!"
-#: LYMessages.c:513
+#: LYMessages.c:514
msgid "Not enough memory for file!"
msgstr "Minnet slut för fil!"
-#: LYMessages.c:514
+#: LYMessages.c:515
msgid "Can't open file for reading."
msgstr "Kan inte öppna fil för läsning."
-#: LYMessages.c:515
+#: LYMessages.c:516
msgid "File does not exist."
msgstr "Filen existerar inte."
-#: LYMessages.c:516
+#: LYMessages.c:517
msgid "File does not exist - reenter or cancel:"
msgstr "Filen existerar inte - ange igen eller avbryt:"
-#: LYMessages.c:517
+#: LYMessages.c:518
msgid "File is not readable."
msgstr "Filen är inte läsbar."
-#: LYMessages.c:518
+#: LYMessages.c:519
msgid "File is not readable - reenter or cancel:"
msgstr "Filen är inte läsbar - ange igen eller avbryt:"
-#: LYMessages.c:519
+#: LYMessages.c:520
msgid "Nothing to insert - file is 0-length."
msgstr "Inget att lägga in - filen har nollstorlek."
-#: LYMessages.c:520
+#: LYMessages.c:521
msgid "Save request cancelled!!!"
msgstr "Sparning avbruten!!!"
-#: LYMessages.c:521
+#: LYMessages.c:522
msgid "Mail request cancelled!!!"
msgstr "E-post avbrutet!!!"
#. #define CONFIRM_MAIL_SOURCE_PREPARSED
-#: LYMessages.c:523
+#: LYMessages.c:524
msgid "Viewing preparsed source. Are you sure you want to mail it?"
msgstr "Visar tolkad källkod. Är du säker på att du vill skicka den?"
-#: LYMessages.c:524
+#: LYMessages.c:525
msgid "Please wait..."
msgstr "Var god vänta..."
-#: LYMessages.c:525
+#: LYMessages.c:526
msgid "Mailing file. Please wait..."
msgstr "Skickar fil. Var god vänta..."
-#: LYMessages.c:526
+#: LYMessages.c:527
msgid "ERROR - Unable to mail file"
msgstr "FEL - Kan inte skicka fil per e-post"
#. #define CONFIRM_LONG_SCREEN_PRINT
-#: LYMessages.c:528
+#: LYMessages.c:529
#, c-format
msgid "File is %d screens long. Are you sure you want to print?"
msgstr "Filen är %d skärmar lång. Är du säker att du vill skriva ut?"
-#: LYMessages.c:529
+#: LYMessages.c:530
msgid "Print request cancelled!!!"
msgstr "Utskrift avbruten!!!"
-#: LYMessages.c:530
+#: LYMessages.c:531
msgid "Press <return> to begin: "
msgstr "Tryck <Enter> för att börja: "
-#: LYMessages.c:531
+#: LYMessages.c:532
msgid "Press <return> to finish: "
msgstr "Tryck <Enter> för att avsluta: "
#. #define CONFIRM_LONG_PAGE_PRINT
-#: LYMessages.c:533
+#: LYMessages.c:534
#, c-format
msgid "File is %d pages long. Are you sure you want to print?"
msgstr "Filen är %d sidor lång. Är du säker att du vill skriva ut?"
#. #define CHECK_PRINTER
-#: LYMessages.c:535
+#: LYMessages.c:536
msgid "Be sure your printer is on-line. Press <return> to start printing:"
msgstr "Försäkra dig om att skrivaren är inkopplad. Tryck <Enter> för att påbörja utskriften:"
-#: LYMessages.c:536
+#: LYMessages.c:537
msgid "ERROR - Unable to allocate file space!!!"
msgstr "FEL - kan inte reservera filutrymme!!!"
-#: LYMessages.c:537
+#: LYMessages.c:538
msgid "Unable to open tempfile"
msgstr "Kan inte öppna temporärfil"
-#: LYMessages.c:538
+#: LYMessages.c:539
msgid "Unable to open print options file"
msgstr "Kan inte öppna utskriftsalternativfil"
-#: LYMessages.c:539
+#: LYMessages.c:540
msgid "Printing file. Please wait..."
msgstr "Skriver ut fil. Var god vänta..."
-#: LYMessages.c:540
+#: LYMessages.c:541
msgid "Please enter a valid internet mail address: "
msgstr "Ange en giltig Internet-e-postadress: "
-#: LYMessages.c:541
+#: LYMessages.c:542
msgid "ERROR! - printer is misconfigured!"
msgstr "FEL! - skrivaren är felkonfigurerad!"
-#: LYMessages.c:542
+#: LYMessages.c:543
msgid "Image map from POST response not available!"
msgstr "Bildkarta från \"POST\"-svar ej tillgänglig!"
-#: LYMessages.c:543
+#: LYMessages.c:544
msgid "Misdirected client-side image MAP request!"
msgstr "Feldirigerad klientbildkarteförfrågan!"
-#: LYMessages.c:544
+#: LYMessages.c:545
msgid "Client-side image MAP is not accessible!"
msgstr "Klientbildkarta ej åtkomlig!"
-#: LYMessages.c:545
+#: LYMessages.c:546
msgid "No client-side image MAPs are available!"
msgstr "Inga klientbildkartor är tillgängliga!"
-#: LYMessages.c:546
+#: LYMessages.c:547
msgid "Client-side image MAP is not available!"
msgstr "Klientbildkarta ej tillgänglig!"
#. #define OPTION_SCREEN_NEEDS_24
-#: LYMessages.c:549
+#: LYMessages.c:550
msgid "Screen height must be at least 24 lines for the Options menu!"
msgstr "Skärmhöjden måste vara minst 24 rader för alternativmenyn!"
#. #define OPTION_SCREEN_NEEDS_23
-#: LYMessages.c:551
+#: LYMessages.c:552
msgid "Screen height must be at least 23 lines for the Options menu!"
msgstr "Skärmhöjden måste vara minst 23 rader för alternativmenyn!"
#. #define OPTION_SCREEN_NEEDS_22
-#: LYMessages.c:553
+#: LYMessages.c:554
msgid "Screen height must be at least 22 lines for the Options menu!"
msgstr "Skärmhöjden måste vara minst 22 rader för alternativmenyn!"
-#: LYMessages.c:555
+#: LYMessages.c:556
msgid "That key requires Advanced User mode."
msgstr "Den knappen kräver avancerat användarläge."
-#: LYMessages.c:556
+#: LYMessages.c:557
#, c-format
msgid "Content-type: %s"
msgstr "Datatyp: %s"
-#: LYMessages.c:557
+#: LYMessages.c:558
msgid "Command: "
msgstr "Kommando: "
-#: LYMessages.c:558
+#: LYMessages.c:559
msgid "Unknown or ambiguous command"
msgstr "Okänt eller tvetydigt kommando"
-#: LYMessages.c:559
+#: LYMessages.c:560
msgid " Version "
msgstr " Version "
-#: LYMessages.c:560
+#: LYMessages.c:561
msgid " first"
msgstr " först"
-#: LYMessages.c:561
+#: LYMessages.c:562
msgid ", guessing..."
msgstr ", gissar..."
-#: LYMessages.c:562
+#: LYMessages.c:563
msgid "Permissions for "
msgstr "Behörighet för "
-#: LYMessages.c:563
+#: LYMessages.c:564
msgid "Select "
msgstr "Välj "
-#: LYMessages.c:564
+#: LYMessages.c:565
msgid "capital letter"
msgstr "stora bokstaven"
-#: LYMessages.c:565
+#: LYMessages.c:566
msgid " of option line,"
msgstr " i alternativet,"
-#: LYMessages.c:566
+#: LYMessages.c:567
msgid " to save,"
msgstr " för att lagra,"
-#: LYMessages.c:567
+#: LYMessages.c:568
msgid " to "
msgstr " till "
-#: LYMessages.c:568
+#: LYMessages.c:569
msgid " or "
msgstr " eller "
-#: LYMessages.c:569
+#: LYMessages.c:570
msgid " index"
msgstr " index"
-#: LYMessages.c:570
+#: LYMessages.c:571
msgid " to return to Lynx."
msgstr " för att återgå till Lynx"
-#: LYMessages.c:571
+#: LYMessages.c:572
msgid "Accept Changes"
msgstr "Bekräfta ändringar"
-#: LYMessages.c:572
+#: LYMessages.c:573
msgid "Reset Changes"
msgstr "Nollställ ändringar"
-#: LYMessages.c:573
+#: LYMessages.c:574
msgid "Left Arrow cancels changes"
msgstr "Vänsterpil avbryter ändringar"
-#: LYMessages.c:574
+#: LYMessages.c:575
msgid "Save options to disk"
msgstr "Spara inställningar till disk"
-#: LYMessages.c:575
+#: LYMessages.c:576
msgid "Hit RETURN to accept entered data."
msgstr "Tryck ENTER för att bekräfta angiven data."
#. #define ACCEPT_DATA_OR_DEFAULT
-#: LYMessages.c:577
+#: LYMessages.c:578
msgid "Hit RETURN to accept entered data. Delete data to invoke the default."
msgstr "Tryck ENTER för att bekräfta angiven data. Ta bort för att återställa förval."
-#: LYMessages.c:578
+#: LYMessages.c:579
msgid "Value accepted!"
msgstr "Värdet accepterat!"
#. #define VALUE_ACCEPTED_WARNING_X
-#: LYMessages.c:580
+#: LYMessages.c:581
msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!"
msgstr "Värdet accepterat! -- VARNING: Lynx har ställts in för XWINDOWS!"
#. #define VALUE_ACCEPTED_WARNING_NONX
-#: LYMessages.c:582
+#: LYMessages.c:583
msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!"
msgstr "Värdet accepterat! -- VARNING: Lynx har INTE ställts in för XWINDOWS!"
-#: LYMessages.c:583
+#: LYMessages.c:584
msgid "You are not allowed to change which editor to use!"
msgstr "Du har inte rättighet att ändra textredigeringsprogram!"
-#: LYMessages.c:584
+#: LYMessages.c:585
msgid "Failed to set DISPLAY variable!"
msgstr "Kunde inte ställa in DISPLAY-variabel!"
-#: LYMessages.c:585
+#: LYMessages.c:586
msgid "Failed to clear DISPLAY variable!"
msgstr "Kunde inte ta bort DISPLAY-variabel!"
#. #define BOOKMARK_CHANGE_DISALLOWED
-#: LYMessages.c:587
+#: LYMessages.c:588
msgid "You are not allowed to change the bookmark file!"
msgstr "Du har inte rättighet att ändra bokmärkesfil!"
-#: LYMessages.c:588
+#: LYMessages.c:589
msgid "Terminal does not support color"
msgstr "Terminalen stöder inte färg"
-#: LYMessages.c:589
+#: LYMessages.c:590
#, c-format
msgid "Your '%s' terminal does not support color."
msgstr "Din \"%s\"-terminal stöder inte färg."
-#: LYMessages.c:590
+#: LYMessages.c:591
msgid "Access to dot files is disabled!"
msgstr "Tillgång till punktfiler är deaktiverad!"
#. #define UA_NO_LYNX_WARNING
-#: LYMessages.c:592
+#: LYMessages.c:593
msgid "User-Agent string does not contain \"Lynx\" or \"L_y_n_x\""
msgstr "Identifieringssträngen innehåller inte \"Lynx\" eller \"L_y_n_x\""
#. #define UA_PLEASE_USE_LYNX
-#: LYMessages.c:594
+#: LYMessages.c:595
msgid "Use \"L_y_n_x\" or \"Lynx\" in User-Agent, or it looks like intentional deception!"
msgstr "Använd \"L_y_n_x\" eller \"Lynx\" i identifieringen, annars ser det ut som medvetet bedrägeri"
#. #define UA_CHANGE_DISABLED
-#: LYMessages.c:596
+#: LYMessages.c:597
msgid "Changing of the User-Agent string is disabled!"
msgstr "Ändring av identifieringssträngen är deaktiverad!"
#. #define CHANGE_OF_SETTING_DISALLOWED
-#: LYMessages.c:598
+#: LYMessages.c:599
msgid "You are not allowed to change this setting."
msgstr "Du har inte behörighet att ändra denna inställning."
-#: LYMessages.c:599
+#: LYMessages.c:600
msgid "Saving Options..."
msgstr "Sparar inställningar..."
-#: LYMessages.c:600
+#: LYMessages.c:601
msgid "Options saved!"
msgstr "Inställningar sparade!"
-#: LYMessages.c:601
+#: LYMessages.c:602
msgid "Unable to save Options!"
msgstr "Kan inte spara inställningar!"
-#: LYMessages.c:602
+#: LYMessages.c:603
msgid " 'r' to return to Lynx "
msgstr " 'r' återgår till Lynx "
-#: LYMessages.c:603
+#: LYMessages.c:604
msgid " '>' to save, or 'r' to return to Lynx "
msgstr " '>' sparar, 'r' återgår till Lynx "
#. #define ANY_KEY_CHANGE_RET_ACCEPT
-#: LYMessages.c:605
+#: LYMessages.c:606
msgid "Hit any key to change value; RETURN to accept."
msgstr "Valfri tangent ändrar, förutom ENTER som accepterar."
-#: LYMessages.c:606
+#: LYMessages.c:607
msgid "Error uncompressing temporary file!"
msgstr "Fel vid dekomprimering av temporärfil!"
-#: LYMessages.c:607
+#: LYMessages.c:608
msgid "Unsupported URL scheme!"
msgstr "Adresstypen stöds ej!"
-#: LYMessages.c:608
+#: LYMessages.c:609
msgid "Unsupported data: URL! Use SHOWINFO, for now."
msgstr "Data stöds ej: URL! Använd SHOWINFO så länge."
-#: LYMessages.c:609
+#: LYMessages.c:610
msgid "Redirection limit of 10 URL's reached."
msgstr "Gräns på 10 adressomdirigeringar nådd."
-#: LYMessages.c:610
+#: LYMessages.c:611
msgid "Illegal redirection URL received from server!"
msgstr "Felaktig omdirigeringsadress mottagen från servern!"
#. #define SERVER_ASKED_FOR_REDIRECTION
-#: LYMessages.c:612
+#: LYMessages.c:613
#, c-format
msgid "Server asked for %d redirection of POST content to"
msgstr "Servern bad om %d-omdirigering för POST-data till"
-#: LYMessages.c:615
+#: LYMessages.c:616
msgid "P)roceed, use G)ET or C)ancel "
msgstr "P=Fortsätt, G=använd Get, C=Avbryt"
-#: LYMessages.c:616
+#: LYMessages.c:617
msgid "P)roceed, or C)ancel "
msgstr "P=Fortsätt, C=Avbryt "
#. #define ADVANCED_POST_GET_REDIRECT
-#: LYMessages.c:618
+#: LYMessages.c:619
msgid "Redirection of POST content. P)roceed, see U)RL, use G)ET or C)ancel"
msgstr "Omdirigering av POST-data. P=Fortsätt, U=Se adress, G=använd GET, C=Avbryt"
#. #define ADVANCED_POST_REDIRECT
-#: LYMessages.c:620
+#: LYMessages.c:621
msgid "Redirection of POST content. P)roceed, see U)RL, or C)ancel"
msgstr "Omdirigering av POST-data. P=Fortsätt, U=Se adress, C=Avbryt"
#. #define CONFIRM_POST_RESUBMISSION
-#: LYMessages.c:622
+#: LYMessages.c:623
msgid "Document from Form with POST content. Resubmit?"
msgstr "Dokument från formulär med POST-data. Skicka igen?"
#. #define CONFIRM_POST_RESUBMISSION_TO
-#: LYMessages.c:624
+#: LYMessages.c:625
#, c-format
msgid "Resubmit POST content to %s ?"
msgstr "Skicka POST-data till %s igen?"
#. #define CONFIRM_POST_LIST_RELOAD
-#: LYMessages.c:626
+#: LYMessages.c:627
#, c-format
msgid "List from document with POST data. Reload %s ?"
msgstr "Lista från dokument med POST-data. Hämta om %s?"
#. #define CONFIRM_POST_DOC_HEAD
-#: LYMessages.c:628
+#: LYMessages.c:629
msgid "Document from POST action, HEAD may not be understood. Proceed?"
msgstr "Dokument från POST-formulär, HEAD kanske inte förstås. Fortsätta?"
#. #define CONFIRM_POST_LINK_HEAD
-#: LYMessages.c:630
+#: LYMessages.c:631
msgid "Form submit action is POST, HEAD may not be understood. Proceed?"
msgstr "Formulärmetod är POST, HEAD kanske inte förstås. Fortsätta?"
-#: LYMessages.c:631
+#: LYMessages.c:632
msgid "Proceed without a username and password?"
msgstr "Fortsätta utan användar-id och lösenord?"
-#: LYMessages.c:632
+#: LYMessages.c:633
#, c-format
msgid "Proceed (%s)?"
msgstr "Fortsätta (%s)?"
-#: LYMessages.c:633
+#: LYMessages.c:634
msgid "Cannot POST to this host."
msgstr "Kan inte skicka POST-data till denna värd."
-#: LYMessages.c:634
+#: LYMessages.c:635
msgid "POST not supported for this URL - ignoring POST data!"
msgstr "POST stöds inte för denna adress - ignorerar POST-data!"
-#: LYMessages.c:635
+#: LYMessages.c:636
msgid "Discarding POST data..."
msgstr "Kastar POST-data..."
-#: LYMessages.c:636
+#: LYMessages.c:637
msgid "Document will not be reloaded!"
msgstr "Dokumentet hämtas inte om!"
-#: LYMessages.c:637
+#: LYMessages.c:638
msgid "Location: "
msgstr "Plats: "
-#: LYMessages.c:638
+#: LYMessages.c:639
#, c-format
msgid "'%s' not found!"
msgstr "'%s' hittades ej!"
-#: LYMessages.c:639
+#: LYMessages.c:640
msgid "Default Bookmark File"
msgstr "Förinställd bokmärkesfil"
-#: LYMessages.c:640
+#: LYMessages.c:641
msgid "Screen too small! (8x35 min)"
msgstr "Skärm för liten! (min. 8x35)"
-#: LYMessages.c:641
+#: LYMessages.c:642
msgid "Select destination or ^G to Cancel: "
msgstr "Välj destination eller ^G för att avbryta: "
#. #define MULTIBOOKMARKS_SELECT
-#: LYMessages.c:643
+#: LYMessages.c:644
msgid "Select subbookmark, '=' for menu, or ^G to cancel: "
msgstr "Välj underbokmärke. '=' ger meny, ^G avbryter: "
#. #define MULTIBOOKMARKS_SELF
-#: LYMessages.c:645
+#: LYMessages.c:646
msgid "Reproduce L)ink in this bookmark file or C)ancel? (l,c): "
msgstr "L=Avbilda länk i bokmärkesfil, C=Avbryt? (l,c): "
-#: LYMessages.c:646
+#: LYMessages.c:647
msgid "Multiple bookmark support is not available."
msgstr "Stöd för multipla bokmärken ej tillgängligt."
-#: LYMessages.c:647
+#: LYMessages.c:648
#, c-format
msgid " Select Bookmark (screen %d of %d)"
msgstr " Välj bokmärke (skärm %d av %d)"
-#: LYMessages.c:648
+#: LYMessages.c:649
msgid " Select Bookmark"
msgstr " Välj bokmärke"
#. #define MULTIBOOKMARKS_EHEAD_MASK
-#: LYMessages.c:650
+#: LYMessages.c:651
#, c-format
msgid "Editing Bookmark DESCRIPTION and FILEPATH (%d of 2)"
msgstr "Redigerar bokmärkes-BESKRIVNING och SÖKVÄG (%d av 2)"
#. #define MULTIBOOKMARKS_EHEAD
-#: LYMessages.c:652
+#: LYMessages.c:653
msgid " Editing Bookmark DESCRIPTION and FILEPATH"
msgstr " Redigerar bokmärkes-BESKRIVNING och SÖKVÄG"
-#: LYMessages.c:653
+#: LYMessages.c:654
msgid "Letter: "
msgstr "Bokstav: "
#. #define USE_PATH_OFF_HOME
-#: LYMessages.c:656
+#: LYMessages.c:657
msgid "Use a filepath off your login directory in SHELL syntax!"
msgstr "Använd en sökväg från din inloggningskatalog enligt SKAL-syntax!"
-#: LYMessages.c:658
+#: LYMessages.c:659
msgid "Use a filepath off your home directory!"
msgstr "Använd en sökväg från din hemkatalog!"
#. #define MAXLINKS_REACHED
-#: LYMessages.c:661
+#: LYMessages.c:662
msgid "Maximum links per page exceeded! Use half-page or two-line scrolling."
msgstr "Max antal länkar per sida överskreds! Använd halvsides- eller tvåradsrullning."
-#: LYMessages.c:662
+#: LYMessages.c:663
msgid "No previously visited links available!"
msgstr "Inga tidigare besökta länkar tillgängliga!"
-#: LYMessages.c:663
+#: LYMessages.c:664
msgid "Memory exhausted! Program aborted!"
msgstr "Minnet slut! Programmet avbrutet!"
-#: LYMessages.c:664
+#: LYMessages.c:665
msgid "Memory exhausted! Aborting..."
msgstr "Minnet slut! Avbryter..."
-#: LYMessages.c:665
+#: LYMessages.c:666
msgid "Not enough memory!"
msgstr "Ej tillräckligt minne!"
-#: LYMessages.c:666
+#: LYMessages.c:667
msgid "Directory/File Manager not available"
msgstr "Katalog-/filhanterare ej tillgänglig"
-#: LYMessages.c:667
+#: LYMessages.c:668
msgid "HREF in BASE tag is not an absolute URL."
msgstr "HREF i BASE-märke är inte en absolut adress."
-#: LYMessages.c:668
+#: LYMessages.c:669
msgid "Location URL is not absolute."
msgstr "\"Location\"-adress ej absolut."
-#: LYMessages.c:669
+#: LYMessages.c:670
msgid "Refresh URL is not absolute."
msgstr "\"Refresh\"-adress ej absolut."
#. #define SENDING_MESSAGE_WITH_BODY_TO
-#: LYMessages.c:671
+#: LYMessages.c:672
msgid ""
"You are sending a message with body to:\n"
" "
@@ -2051,7 +2053,7 @@ msgstr ""
"Du sänder ett meddelande med textkropp till:\n"
" "
-#: LYMessages.c:672
+#: LYMessages.c:673
msgid ""
"You are sending a comment to:\n"
" "
@@ -2059,7 +2061,7 @@ msgstr ""
"Du sänder en kommentar till:\n"
" "
-#: LYMessages.c:673
+#: LYMessages.c:674
msgid ""
"\n"
" With copy to:\n"
@@ -2069,7 +2071,7 @@ msgstr ""
" Med kopia till:\n"
" "
-#: LYMessages.c:674
+#: LYMessages.c:675
msgid ""
"\n"
" With copies to:\n"
@@ -2080,7 +2082,7 @@ msgstr ""
" "
#. #define CTRL_G_TO_CANCEL_SEND
-#: LYMessages.c:676
+#: LYMessages.c:677
msgid ""
"\n"
"\n"
@@ -2091,7 +2093,7 @@ msgstr ""
"Använd Ctrl-G för att avbryta om du inte vill skicka ett meddelande\n"
#. #define ENTER_NAME_OR_BLANK
-#: LYMessages.c:678
+#: LYMessages.c:679
msgid ""
"\n"
" Please enter your name, or leave it blank to remain anonymous\n"
@@ -2100,7 +2102,7 @@ msgstr ""
" Ange ditt namn eller lämna blankt för att förbli anonym\n"
#. #define ENTER_MAIL_ADDRESS_OR_OTHER
-#: LYMessages.c:680
+#: LYMessages.c:681
msgid ""
"\n"
" Please enter a mail address or some other\n"
@@ -2109,11 +2111,11 @@ msgstr ""
" Skriv din e-postadress eller något annat\n"
#. #define MEANS_TO_CONTACT_FOR_RESPONSE
-#: LYMessages.c:682
+#: LYMessages.c:683
msgid " means to contact you, if you desire a response.\n"
msgstr " sätt du kan nås på, om du vill ha ett svar.\n"
-#: LYMessages.c:683
+#: LYMessages.c:684
msgid ""
"\n"
" Please enter a subject line.\n"
@@ -2122,7 +2124,7 @@ msgstr ""
" Ange en ärenderad.\n"
#. #define ENTER_ADDRESS_FOR_CC
-#: LYMessages.c:685
+#: LYMessages.c:686
msgid ""
"\n"
" Enter a mail address for a CC of your message.\n"
@@ -2130,11 +2132,11 @@ msgstr ""
"\n"
" Ange e-postadress som får kopia på ditt meddelande.\n"
-#: LYMessages.c:686
+#: LYMessages.c:687
msgid " (Leave blank if you don't want a copy.)\n"
msgstr " (Lämna blankt om du inte vill ha en kopia).\n"
-#: LYMessages.c:687
+#: LYMessages.c:688
msgid ""
"\n"
" Please review the message body:\n"
@@ -2144,7 +2146,7 @@ msgstr ""
" Se över meddelandekroppen:\n"
"\n"
-#: LYMessages.c:688
+#: LYMessages.c:689
msgid ""
"\n"
"Press RETURN to continue: "
@@ -2152,7 +2154,7 @@ msgstr ""
"\n"
"Tryck ENTER för att fortsätta: "
-#: LYMessages.c:689
+#: LYMessages.c:690
msgid ""
"\n"
"Press RETURN to clean up: "
@@ -2160,11 +2162,11 @@ msgstr ""
"\n"
"Tryck ENTER för att städa upp: "
-#: LYMessages.c:690
+#: LYMessages.c:691
msgid " Use Control-U to erase the default.\n"
msgstr " Använd Control-U för att rensa förvalet.\n"
-#: LYMessages.c:691
+#: LYMessages.c:692
msgid ""
"\n"
" Please enter your message below."
@@ -2173,7 +2175,7 @@ msgstr ""
" Skriv ditt meddelande nedan."
#. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:693 src/LYNews.c:360
+#: LYMessages.c:694 src/LYNews.c:360
msgid ""
"\n"
" When you are done, press enter and put a single period (.)"
@@ -2182,7 +2184,7 @@ msgstr ""
" När du är klar, tryck Enter och skriv en ensam punkt (.)"
#. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:695 src/LYNews.c:361
+#: LYMessages.c:696 src/LYNews.c:361
msgid ""
"\n"
" on a line and press enter again."
@@ -2192,257 +2194,257 @@ msgstr ""
#. Cookies messages
#. #define ADVANCED_COOKIE_CONFIRMATION
-#: LYMessages.c:699
+#: LYMessages.c:700
#, c-format
msgid "%s cookie: %.*s=%.*s Allow? (Y/N/Always/neVer)"
msgstr "%s kaka: %.*s=%.*s Tillåta? (J/N/Alltid/aLdrig)"
#. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
-#: LYMessages.c:701
+#: LYMessages.c:702
#, c-format
msgid "Accept invalid cookie domain=%s for '%s'?"
msgstr "Tillåta ogiltig kakdomän=%s för \"%s\"?"
#. #define INVALID_COOKIE_PATH_CONFIRMATION
-#: LYMessages.c:703
+#: LYMessages.c:704
#, c-format
msgid "Accept invalid cookie path=%s as a prefix of '%s'?"
msgstr "Tillåta ogiltig kaksökväg=%s som prefix för \"%s\"?"
-#: LYMessages.c:704
+#: LYMessages.c:705
msgid "Allowing this cookie."
msgstr "Tillåter kakan."
-#: LYMessages.c:705
+#: LYMessages.c:706
msgid "Rejecting this cookie."
msgstr "Avvisar kakan."
-#: LYMessages.c:706
+#: LYMessages.c:707
msgid "The Cookie Jar is empty."
msgstr "Kakburken är tom."
-#: LYMessages.c:707
+#: LYMessages.c:708
msgid "The Cache Jar is empty."
msgstr "Cacheburken är tom."
#. #define ACTIVATE_TO_GOBBLE
-#: LYMessages.c:709
+#: LYMessages.c:710
msgid "Activate links to gobble up cookies or entire domains,"
msgstr "Aktivera länk för att äta upp kakor eller hela domäner,"
-#: LYMessages.c:710
+#: LYMessages.c:711
msgid "or to change a domain's 'allow' setting."
-msgstr "eller ändra ändra domänens \"tillåt\"-inställning."
+msgstr "eller ändra domänens \"tillåt\"-inställning."
-#: LYMessages.c:711
+#: LYMessages.c:712
msgid "(Cookies never allowed.)"
msgstr "(Kakor tillåts aldrig)"
-#: LYMessages.c:712
+#: LYMessages.c:713
msgid "(Cookies always allowed.)"
msgstr "(Kakor tillåts alltid)"
-#: LYMessages.c:713
+#: LYMessages.c:714
msgid "(Cookies allowed via prompt.)"
msgstr "(Kakor tillåts via fråga)"
-#: LYMessages.c:714
+#: LYMessages.c:715
msgid "(Persistent Cookies.)"
msgstr "(Persistenta kakor)"
-#: LYMessages.c:715
+#: LYMessages.c:716
msgid "(No title.)"
msgstr "(Titel saknas)"
-#: LYMessages.c:716
+#: LYMessages.c:717
msgid "(No name.)"
msgstr "(Inget namn)"
-#: LYMessages.c:717
+#: LYMessages.c:718
msgid "(No value.)"
msgstr "(Inget värde)"
-#: LYMessages.c:718 src/LYOptions.c:2409
+#: LYMessages.c:719 src/LYOptions.c:2424
msgid "None"
msgstr "Ingen"
-#: LYMessages.c:719
+#: LYMessages.c:720
msgid "(End of session.)"
msgstr "(Slut på session)"
-#: LYMessages.c:720
+#: LYMessages.c:721
msgid "Delete this cookie?"
msgstr "Radera denna kaka?"
-#: LYMessages.c:721
+#: LYMessages.c:722
msgid "The cookie has been eaten!"
msgstr "Kakan har ätits upp!"
-#: LYMessages.c:722
+#: LYMessages.c:723
msgid "Delete this empty domain?"
msgstr "Radera denna tomma domän?"
-#: LYMessages.c:723
+#: LYMessages.c:724
msgid "The domain has been eaten!"
msgstr "Domänen har ätits upp!"
#. #define DELETE_COOKIES_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:725
+#: LYMessages.c:726
msgid "D)elete domain's cookies, set allow A)lways/P)rompt/neV)er, or C)ancel? "
msgstr "D=Radera domänens kakor, ställ in A=Alltid/P=Fråga/V=Aldrig, C=Avbryt? "
#. #define DELETE_DOMAIN_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:727
+#: LYMessages.c:728
msgid "D)elete domain, set allow A)lways/P)rompt/neV)er, or C)ancel? "
msgstr "D=Radera domän, ställ in A=Alltid/P=Fråga/V=Aldrig, C=Avbryt? "
-#: LYMessages.c:728
+#: LYMessages.c:729
msgid "All cookies in the domain have been eaten!"
msgstr "Alla kakor från domänen har ätits upp!"
-#: LYMessages.c:729
+#: LYMessages.c:730
#, c-format
msgid "'A'lways allowing from domain '%s'."
msgstr "Tillåter alla kakor från domänen \"%s\"."
-#: LYMessages.c:730
+#: LYMessages.c:731
#, c-format
msgid "ne'V'er allowing from domain '%s'."
msgstr "Avvisar alla kakor från domänen \"%s\"."
-#: LYMessages.c:731
+#: LYMessages.c:732
#, c-format
msgid "'P'rompting to allow from domain '%s'."
msgstr "Frågar om alla kakor från domänen \"%s\"."
-#: LYMessages.c:732
+#: LYMessages.c:733
msgid "Delete all cookies in this domain?"
msgstr "Radera alla kakor i denna domän?"
-#: LYMessages.c:733
+#: LYMessages.c:734
msgid "All of the cookies in the jar have been eaten!"
msgstr "Alla kakor i kakburken har ätits upp!"
-#: LYMessages.c:735
+#: LYMessages.c:736
msgid "Port 19 not permitted in URLs."
msgstr "Port 19 ej tillåten i adress."
-#: LYMessages.c:736
+#: LYMessages.c:737
msgid "Port 25 not permitted in URLs."
msgstr "Port 25 ej tillåten i adress."
-#: LYMessages.c:737
+#: LYMessages.c:738
#, c-format
msgid "Port %lu not permitted in URLs."
msgstr "Port %lu ej tillåten i adress."
-#: LYMessages.c:738
+#: LYMessages.c:739
msgid "URL has a bad port field."
msgstr "Adressen har ett felaktigt portfält."
-#: LYMessages.c:739
+#: LYMessages.c:740
msgid "Maximum nesting of HTML elements exceeded."
msgstr "Maximal stapling av HTML-element överskreds."
-#: LYMessages.c:740
+#: LYMessages.c:741
msgid "Bad partial reference! Stripping lead dots."
msgstr "Felaktig partiell referens! Raderar inledande punkter."
-#: LYMessages.c:741
+#: LYMessages.c:742
msgid "Trace Log open failed. Trace off!"
msgstr "Öppning av spårningslogg misslyckades. Spårning avslagen!"
-#: LYMessages.c:742
+#: LYMessages.c:743
msgid "Lynx Trace Log"
msgstr "Lynx' spårningslogg"
-#: LYMessages.c:743
+#: LYMessages.c:744
msgid "No trace log has been started for this session."
msgstr "Ingen spårningslogg har startats för denna session."
#. #define MAX_TEMPCOUNT_REACHED
-#: LYMessages.c:745
+#: LYMessages.c:746
msgid "The maximum temporary file count has been reached!"
msgstr "Maximalt antal temporärfiler har nåtts!"
#. #define FORM_VALUE_TOO_LONG
-#: LYMessages.c:747
+#: LYMessages.c:748
msgid "Form field value exceeds buffer length! Trim the tail."
msgstr "Värdet för formulärfält är längre än bufferten! Klipp på slutet."
#. #define FORM_TAIL_COMBINED_WITH_HEAD
-#: LYMessages.c:749
+#: LYMessages.c:750
msgid "Modified tail combined with head of form field value."
msgstr "Modifierad avslutning kombinerad med huvudet i formulärfältsvärdet."
#. HTFile.c
-#: LYMessages.c:752
+#: LYMessages.c:753
msgid "Directory"
msgstr "Katalog"
-#: LYMessages.c:753
+#: LYMessages.c:754
msgid "Directory browsing is not allowed."
msgstr "Katalogbläddring tillåts ej."
-#: LYMessages.c:754
+#: LYMessages.c:755
msgid "Selective access is not enabled for this directory"
msgstr "Selektiv åtkomst är inte tillgänglig för denna katalog"
-#: LYMessages.c:755
+#: LYMessages.c:756
msgid "Multiformat: directory scan failed."
msgstr "Multiformat: katalogavsökning misslyckades."
-#: LYMessages.c:756
+#: LYMessages.c:757
msgid "This directory is not readable."
msgstr "Denna katalog är inte läsbar."
-#: LYMessages.c:757
+#: LYMessages.c:758
msgid "Can't access requested file."
msgstr "Kan inte komma åt vald fil."
-#: LYMessages.c:758
+#: LYMessages.c:759
msgid "Could not find suitable representation for transmission."
msgstr "Kunde inte hitta en lämplig representation för överföring."
-#: LYMessages.c:759
+#: LYMessages.c:760
msgid "Could not open file for decompression!"
msgstr "Kunde inte öppna filen för dekomprimering!"
-#: LYMessages.c:760
+#: LYMessages.c:761
msgid "Files:"
msgstr "Filer:"
-#: LYMessages.c:761
+#: LYMessages.c:762
msgid "Subdirectories:"
msgstr "Underkataloger:"
-#: LYMessages.c:762
+#: LYMessages.c:763
msgid " directory"
msgstr " katalog"
-#: LYMessages.c:763
+#: LYMessages.c:764
msgid "Up to "
msgstr "Upp till "
-#: LYMessages.c:764
+#: LYMessages.c:765
msgid "Current directory is "
msgstr "Aktuell katalog är "
#. HTFTP.c
-#: LYMessages.c:767
+#: LYMessages.c:768
msgid "Symbolic Link"
msgstr "Symbolisk länk"
#. HTGopher.c
-#: LYMessages.c:770
+#: LYMessages.c:771
msgid "No response from server!"
msgstr "Inget svar från servern!"
-#: LYMessages.c:771
+#: LYMessages.c:772
msgid "CSO index"
msgstr "CSO-index"
-#: LYMessages.c:772
+#: LYMessages.c:773
msgid ""
"\n"
"This is a searchable index of a CSO database.\n"
@@ -2450,16 +2452,16 @@ msgstr ""
"\n"
"Detta är ett sökbart index i en CSO-databas.\n"
-#: LYMessages.c:773
+#: LYMessages.c:774
msgid "CSO Search Results"
msgstr "CSO-sökresultat"
-#: LYMessages.c:774
+#: LYMessages.c:775
#, c-format
msgid "Seek fail on %s\n"
msgstr "Sökning misslyckades på %s\n"
-#: LYMessages.c:775
+#: LYMessages.c:776
msgid ""
"\n"
"Press the 's' key and enter search keywords.\n"
@@ -2467,7 +2469,7 @@ msgstr ""
"\n"
"Tryck \"s\"-tangenten och ange söknyckelord.\n"
-#: LYMessages.c:776
+#: LYMessages.c:777
msgid ""
"\n"
"This is a searchable Gopher index.\n"
@@ -2475,35 +2477,35 @@ msgstr ""
"\n"
"Detta är ett sökbart Gopherindex.\n"
-#: LYMessages.c:777
+#: LYMessages.c:778
msgid "Gopher index"
msgstr "Gopherindex"
-#: LYMessages.c:778
+#: LYMessages.c:779
msgid "Gopher Menu"
msgstr "Gophermeny"
-#: LYMessages.c:779
+#: LYMessages.c:780
msgid " Search Results"
msgstr " Sökresultats"
-#: LYMessages.c:780
+#: LYMessages.c:781
msgid "Sending CSO/PH request."
msgstr "Sänder CSO/PH-fråga."
-#: LYMessages.c:781
+#: LYMessages.c:782
msgid "Sending Gopher request."
msgstr "Sänder Gopherfråga."
-#: LYMessages.c:782
+#: LYMessages.c:783
msgid "CSO/PH request sent; waiting for response."
msgstr "CSO/PH-fråga sänd; väntar på svar."
-#: LYMessages.c:783
+#: LYMessages.c:784
msgid "Gopher request sent; waiting for response."
msgstr "Gopherfråga sänd; väntar på svar."
-#: LYMessages.c:784
+#: LYMessages.c:785
msgid ""
"\n"
"Please enter search keywords.\n"
@@ -2511,7 +2513,7 @@ msgstr ""
"\n"
"Ange söknyckelord.\n"
-#: LYMessages.c:785
+#: LYMessages.c:786
msgid ""
"\n"
"The keywords that you enter will allow you to search on a"
@@ -2519,201 +2521,205 @@ msgstr ""
"\n"
"Nyckelorden du anger gör det möjligt att söka på en"
-#: LYMessages.c:786
+#: LYMessages.c:787
msgid " person's name in the database.\n"
msgstr " persons namn i databasen.\n"
#. HTNews.c
-#: LYMessages.c:789
+#: LYMessages.c:790
msgid "Connection closed ???"
msgstr "Anslutning stängd???"
-#: LYMessages.c:790
+#: LYMessages.c:791
msgid "Cannot open temporary file for news POST."
msgstr "Kan inte öppna temporärfil för diskussionsinlägg."
-#: LYMessages.c:791
+#: LYMessages.c:792
msgid "This client does not contain support for posting to news with SSL."
msgstr "Denna klient innehåller inte stöd för att posta inlägg över SSL."
#. HTStyle.c
-#: LYMessages.c:794
+#: LYMessages.c:795
#, c-format
msgid "Style %d `%s' SGML:%s. Font %s %.1f point.\n"
msgstr "Stil %d \"%s\" SGML:%s. Teckensnitt %s %.1f punkter.\n"
-#: LYMessages.c:796
+#: LYMessages.c:797
#, c-format
msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n"
msgstr "\tJustering=%d, %d tabbar. (%.0f före, %.0f efter)\n"
-#: LYMessages.c:797
+#: LYMessages.c:798
#, c-format
msgid "\t\tTab kind=%d at %.0f\n"
msgstr "\t\tTabbsort=%d på %.0f\n"
#. HTTP.c
-#: LYMessages.c:800
+#: LYMessages.c:801
msgid "Can't proceed without a username and password."
msgstr "Kan inte fortsätta utan användar-id och lösenord."
-#: LYMessages.c:801
+#: LYMessages.c:802
msgid "Can't retry with authorization! Contact the server's WebMaster."
msgstr "Kan inte försöka igen utan tillåtelse! Kontakta serverns ansvariga."
-#: LYMessages.c:802
+#: LYMessages.c:803
msgid "Can't retry with proxy authorization! Contact the server's WebMaster."
msgstr "Kan ej försöka igen utan mellanserverauktorisering! Kontakta serverns ansvariga."
-#: LYMessages.c:803
+#: LYMessages.c:804
msgid "Retrying with proxy authorization information."
msgstr "Försöker igen med mellanserverauktoriseringsinformation."
-#: LYMessages.c:804
+#: LYMessages.c:805
#, c-format
msgid "SSL error:%s-Continue?"
msgstr "SSL-fel:%s-Fortsätta?"
#. HTWAIS.c
-#: LYMessages.c:807
+#: LYMessages.c:808
msgid "HTWAIS: Return message too large."
msgstr "HTWAIS: Returmeddelande för stort."
-#: LYMessages.c:808
+#: LYMessages.c:809
msgid "Enter WAIS query: "
msgstr "Ange WAIS-fråga: "
#. Miscellaneous status
-#: LYMessages.c:811
+#: LYMessages.c:812
msgid "Retrying as HTTP0 request."
msgstr "Försöker ingen som HTTP0-fråga."
-#: LYMessages.c:812
+#: LYMessages.c:813
#, c-format
msgid "Transferred %d bytes"
msgstr "Överförde %d byte"
-#: LYMessages.c:813
+#: LYMessages.c:814
msgid "Data transfer complete"
msgstr "Dataöverföring färdig"
-#: LYMessages.c:814
+#: LYMessages.c:815
#, c-format
msgid "Error processing line %d of %s\n"
msgstr "Fel vid tolkning av rad %d i %s\n"
#. Lynx internal page titles
-#: LYMessages.c:817
+#: LYMessages.c:818
msgid "Address List Page"
msgstr "Adresslistesida"
-#: LYMessages.c:818
+#: LYMessages.c:819
msgid "Bookmark file"
msgstr "Bokmärkesfil"
-#: LYMessages.c:819
+#: LYMessages.c:820
msgid "Configuration Definitions"
msgstr "Konfigurationsdefinitioner"
-#: LYMessages.c:820
+#: LYMessages.c:821
msgid "Cookie Jar"
msgstr "Kakburk"
-#: LYMessages.c:821
+#: LYMessages.c:822
+msgid "Current Edit-Key Map"
+msgstr "Aktuella tangentbordsbindningar för redigering"
+
+#: LYMessages.c:823
msgid "Current Key Map"
msgstr "Aktuella tangentbordsbindningar"
-#: LYMessages.c:822
+#: LYMessages.c:824
msgid "File Management Options"
msgstr "Filhanteringsalternativ"
-#: LYMessages.c:823
+#: LYMessages.c:825
msgid "Download Options"
msgstr "Hämtningalternativ"
-#: LYMessages.c:824
+#: LYMessages.c:826
msgid "History Page"
msgstr "Historiksida"
-#: LYMessages.c:825
+#: LYMessages.c:827
msgid "Cache Jar"
msgstr "Cacheburk"
-#: LYMessages.c:826
+#: LYMessages.c:828
msgid "List Page"
msgstr "Listsida"
-#: LYMessages.c:827
+#: LYMessages.c:829
msgid "Lynx.cfg Information"
msgstr "Lynx.cfg-information"
-#: LYMessages.c:828
+#: LYMessages.c:830
msgid "Converted Mosaic Hotlist"
msgstr "Konverterade Mosaicbokmärken"
-#: LYMessages.c:829
+#: LYMessages.c:831
msgid "Options Menu"
msgstr "Alternativmeny"
-#: LYMessages.c:830
+#: LYMessages.c:832
msgid "File Permission Options"
msgstr "Filbehörighetsalternativ"
-#: LYMessages.c:831
+#: LYMessages.c:833
msgid "Printing Options"
msgstr "Utskriftsalternativ"
-#: LYMessages.c:832
+#: LYMessages.c:834
msgid "Information about the current document"
msgstr "Information om det aktuella dokumentet"
-#: LYMessages.c:833
+#: LYMessages.c:835
msgid "Your recent statusline messages"
msgstr "Dina senaste statusradmeddelanden"
-#: LYMessages.c:834
+#: LYMessages.c:836
msgid "Upload Options"
msgstr "Insändningsalternativ"
-#: LYMessages.c:835
+#: LYMessages.c:837
msgid "Visited Links Page"
msgstr "Använda länkar"
#. CONFIG_DEF_TITLE subtitles
-#: LYMessages.c:838
+#: LYMessages.c:840
msgid "See also"
msgstr "Se även"
-#: LYMessages.c:839
+#: LYMessages.c:841
msgid "your"
msgstr "din"
-#: LYMessages.c:840
+#: LYMessages.c:842
msgid "for runtime options"
msgstr "för körningsalternativ"
-#: LYMessages.c:841
+#: LYMessages.c:843
msgid "compile time options"
msgstr "kompileringsalternativ"
-#: LYMessages.c:842
+#: LYMessages.c:844
msgid "color-style configuration"
msgstr "konfigurering av color-style"
-#: LYMessages.c:843
+#: LYMessages.c:845
msgid "latest release"
msgstr "senaste utgåva"
-#: LYMessages.c:844
+#: LYMessages.c:846
msgid "pre-release version"
msgstr "förhandsversion"
-#: LYMessages.c:845
+#: LYMessages.c:847
msgid "development version"
msgstr "utvecklingsversion"
#. #define AUTOCONF_CONFIG_CACHE
-#: LYMessages.c:847
+#: LYMessages.c:849
msgid ""
"The following data were derived during the automatic configuration/build\n"
"process of this copy of Lynx. When reporting a bug, please include a copy\n"
@@ -2724,7 +2730,7 @@ msgstr ""
"inkludera en kopia av denna sida."
#. #define AUTOCONF_LYNXCFG_H
-#: LYMessages.c:851
+#: LYMessages.c:853
msgid ""
"The following data were used as automatically-configured compile-time\n"
"definitions when this copy of Lynx was built."
@@ -2733,53 +2739,53 @@ msgstr ""
"när denna kopia av Lynx kompilerades."
#. #define DIRED_NOVICELINE
-#: LYMessages.c:856
+#: LYMessages.c:858
msgid " C)reate D)ownload E)dit F)ull menu M)odify R)emove T)ag U)pload \n"
msgstr "C=Skapa D=Hämta E=Redigera F=Full meny M=Ändra R=Radera T=Märk U=Skicka\n"
-#: LYMessages.c:857
+#: LYMessages.c:859
msgid "Failed to obtain status of current link!"
msgstr "Kunde inte hämta status för aktuell länk!"
#. #define INVALID_PERMIT_URL
-#: LYMessages.c:860
+#: LYMessages.c:862
msgid "Special URL only valid from current File Permission menu!"
msgstr "Speciell adress endast giltig i menyn för filbehörigheter!"
-#: LYMessages.c:864
+#: LYMessages.c:866
msgid "External support is currently disabled."
msgstr "Externt stöd är just nu deaktiverat."
#. new with 2.8.4dev.21
-#: LYMessages.c:868
+#: LYMessages.c:870
msgid "Changing working-directory is currently disabled."
msgstr "Byte av arbetskatalog tillåts ej just nu."
-#: LYMessages.c:869
+#: LYMessages.c:871
msgid "Linewrap OFF!"
msgstr "Radbrytning AV!"
-#: LYMessages.c:870
+#: LYMessages.c:872
msgid "Linewrap ON!"
msgstr "Radbrytning PÅ!"
-#: LYMessages.c:871
+#: LYMessages.c:873
msgid "Parsing nested-tables toggled OFF! Reloading..."
msgstr "Tolkning av nästlade tabeller AV! Hämtar om..."
-#: LYMessages.c:872
+#: LYMessages.c:874
msgid "Parsing nested-tables toggled ON! Reloading..."
msgstr "Tolkning av nästlade tabeller PÅ! Hämtar om..."
-#: LYMessages.c:873
+#: LYMessages.c:875
msgid "Shifting is disabled while line-wrap is in effect"
msgstr "Skiftning är deaktiverad när radbrytning är aktiv"
-#: LYMessages.c:874
+#: LYMessages.c:876
msgid "Trace not supported"
msgstr "Spårning stöds ej"
-#: LYMessages.c:795
+#: LYMessages.c:796
#, c-format
msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
msgstr "\tIndrag: första=%.0f övriga=%.0f, Höjd=%.1f Djup=%.1f\n"
@@ -2803,12 +2809,12 @@ msgstr "Denna klient kan inte skapa mellanserverauktoriseringsinformation för p
msgid "This client doesn't know how to compose authorization information for scheme"
msgstr "Denna klient kan inte skapa auktoriseringsinformation för protokolltyp"
-#: WWW/Library/Implementation/HTAABrow.c:1093
+#: WWW/Library/Implementation/HTAABrow.c:1094
#, c-format
msgid "Invalid header '%s%s%s%s%s'"
msgstr "Felaktigt huvud \"%s%s%s%s%s\""
-#: WWW/Library/Implementation/HTAABrow.c:1198
+#: WWW/Library/Implementation/HTAABrow.c:1200
msgid "Proxy authorization required -- retrying"
msgstr "Mellanserverauktorisering krävs -- försöker igen"
@@ -2824,25 +2830,25 @@ msgstr "Åtkomst förbjuden av regel"
msgid "Document with POST content not found in cache. Resubmit?"
msgstr "Dokument med POST-data hittades ej i cache. Skicka in igen?"
-#: WWW/Library/Implementation/HTAccess.c:949
+#: WWW/Library/Implementation/HTAccess.c:947
msgid "Loading failed, use a previous copy."
msgstr "Hämtningen misslyckades, använder tidigare exemplar."
-#: WWW/Library/Implementation/HTAccess.c:1058 src/GridText.c:8867
+#: WWW/Library/Implementation/HTAccess.c:1056 src/GridText.c:8875
msgid "Loading incomplete."
msgstr "Hämtning ej komplett."
-#: WWW/Library/Implementation/HTAccess.c:1089
+#: WWW/Library/Implementation/HTAccess.c:1087
#, c-format
msgid "**** HTAccess: socket or file number returned by obsolete load routine!\n"
msgstr "**** HTAccess: uttag eller filnummer returnerad av föråldrad inläsningsrutin!\n"
-#: WWW/Library/Implementation/HTAccess.c:1091
+#: WWW/Library/Implementation/HTAccess.c:1089
#, c-format
msgid "**** HTAccess: Internal software error. Please mail lynx-dev at nongnu.org!\n"
msgstr "**** HTAccess: Internt programvarufel. Meddela lynx-dev at nongnu.org!\n"
-#: WWW/Library/Implementation/HTAccess.c:1092
+#: WWW/Library/Implementation/HTAccess.c:1090
#, c-format
msgid "**** HTAccess: Status returned was: %d\n"
msgstr "**** HTAccess: Returnerad status var: %d\n"
@@ -2851,65 +2857,65 @@ msgstr "**** HTAccess: Returnerad status var: %d\n"
#. * hack: if we fail in HTAccess.c
#. * avoid duplicating URL, oh.
#.
-#: WWW/Library/Implementation/HTAccess.c:1098 src/LYMainLoop.c:8050
+#: WWW/Library/Implementation/HTAccess.c:1096 src/LYMainLoop.c:8074
msgid "Can't Access"
msgstr "Kan inte komma åt"
-#: WWW/Library/Implementation/HTAccess.c:1106
+#: WWW/Library/Implementation/HTAccess.c:1104
msgid "Unable to access document."
msgstr "Kan inte komma åt dokument."
-#: WWW/Library/Implementation/HTFTP.c:849
+#: WWW/Library/Implementation/HTFTP.c:875
#, c-format
msgid "Enter password for user %s@%s:"
msgstr "Ange lösenord för användar-id %s@%s:"
-#: WWW/Library/Implementation/HTFTP.c:877
+#: WWW/Library/Implementation/HTFTP.c:903
msgid "Unable to connect to FTP host."
msgstr "Kan inte ansluta till ftp-värd."
-#: WWW/Library/Implementation/HTFTP.c:1158
+#: WWW/Library/Implementation/HTFTP.c:1142
msgid "close master socket"
msgstr "stängd huvuduttag (master socket)"
-#: WWW/Library/Implementation/HTFTP.c:1220
+#: WWW/Library/Implementation/HTFTP.c:1204
msgid "socket for master socket"
msgstr "uttag (socket) för huvuduttag"
-#: WWW/Library/Implementation/HTFTP.c:2986
+#: WWW/Library/Implementation/HTFTP.c:2952
msgid "Receiving FTP directory."
msgstr "Hämtar ftp-katalog."
-#: WWW/Library/Implementation/HTFTP.c:3122
+#: WWW/Library/Implementation/HTFTP.c:3090
#, c-format
msgid "Transferred %d bytes (%5d)"
msgstr "Överförde %d byte (%5d)"
-#: WWW/Library/Implementation/HTFTP.c:3480
+#: WWW/Library/Implementation/HTFTP.c:3448
msgid "connect for data"
msgstr "ansluter för data"
-#: WWW/Library/Implementation/HTFTP.c:4141
+#: WWW/Library/Implementation/HTFTP.c:4120
msgid "Receiving FTP file."
msgstr "Hämtar ftp-fil."
-#: WWW/Library/Implementation/HTFinger.c:278
+#: WWW/Library/Implementation/HTFinger.c:274
msgid "Could not set up finger connection."
msgstr "Kunde inte skapa \"finger\"-anslutning."
-#: WWW/Library/Implementation/HTFinger.c:325
+#: WWW/Library/Implementation/HTFinger.c:321
msgid "Could not load data (no sitename in finger URL)"
msgstr "Kunde inte hämta data (inget värdnamn i \"finger\"-adress)"
-#: WWW/Library/Implementation/HTFinger.c:329
+#: WWW/Library/Implementation/HTFinger.c:325
msgid "Invalid port number - will only use port 79!"
msgstr "Felaktigt portnummer - använder endast port 79!"
-#: WWW/Library/Implementation/HTFinger.c:395
+#: WWW/Library/Implementation/HTFinger.c:391
msgid "Could not access finger host."
msgstr "Kunde inta komma åt \"finger\"-värd."
-#: WWW/Library/Implementation/HTFinger.c:403
+#: WWW/Library/Implementation/HTFinger.c:399
msgid "No response from finger server."
msgstr "Inget svar från \"finger\"-server."
@@ -3011,7 +3017,7 @@ msgstr "Kunde inte komma åt %s."
#: WWW/Library/Implementation/HTNews.c:2733
#, c-format
msgid "Can't read news info. News host %.20s responded: %.200s"
-msgstr "Kan inte läsa dikussionsinformation. Värden %.20s svarade %.200s"
+msgstr "Kan inte läsa diskussionsinformation. Värden %.20s svarade %.200s"
#: WWW/Library/Implementation/HTNews.c:2737
#, c-format
@@ -3040,16 +3046,16 @@ msgstr "Läser artikel."
msgid "Sorry, could not load requested news."
msgstr "Kunde inte hämta begärda artiklar."
-#: WWW/Library/Implementation/HTTCP.c:1286
+#: WWW/Library/Implementation/HTTCP.c:1323
msgid "Address has invalid port"
msgstr "Adressen har en ogiltig port"
-#: WWW/Library/Implementation/HTTCP.c:1362
+#: WWW/Library/Implementation/HTTCP.c:1397
msgid "Address length looks invalid"
msgstr "Adresslängden verkar ogiltig"
-#: WWW/Library/Implementation/HTTCP.c:1622
-#: WWW/Library/Implementation/HTTCP.c:1640
+#: WWW/Library/Implementation/HTTCP.c:1845
+#: WWW/Library/Implementation/HTTCP.c:1863
#, c-format
msgid "Unable to locate remote host %s."
msgstr "Kan inte hitta värd %s."
@@ -3058,39 +3064,39 @@ msgstr "Kan inte hitta värd %s."
#. * but not HTAlert, because typically there will be other
#. * alerts from the callers. - kw
#.
-#: WWW/Library/Implementation/HTTCP.c:1637
+#: WWW/Library/Implementation/HTTCP.c:1860
#: WWW/Library/Implementation/HTTelnet.c:115
#, c-format
msgid "Invalid hostname %s"
msgstr "Ogiltigt värdnamn %s"
-#: WWW/Library/Implementation/HTTCP.c:1651
+#: WWW/Library/Implementation/HTTCP.c:1874
#, c-format
msgid "Making %s connection to %s"
msgstr "Kopplar upp %s-anslutning till %s"
-#: WWW/Library/Implementation/HTTCP.c:1662
+#: WWW/Library/Implementation/HTTCP.c:1885
msgid "socket failed."
msgstr "uttag misslyckades."
-#: WWW/Library/Implementation/HTTCP.c:1676
+#: WWW/Library/Implementation/HTTCP.c:1899
#, c-format
msgid "socket failed: family %d addr %s port %s."
msgstr "uttag misslyckades: familj %d adress %s port %s."
-#: WWW/Library/Implementation/HTTCP.c:1700
+#: WWW/Library/Implementation/HTTCP.c:1923
msgid "Could not make connection non-blocking."
msgstr "Kunde inte koppla upp icke-blockerande anslutning."
-#: WWW/Library/Implementation/HTTCP.c:1768
+#: WWW/Library/Implementation/HTTCP.c:1991
msgid "Connection failed (too many retries)."
msgstr "Uppkoppling misslyckades (för många försök)."
-#: WWW/Library/Implementation/HTTCP.c:1955
+#: WWW/Library/Implementation/HTTCP.c:2180
msgid "Could not restore socket to blocking."
msgstr "Kunde inte återställa blockering i uttag."
-#: WWW/Library/Implementation/HTTCP.c:2021
+#: WWW/Library/Implementation/HTTCP.c:2248
msgid "Socket read failed (too many tries)."
msgstr "Fel vid läsning från uttag (för många försök)."
@@ -3099,68 +3105,72 @@ msgstr "Fel vid läsning från uttag (för många försök)."
msgid "SSL callback:%s, preverify_ok=%d, ssl_okay=%d"
msgstr "SSL-återanrop:%s, preverify_ok=%d, ssl_okay=%d"
-#: WWW/Library/Implementation/HTTP.c:432
+#: WWW/Library/Implementation/HTTP.c:438
#, c-format
msgid "Address contains a username: %s"
msgstr "Adress innehåller användar-id: %s"
-#: WWW/Library/Implementation/HTTP.c:486
+#: WWW/Library/Implementation/HTTP.c:492
#, c-format
msgid "Certificate issued by: %s"
msgstr "Certifikatutfärdare: %s"
-#: WWW/Library/Implementation/HTTP.c:673
+#: WWW/Library/Implementation/HTTP.c:679
msgid "This client does not contain support for HTTPS URLs."
msgstr "Denna klient innehåller inte stöd för HTTPS-adresser."
-#: WWW/Library/Implementation/HTTP.c:698
+#: WWW/Library/Implementation/HTTP.c:704
msgid "Unable to connect to remote host."
msgstr "Kan inte ansluta till värd."
-#: WWW/Library/Implementation/HTTP.c:730
+#: WWW/Library/Implementation/HTTP.c:744
msgid "Retrying connection without TLS."
msgstr "Gör nytt försök; ansluter utan TLS."
-#: WWW/Library/Implementation/HTTP.c:773
+#: WWW/Library/Implementation/HTTP.c:794
+msgid "GnuTLS error when trying to verify certificate."
+msgstr "Fel i GnuTLS när certifikatet skulle bekräftas."
+
+#: WWW/Library/Implementation/HTTP.c:806
+msgid "the certificate has no known issuer"
+msgstr "certifikatet har ingen känd utfärdare"
+
+#: WWW/Library/Implementation/HTTP.c:808
msgid "no issuer was found"
msgstr "ingen utfärdare hittades"
-#: WWW/Library/Implementation/HTTP.c:775
+#: WWW/Library/Implementation/HTTP.c:810
msgid "issuer is not a CA"
msgstr "utfärdaren är inte ett certifieringsorgan"
-#: WWW/Library/Implementation/HTTP.c:777
-msgid "the certificate has no known issuer"
-msgstr "certifikatet har ingen känd utfärdare"
-
-#: WWW/Library/Implementation/HTTP.c:779
+#: WWW/Library/Implementation/HTTP.c:812
msgid "the certificate has been revoked"
msgstr "certifikatet har återkallats"
-#: WWW/Library/Implementation/HTTP.c:781
+#: WWW/Library/Implementation/HTTP.c:814
msgid "the certificate is not trusted"
msgstr "certifikatet är inte betrott"
-#: WWW/Library/Implementation/HTTP.c:855
+#: WWW/Library/Implementation/HTTP.c:889
#, c-format
msgid "Verified connection to %s (cert=%s)"
msgstr "Verifierade anslutning mot %s (cert=%s)"
-#: WWW/Library/Implementation/HTTP.c:903 WWW/Library/Implementation/HTTP.c:945
+#: WWW/Library/Implementation/HTTP.c:937 WWW/Library/Implementation/HTTP.c:979
#, c-format
msgid "Verified connection to %s (subj=%s)"
msgstr "Verifierade anslutning mot %s (subj=%s)"
-#: WWW/Library/Implementation/HTTP.c:975
+#: WWW/Library/Implementation/HTTP.c:1009
msgid "Can't find common name in certificate"
msgstr "Hittar inte vanligt namn i certifikatet"
-#: WWW/Library/Implementation/HTTP.c:978
+#: WWW/Library/Implementation/HTTP.c:1012
#, c-format
msgid "SSL error:host(%s)!=cert(%s)-Continue?"
msgstr "SSL-fel:värd(%s)!=cert(%s)-Fortsätta?"
-#: WWW/Library/Implementation/HTTP.c:991
+#: WWW/Library/Implementation/HTTP.c:1025
#, c-format
msgid "UNVERIFIED connection to %s (cert=%s)"
msgstr "OVERIFIERAD anslutning mot %s (cert=%s)"
@@ -3168,25 +3178,25 @@ msgstr "OVERIFIERAD anslutning mot %s (cert=%s)"
# %d = SSL_get_cipher_bits(handle,NULL)
# %s = SSL_get_cipher_version(handle)
# %s = SSL_get_cipher(handle)
-#: WWW/Library/Implementation/HTTP.c:1000
+#: WWW/Library/Implementation/HTTP.c:1034
#, c-format
msgid "Secure %d-bit %s (%s) HTTP connection"
msgstr "Säker %d-bitars HTTP-anslutning med %s (%s)"
-#: WWW/Library/Implementation/HTTP.c:1467
+#: WWW/Library/Implementation/HTTP.c:1497
msgid "Sending HTTP request."
msgstr "Sänder HTTP-fråga."
-#: WWW/Library/Implementation/HTTP.c:1509
+#: WWW/Library/Implementation/HTTP.c:1539
msgid "Unexpected network write error; connection aborted."
msgstr "Oväntat skrivfel på nätverket; uppkopplingen avbröts."
-#: WWW/Library/Implementation/HTTP.c:1515
+#: WWW/Library/Implementation/HTTP.c:1545
msgid "HTTP request sent; waiting for response."
msgstr "HTTP-fråga sänd; väntar på svar."
-#: WWW/Library/Implementation/HTTP.c:1588
-#: WWW/Library/Implementation/HTTP.c:1598
+#: WWW/Library/Implementation/HTTP.c:1618
+#: WWW/Library/Implementation/HTTP.c:1628
msgid "Unexpected network read error; connection aborted."
msgstr "Oväntat läsfel på nätverket; uppkopplingen avbröts."
@@ -3199,7 +3209,7 @@ msgstr "Oväntat läsfel på nätverket; uppkopplingen avbröts."
#. * line and possibly other headers, so we'll deal with them by
#. * showing the full header to the user as text/plain. - FM
#.
-#: WWW/Library/Implementation/HTTP.c:1800
+#: WWW/Library/Implementation/HTTP.c:1830
msgid "Got unexpected Informational Status."
msgstr "Fick oväntad informationsstatus."
@@ -3209,7 +3219,7 @@ msgstr "Fick oväntad informationsstatus."
#. * content. We'll instruct the user to do that, and
#. * restore the current document. - FM
#.
-#: WWW/Library/Implementation/HTTP.c:1834
+#: WWW/Library/Implementation/HTTP.c:1864
msgid "Request fulfilled. Reset Content."
msgstr "Frågan slutförd. Nollställ innehåll."
@@ -3219,27 +3229,27 @@ msgstr "Frågan slutförd. Nollställ innehåll."
#. * status is inappropriate. We'll deal with it by showing
#. * the full header to the user as text/plain. - FM
#.
-#: WWW/Library/Implementation/HTTP.c:1949
+#: WWW/Library/Implementation/HTTP.c:1979
msgid "Got unexpected 304 Not Modified status."
msgstr "Fick oväntad \"ej modifierad\"-(304)-status."
-#: WWW/Library/Implementation/HTTP.c:2012
+#: WWW/Library/Implementation/HTTP.c:2042
msgid "Redirection of POST content requires user approval."
msgstr "Omdirigering av POST-innehåll kräver användarens samtycke."
-#: WWW/Library/Implementation/HTTP.c:2027
+#: WWW/Library/Implementation/HTTP.c:2057
msgid "Have POST content. Treating Permanent Redirection as Temporary.\n"
msgstr "Har POST-innehåll. Behandlar permanent omdirigering som temporär.\n"
-#: WWW/Library/Implementation/HTTP.c:2071
+#: WWW/Library/Implementation/HTTP.c:2101
msgid "Retrying with access authorization information."
msgstr "Försöker igen med auktoriseringsinformation."
-#: WWW/Library/Implementation/HTTP.c:2083
+#: WWW/Library/Implementation/HTTP.c:2113
msgid "Show the 401 message body?"
msgstr "Visa kroppen för 401-meddelandet?"
-#: WWW/Library/Implementation/HTTP.c:2127
+#: WWW/Library/Implementation/HTTP.c:2157
msgid "Show the 407 message body?"
msgstr "Via kroppen för 407-meddelandet?"
@@ -3247,7 +3257,7 @@ msgstr "Via kroppen för 407-meddelandet?"
#. * Bad or unknown server_status number. Take a chance and hope
#. * there is something to display. - FM
#.
-#: WWW/Library/Implementation/HTTP.c:2227
+#: WWW/Library/Implementation/HTTP.c:2257
msgid "Unknown status reply from server!"
msgstr "Okänt statussvar från server!"
@@ -3268,36 +3278,36 @@ msgstr "Kunde inte öppna WAIS-anslutning för läsning."
msgid "Diagnostic code is "
msgstr "Diagnostisk kod är "
-#: WWW/Library/Implementation/HTWAIS.c:464
+#: WWW/Library/Implementation/HTWAIS.c:460
msgid "Index "
msgstr "Index "
-#: WWW/Library/Implementation/HTWAIS.c:468
+#: WWW/Library/Implementation/HTWAIS.c:464
#, c-format
msgid " contains the following %d item%s relevant to \""
msgstr " innehåller följande %d%s poster relevanta för \""
-#: WWW/Library/Implementation/HTWAIS.c:476
+#: WWW/Library/Implementation/HTWAIS.c:472
msgid "The first figure after each entry is its relative score, "
msgstr "Den första siffran efter varje post är dess relativa poäng, "
-#: WWW/Library/Implementation/HTWAIS.c:477
+#: WWW/Library/Implementation/HTWAIS.c:473
msgid "the second is the number of lines in the item."
msgstr "den andra är antalet rader i posten"
-#: WWW/Library/Implementation/HTWAIS.c:519
+#: WWW/Library/Implementation/HTWAIS.c:515
msgid " (bad file name)"
msgstr " (felaktigt filnamn)"
-#: WWW/Library/Implementation/HTWAIS.c:545
+#: WWW/Library/Implementation/HTWAIS.c:541
msgid "(bad doc id)"
msgstr "(felaktig dokument-id)"
-#: WWW/Library/Implementation/HTWAIS.c:561
+#: WWW/Library/Implementation/HTWAIS.c:557
msgid "(Short Header record, can't display)"
msgstr "(Kort huvudpost, kan inte visa)"
-#: WWW/Library/Implementation/HTWAIS.c:568
+#: WWW/Library/Implementation/HTWAIS.c:564
msgid ""
"\n"
"Long Header record, can't display\n"
@@ -3305,7 +3315,7 @@ msgstr ""
"\n"
"Lång huvudpost, kan inte visa\n"
-#: WWW/Library/Implementation/HTWAIS.c:575
+#: WWW/Library/Implementation/HTWAIS.c:571
msgid ""
"\n"
"Text record\n"
@@ -3313,7 +3323,7 @@ msgstr ""
"\n"
"Textfält\n"
-#: WWW/Library/Implementation/HTWAIS.c:584
+#: WWW/Library/Implementation/HTWAIS.c:580
msgid ""
"\n"
"Headline record, can't display\n"
@@ -3321,7 +3331,7 @@ msgstr ""
"\n"
"Rubrikfält, kan inte visa\n"
-#: WWW/Library/Implementation/HTWAIS.c:592
+#: WWW/Library/Implementation/HTWAIS.c:588
msgid ""
"\n"
"Code record, can't display\n"
@@ -3329,27 +3339,27 @@ msgstr ""
"\n"
"Kodfält, kan inte visa\n"
-#: WWW/Library/Implementation/HTWAIS.c:696
+#: WWW/Library/Implementation/HTWAIS.c:692
msgid "Syntax error in WAIS URL"
msgstr "Syntaxfel i WAIS-adress"
-#: WWW/Library/Implementation/HTWAIS.c:768
+#: WWW/Library/Implementation/HTWAIS.c:764
msgid " (WAIS Index)"
msgstr " (WAIS-index)"
-#: WWW/Library/Implementation/HTWAIS.c:775
+#: WWW/Library/Implementation/HTWAIS.c:771
msgid "WAIS Index: "
msgstr "WAIS-index: "
-#: WWW/Library/Implementation/HTWAIS.c:781
+#: WWW/Library/Implementation/HTWAIS.c:777
msgid "This is a link for searching the "
msgstr "Detta är en länk för att söka i "
-#: WWW/Library/Implementation/HTWAIS.c:785
+#: WWW/Library/Implementation/HTWAIS.c:781
msgid " WAIS Index.\n"
msgstr " WAIS-index.\n"
-#: WWW/Library/Implementation/HTWAIS.c:814
+#: WWW/Library/Implementation/HTWAIS.c:810
msgid ""
"\n"
"Enter the 's'earch command and then specify search words.\n"
@@ -3357,188 +3367,188 @@ msgstr ""
"\n"
"Välj S=sök och ange sedan sökord.\n"
-#: WWW/Library/Implementation/HTWAIS.c:836
+#: WWW/Library/Implementation/HTWAIS.c:832
msgid " (in "
msgstr " (i "
-#: WWW/Library/Implementation/HTWAIS.c:845
+#: WWW/Library/Implementation/HTWAIS.c:841
msgid "WAIS Search of \""
msgstr "WAIS-sökning efter \""
-#: WWW/Library/Implementation/HTWAIS.c:849
+#: WWW/Library/Implementation/HTWAIS.c:845
msgid "\" in: "
msgstr "\" i: "
-#: WWW/Library/Implementation/HTWAIS.c:864
+#: WWW/Library/Implementation/HTWAIS.c:860
msgid "HTWAIS: Request too large."
msgstr "HTWAIS: Fråga för stor."
-#: WWW/Library/Implementation/HTWAIS.c:873
+#: WWW/Library/Implementation/HTWAIS.c:869
msgid "Searching WAIS database..."
msgstr "Söker WAIS-databas..."
-#: WWW/Library/Implementation/HTWAIS.c:883
+#: WWW/Library/Implementation/HTWAIS.c:879
msgid "Search interrupted."
msgstr "Sökning avbruten."
-#: WWW/Library/Implementation/HTWAIS.c:934
+#: WWW/Library/Implementation/HTWAIS.c:930
msgid "Can't convert format of WAIS document"
msgstr "Kan inte konvertera WAIS-dokumentformat"
-#: WWW/Library/Implementation/HTWAIS.c:978
+#: WWW/Library/Implementation/HTWAIS.c:974
msgid "HTWAIS: Request too long."
msgstr "HTWAIS: Fråga för lång."
#.
#. * Actually do the transaction given by request_message.
#.
-#: WWW/Library/Implementation/HTWAIS.c:992
+#: WWW/Library/Implementation/HTWAIS.c:988
msgid "Fetching WAIS document..."
msgstr "Hämtar WAIS-dokument..."
#. display_search_response(target, retrieval_response,
#. wais_database, keywords);
-#: WWW/Library/Implementation/HTWAIS.c:1031
+#: WWW/Library/Implementation/HTWAIS.c:1027
msgid "No text was returned!\n"
msgstr "Ingen text returnerades!\n"
-#: WWW/Library/Implementation/HTWSRC.c:301
+#: WWW/Library/Implementation/HTWSRC.c:302
msgid " NOT GIVEN in source file; "
msgstr " EJ ANGIVEN i källfilen; "
-#: WWW/Library/Implementation/HTWSRC.c:324
+#: WWW/Library/Implementation/HTWSRC.c:325
msgid " WAIS source file"
msgstr " WAIS-källfil"
-#: WWW/Library/Implementation/HTWSRC.c:331
+#: WWW/Library/Implementation/HTWSRC.c:332
msgid " description"
msgstr " beskrivning"
-#: WWW/Library/Implementation/HTWSRC.c:341
+#: WWW/Library/Implementation/HTWSRC.c:342
msgid "Access links"
msgstr "Åtkomstlänkar"
-#: WWW/Library/Implementation/HTWSRC.c:362
+#: WWW/Library/Implementation/HTWSRC.c:363
msgid "Direct access"
msgstr "Direktåtkomst"
#. * Proxy will be used if defined, so let user know that - FM *
-#: WWW/Library/Implementation/HTWSRC.c:365
+#: WWW/Library/Implementation/HTWSRC.c:366
msgid " (or via proxy server, if defined)"
msgstr " (eller via mellanserver, om angiven)"
-#: WWW/Library/Implementation/HTWSRC.c:380
+#: WWW/Library/Implementation/HTWSRC.c:381
msgid "Maintainer"
msgstr "Ansvarig"
-#: WWW/Library/Implementation/HTWSRC.c:388
+#: WWW/Library/Implementation/HTWSRC.c:389
msgid "Host"
msgstr "Värd"
-#: src/GridText.c:699
+#: src/GridText.c:691
msgid "Memory exhausted, display interrupted!"
msgstr "Minnet slut, visning avbruten!"
-#: src/GridText.c:704
+#: src/GridText.c:696
msgid "Memory exhausted, will interrupt transfer!"
msgstr "Minnet slut, avbryter överföring!"
-#: src/GridText.c:3685
+#: src/GridText.c:3674
msgid " *** MEMORY EXHAUSTED ***"
msgstr " *** MINNET SLUT ***"
-#: src/GridText.c:6146
+#: src/GridText.c:6152
msgid "text entry field"
msgstr "textinmatningsfält"
-#: src/GridText.c:6149
+#: src/GridText.c:6155
msgid "password entry field"
msgstr "lösenordsinmatningsfält"
-#: src/GridText.c:6152
+#: src/GridText.c:6158
msgid "checkbox"
msgstr "kryssruta"
-#: src/GridText.c:6155
+#: src/GridText.c:6161
msgid "radio button"
msgstr "radioknapp"
-#: src/GridText.c:6158
+#: src/GridText.c:6164
msgid "submit button"
msgstr "sändknapp"
-#: src/GridText.c:6161
+#: src/GridText.c:6167
msgid "reset button"
msgstr "nollställningsknapp"
-#: src/GridText.c:6164
+#: src/GridText.c:6170
msgid "script button"
msgstr "skriptknapp"
-#: src/GridText.c:6167
+#: src/GridText.c:6173
msgid "popup menu"
msgstr "popup-meny"
-#: src/GridText.c:6170
+#: src/GridText.c:6176
msgid "hidden form field"
msgstr "dolt formulärfält"
-#: src/GridText.c:6173
+#: src/GridText.c:6179
msgid "text entry area"
msgstr "textinmatningsområde"
-#: src/GridText.c:6176
+#: src/GridText.c:6182
msgid "range entry field"
msgstr "områdesinmatningsfält"
-#: src/GridText.c:6179
+#: src/GridText.c:6185
msgid "file entry field"
msgstr "filinmatningsfält"
-#: src/GridText.c:6182
+#: src/GridText.c:6188
msgid "text-submit field"
msgstr "textsändfält"
-#: src/GridText.c:6185
+#: src/GridText.c:6191
msgid "image-submit button"
msgstr "bildsändfält"
-#: src/GridText.c:6188
+#: src/GridText.c:6194
msgid "keygen field"
msgstr "nyckelgenerering misslyckades"
-#: src/GridText.c:6191
+#: src/GridText.c:6197
msgid "unknown form field"
msgstr "okänt formulärfält"
-#: src/GridText.c:6211 src/GridText.c:6218 src/LYList.c:248
+#: src/GridText.c:6217 src/GridText.c:6224 src/LYList.c:249
msgid "unknown field or link"
msgstr "okänt fält eller länk"
-#: src/GridText.c:10649
+#: src/GridText.c:10650
msgid "Can't open file for uploading"
msgstr "Kan inte öppna fil för sändning"
-#: src/GridText.c:11837
+#: src/GridText.c:11843
#, c-format
msgid "Submitting %s"
msgstr "Skickar %s"
#. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12894
+#: src/GridText.c:12919
msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
msgstr "Hängning upptäckt: TextAnchor-struktur förstörd - föreslår avbrott!"
#. don't show previous state
-#: src/GridText.c:13056
+#: src/GridText.c:13083
msgid "Wrap lines to fit displayed area?"
msgstr "Ombryt rader så att de passar i visat fält?"
-#: src/GridText.c:13696
+#: src/GridText.c:13719
msgid "Very long lines have been truncated!"
msgstr "mycket långa rader har trunkerats!"
-#: src/HTAlert.c:164 src/LYShowInfo.c:364 src/LYShowInfo.c:368
+#: src/HTAlert.c:164 src/LYShowInfo.c:386 src/LYShowInfo.c:390
msgid "bytes"
msgstr "byte"
@@ -3546,32 +3556,32 @@ msgstr "byte"
#. * If we know the total size of the file, we can compute
#. * a percentage, and show a corresponding progress bar.
#.
-#: src/HTAlert.c:303 src/HTAlert.c:329
+#: src/HTAlert.c:328 src/HTAlert.c:354
#, c-format
msgid "Read %s of data"
msgstr "Läste %s data"
-#: src/HTAlert.c:326
+#: src/HTAlert.c:351
#, c-format
msgid "Read %s of %s of data"
msgstr "Läste %s av %s data"
-#: src/HTAlert.c:335
+#: src/HTAlert.c:360
#, c-format
msgid ", %s/sec"
msgstr ", %s/s"
-#: src/HTAlert.c:347
+#: src/HTAlert.c:374
#, c-format
msgid " (stalled for %s)"
msgstr " (avstannad i %s)"
-#: src/HTAlert.c:351
+#: src/HTAlert.c:378
#, c-format
msgid ", ETA %s"
msgstr ", %s kvar"
-#: src/HTAlert.c:373
+#: src/HTAlert.c:400
msgid " (Press 'z' to abort)"
msgstr " (\"z\" avbryter)"
@@ -3600,11 +3610,11 @@ msgstr " (\"z\" avbryter)"
#. * Lynx will also accept y Y n N as responses unless there is a conflict
#. * with the first letter of the "yes" or "no" translation.
#.
-#: src/HTAlert.c:411 src/HTAlert.c:459
+#: src/HTAlert.c:438 src/HTAlert.c:486
msgid "yes"
msgstr "ja"
-#: src/HTAlert.c:414 src/HTAlert.c:460
+#: src/HTAlert.c:441 src/HTAlert.c:487
msgid "no"
msgstr "nej"
@@ -3624,7 +3634,7 @@ msgstr "nej"
#. * (Y/N/Always/neVer) - English (original)
#. * (O/N/Toujours/Jamais) - French
#.
-#: src/HTAlert.c:913
+#: src/HTAlert.c:940
msgid "Y/N/A/V"
msgstr "J/N/A/L"
@@ -3668,7 +3678,7 @@ msgstr ""
" kommandot radera bokmärke, vilket vanligtvis nås via tangenten \"R\",\n"
" men som kan ha ändrats av dig eller din systemadministratör."
-#: src/LYBookmark.c:376
+#: src/LYBookmark.c:378
#, c-format
msgid ""
" You can delete links by the 'R' key<br>\n"
@@ -3677,7 +3687,7 @@ msgstr ""
" Du kan ta bort länkar med \"R\"-tangenten<br>\n"
"<ol>\n"
-#: src/LYBookmark.c:379
+#: src/LYBookmark.c:381
msgid ""
" You can delete links using the remove bookmark command. It is usually\n"
" the 'R' key but may have been remapped by you or your system\n"
@@ -3687,7 +3697,7 @@ msgstr ""
" nås via tangenten \"R\", men som kan ha ändrats av dig eller din\n"
" systemadministratör."
-#: src/LYBookmark.c:383
+#: src/LYBookmark.c:385
msgid ""
" This file also may be edited with a standard text editor to delete\n"
" outdated or invalid links, or to change their order."
@@ -3696,7 +3706,7 @@ msgstr ""
" att ta bort föråldrade eller ogiltiga länkar, eller ändra den inbördes\n"
" ordningen."
-#: src/LYBookmark.c:386
+#: src/LYBookmark.c:388
msgid ""
"Note: if you edit this file manually\n"
" you should not change the format within the lines\n"
@@ -3713,7 +3723,7 @@ msgstr ""
msgid "File may be recoverable from %s during this session"
msgstr "Filen kan kanske återskapas från %s under denna session"
-#: src/LYCgi.c:158
+#: src/LYCgi.c:162
#, c-format
msgid "Do you want to execute \"%s\"?"
msgstr "Vill du starta \"%s\"?"
@@ -3722,71 +3732,75 @@ msgstr "Vill du starta \"%s\"?"
#. * Neither the path as given nor any components examined by backing up
#. * were stat()able. - kw
#.
-#: src/LYCgi.c:273
+#: src/LYCgi.c:277
msgid "Unable to access cgi script"
msgstr "Kan inte nå cgi-skript"
-#: src/LYCgi.c:707 src/LYCgi.c:710
+#: src/LYCgi.c:711 src/LYCgi.c:714
msgid "Good Advice"
msgstr "Gott råd"
-#: src/LYCgi.c:714
+#: src/LYCgi.c:718
msgid "An excellent http server for VMS is available via"
msgstr "En utmärkt http-server för VMS är tillgänglig via"
-#: src/LYCgi.c:721
+#: src/LYCgi.c:725
msgid "this link"
msgstr "denna länk"
-#: src/LYCgi.c:725
+#: src/LYCgi.c:729
msgid "It provides state of the art CGI script support.\n"
msgstr "Den ger förstklassigt stöd för CGI-skript.\n"
-#: src/LYClean.c:122
+#: src/LYClean.c:115
msgid "Exiting via interrupt:"
msgstr "Avslutar via avbrott:"
-#: src/LYCookie.c:2537
+#: src/LYCookie.c:2538
msgid "(from a previous session)"
msgstr "(från en tidigare session)"
-#: src/LYCookie.c:2598
+#: src/LYCookie.c:2599
msgid "Maximum Gobble Date:"
msgstr "Maximalt ätdatum:"
-#: src/LYCookie.c:2637
+#: src/LYCookie.c:2638
msgid "Internal"
msgstr "Intern"
-#: src/LYCookie.c:2638
+#: src/LYCookie.c:2639
msgid "cookie_domain_flag_set error, aborting program"
msgstr "\"cookie_domain_flag_set\"-fel, avbryter programmet"
-#: src/LYCurses.c:1297
+#: src/LYCurses.c:1170
+msgid "Terminal reinitialisation failed - unknown terminal type?"
+msgstr "Ominitiering av terminalen misslyckades - okänd terminaltyp?"
+
+#: src/LYCurses.c:1377
msgid "Terminal initialisation failed - unknown terminal type?"
-msgstr "Terminalinitiering misslyckades - okänd terminaltyp?"
+msgstr "Initiering av terminalen misslyckades - okänd terminaltyp?"
-#: src/LYCurses.c:1780
+#: src/LYCurses.c:1863
msgid "Terminal ="
msgstr "Terminal ="
-#: src/LYCurses.c:1784
+#: src/LYCurses.c:1867
msgid "You must use a vt100, 200, etc. terminal with this program."
msgstr "Du måste använda en vt100-, -200-, etc. -terminal med detta program."
-#: src/LYCurses.c:1833
+#: src/LYCurses.c:1916
msgid "Your Terminal type is unknown!"
msgstr "Din terminaltyp är okänd!"
-#: src/LYCurses.c:1834
+#: src/LYCurses.c:1917
msgid "Enter a terminal type:"
msgstr "Ange en terminaltyp:"
-#: src/LYCurses.c:1848
+#: src/LYCurses.c:1931
msgid "TERMINAL TYPE IS SET TO"
msgstr "TERMINALTYP SATT TILL"
-#: src/LYCurses.c:2398
+#: src/LYCurses.c:2483
#, c-format
msgid ""
"\n"
@@ -3795,7 +3809,7 @@ msgstr ""
"\n"
"Ett fatalt fel har uppstått i %s ver. %s\n"
-#: src/LYCurses.c:2401
+#: src/LYCurses.c:2486
#, c-format
msgid ""
"\n"
@@ -3854,39 +3868,39 @@ msgstr "Visa temporär fil"
msgid "Save to disk disabled."
msgstr "\"Spara på disk\" deaktiverad."
-#: src/LYDownload.c:561 src/LYPrint.c:1322
+#: src/LYDownload.c:561 src/LYPrint.c:1330
msgid "Local additions:"
msgstr "Lokala tillägg:"
-#: src/LYDownload.c:572 src/LYUpload.c:209
+#: src/LYDownload.c:572 src/LYUpload.c:206
msgid "No Name Given"
msgstr "Inget namn har angetts"
-#: src/LYHistory.c:679
+#: src/LYHistory.c:680
msgid "You selected:"
msgstr "Du valde:"
-#: src/LYHistory.c:703 src/LYHistory.c:932
+#: src/LYHistory.c:704 src/LYHistory.c:933
msgid "(no address)"
msgstr "(ingen adress)"
-#: src/LYHistory.c:707
+#: src/LYHistory.c:708
msgid " (internal)"
msgstr " (intern)"
-#: src/LYHistory.c:709
+#: src/LYHistory.c:710
msgid " (was internal)"
msgstr " (var intern)"
-#: src/LYHistory.c:807
+#: src/LYHistory.c:808
msgid " (From History)"
msgstr " (Från historik)"
-#: src/LYHistory.c:852
+#: src/LYHistory.c:853
msgid "You visited (POSTs, bookmark, menu and list files excluded):"
msgstr "Du besökte (POST, bokmärkes-, meny- och listfiler ej medräknade):"
-#: src/LYHistory.c:1154
+#: src/LYHistory.c:1155
msgid "(No messages yet)"
msgstr "(Inga meddelanden ännu)"
@@ -3946,27 +3960,27 @@ msgstr "Totalt antal malloc"
msgid "Total frees"
msgstr "Totalt antal free"
-#: src/LYList.c:88
+#: src/LYList.c:89
msgid "References in "
msgstr "Referenser i "
-#: src/LYList.c:91
+#: src/LYList.c:92
msgid "this document:"
msgstr "detta dokument:"
-#: src/LYList.c:97
+#: src/LYList.c:98
msgid "Visible links:"
msgstr "Besökta länkar:"
-#: src/LYList.c:201 src/LYList.c:312
+#: src/LYList.c:202 src/LYList.c:321
msgid "Hidden links:"
msgstr "Dolda länkar:"
-#: src/LYList.c:349
+#: src/LYList.c:358
msgid "References"
msgstr "Referenser"
-#: src/LYList.c:353
+#: src/LYList.c:362
msgid "Visible links"
msgstr "Synliga länkar"
@@ -3979,305 +3993,305 @@ msgstr "Kan inte ta status på \"%s\"."
msgid "The selected item is not a file or a directory! Request ignored."
msgstr "Vald post är inte en fil eller en katalog! Begäran ignoreras."
-#: src/LYLocal.c:455
+#: src/LYLocal.c:456
#, c-format
msgid "Unable to %s due to system error!"
msgstr "Kan inte %s på grund av systemfel!"
-#: src/LYLocal.c:489
+#: src/LYLocal.c:490
#, c-format
msgid "Probable failure to %s due to system error!"
msgstr "Möjligt misslyckande i %s på grund av systemfel!"
-#: src/LYLocal.c:554 src/LYLocal.c:577
+#: src/LYLocal.c:555 src/LYLocal.c:578
#, c-format
msgid "remove %s"
msgstr "ta bort %s"
-#: src/LYLocal.c:597
+#: src/LYLocal.c:598
#, c-format
msgid "touch %s"
msgstr "ändra datum på %s"
-#: src/LYLocal.c:627
+#: src/LYLocal.c:628
#, c-format
msgid "move %s to %s"
msgstr "flytta %s till %s"
-#: src/LYLocal.c:675
+#: src/LYLocal.c:676
msgid "There is already a directory with that name! Request ignored."
msgstr "Det finns redan en katalog med det namnet! Begäran ignoreras."
-#: src/LYLocal.c:677
+#: src/LYLocal.c:678
msgid "There is already a file with that name! Request ignored."
msgstr "Det finns redan en fil med det namnet! Begäran ignoreras."
-#: src/LYLocal.c:679
+#: src/LYLocal.c:680
msgid "The specified name is already in use! Request ignored."
msgstr "Angivet filnamn används redan! Begäran ignoreras."
-#: src/LYLocal.c:691
+#: src/LYLocal.c:692
msgid "Destination has different owner! Request denied."
msgstr "Målet har annan ägare! Begäran avvisas."
-#: src/LYLocal.c:694
+#: src/LYLocal.c:695
msgid "Destination is not a valid directory! Request denied."
msgstr "Målet är inte en giltig katalog! Begäran avvisas."
-#: src/LYLocal.c:710
+#: src/LYLocal.c:711
msgid "Source and destination are the same location! Request ignored!"
msgstr "Källa och mål är samma plats! Begäran ignorerad."
-#: src/LYLocal.c:734
+#: src/LYLocal.c:735
msgid "Remove all tagged files and directories?"
msgstr "Ta bort alla markerade filer och kataloger?"
-#: src/LYLocal.c:807
+#: src/LYLocal.c:808
msgid "Enter new location for tagged items: "
msgstr "Ange ny plats för markerade poster: "
-#: src/LYLocal.c:905
+#: src/LYLocal.c:906
msgid "Enter new name for directory: "
msgstr "Ange nytt namn för katalog: "
-#: src/LYLocal.c:907
+#: src/LYLocal.c:908
msgid "Enter new name for file: "
msgstr "Ange nytt namn för fil: "
-#: src/LYLocal.c:919
+#: src/LYLocal.c:920
msgid "Illegal character (path-separator) found! Request ignored."
msgstr "Felaktigt tecken (sökvägsavdelare) funnen! Begäran ignorerad."
-#: src/LYLocal.c:969
+#: src/LYLocal.c:970
msgid "Enter new location for directory: "
msgstr "Ange ny plats för katalog: "
-#: src/LYLocal.c:971
+#: src/LYLocal.c:972
msgid "Enter new location for file: "
msgstr "Ange ny plats för fil: "
-#: src/LYLocal.c:998
+#: src/LYLocal.c:999
msgid "Unexpected failure - unable to find trailing path separator"
msgstr "Oväntat misslyckande - kan inte hitta avslutande sökvägsavdelare"
-#: src/LYLocal.c:1060
+#: src/LYLocal.c:1061
msgid "Modify name, location, or permission (n, l, or p): "
msgstr "Ända N=namn, L=plats eller P=behörighet? "
-#: src/LYLocal.c:1062
+#: src/LYLocal.c:1063
msgid "Modify name or location (n or l): "
msgstr "Ändra N=namn eller L=plats? "
#.
#. * Code for changing ownership needed here.
#.
-#: src/LYLocal.c:1091
+#: src/LYLocal.c:1092
msgid "This feature not yet implemented!"
msgstr "Denna funktion är ännu ej implementerad!"
-#: src/LYLocal.c:1112
+#: src/LYLocal.c:1113
msgid "Enter name of file to create: "
msgstr "Ange namn på fil att skapa: "
-#: src/LYLocal.c:1115 src/LYLocal.c:1152
+#: src/LYLocal.c:1116 src/LYLocal.c:1153
msgid "Illegal redirection \"//\" found! Request ignored."
msgstr "Felaktig omdirigering \"//\" funnen! Begäran ignoreras."
-#: src/LYLocal.c:1149
+#: src/LYLocal.c:1150
msgid "Enter name for new directory: "
msgstr "Ange namn på ny katalog: "
-#: src/LYLocal.c:1190
+#: src/LYLocal.c:1191
msgid "Create file or directory (f or d): "
msgstr "Skapa F=fil eller D=katalog? "
-#: src/LYLocal.c:1232
+#: src/LYLocal.c:1233
#, c-format
msgid "Remove directory '%s'?"
msgstr "Ta bort katalogen \"%s\"?"
-#: src/LYLocal.c:1235
+#: src/LYLocal.c:1236
msgid "Remove directory?"
msgstr "Ta bort katalogen?"
-#: src/LYLocal.c:1240
+#: src/LYLocal.c:1241
#, c-format
msgid "Remove file '%s'?"
msgstr "Ta bort fil \"%s\"?"
-#: src/LYLocal.c:1242
+#: src/LYLocal.c:1243
msgid "Remove file?"
msgstr "Ta bort fil?"
-#: src/LYLocal.c:1247
+#: src/LYLocal.c:1248
#, c-format
msgid "Remove symbolic link '%s'?"
msgstr "Ta bort symbolisk länk \"%s\"?"
-#: src/LYLocal.c:1249
+#: src/LYLocal.c:1250
msgid "Remove symbolic link?"
msgstr "Ta bort symbolisk länk?"
-#: src/LYLocal.c:1347
+#: src/LYLocal.c:1348
msgid "Sorry, don't know how to permit non-UNIX files yet."
msgstr "Tyvärr, kan inte ändra behörighet för icke-Unixfiler ännu."
-#: src/LYLocal.c:1376
+#: src/LYLocal.c:1377
msgid "Unable to open permit options file"
msgstr "Kan inte öppna behörighetsalternativfil"
-#: src/LYLocal.c:1404
+#: src/LYLocal.c:1405
msgid "Specify permissions below:"
msgstr "Ange behörighet nedan:"
-#: src/LYLocal.c:1405 src/LYShowInfo.c:265
+#: src/LYLocal.c:1406 src/LYShowInfo.c:287
msgid "Owner:"
msgstr "Ägare:"
-#: src/LYLocal.c:1421
+#: src/LYLocal.c:1422
msgid "Group"
msgstr "Grupp"
-#: src/LYLocal.c:1437
+#: src/LYLocal.c:1438
msgid "Others:"
msgstr "Övriga:"
-#: src/LYLocal.c:1455
+#: src/LYLocal.c:1456
msgid "form to permit"
msgstr "formulär för att ändra behörighet för"
-#: src/LYLocal.c:1551
+#: src/LYLocal.c:1552
msgid "Invalid mode format."
msgstr "Ogiltigt format på behörighet."
-#: src/LYLocal.c:1555
+#: src/LYLocal.c:1556
msgid "Invalid syntax format."
msgstr "Ogiltig syntaxformat."
-#: src/LYLocal.c:1742
+#: src/LYLocal.c:1743
msgid "Warning! UUDecoded file will exist in the directory you started Lynx."
msgstr "Varning! UU-avkodad fil lagras i katalogen du startade Lynx från."
-#: src/LYLocal.c:1932
+#: src/LYLocal.c:1933
msgid "NULL URL pointer"
msgstr "URL-pekare är NULL"
-#: src/LYLocal.c:2014
+#: src/LYLocal.c:2015
#, c-format
msgid "Executing %s "
msgstr "Kör %s "
-#: src/LYLocal.c:2017
+#: src/LYLocal.c:2018
msgid "Executing system command. This might take a while."
msgstr "Kör systemkommando. Detta kan ta en stund."
-#: src/LYLocal.c:2091
+#: src/LYLocal.c:2092
msgid "Current directory:"
msgstr "Aktuell katalog:"
-#: src/LYLocal.c:2094 src/LYLocal.c:2112
+#: src/LYLocal.c:2095 src/LYLocal.c:2113
msgid "Current selection:"
msgstr "Aktuell markering:"
-#: src/LYLocal.c:2098
+#: src/LYLocal.c:2099
msgid "Nothing currently selected."
msgstr "Ingenting har markerats."
-#: src/LYLocal.c:2114
+#: src/LYLocal.c:2115
msgid "tagged item:"
msgstr "markerad post:"
-#: src/LYLocal.c:2115
+#: src/LYLocal.c:2116
msgid "tagged items:"
msgstr "markerade poster:"
-#: src/LYLocal.c:2215 src/LYLocal.c:2224
+#: src/LYLocal.c:2216 src/LYLocal.c:2225
msgid "Illegal filename; request ignored."
msgstr "Ogiltigt filnamn; begäran ignorerad."
#. directory not writable
-#: src/LYLocal.c:2322 src/LYLocal.c:2381
+#: src/LYLocal.c:2323 src/LYLocal.c:2382
msgid "Install in the selected directory not permitted."
msgstr "Installation i vald katalog ej tillåten."
-#: src/LYLocal.c:2377
+#: src/LYLocal.c:2378
msgid "The selected item is not a directory! Request ignored."
msgstr "Vald post är inte en katalog! Begäran ignorerad."
-#: src/LYLocal.c:2386
+#: src/LYLocal.c:2387
msgid "Just a moment, ..."
msgstr "Ett ögonblick, ..."
-#: src/LYLocal.c:2403
+#: src/LYLocal.c:2404
msgid "Error building install args"
msgstr "Fel vid uppbyggning av installationsflaggor"
-#: src/LYLocal.c:2418 src/LYLocal.c:2449
+#: src/LYLocal.c:2419 src/LYLocal.c:2450
#, c-format
msgid "Source and target are the same: %s"
msgstr "Källa och mål är samma: %s"
-#: src/LYLocal.c:2425 src/LYLocal.c:2456
+#: src/LYLocal.c:2426 src/LYLocal.c:2457
#, c-format
msgid "Already in target directory: %s"
msgstr "Redan i målkatalog: %s"
-#: src/LYLocal.c:2474
+#: src/LYLocal.c:2475
msgid "Installation complete"
msgstr "Installation färdig"
-#: src/LYLocal.c:2666
+#: src/LYLocal.c:2680
msgid "Temporary URL or list would be too long."
msgstr "Temporär adress eller lista skulle vara för lång."
-#: src/LYMail.c:544
+#: src/LYMail.c:566
msgid "Sending"
msgstr "Skickar"
-#: src/LYMail.c:1030
+#: src/LYMail.c:1050
#, c-format
msgid "The link %s :?: %s \n"
msgstr "Länken %s :?: %s \n"
-#: src/LYMail.c:1032
+#: src/LYMail.c:1052
#, c-format
msgid "called \"%s\"\n"
msgstr "anropade \"%s\"\n"
-#: src/LYMail.c:1033
+#: src/LYMail.c:1053
#, c-format
msgid "in the file \"%s\" called \"%s\"\n"
msgstr "i filen \"%s\" anropade \"%s\"\n"
-#: src/LYMail.c:1034
+#: src/LYMail.c:1054
msgid "was requested but was not available."
msgstr "efterfrågades men var inte tillgänglig."
-#: src/LYMail.c:1035
+#: src/LYMail.c:1055
msgid "Thought you might want to know."
msgstr "Tänkte att du kanske ville veta."
-#: src/LYMail.c:1037
+#: src/LYMail.c:1057
msgid "This message was automatically generated by"
msgstr "Detta meddelande automatgenererades av"
-#: src/LYMail.c:1751
+#: src/LYMail.c:1770
msgid "No system mailer configured"
msgstr "E-postprogram inte konfigurerat i systemet"
-#: src/LYMain.c:1049
+#: src/LYMain.c:1069
msgid "No Winsock found, sorry."
msgstr "Ingen Winsock hittades, ursäkta."
-#: src/LYMain.c:1240
+#: src/LYMain.c:1260
msgid "You MUST define a valid TMP or TEMP area!"
msgstr "Du MÅSTE ange ett giltigt TMP- eller TEMP-område!"
-#: src/LYMain.c:1293 src/LYMainLoop.c:5260
+#: src/LYMain.c:1313 src/LYMainLoop.c:5283
msgid "No such directory"
msgstr "Katalogen finns ej"
-#: src/LYMain.c:1487
+#: src/LYMain.c:1507
#, c-format
msgid ""
"\n"
@@ -4288,7 +4302,7 @@ msgstr ""
"Konfigurationsfilen \"%s\" ej tillgänglig.\n"
"\n"
-#: src/LYMain.c:1497
+#: src/LYMain.c:1517
#, c-format
msgid ""
"\n"
@@ -4299,201 +4313,179 @@ msgstr ""
"Lynxteckenuppsättningar ej deklarerade.\n"
"\n"
-#: src/LYMain.c:1526
-#, c-format
-msgid ""
-"\n"
-"Lynx edit map not declared.\n"
-"\n"
-msgstr ""
-"\n"
-"Lynxredigeringskarta ej deklarerad.\n"
-"\n"
-
-#: src/LYMain.c:1608
-#, c-format
-msgid ""
-"\n"
-"Lynx file \"%s\" is not available.\n"
-"\n"
-msgstr ""
-"\n"
-"Lynxfilen \"%s\" ej tillgänglig.\n"
-"\n"
-
-#: src/LYMain.c:1683
+#: src/LYMain.c:1654
#, c-format
msgid "Ignored %d characters from standard input.\n"
msgstr "Ignorerade %d tecken från standard in.\n"
-#: src/LYMain.c:1685
+#: src/LYMain.c:1656
#, c-format
msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
msgstr "Använd \"-stdin\" eller \"-\" för att beskriva hur indata från rör skall hanteras.\n"
-#: src/LYMain.c:1843
+#: src/LYMain.c:1814
msgid "Warning:"
msgstr "Varning:"
-#: src/LYMain.c:2408
+#: src/LYMain.c:2384
msgid "persistent cookies state will be changed in next session only."
msgstr "varaktiga kakinställningar ändras endast i nästa session."
-#: src/LYMain.c:2644 src/LYMain.c:2689
+#: src/LYMain.c:2621 src/LYMain.c:2666
#, c-format
msgid "Lynx: ignoring unrecognized charset=%s\n"
msgstr "Lynx: ignorerar okänd teckenuppsättning %s\n"
-#: src/LYMain.c:3208
+#: src/LYMain.c:3185
#, c-format
msgid "%s Version %s (%s)"
msgstr "%s version %s (%s)"
-#: src/LYMain.c:3246
+#: src/LYMain.c:3223
#, c-format
msgid "Built on %s %s %s\n"
msgstr "Byggd %s %s %s\n"
-#: src/LYMain.c:3268
+#: src/LYMain.c:3245
msgid "Copyrights held by the Lynx Developers Group,"
msgstr "Upphovsrätten ligger hos Lynx-utvecklargruppen,"
-#: src/LYMain.c:3269
+#: src/LYMain.c:3246
msgid "the University of Kansas, CERN, and other contributors."
msgstr "Kansas Universitet, CERN, och andra bidragslämnare."
-#: src/LYMain.c:3270
+#: src/LYMain.c:3247
msgid "Distributed under the GNU General Public License (Version 2)."
msgstr "Distribuerad enligt GNU General Public License (version 2)."
-#: src/LYMain.c:3271
+#: src/LYMain.c:3248
msgid "See http://lynx.isc.org/ and the online help for more information."
msgstr "Se http://lynx.isc.org/ och direkthjälpen för ytterligare information."
-#: src/LYMain.c:4104
+#: src/LYMain.c:4091
#, c-format
msgid "USAGE: %s [options] [file]\n"
msgstr "ANVÄNDNING: %s [flaggor] [fil]\n"
-#: src/LYMain.c:4105
+#: src/LYMain.c:4092
#, c-format
msgid "Options are:\n"
msgstr "Flaggorna är:\n"
-#: src/LYMain.c:4406
+#: src/LYMain.c:4395
#, c-format
msgid "%s: Invalid Option: %s\n"
msgstr "%s: Okänd flagga: %s\n"
-#: src/LYMainLoop.c:575
+#: src/LYMainLoop.c:572
#, c-format
msgid "Internal error: Invalid mouse link %d!"
msgstr "Internt fel: Ogiltig muslänk %d!"
-#: src/LYMainLoop.c:696 src/LYMainLoop.c:5282
+#: src/LYMainLoop.c:693 src/LYMainLoop.c:5305
msgid "A URL specified by the user"
msgstr "En adress angiven av användaren"
-#: src/LYMainLoop.c:1148
+#: src/LYMainLoop.c:1142
msgid "Enctype multipart/form-data not yet supported! Cannot submit."
msgstr "Kodningen multiport/form-data stöds inte ännu! Kan inte skicka."
#.
#. * Make a name for this help file.
#.
-#: src/LYMainLoop.c:3177
+#: src/LYMainLoop.c:3196
msgid "Help Screen"
msgstr "Hjälpskärm"
-#: src/LYMainLoop.c:3308
+#: src/LYMainLoop.c:3327
msgid "System Index"
msgstr "Systemindex"
-#: src/LYMainLoop.c:3556
+#: src/LYMainLoop.c:3575
#, c-format
msgid "Query parameter %d: "
msgstr "Anropsparameter %d: "
-#: src/LYMainLoop.c:3781 src/LYMainLoop.c:5558
+#: src/LYMainLoop.c:3804 src/LYMainLoop.c:5581
msgid "Entry into main screen"
msgstr "Ingång till huvudskärm"
-#: src/LYMainLoop.c:4039
+#: src/LYMainLoop.c:4062
msgid "No next document present"
msgstr "Det finns inget nästa dokument"
-#: src/LYMainLoop.c:4334
+#: src/LYMainLoop.c:4357
msgid "charset for this document specified explicitly, sorry..."
msgstr "teckenuppsättning för detta dokumentet explicit deklarerat, ursäkta..."
-#: src/LYMainLoop.c:5240
+#: src/LYMainLoop.c:5263
msgid "cd to:"
msgstr "byt katalog till:"
-#: src/LYMainLoop.c:5263
+#: src/LYMainLoop.c:5286
msgid "A component of path is not a directory"
msgstr "En del av sökvägen är inte en katalog"
-#: src/LYMainLoop.c:5266
+#: src/LYMainLoop.c:5289
msgid "failed to change directory"
msgstr "lyckades inte byta katalog"
-#: src/LYMainLoop.c:6496
+#: src/LYMainLoop.c:6515
msgid "Reparsing document under current settings..."
msgstr "Tolkar om dokumentet med aktuella inställningar..."
-#: src/LYMainLoop.c:6790
+#: src/LYMainLoop.c:6809
#, c-format
msgid "Fatal error - could not open output file %s\n"
msgstr "Fatalt fel - kunde inte öppna utdatafil %s\n"
# Kollas!
-#: src/LYMainLoop.c:7128
+#: src/LYMainLoop.c:7151
msgid "TABLE center enable."
msgstr "Tabellcentrering aktiverad."
# Kollas!
-#: src/LYMainLoop.c:7131
+#: src/LYMainLoop.c:7154
msgid "TABLE center disable."
msgstr "Tabellcentrering inaktiverad."
-#: src/LYMainLoop.c:7211
+#: src/LYMainLoop.c:7234
msgid "Current URL is empty."
msgstr "Nuvarande adress är tom."
-#: src/LYMainLoop.c:7213 src/LYUtils.c:1881
+#: src/LYMainLoop.c:7236 src/LYUtils.c:1917
msgid "Copy to clipboard failed."
msgstr "Misslyckades kopiera till urklipp."
-#: src/LYMainLoop.c:7215
+#: src/LYMainLoop.c:7238
msgid "Document URL put to clipboard."
msgstr "Dokumentadress lagd i urklipp."
-#: src/LYMainLoop.c:7217
+#: src/LYMainLoop.c:7240
msgid "Link URL put to clipboard."
msgstr "Länkadress lagd i urklipp."
-#: src/LYMainLoop.c:7244
+#: src/LYMainLoop.c:7267
msgid "No URL in the clipboard."
msgstr "Ingen adress i urklipp."
-#: src/LYMainLoop.c:7936 src/LYMainLoop.c:8105
+#: src/LYMainLoop.c:7960 src/LYMainLoop.c:8131
msgid "-index-"
msgstr "-index-"
-#: src/LYMainLoop.c:8045
+#: src/LYMainLoop.c:8069
msgid "lynx: Can't access startfile"
msgstr "lynx: Kan inte komma åt startfil"
-#: src/LYMainLoop.c:8057
+#: src/LYMainLoop.c:8081
msgid "lynx: Start file could not be found or is not text/html or text/plain"
msgstr "lynx: Startfilen hittades inte eller är varken text/html eller text/plain"
-#: src/LYMainLoop.c:8058
+#: src/LYMainLoop.c:8082
msgid " Exiting..."
msgstr " Avslutar..."
-#: src/LYMainLoop.c:8099
+#: src/LYMainLoop.c:8125
msgid "-more-"
msgstr "-mer-"
@@ -4557,370 +4549,375 @@ msgstr ""
msgid "Message has no original text!"
msgstr "Inlägget har ingen ursprunglig text!"
-#: src/LYOptions.c:770
+#: src/LYOptions.c:774
msgid "review/edit B)ookmarks files"
msgstr "se/redigera B)okmärkesfiler"
-#: src/LYOptions.c:772
+#: src/LYOptions.c:776
msgid "B)ookmark file: "
msgstr "B)okmärkesfil: "
-#: src/LYOptions.c:2120 src/LYOptions.c:2127
+#: src/LYOptions.c:2123 src/LYOptions.c:2130
msgid "ON"
msgstr "PÅ"
#. verbose_img variable
-#: src/LYOptions.c:2121 src/LYOptions.c:2126 src/LYOptions.c:2289
-#: src/LYOptions.c:2300
+#: src/LYOptions.c:2124 src/LYOptions.c:2129 src/LYOptions.c:2302
+#: src/LYOptions.c:2313
msgid "OFF"
msgstr "AV"
-#: src/LYOptions.c:2122
+#: src/LYOptions.c:2125
msgid "NEVER"
msgstr "ALDRIG"
-#: src/LYOptions.c:2123
+#: src/LYOptions.c:2126
msgid "ALWAYS"
msgstr "ALLTID"
-#: src/LYOptions.c:2139 src/LYOptions.c:2281
+#: src/LYOptions.c:2142 src/LYOptions.c:2294
msgid "ignore"
msgstr "ignorera"
-#: src/LYOptions.c:2140
+#: src/LYOptions.c:2143
msgid "ask user"
msgstr "fråga användaren"
-#: src/LYOptions.c:2141
+#: src/LYOptions.c:2144
msgid "accept all"
msgstr "ta emot alla"
-#: src/LYOptions.c:2153
+#: src/LYOptions.c:2156
msgid "ALWAYS OFF"
msgstr "ALLTID AV"
-#: src/LYOptions.c:2154
+#: src/LYOptions.c:2157
msgid "FOR LOCAL FILES ONLY"
msgstr "ENDAST FÖR LOKALA FILER"
-#: src/LYOptions.c:2156
+#: src/LYOptions.c:2159
msgid "ALWAYS ON"
msgstr "ALLTID PÅ"
# Numeriskt tangentbord
-#: src/LYOptions.c:2168
+#: src/LYOptions.c:2171
msgid "Numbers act as arrows"
msgstr "Siffror som pilar"
-#: src/LYOptions.c:2170
+#: src/LYOptions.c:2173
msgid "Links are numbered"
msgstr "Numrerade länkar"
-#: src/LYOptions.c:2173
+#: src/LYOptions.c:2176
msgid "Links and form fields are numbered"
msgstr "Numrerade länkar och formulärfält"
-#: src/LYOptions.c:2176
+#: src/LYOptions.c:2179
msgid "Form fields are numbered"
msgstr "Numrerade formulärfält"
-#: src/LYOptions.c:2191
+#: src/LYOptions.c:2194
msgid "Case insensitive"
msgstr "Skilj inte VERSALER och gemener"
-#: src/LYOptions.c:2192
+#: src/LYOptions.c:2195
msgid "Case sensitive"
msgstr "Skilj VERSALER och gemener"
-#: src/LYOptions.c:2216
+#: src/LYOptions.c:2229
msgid "prompt normally"
msgstr "fråga som vanligt"
-#: src/LYOptions.c:2217
+#: src/LYOptions.c:2230
msgid "force yes-response"
msgstr "svara alltid ja"
-#: src/LYOptions.c:2218
+#: src/LYOptions.c:2231
msgid "force no-response"
msgstr "svara alltid nej"
-#: src/LYOptions.c:2236
+#: src/LYOptions.c:2249
msgid "Novice"
msgstr "Nybörjare"
-#: src/LYOptions.c:2237
+#: src/LYOptions.c:2250
msgid "Intermediate"
msgstr "Amatör"
-#: src/LYOptions.c:2238
+#: src/LYOptions.c:2251
msgid "Advanced"
msgstr "Avancerad"
-#: src/LYOptions.c:2247
+#: src/LYOptions.c:2260
msgid "By First Visit"
msgstr "Efter första besök"
-#: src/LYOptions.c:2249
+#: src/LYOptions.c:2262
msgid "By First Visit Reversed"
msgstr "Efter första användning, omvänt"
-#: src/LYOptions.c:2250
+#: src/LYOptions.c:2263
msgid "As Visit Tree"
msgstr "Som besöksträd"
-#: src/LYOptions.c:2251
+#: src/LYOptions.c:2264
msgid "By Last Visit"
msgstr "Efter senaste besök"
-#: src/LYOptions.c:2253
+#: src/LYOptions.c:2266
msgid "By Last Visit Reversed"
msgstr "Efter senaste besök, omvänt"
#. Old_DTD variable
-#: src/LYOptions.c:2264
+#: src/LYOptions.c:2277
msgid "relaxed (TagSoup mode)"
msgstr "avslappnad (TagSoup-läge)"
-#: src/LYOptions.c:2265
+#: src/LYOptions.c:2278
msgid "strict (SortaSGML mode)"
msgstr "strikt (SortaSGML-läge)"
-#: src/LYOptions.c:2272
+#: src/LYOptions.c:2285
msgid "Ignore"
msgstr "Ignorera"
-#: src/LYOptions.c:2273
+#: src/LYOptions.c:2286
msgid "Add to trace-file"
msgstr "Lägg till spårningsfil"
-#: src/LYOptions.c:2274
+#: src/LYOptions.c:2287
msgid "Add to LYNXMESSAGES"
msgstr "Lägg till LYNXMESSAGES"
-#: src/LYOptions.c:2275
+#: src/LYOptions.c:2288
msgid "Warn, point to trace-file"
msgstr "Varna, visa mot spårfil"
-#: src/LYOptions.c:2282
+#: src/LYOptions.c:2295
msgid "as labels"
msgstr "som etiketter"
-#: src/LYOptions.c:2283
+#: src/LYOptions.c:2296
msgid "as links"
msgstr "som länkar"
-#: src/LYOptions.c:2290
+#: src/LYOptions.c:2303
msgid "show filename"
msgstr "visa filnamn"
-#: src/LYOptions.c:2301
+#: src/LYOptions.c:2314
msgid "STANDARD"
msgstr "NORMAL"
-#: src/LYOptions.c:2302
+#: src/LYOptions.c:2315
msgid "ADVANCED"
msgstr "AVANCERAD"
-#: src/LYOptions.c:2336
+#: src/LYOptions.c:2349
msgid "Directories first"
msgstr "Kataloger först"
-#: src/LYOptions.c:2337
+#: src/LYOptions.c:2350
msgid "Files first"
msgstr "Filer först"
-#: src/LYOptions.c:2338
+#: src/LYOptions.c:2351
msgid "Mixed style"
msgstr "Blandad visning"
-#: src/LYOptions.c:2346 src/LYOptions.c:2366
+#: src/LYOptions.c:2359 src/LYOptions.c:2379
msgid "By Name"
msgstr "Efter namn"
-#: src/LYOptions.c:2347 src/LYOptions.c:2367
+#: src/LYOptions.c:2360 src/LYOptions.c:2380
msgid "By Type"
msgstr "Efter typ"
-#: src/LYOptions.c:2348 src/LYOptions.c:2368
+#: src/LYOptions.c:2361 src/LYOptions.c:2381
msgid "By Size"
msgstr "Efter storlek"
-#: src/LYOptions.c:2349 src/LYOptions.c:2369
+#: src/LYOptions.c:2362 src/LYOptions.c:2382
msgid "By Date"
msgstr "Efter datum"
-#: src/LYOptions.c:2350
+#: src/LYOptions.c:2363
msgid "By Mode"
msgstr "Efter läge"
-#: src/LYOptions.c:2352
+#: src/LYOptions.c:2365
msgid "By User"
msgstr "Efter användare"
-#: src/LYOptions.c:2353
+#: src/LYOptions.c:2366
msgid "By Group"
msgstr "Efter grupp"
-#: src/LYOptions.c:2378
+#: src/LYOptions.c:2391
msgid "Do not show rate"
-msgstr "Visa inte hastighe"
+msgstr "Visa inte hastighet"
-#: src/LYOptions.c:2379 src/LYOptions.c:2380
+#: src/LYOptions.c:2392 src/LYOptions.c:2393
#, c-format
msgid "Show %s/sec rate"
msgstr "Visa hastighet som %s/s"
-#: src/LYOptions.c:2382 src/LYOptions.c:2383
+#: src/LYOptions.c:2395 src/LYOptions.c:2396
#, c-format
msgid "Show %s/sec, ETA"
msgstr "Visa %s/s, tid kvar"
-#: src/LYOptions.c:2386
+#: src/LYOptions.c:2397 src/LYOptions.c:2398
+#, c-format
+msgid "Show %s/sec (2-digits), ETA"
+msgstr "Visa %s/s (2 siffror), tid kvar"
+
+#: src/LYOptions.c:2401
msgid "Show progressbar"
msgstr "Visa förloppsindikator"
-#: src/LYOptions.c:2398
+#: src/LYOptions.c:2413
msgid "Accept lynx's internal types"
msgstr "Godta lynx interna typer"
-#: src/LYOptions.c:2399
+#: src/LYOptions.c:2414
msgid "Also accept lynx.cfg's types"
msgstr "Godta även typer från lynx.cfg"
-#: src/LYOptions.c:2400
+#: src/LYOptions.c:2415
msgid "Also accept user's types"
msgstr "Godta även användarens typer"
-#: src/LYOptions.c:2401
+#: src/LYOptions.c:2416
msgid "Also accept system's types"
msgstr "Godta även systemets typer"
-#: src/LYOptions.c:2402
+#: src/LYOptions.c:2417
msgid "Accept all types"
msgstr "Godta alla typer"
-#: src/LYOptions.c:2411
+#: src/LYOptions.c:2426
msgid "gzip"
msgstr "gzip"
-#: src/LYOptions.c:2412
+#: src/LYOptions.c:2427
msgid "deflate"
msgstr "deflate"
-#: src/LYOptions.c:2415
+#: src/LYOptions.c:2430
msgid "compress"
msgstr "compress"
-#: src/LYOptions.c:2418
+#: src/LYOptions.c:2433
msgid "bzip2"
msgstr "bzip2"
-#: src/LYOptions.c:2420
+#: src/LYOptions.c:2435
msgid "All"
msgstr "Alla"
-#: src/LYOptions.c:2699 src/LYOptions.c:2728
+#: src/LYOptions.c:2798 src/LYOptions.c:2827
#, c-format
msgid "Use %s to invoke the Options menu!"
msgstr "Använd %s för att nå alternativmenyn!"
-#: src/LYOptions.c:3541
+#: src/LYOptions.c:3675
msgid "(options marked with (!) will not be saved)"
msgstr "(inställningar markerade med (!) kommer ej att sparas)"
-#: src/LYOptions.c:3549
+#: src/LYOptions.c:3683
msgid "General Preferences"
msgstr "Allmänna inställningar"
#. ***************************************************************
#. User Mode: SELECT
-#: src/LYOptions.c:3553
+#: src/LYOptions.c:3687
msgid "User mode"
msgstr "Användarläge"
#. Editor: INPUT
-#: src/LYOptions.c:3559
+#: src/LYOptions.c:3693
msgid "Editor"
msgstr "Redigeringsprogram"
#. Search Type: SELECT
-#: src/LYOptions.c:3564
+#: src/LYOptions.c:3698
msgid "Type of Search"
msgstr "Söktyp"
-#: src/LYOptions.c:3569
+#: src/LYOptions.c:3703
msgid "Security and Privacy"
-msgstr "Säkerhet och personlig integritet"
+msgstr "Säkerhet och sekretess"
#. ***************************************************************
#. Cookies: SELECT
-#: src/LYOptions.c:3573
+#: src/LYOptions.c:3707
msgid "Cookies"
msgstr "Kakor"
#. Cookie Prompting: SELECT
-#: src/LYOptions.c:3587
+#: src/LYOptions.c:3721
msgid "Invalid-Cookie Prompting"
msgstr "Fråga för ogiltiga kakor"
#. SSL Prompting: SELECT
-#: src/LYOptions.c:3594
+#: src/LYOptions.c:3728
msgid "SSL Prompting"
msgstr "Fråga för SSL"
-#: src/LYOptions.c:3600
+#: src/LYOptions.c:3734
msgid "Keyboard Input"
msgstr "Tangentbordsindata"
#. ***************************************************************
#. Keypad Mode: SELECT
-#: src/LYOptions.c:3604
+#: src/LYOptions.c:3738
msgid "Keypad mode"
msgstr "Numeriskt tangentbord"
#. Emacs keys: ON/OFF
-#: src/LYOptions.c:3610
+#: src/LYOptions.c:3744
msgid "Emacs keys"
msgstr "Emacstangenter"
#. VI Keys: ON/OFF
-#: src/LYOptions.c:3616
+#: src/LYOptions.c:3750
msgid "VI keys"
msgstr "VI-tangenter"
#. Line edit style: SELECT
#. well, at least 2 line edit styles available
-#: src/LYOptions.c:3623
+#: src/LYOptions.c:3757
msgid "Line edit style"
msgstr "Radredigeringsstil"
#. Keyboard layout: SELECT
-#: src/LYOptions.c:3635
+#: src/LYOptions.c:3769
msgid "Keyboard layout"
msgstr "Tangentbordsmall"
#.
#. * Display and Character Set
#.
-#: src/LYOptions.c:3649
+#: src/LYOptions.c:3783
msgid "Display and Character Set"
msgstr "Visning och teckenuppsättning"
#. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3654
+#: src/LYOptions.c:3788
msgid "Use locale-based character set"
msgstr "Lokalbaserad teckenuppsättning"
-#: src/LYOptions.c:3661
+#: src/LYOptions.c:3795
msgid "Use HTML5 charset replacements"
msgstr "Använd HTML5:s ersättande teckenkoder"
#. Display Character Set: SELECT
-#: src/LYOptions.c:3667
+#: src/LYOptions.c:3801
msgid "Display character set"
msgstr "Teckenuppsättning för visning"
-#: src/LYOptions.c:3698
+#: src/LYOptions.c:3832
msgid "Assumed document character set"
msgstr "Förvald dokumentteckenuppsättning"
@@ -4929,263 +4926,272 @@ msgstr "Förvald dokumentteckenuppsättning"
#. * we split the header to make it more readable:
#. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
#.
-#: src/LYOptions.c:3718
+#: src/LYOptions.c:3852
msgid "CJK mode"
msgstr "CJK-läge"
-#: src/LYOptions.c:3720
+#: src/LYOptions.c:3854
msgid "Raw 8-bit"
msgstr "Rå 8-bitars"
#. X Display: INPUT
-#: src/LYOptions.c:3728
+#: src/LYOptions.c:3862
msgid "X Display"
msgstr "X-display"
#.
#. * Document Appearance
#.
-#: src/LYOptions.c:3734
+#: src/LYOptions.c:3868
msgid "Document Appearance"
msgstr "Dokumentutseende"
-#: src/LYOptions.c:3740
+#: src/LYOptions.c:3874
msgid "Show color"
msgstr "Visa färg"
+#. Color style: ON/OFF
+#: src/LYOptions.c:3899
+msgid "Color style"
+msgstr "Färgstil"
+
+#: src/LYOptions.c:3908
+msgid "Default colors"
+msgstr "Förvalda färger"
+
#. Show cursor: ON/OFF
-#: src/LYOptions.c:3764
+#: src/LYOptions.c:3916
msgid "Show cursor"
msgstr "Visa markör"
#. Underline links: ON/OFF
-#: src/LYOptions.c:3770
+#: src/LYOptions.c:3922
msgid "Underline links"
msgstr "Stryk under länkar"
#. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3777
+#: src/LYOptions.c:3929
msgid "Show scrollbar"
msgstr "Visa rullningslist"
#. Select Popups: ON/OFF
-#: src/LYOptions.c:3784
+#: src/LYOptions.c:3936
msgid "Popups for select fields"
msgstr "Popup för valfält"
#. HTML error recovery: SELECT
-#: src/LYOptions.c:3790
+#: src/LYOptions.c:3942
msgid "HTML error recovery"
msgstr "HTML-felåterhämtning"
#. Bad HTML messages: SELECT
-#: src/LYOptions.c:3796
+#: src/LYOptions.c:3948
msgid "Bad HTML messages"
msgstr "Meddelanden om trasig HTML"
#. Show Images: SELECT
-#: src/LYOptions.c:3802
+#: src/LYOptions.c:3954
msgid "Show images"
msgstr "Visa bilder"
#. Verbose Images: ON/OFF
-#: src/LYOptions.c:3816
+#: src/LYOptions.c:3968
msgid "Verbose images"
msgstr "Pratsamma bilder"
#.
#. * Headers Transferred to Remote Servers
#.
-#: src/LYOptions.c:3824
+#: src/LYOptions.c:3976
msgid "Headers Transferred to Remote Servers"
msgstr "Frågehuvud överfört till fjärrservrar"
#. ***************************************************************
#. Mail Address: INPUT
-#: src/LYOptions.c:3828
+#: src/LYOptions.c:3980
msgid "Personal mail address"
msgstr "Egen e-postadress"
-#: src/LYOptions.c:3833
+#: src/LYOptions.c:3985
msgid "Personal name for mail"
msgstr "Eget namn för e-post"
-#: src/LYOptions.c:3840
+#: src/LYOptions.c:3992
msgid "Password for anonymous ftp"
msgstr "Lösenord för anonym ftp"
#. Preferred media type: SELECT
-#: src/LYOptions.c:3846
+#: src/LYOptions.c:3998
msgid "Preferred media type"
msgstr "Önskad mediatyp"
#. Preferred encoding: SELECT
-#: src/LYOptions.c:3852
+#: src/LYOptions.c:4004
msgid "Preferred encoding"
msgstr "Önskade kodningsform"
#. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3858
+#: src/LYOptions.c:4010
msgid "Preferred document character set"
msgstr "Önskad dokumentteckenuppsättning"
#. Preferred Document Language: INPUT
-#: src/LYOptions.c:3863
+#: src/LYOptions.c:4015
msgid "Preferred document language"
msgstr "Önskade dokumentspråk"
-#: src/LYOptions.c:3869
+#: src/LYOptions.c:4021
msgid "Send User-Agent header"
msgstr "Sänd webbläsaridentifiering"
-#: src/LYOptions.c:3871
+#: src/LYOptions.c:4023
msgid "User-Agent header"
msgstr "Webbläsaridentifiering"
#.
#. * Listing and Accessing Files
#.
-#: src/LYOptions.c:3879
+#: src/LYOptions.c:4031
msgid "Listing and Accessing Files"
msgstr "Visning av och åtkomst till filer"
#. FTP sort: SELECT
-#: src/LYOptions.c:3884
+#: src/LYOptions.c:4036
msgid "Use Passive FTP"
msgstr "Använd passiv ftp"
#. FTP sort: SELECT
-#: src/LYOptions.c:3890
+#: src/LYOptions.c:4042
msgid "FTP sort criteria"
msgstr "Sortering för ftp-kataloger"
#. Local Directory Sort: SELECT
-#: src/LYOptions.c:3898
+#: src/LYOptions.c:4050
msgid "Local directory sort criteria"
msgstr "Sortering för lokala kataloger"
#. Local Directory Order: SELECT
-#: src/LYOptions.c:3904
+#: src/LYOptions.c:4056
msgid "Local directory sort order"
msgstr "Sortering för lokala kataloger"
-#: src/LYOptions.c:3913
+#: src/LYOptions.c:4065
msgid "Show dot files"
msgstr "Visa punktfiler"
-#: src/LYOptions.c:3921
+#: src/LYOptions.c:4073
msgid "Execution links"
msgstr "Exekveringslänkar"
-#: src/LYOptions.c:3939
+#: src/LYOptions.c:4091
msgid "Pause when showing message"
msgstr "Pausa vid visning av meddelande"
#. Show transfer rate: SELECT
-#: src/LYOptions.c:3946
+#: src/LYOptions.c:4098
msgid "Show transfer rate"
msgstr "Visa överföringshastighet"
#.
#. * Special Files and Screens
#.
-#: src/LYOptions.c:3966
+#: src/LYOptions.c:4118
msgid "Special Files and Screens"
msgstr "Speciella filer och skärmar"
-#: src/LYOptions.c:3971
+#: src/LYOptions.c:4123
msgid "Multi-bookmarks"
msgstr "Multibokmärken"
-#: src/LYOptions.c:3979
+#: src/LYOptions.c:4131
msgid "Review/edit Bookmarks files"
msgstr "Se/ändra bokmärkesfiler"
-#: src/LYOptions.c:3982
+#: src/LYOptions.c:4134
msgid "Goto multi-bookmark menu"
msgstr "Gå till multibokmärkesmenyn"
-#: src/LYOptions.c:3984
+#: src/LYOptions.c:4136
msgid "Bookmarks file"
msgstr "Bokmärkesfil"
#. Auto Session: ON/OFF
-#: src/LYOptions.c:3991
+#: src/LYOptions.c:4143
msgid "Auto Session"
msgstr "Automatiskt arbetspass"
#. Session File Menu: INPUT
-#: src/LYOptions.c:3997
+#: src/LYOptions.c:4149
msgid "Session file"
msgstr "Arbetspassfil"
#. Visited Pages: SELECT
-#: src/LYOptions.c:4003
+#: src/LYOptions.c:4155
msgid "Visited Pages"
msgstr "Besökta sidor"
-#: src/LYOptions.c:4008
+#: src/LYOptions.c:4160
msgid "View the file "
msgstr "Visa filen "
-#: src/LYPrint.c:947
+#: src/LYPrint.c:955
#, c-format
msgid " Print job complete.\n"
msgstr " Utskriftsjobb färdigt.\n"
-#: src/LYPrint.c:1274
+#: src/LYPrint.c:1282
msgid "Document:"
msgstr "Dokument:"
-#: src/LYPrint.c:1275
+#: src/LYPrint.c:1283
msgid "Number of lines:"
msgstr "Antal länkar:"
-#: src/LYPrint.c:1276
+#: src/LYPrint.c:1284
msgid "Number of pages:"
msgstr "Antal sidor:"
-#: src/LYPrint.c:1277
+#: src/LYPrint.c:1285
msgid "pages"
msgstr "sidor"
-#: src/LYPrint.c:1277
+#: src/LYPrint.c:1285
msgid "page"
msgstr "sida"
-#: src/LYPrint.c:1278
+#: src/LYPrint.c:1286
msgid "(approximately)"
msgstr "(ungefär)"
-#: src/LYPrint.c:1285
+#: src/LYPrint.c:1293
msgid "Some print functions have been disabled!"
msgstr "Vissa utskriftsfunktioner har deaktiverats!"
-#: src/LYPrint.c:1289
+#: src/LYPrint.c:1297
msgid "Standard print options:"
msgstr "Fördefinierade utskriftsalternativ:"
-#: src/LYPrint.c:1290
+#: src/LYPrint.c:1298
msgid "Print options:"
msgstr "Utskriftsalternativ"
-#: src/LYPrint.c:1297
+#: src/LYPrint.c:1305
msgid "Save to a local file"
msgstr "Spara som lokal fil"
-#: src/LYPrint.c:1299
+#: src/LYPrint.c:1307
msgid "Save to disk disabled"
msgstr "\"Spara på disk\" deaktiverad"
-#: src/LYPrint.c:1306
+#: src/LYPrint.c:1314
msgid "Mail the file"
msgstr "Sänd filer per e-post"
-#: src/LYPrint.c:1313
+#: src/LYPrint.c:1321
msgid "Print to the screen"
msgstr "Skriv ut på skärmen"
-#: src/LYPrint.c:1318
+#: src/LYPrint.c:1326
msgid "Print out on a printer attached to your vt100 terminal"
msgstr "Skriv ut på en skrivare ansluten till din vt100-terminal"
@@ -5210,291 +5216,291 @@ msgstr ""
msgid "Offending line:"
msgstr "Felaktig rad:"
-#: src/LYReadCFG.c:757
+#: src/LYReadCFG.c:769
#, c-format
msgid "key remapping of %s to %s for %s failed\n"
msgstr "tangentomdefiniering av %s till %s för %s misslyckades\n"
-#: src/LYReadCFG.c:764
+#: src/LYReadCFG.c:776
#, c-format
msgid "key remapping of %s to %s failed\n"
msgstr "tangentomdefiniering av %s till %s misslyckades\n"
-#: src/LYReadCFG.c:785
+#: src/LYReadCFG.c:797
#, c-format
msgid "invalid line-editor selection %s for key %s, selecting all\n"
msgstr "ogiltig radredigeringsval %s för tangent %s, väljer alla\n"
-#: src/LYReadCFG.c:810 src/LYReadCFG.c:822
+#: src/LYReadCFG.c:822 src/LYReadCFG.c:834
#, c-format
msgid "setting of line-editor binding for key %s (0x%x) to 0x%x for %s failed\n"
msgstr "inställning av radredigeringsdefinition för tangent %s (0x%x) till 0x%x för %s misslyckades\n"
-#: src/LYReadCFG.c:826
+#: src/LYReadCFG.c:838
#, c-format
msgid "setting of line-editor binding for key %s (0x%x) for %s failed\n"
msgstr "inställning av radredigeringsdefinition för tangent %s (0x%x) för %s misslyckades\n"
-#: src/LYReadCFG.c:922
+#: src/LYReadCFG.c:934
#, c-format
msgid "Lynx: cannot start, CERN rules file %s is not available\n"
msgstr "Lynx: kan inte börja, CERN-regelfilen %s ej tillgänglig\n"
-#: src/LYReadCFG.c:923
+#: src/LYReadCFG.c:935
msgid "(no name)"
msgstr "(inget namn)"
-#: src/LYReadCFG.c:2044
+#: src/LYReadCFG.c:2073
#, c-format
msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
msgstr "Mer än %d staplade lynx.cfg-inkluderingar -- kanske en slinga?!?\n"
-#: src/LYReadCFG.c:2046
+#: src/LYReadCFG.c:2075
#, c-format
msgid "Last attempted include was '%s',\n"
msgstr "Sista försökta inkludering var \"%s\",\n"
-#: src/LYReadCFG.c:2047
+#: src/LYReadCFG.c:2076
#, c-format
msgid "included from '%s'.\n"
msgstr "inkluderad från \"%s\".\n"
-#: src/LYReadCFG.c:2450 src/LYReadCFG.c:2463 src/LYReadCFG.c:2521
+#: src/LYReadCFG.c:2479 src/LYReadCFG.c:2492 src/LYReadCFG.c:2550
msgid "The following is read from your lynx.cfg file."
msgstr "Följande läses från din lynx.cfg-fil."
-#: src/LYReadCFG.c:2451 src/LYReadCFG.c:2464
+#: src/LYReadCFG.c:2480 src/LYReadCFG.c:2493
msgid "Please read the distribution"
msgstr "Se distributionens"
-#: src/LYReadCFG.c:2457 src/LYReadCFG.c:2467
+#: src/LYReadCFG.c:2486 src/LYReadCFG.c:2496
msgid "for more comments."
msgstr "för ytterligare kommentarer."
-#: src/LYReadCFG.c:2503
+#: src/LYReadCFG.c:2532
msgid "RELOAD THE CHANGES"
msgstr "HÄMTA OM ÄNDRINGARNA"
-#: src/LYReadCFG.c:2511
+#: src/LYReadCFG.c:2540
msgid "Your primary configuration"
msgstr "Din primära konfiguration"
-#: src/LYShowInfo.c:177
+#: src/LYShowInfo.c:111
+msgid "URL:"
+msgstr "Adress:"
+
+#: src/LYShowInfo.c:196
msgid "Directory that you are currently viewing"
msgstr "Visad katalog"
-#: src/LYShowInfo.c:180
+#: src/LYShowInfo.c:199
msgid "Name:"
msgstr "Namn:"
-#: src/LYShowInfo.c:183
-msgid "URL:"
-msgstr "Adress:"
-
-#: src/LYShowInfo.c:197
+#: src/LYShowInfo.c:216
msgid "Directory that you have currently selected"
msgstr "Markerade kataloger"
-#: src/LYShowInfo.c:199
+#: src/LYShowInfo.c:218
msgid "File that you have currently selected"
msgstr "Markerade filer"
-#: src/LYShowInfo.c:202
+#: src/LYShowInfo.c:221
msgid "Symbolic link that you have currently selected"
msgstr "Markerade symboliska länkar"
-#: src/LYShowInfo.c:205
+#: src/LYShowInfo.c:224
msgid "Item that you have currently selected"
msgstr "Markerade poster"
-#: src/LYShowInfo.c:207
+#: src/LYShowInfo.c:226
msgid "Full name:"
msgstr "Fullt namn:"
-#: src/LYShowInfo.c:217
+#: src/LYShowInfo.c:239
msgid "Unable to follow link"
msgstr "Kan inte följa länk"
-#: src/LYShowInfo.c:219
+#: src/LYShowInfo.c:241
msgid "Points to file:"
msgstr "Pekar på fil:"
-#: src/LYShowInfo.c:224
+#: src/LYShowInfo.c:246
msgid "Name of owner:"
msgstr "Namn på ägare:"
-#: src/LYShowInfo.c:227
+#: src/LYShowInfo.c:249
msgid "Group name:"
msgstr "Gruppnamn:"
-#: src/LYShowInfo.c:229
+#: src/LYShowInfo.c:251
msgid "File size:"
msgstr "Filstorlek:"
-#: src/LYShowInfo.c:231
+#: src/LYShowInfo.c:253
msgid "(bytes)"
msgstr "(byte)"
#.
#. * Include date and time information.
#.
-#: src/LYShowInfo.c:236
+#: src/LYShowInfo.c:258
msgid "Creation date:"
msgstr "Skapad den:"
-#: src/LYShowInfo.c:239
+#: src/LYShowInfo.c:261
msgid "Last modified:"
msgstr "Senast ändrad:"
-#: src/LYShowInfo.c:242
+#: src/LYShowInfo.c:264
msgid "Last accessed:"
msgstr "Senast åtkommen:"
-#: src/LYShowInfo.c:248
+#: src/LYShowInfo.c:270
msgid "Access Permissions"
msgstr "Åtkomstbehörighet"
-#: src/LYShowInfo.c:283
+#: src/LYShowInfo.c:305
msgid "Group:"
msgstr "Grupp:"
-#: src/LYShowInfo.c:303
+#: src/LYShowInfo.c:325
msgid "World:"
msgstr "Övriga:"
-#: src/LYShowInfo.c:310
+#: src/LYShowInfo.c:332
msgid "File that you are currently viewing"
msgstr "Visad fil"
-#: src/LYShowInfo.c:318 src/LYShowInfo.c:422
+#: src/LYShowInfo.c:340 src/LYShowInfo.c:444
msgid "Linkname:"
msgstr "Länknamn:"
-#: src/LYShowInfo.c:324 src/LYShowInfo.c:339
+#: src/LYShowInfo.c:346 src/LYShowInfo.c:361
msgid "Charset:"
msgstr "Teckenuppsättning:"
-#: src/LYShowInfo.c:338
+#: src/LYShowInfo.c:360
msgid "(assumed)"
msgstr "(antogs)"
-#: src/LYShowInfo.c:345
+#: src/LYShowInfo.c:367
msgid "Server:"
msgstr "Server:"
-#: src/LYShowInfo.c:348
+#: src/LYShowInfo.c:370
msgid "Date:"
msgstr "Datum:"
-#: src/LYShowInfo.c:351
+#: src/LYShowInfo.c:373
msgid "Last Mod:"
msgstr "Senaste ändring:"
-#: src/LYShowInfo.c:356
+#: src/LYShowInfo.c:378
msgid "Expires:"
msgstr "Utgår:"
-#: src/LYShowInfo.c:359
+#: src/LYShowInfo.c:381
msgid "Cache-Control:"
msgstr "Cachekontroll:"
-#: src/LYShowInfo.c:362
+#: src/LYShowInfo.c:384
msgid "Content-Length:"
msgstr "Datalängd:"
-#: src/LYShowInfo.c:366
+#: src/LYShowInfo.c:388
msgid "Length:"
msgstr "Längd:"
-#: src/LYShowInfo.c:371
+#: src/LYShowInfo.c:393
msgid "Language:"
msgstr "Språk:"
-#: src/LYShowInfo.c:378
+#: src/LYShowInfo.c:400
msgid "Post Data:"
msgstr "\"POST\"-data:"
-#: src/LYShowInfo.c:381
+#: src/LYShowInfo.c:403
msgid "Post Content Type:"
msgstr "\"POST\"-datatyp:"
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:406
msgid "Owner(s):"
msgstr "Ägare:"
-#: src/LYShowInfo.c:389
+#: src/LYShowInfo.c:411
msgid "size:"
msgstr "storlek:"
-#: src/LYShowInfo.c:391
+#: src/LYShowInfo.c:413
msgid "lines"
msgstr "rader"
-#: src/LYShowInfo.c:395
+#: src/LYShowInfo.c:417
msgid "forms mode"
msgstr "formulärläge"
-#: src/LYShowInfo.c:397
+#: src/LYShowInfo.c:419
msgid "source"
msgstr "källkod"
-#: src/LYShowInfo.c:398
+#: src/LYShowInfo.c:420
msgid "normal"
msgstr "normal"
-#: src/LYShowInfo.c:400
+#: src/LYShowInfo.c:422
msgid ", safe"
msgstr ", säker"
-#: src/LYShowInfo.c:402
+#: src/LYShowInfo.c:424
msgid ", via internal link"
msgstr ", via intern länk"
-#: src/LYShowInfo.c:407
+#: src/LYShowInfo.c:429
msgid ", no-cache"
msgstr ", ingen cache"
-#: src/LYShowInfo.c:409
+#: src/LYShowInfo.c:431
msgid ", ISMAP script"
msgstr ", ISMAP-skript"
-#: src/LYShowInfo.c:411
+#: src/LYShowInfo.c:433
msgid ", bookmark file"
msgstr ", bokmärkesfil"
-#: src/LYShowInfo.c:415
+#: src/LYShowInfo.c:437
msgid "mode:"
msgstr "läge:"
-#: src/LYShowInfo.c:421
+#: src/LYShowInfo.c:443
msgid "Link that you currently have selected"
msgstr "Markerad länk"
-#: src/LYShowInfo.c:430
+#: src/LYShowInfo.c:452
msgid "Method:"
msgstr "Metod:"
-#: src/LYShowInfo.c:434
+#: src/LYShowInfo.c:456
msgid "Enctype:"
msgstr "Kodningstyp:"
-#: src/LYShowInfo.c:440
+#: src/LYShowInfo.c:462
msgid "Action:"
msgstr "Åtgärd:"
-#: src/LYShowInfo.c:446
+#: src/LYShowInfo.c:468
msgid "(Form field)"
msgstr "(Formulärfält)"
-#: src/LYShowInfo.c:457
+#: src/LYShowInfo.c:478
msgid "No Links on the current page"
msgstr "Ingen länk på aktuell sida"
-#: src/LYShowInfo.c:463
+#: src/LYShowInfo.c:484
msgid "Server Headers:"
msgstr "Serverhuvuden:"
-#: src/LYStyle.c:331
+#: src/LYStyle.c:338
#, c-format
msgid ""
"Syntax Error parsing style in lss file:\n"
@@ -5511,6 +5517,17 @@ msgstr ""
"där OBJEKT är en av EM,STRONG,B,I,U,BLINK etc.\n"
"\n"
+#: src/LYStyle.c:933
+#, c-format
+msgid ""
+"\n"
+"Lynx file \"%s\" is not available.\n"
+"\n"
+msgstr ""
+"\n"
+"Lynxfilen \"%s\" ej tillgänglig.\n"
+"\n"
+
#: src/LYTraversal.c:111
msgid "here is a list of the history stack so that you may rebuild"
msgstr "här finns en lista över historikstacken så att du kan bygga om"
@@ -5535,41 +5552,41 @@ msgstr "Ogiltig omdirigering med \"~\" hittad! Begäran ignorerad."
msgid "Unable to upload file."
msgstr "Kan inte skicka fil."
-#: src/LYUpload.c:199
+#: src/LYUpload.c:196
msgid "Upload To:"
msgstr "Skicka till:"
-#: src/LYUpload.c:200
+#: src/LYUpload.c:197
msgid "Upload options:"
msgstr "Insändningsalternativ:"
-#: src/LYUtils.c:1883
+#: src/LYUtils.c:1919
msgid "Download document URL put to clipboard."
msgstr "Adress till hämtat dokument lagt i urklipp."
-#: src/LYUtils.c:2668
+#: src/LYUtils.c:2666
msgid "Unexpected access protocol for this URL scheme."
msgstr "Oväntat åtkomstprotokoll för denna adresstyp."
-#: src/LYUtils.c:3492
+#: src/LYUtils.c:3571
msgid "Too many tempfiles"
msgstr "För många temporärfiler"
-#: src/LYUtils.c:3792
+#: src/LYUtils.c:3871
msgid "unknown restriction"
msgstr "okänd begränsning"
-#: src/LYUtils.c:3823
+#: src/LYUtils.c:3902
#, c-format
msgid "No restrictions set.\n"
msgstr "Inga begränsningar satta.\n"
-#: src/LYUtils.c:3826
+#: src/LYUtils.c:3905
#, c-format
msgid "Restrictions set:\n"
msgstr "Satta begränsningar:\n"
-#: src/LYUtils.c:5212
+#: src/LYUtils.c:5279
msgid "Cannot find HOME directory"
msgstr "Hittar inte hemkatalogen (HOME)"
@@ -5577,7 +5594,7 @@ msgstr "Hittar inte hemkatalogen (HOME)"
msgid "Normally disabled. See ENABLE_LYNXRC in lynx.cfg\n"
msgstr "Vanligtvis avstängd. Se ENABLE_LYNXRC i lynx.cfg\n"
-#: src/LYrcFile.c:325
+#: src/LYrcFile.c:327
msgid ""
"accept_all_cookies allows the user to tell Lynx to automatically\n"
"accept all cookies if desired. The default is \"FALSE\" which will\n"
@@ -5589,7 +5606,7 @@ msgstr ""
"varje kaka. Sätt accept_all_cookies till \"TRUE\" för att acceptera\n"
"alla kakor.\n"
-#: src/LYrcFile.c:333
+#: src/LYrcFile.c:335
msgid ""
"anonftp_password allows the user to tell Lynx to use the personal\n"
"email address as the password for anonymous ftp. If no value is given,\n"
@@ -5601,7 +5618,7 @@ msgstr ""
"kommer Lynx använda den personliga e-postadressen. Sätt anonftp_password\n"
"till ett annat värde om du vill välja.\n"
-#: src/LYrcFile.c:342
+#: src/LYrcFile.c:344
msgid ""
"bookmark_file specifies the name and location of the default bookmark\n"
"file into which the user can paste links for easy access at a later\n"
@@ -5610,7 +5627,7 @@ msgstr ""
"bookmark_file anger namn och plats för standardbokmärkesfilen, i vilken\n"
"användaren kan klistra in länkar för att lätt komma åt dem senare.\n"
-#: src/LYrcFile.c:347
+#: src/LYrcFile.c:349
msgid ""
"If case_sensitive_searching is \"on\" then when the user invokes a search\n"
"using the 's' or '/' keys, the search performed will be case sensitive\n"
@@ -5620,7 +5637,7 @@ msgstr ""
"med \"s\" eller \"/\" kommer sökningen som genomförs att göra skillnad på\n"
"gemener och versaler. Förvalet är normalt sett av (\"off\").\n"
-#: src/LYrcFile.c:352
+#: src/LYrcFile.c:354
msgid ""
"The character_set definition controls the representation of 8 bit\n"
"characters for your terminal. If 8 bit characters do not show up\n"
@@ -5634,7 +5651,7 @@ msgstr ""
"använda sjubitarstolkningarna.\n"
"Giltiga teckenuppsättningar är:\n"
-#: src/LYrcFile.c:359
+#: src/LYrcFile.c:361
msgid ""
"cookie_accept_domains and cookie_reject_domains are comma-delimited\n"
"lists of domains from which Lynx should automatically accept or reject\n"
@@ -5648,7 +5665,7 @@ msgstr ""
"att gå före. Flaggan accept_all_cookies går före alla inställningar\n"
"som görs här.\n"
-#: src/LYrcFile.c:367
+#: src/LYrcFile.c:369
msgid ""
"cookie_file specifies the file from which to read persistent cookies.\n"
"The default is ~/"
@@ -5656,7 +5673,7 @@ msgstr ""
"cookie_file anger filen som varaktiga kakor skall läsas från.\n"
"Förval är ~/"
-#: src/LYrcFile.c:372
+#: src/LYrcFile.c:374
msgid ""
"cookie_loose_invalid_domains, cookie_strict_invalid_domains, and\n"
"cookie_query_invalid_domains are comma-delimited lists of which domains\n"
@@ -5674,7 +5691,7 @@ msgstr ""
"sökväg- eller domänattribut. Alla domäner får som förval frågor till\n"
"användaren för felaktiga sökvägar eller domäner.\n"
-#: src/LYrcFile.c:386
+#: src/LYrcFile.c:388
msgid ""
"dir_list_order specifies the directory list order under DIRED_SUPPORT\n"
"(if implemented). The default is \"ORDER_BY_NAME\"\n"
@@ -5682,7 +5699,7 @@ msgstr ""
"dir_list_order anger kataloglistesortering i DIRED_SUPPORT (om det är\n"
"implementerat). Förvalet är \"ORDER_BY_NAME\"\n"
-#: src/LYrcFile.c:391
+#: src/LYrcFile.c:393
msgid ""
"dir_list_styles specifies the directory list style under DIRED_SUPPORT\n"
"(if implemented). The default is \"MIXED_STYLE\", which sorts both\n"
@@ -5691,22 +5708,22 @@ msgid ""
msgstr ""
"dir_list_styles anger kataloglistestil i DIRED_SUPPORT (om det är\n"
"implementerat). Förvalet är \"MIXED_STYLE\", vilket sorterar filer\n"
-"och kataloger tillsammanns. \"FILES_FIRST\" listar filer först, och\n"
+"och kataloger tillsammans. \"FILES_FIRST\" listar filer först, och\n"
"\"DIRECTORIES_FIRST\" listar kataloger först.\n"
-#: src/LYrcFile.c:399
+#: src/LYrcFile.c:401
msgid ""
"If emacs_keys is to \"on\" then the normal EMACS movement keys:\n"
" ^N = down ^P = up\n"
" ^B = left ^F = right\n"
"will be enabled.\n"
msgstr ""
-"Om emacs_keys sätts till \"on\" kommer EMACS-förflyttningstangeter att\n"
+"Om emacs_keys sätts till \"on\" kommer EMACS-förflyttningstangenter att\n"
"aktiveras:\n"
" ^N = ned ^P = upp\n"
" ^B = vänster ^F = höger\n"
-#: src/LYrcFile.c:405
+#: src/LYrcFile.c:407
msgid ""
"file_editor specifies the editor to be invoked when editing local files\n"
"or sending mail. If no editor is specified, then file editing is disabled\n"
@@ -5718,7 +5735,7 @@ msgstr ""
"filredigering, såvida det inte aktiveras från kommandoraden, och den inbyggda\n"
"radredigeraren används för e-post.\n"
-#: src/LYrcFile.c:412
+#: src/LYrcFile.c:414
msgid ""
"The file_sorting_method specifies which value to sort on when viewing\n"
"file lists such as FTP directories. The options are:\n"
@@ -5734,7 +5751,7 @@ msgstr ""
" BY_SIZE -- sorterar efter filstorlek\n"
" BY_DATE -- sorterar efter fildatum\n"
-#: src/LYrcFile.c:435
+#: src/LYrcFile.c:437
msgid ""
"lineedit_mode specifies the key binding used for inputting strings in\n"
"prompts and forms. If lineedit_mode is set to \"Default Binding\" then\n"
@@ -5760,7 +5777,7 @@ msgstr ""
" Radera ord: ^B ^F ^E = Radslut\n"
"\n"
-#: src/LYrcFile.c:453
+#: src/LYrcFile.c:455
msgid ""
"The following allow you to define sub-bookmark files and descriptions.\n"
"The format is multi_bookmark<capital_letter>=<filename>,<description>\n"
@@ -5773,7 +5790,7 @@ msgstr ""
"Upp till 26 bokmärkesfiler (de stora bokstäverna A-Z) tillåts.\n"
"Vi börjar med \"multi_bookmarkB\" eftersom \"A\" är förvalet (se ovan).\n"
-#: src/LYrcFile.c:459
+#: src/LYrcFile.c:461
msgid ""
"personal_mail_address specifies your personal mail address. The\n"
"address will be sent during HTTP file transfers for authorization and\n"
@@ -5783,7 +5800,7 @@ msgid ""
"could leave this field blank, but then you won't have it included in\n"
"your mailed comments.\n"
msgstr ""
-"personal_mail_address anger din personliga e-postaderss. Adressen\n"
+"personal_mail_address anger din personliga e-postadress. Adressen\n"
"sänds under HTTP-filöverföringar för auktoriserings- och\n"
"loggningsändamål, samt för att sända kommentarer per e-post\n"
"Om du inte vill att denna information skall sändas, sätt NO_FROM_HEADER\n"
@@ -5791,7 +5808,7 @@ msgstr ""
"även lämna detta fält blankt, men då inkluderas det inte i kommentarer\n"
"du sänder.\n"
-#: src/LYrcFile.c:468
+#: src/LYrcFile.c:470
msgid ""
"personal_mail_name specifies your personal name, for mail. The\n"
"name is sent for mailed comments. Lynx will prompt for this,\n"
@@ -5811,7 +5828,7 @@ msgstr ""
"sidoeffekt av att sända e-post. För att ändra standardvärdet måste\n"
"du använda inställningsmenyn, eller redigera den här filen direkt.\n"
-#: src/LYrcFile.c:478
+#: src/LYrcFile.c:480
msgid ""
"preferred_charset specifies the character set in MIME notation (e.g.,\n"
"ISO-8859-2, ISO-8859-5) which Lynx will indicate you prefer in requests\n"
@@ -5838,7 +5855,7 @@ msgstr ""
"servern sända ett felmeddelande, även om det är tillåtet att sända även\n"
"ett icke-acceptabelt svar.\n"
-#: src/LYrcFile.c:494
+#: src/LYrcFile.c:496
msgid ""
"preferred_language specifies the language in MIME notation (e.g., en,\n"
"fr, may be a comma-separated list in decreasing preference)\n"
@@ -5852,7 +5869,7 @@ msgstr ""
"Om en fil i det språket finns att tillgå kommer servern sända den.\n"
"Annars kommer servern sända filen i sitt standardspråk.\n"
-#: src/LYrcFile.c:505
+#: src/LYrcFile.c:507
msgid ""
"If run_all_execution_links is set \"on\" then all local execution links\n"
"will be executed when they are selected.\n"
@@ -5874,7 +5891,7 @@ msgstr ""
" Detta bör endast aktiveras (\"on\") om du visar information från\n"
" tillförlitliga källor.\n"
-#: src/LYrcFile.c:516
+#: src/LYrcFile.c:518
msgid ""
"If run_execution_links_on_local_files is set \"on\" then all local\n"
"execution links that are found in LOCAL files will be executed when they\n"
@@ -5902,7 +5919,7 @@ msgstr ""
" Detta bör endast aktiveras (\"on\") om du visar information från\n"
" tillförlitliga källor.\n"
-#: src/LYrcFile.c:534
+#: src/LYrcFile.c:536
msgid ""
"select_popups specifies whether the OPTIONs in a SELECT block which\n"
"lacks a MULTIPLE attribute are presented as a vertical list of radio\n"
@@ -5914,13 +5931,13 @@ msgid ""
msgstr ""
"select_popups anger huruvida OPTION i ett SELECT-block som saknar\n"
"MULTIPLE-attribut skall visas som en vertikal lista med radioknappar\n"
-"eller via en popupmuni. Observera att om MULTIPLE-attributet finns i\n"
+"eller via en popupmeny. Observera att om MULTIPLE-attributet finns i\n"
"SELECT-märket kommer Lynx alltid skapa en vertikal lista med kryssrutor\n"
"för varje OPTION. Värdet \"on\" skapar som förval popupmenyer, medan\n"
"värdet \"off\" väljer radioknappar. Förvalet kan gås förbi via\n"
"kommandoradsflaggan -popup.\n"
-#: src/LYrcFile.c:545
+#: src/LYrcFile.c:547
msgid ""
"show_color specifies how to set the color mode at startup. A value of\n"
"\"never\" will force color mode off (treat the terminal as monochrome)\n"
@@ -5953,7 +5970,7 @@ msgstr ""
"alternativmenyn. Om alternativen sparas kommer inställningarna \"on\" och\n"
"\"off\" att tolkas som \"default\".\n"
-#: src/LYrcFile.c:562
+#: src/LYrcFile.c:564
msgid ""
"show_cursor specifies whether to 'hide' the cursor to the right (and\n"
"bottom, if possible) of the screen, or to place it to the left of the\n"
@@ -5974,7 +5991,7 @@ msgstr ""
"\"on\" placerar markören till vänster som förval, medan \"off\" \"gömmer\"\n"
"markören. Förvalet kan gås förbi via kommandoradsflaggan -show_cursor.\n"
-#: src/LYrcFile.c:573
+#: src/LYrcFile.c:575
msgid ""
"show_dotfiles specifies that the directory listing should include\n"
"\"hidden\" (dot) files/directories. If set \"on\", this will be\n"
@@ -5989,7 +6006,7 @@ msgstr ""
"filer är deaktiverat kommer skapandet av sådana filer via Lynx\n"
"också att deaktiveras.\n"
-#: src/LYrcFile.c:584
+#: src/LYrcFile.c:586
msgid ""
"If sub_bookmarks is not turned \"off\", and multiple bookmarks have\n"
"been defined (see below), then all bookmark operations will first\n"
@@ -6011,7 +6028,7 @@ msgstr ""
"mellannivåer. Om detta alternativ sätts till \"standard\" visas menyn\n"
"oavsett användarläge.\n"
-#: src/LYrcFile.c:598
+#: src/LYrcFile.c:600
msgid ""
"user_mode specifies the users level of knowledge with Lynx. The\n"
"default is \"NOVICE\" which displays two extra lines of help at the\n"
@@ -6027,7 +6044,7 @@ msgstr ""
"stänga av extrainformationen. Använd \"ADVANCED\" för att se adressen\n"
"för den markerade länken nederst på skärmen.\n"
-#: src/LYrcFile.c:607
+#: src/LYrcFile.c:609
msgid ""
"If verbose_images is \"on\", lynx will print the name of the image\n"
"source file in place of [INLINE], [LINK] or [IMAGE]\n"
@@ -6037,7 +6054,7 @@ msgstr ""
"istället för [INLINE], [LINK] eller [IMAGE]\n"
"Se även VERBOSE_IMAGES i lynx.cfg\n"
-#: src/LYrcFile.c:612
+#: src/LYrcFile.c:614
msgid ""
"If vi_keys is set to \"on\", then the normal VI movement keys:\n"
" j = down k = up\n"
@@ -6046,14 +6063,14 @@ msgid ""
"Capital 'H', 'J' and 'K will still activate help, jump shortcuts,\n"
"and the keymap display, respectively.\n"
msgstr ""
-"Om vi_keys sätts till \"on\" kommer VI-förflyttningstangeter att aktiveras:\n"
+"Om vi_keys sätts till \"on\" kommer VI-förflyttningstangenter att aktiveras:\n"
" j = ned k = upp\n"
" h = vänster l = höger\n"
"Dessa tangenter gäller bara som gemener.\n"
-"Versala \"H\", \"J\" och \"K\" aktiverar hjälp, hoppgenvägar respektiva\n"
+"Versala \"H\", \"J\" och \"K\" aktiverar hjälp, hoppgenvägar respektive\n"
"tangentbordsinställningarna.\n"
-#: src/LYrcFile.c:620
+#: src/LYrcFile.c:622
msgid ""
"The visited_links setting controls how Lynx organizes the information\n"
"in the Visited Links Page.\n"
@@ -6061,7 +6078,7 @@ msgstr ""
"Inställningen visited_links anger hur Lynx organiserar informationen\n"
"på sidan Använda länkar.\n"
-#: src/LYrcFile.c:845
+#: src/LYrcFile.c:861
msgid ""
"If keypad_mode is set to \"NUMBERS_AS_ARROWS\", then the numbers on\n"
"your keypad when the numlock is on will act as arrow keys:\n"
@@ -6072,14 +6089,14 @@ msgid ""
"regardless of whether numlock is on.\n"
msgstr ""
"Om keypad_mode sätts till \"NUMBERS_AS_ARROWS\" fungerar siffrorna på\n"
-"ditt numeriska tangentbord som piltangeter när NumLock är aktivt:\n"
-" 8 = Upppil\n"
+"ditt numeriska tangentbord som piltangenter när NumLock är aktivt:\n"
+" 8 = Upp-pil\n"
" 4 = Vänsterpil 6 = Högerpil\n"
" 2 = Nedpil\n"
"och motsvarande siffertangenter på tangentbordet fungerar som\n"
-"piltangetner, oavsett om NumLock är aktivt eller inte.\n"
+"piltangenter, oavsett om NumLock är aktivt eller inte.\n"
-#: src/LYrcFile.c:854
+#: src/LYrcFile.c:870
msgid ""
"If keypad_mode is set to \"LINKS_ARE_NUMBERED\", then numbers will\n"
"appear next to each link and numbers are used to select links.\n"
@@ -6087,7 +6104,7 @@ msgstr ""
"Om keypad_mode sätts till \"LINKS_ARE_NUMBERED\" kommer siffror\n"
"att visas vid varje länk, och siffror används för att välja länk.\n"
-#: src/LYrcFile.c:858
+#: src/LYrcFile.c:874
msgid ""
"If keypad_mode is set to \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\", then\n"
"numbers will appear next to each link and visible form input field.\n"
@@ -6106,7 +6123,7 @@ msgstr ""
"alternativet inte är synligt på skärmen. Referenslistor och utdata från\n"
"listkommandot kommer även de att numrera formulärindatafält.\n"
-#: src/LYrcFile.c:867
+#: src/LYrcFile.c:883
msgid ""
"NOTE: Some fixed format documents may look disfigured when\n"
"\"LINKS_ARE_NUMBERED\" or \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" are\n"
@@ -6116,7 +6133,7 @@ msgstr ""
"\"LINKS_ARE_NUMBERED\" eller \"LINKS_AND_FORM_FILES_ARE_NUMBERED\" är\n"
"aktiva.\n"
-#: src/LYrcFile.c:899
+#: src/LYrcFile.c:915
msgid ""
"Lynx User Defaults File\n"
"\n"
@@ -6124,7 +6141,7 @@ msgstr ""
"Standardanvändarinställningsfil för Lynx\n"
"\n"
-#: src/LYrcFile.c:908
+#: src/LYrcFile.c:924
msgid ""
"This file contains options saved from the Lynx Options Screen (normally\n"
"with the 'o' key). To save options with that screen, you must select the\n"
@@ -6134,7 +6151,7 @@ msgstr ""
"(vanligtvis med knappen \"o\"). För att spara inställningar därifrån måste\n"
"du markera kryssrutan:\n"
-#: src/LYrcFile.c:915
+#: src/LYrcFile.c:931
msgid ""
"You must then save the settings using the link on the line above the\n"
"checkbox:\n"
@@ -6142,7 +6159,7 @@ msgstr ""
"Du måste sedan spara inställningarna med hjälp av länken på raden\n"
"ovanför kryssrutan:\n"
-#: src/LYrcFile.c:922
+#: src/LYrcFile.c:938
msgid ""
"You may also use the command-line option \"-forms_options\", which displays\n"
"the simpler Options Menu instead. Save options with that using the '>' key.\n"
@@ -6153,7 +6170,7 @@ msgstr ""
"knappen \">\".\n"
"\n"
-#: src/LYrcFile.c:929
+#: src/LYrcFile.c:945
msgid ""
"This file contains options saved from the Lynx Options Screen (normally\n"
"with the '>' key).\n"
@@ -6163,7 +6180,7 @@ msgstr ""
"(normalt med \">\"-knappen).\n"
"\n"
-#: src/LYrcFile.c:936
+#: src/LYrcFile.c:952
msgid ""
"There is normally no need to edit this file manually, since the defaults\n"
"here can be controlled from the Options Screen, and the next time options\n"
@@ -6183,6 +6200,15 @@ msgstr ""
"\"lynx.cfg\". Den har ett annat innehåll och ett annat format.\n"
"Det är inte den här filen.\n"
+#~ msgid ""
+#~ "\n"
+#~ "Lynx edit map not declared.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Lynxredigeringskarta ej deklarerad.\n"
+#~ "\n"
+
#~ msgid "Very long lines have been wrapped!"
#~ msgstr "Mycket långa rader har ombrutits!"
diff --git a/samples/lynx-demo.cfg b/samples/lynx-demo.cfg
index d07db76..5bd20dc 100644
--- a/samples/lynx-demo.cfg
+++ b/samples/lynx-demo.cfg
@@ -2,7 +2,7 @@
STARTFILE:file://localhost/~/home.htm
HELPFILE:file://localhost/~/help/lynx_help_main.html.gz
-DEFAULT_INDEX_FILE:http://lynx.isc.org/
+DEFAULT_INDEX_FILE:http://lynx.invisible-island.net/
CHARACTER_SET:cp850
ASSUME_CHARSET:utf-8
FORCE_SSL_COOKIES_SECURE:TRUE
diff --git a/samples/lynx_bookmarks.htm b/samples/lynx_bookmarks.htm
index acfa3c7..567f7d8 100644
--- a/samples/lynx_bookmarks.htm
+++ b/samples/lynx_bookmarks.htm
@@ -4,10 +4,10 @@
</head>
You can delete links by the 'R' key<br>
<ol>
-<li><a href="http://lynx.isc.org/release/">Lynx homepage</a>
+<li><a href="http://lynx.invisible-island.net/">Lynx homepage</a>
<li><a href="http://home.pacific.net.sg/~kennethkwok/lynx/">Lynx Browser for Windows 9x/NT/2000/XP</a>
<li><a href="http://www.fdisk.com/doslynx/lynxport.htm">Lynx for DOS 386 and Win32</a>
<li><a href="http://www.chass.utoronto.ca/~purslow/lhfb.html">Lynx Help for Beginners</a>
<li><a href="http://www.hicom.net/~oedipus/weave.html">HTML Authoring and Accessibility Resources for Lynx</a>
<li><a href="http://perso.club-internet.fr/dominique.guebey/tekno/lynx.htm">La page navigateur LYNX</a>
-<li><a href="http://lynx.isc.org/release/">Current Lynx Release</a>
+<li><a href="http://lynx.invisible-island.net/release/">Current Lynx Release</a>
diff --git a/scripts/cfg_edit.sh b/scripts/cfg_edit.sh
index 6206c6c..99f00be 100755
--- a/scripts/cfg_edit.sh
+++ b/scripts/cfg_edit.sh
@@ -7,7 +7,7 @@
# Append a '=' if none present'
# Break into two strings at '='
# Prefix ' { "' and suffix '" },'
-sort |
+LC_ALL=C sort |
sed -e 's!^[ ]*!!' -e 's![ ]*$!!' \
-e 's!\\!\\\\!g' \
-e 's!"!\\"!g' \
diff --git a/src/GridText.c b/src/GridText.c
index b05aaf2..810a38d 100644
--- a/src/GridText.c
+++ b/src/GridText.c
@@ -1,5 +1,5 @@
/*
- * $LynxId: GridText.c,v 1.286 2014/12/16 01:23:52 tom Exp $
+ * $LynxId: GridText.c,v 1.287 2015/12/16 01:20:01 tom Exp $
*
* Character grid hypertext object
* ===============================
@@ -8226,7 +8226,6 @@ void print_wwwfile_to_fd(FILE *fp,
if (off2 >= 0 && off2 < cur->length) {
temp_ptr = &(cur->value[off2]);
- temp_len = 1;
try_utf8 = temp_ptr;
temp_chr = (int) UCGetUniFromUtf8String(&try_utf8);
if (temp_chr > 127) {
diff --git a/src/HTML.c b/src/HTML.c
index 69e21b2..e10efe7 100644
--- a/src/HTML.c
+++ b/src/HTML.c
@@ -1,5 +1,5 @@
/*
- * $LynxId: HTML.c,v 1.165 2014/12/16 01:21:32 tom Exp $
+ * $LynxId: HTML.c,v 1.166 2015/12/13 23:08:45 Kihara.Hideto Exp $
*
* Structured stream to Rich hypertext converter
* ============================================
@@ -1681,6 +1681,22 @@ static int HTML_start_element(HTStructured * me, int element_number,
HText_appendParagraph(me->text);
break;
+ case HTML_SECTION:
+ case HTML_ARTICLE:
+ case HTML_MAIN:
+ case HTML_ASIDE:
+ case HTML_HEADER:
+ case HTML_FOOTER:
+ case HTML_NAV:
+ CHECK_ID(HTML_GEN5_ID);
+ if (HText_hasToolbar(me->text))
+ HText_appendParagraph(me->text);
+ break;
+
+ case HTML_FIGURE:
+ CHECK_ID(HTML_GEN5_ID);
+ break;
+
case HTML_FRAMESET:
break;
diff --git a/src/LYCookie.c b/src/LYCookie.c
index be801ab..5743485 100644
--- a/src/LYCookie.c
+++ b/src/LYCookie.c
@@ -1,5 +1,5 @@
/*
- * $LynxId: LYCookie.c,v 1.129 2014/11/29 15:28:10 Mike.Gorse Exp $
+ * $LynxId: LYCookie.c,v 1.131 2015/09/30 22:05:41 tom Exp $
*
* Lynx Cookie Support LYCookie.c
* ===================
@@ -753,10 +753,13 @@ static char *scan_cookie_sublist(char *hostname,
*/
if ((co->flags & COOKIE_FLAG_EXPIRES_SET) &&
co->expires <= now) {
+ next = hl->next;
HTList_removeObject(sublist, co);
freeCookie(co);
total_cookies--;
- continue;
+ if (next)
+ continue;
+ break;
}
/*
diff --git a/src/LYEditmap.c b/src/LYEditmap.c
index 61efe16..6b453d8 100644
--- a/src/LYEditmap.c
+++ b/src/LYEditmap.c
@@ -1,5 +1,5 @@
/*
- * $LynxId: LYEditmap.c,v 1.73 2014/02/08 01:12:58 Gisle.Vanem Exp $
+ * $LynxId: LYEditmap.c,v 1.74 2015/10/08 00:17:28 tom Exp $
*
* LYEditMap.c
* Keybindings for line and form editing.
@@ -131,119 +131,119 @@ static LYEditCode *Mod3Binding = Mod1Binding;
static const LYEditInit initMod1Binding[] =
{
- {1, LYE_BOL}, /* ^B */
- {2, LYE_BACKW}, /* ^C */
- {3, LYE_UNMOD}, /* ^D */
- {4, LYK_NEXT_LINK | LYE_FORM_LAC}, /* ^E */
- {5, LYK_EDITTEXTAREA | LYE_FORM_LAC}, /* ^F */
- {6, LYE_FORWW}, /* ^G */
- {7, LYE_ABORT}, /* ^H */
- {8, LYE_DELPW}, /* ^I */
- {9, LYE_UNMOD}, /* ^J */
- {10, LYE_ENTER}, /* ^K */
- {11, LYK_LPOS_NEXT_LINK | LYE_FORM_LAC}, /* ^L */
- {12, LYE_FORM_PASS}, /* ^M */
- {13, LYE_ENTER}, /* ^N */
- {14, LYE_FORWW}, /* ^O */
- {15, LYE_UNMOD}, /* ^P */
- {16, LYE_BACKW}, /* ^Q */
- {18, LYE_BACKW}, /* ^S */
- {21, LYE_FORM_PASS}, /* ^V */
- {23, LYE_KILLREG}, /* ^X */
- {24, LYE_XPMARK}, /* ^Y */
- {25, LYE_UNMOD}, /* ^Z */
- {26, LYE_FORM_PASS}, /* ^[ */
- {28, LYE_FORM_PASS}, /* ^] */
- {29, LYE_FORM_PASS}, /* ^^ */
- {30, LYE_UNMOD}, /* ^_ */
- {32, LYE_UNMOD}, /* */
- {33, LYE_UNMOD}, /* ! */
- {34, LYE_UNMOD}, /* " */
- {35, LYE_UNMOD}, /* # */
- {36, LYE_UNMOD}, /* $ */
- {37, LYE_UNMOD}, /* % */
- {38, LYE_UNMOD}, /* & */
- {39, LYE_UNMOD}, /* ' */
- {40, LYE_UNMOD}, /* ( */
- {41, LYE_UNMOD}, /* ) */
- {42, LYE_UNMOD}, /* * */
- {43, LYE_UNMOD}, /* + */
- {44, LYE_UNMOD}, /* , */
- {45, LYE_UNMOD}, /* - */
- {46, LYE_UNMOD}, /* . */
- {47, LYE_FORM_PASS}, /* / */
- {48, LYE_UNMOD}, /* 0 */
- {49, LYE_UNMOD}, /* 1 */
- {50, LYE_UNMOD}, /* 2 */
- {51, LYE_UNMOD}, /* 3 */
- {52, LYE_UNMOD}, /* 4 */
- {53, LYE_UNMOD}, /* 5 */
- {54, LYE_UNMOD}, /* 6 */
- {55, LYE_UNMOD}, /* 7 */
- {56, LYE_UNMOD}, /* 8 */
- {57, LYE_UNMOD}, /* 9 */
- {58, LYE_UNMOD}, /* : */
- {59, LYE_UNMOD}, /* ; */
- {60, LYK_HOME | LYE_FORM_LAC}, /* < */
- {61, LYE_UNMOD}, /* = */
- {62, LYK_END | LYE_FORM_LAC}, /* > */
- {63, LYE_UNMOD}, /* ? */
- {64, LYE_C1CHAR}, /* @ */
- {65, LYE_C1CHAR}, /* A */
- {66, LYE_C1CHAR}, /* B */
- {67, LYE_C1CHAR}, /* C */
- {68, LYE_C1CHAR}, /* D */
- {69, LYE_C1CHAR}, /* E */
- {70, LYE_C1CHAR}, /* F */
- {71, LYE_C1CHAR}, /* G */
- {72, LYE_C1CHAR}, /* H */
- {73, LYE_C1CHAR}, /* I */
- {74, LYE_C1CHAR}, /* J */
- {75, LYE_C1CHAR}, /* K */
- {76, LYE_C1CHAR}, /* L */
- {77, LYE_C1CHAR}, /* M */
- {78, LYE_C1CHAR}, /* N */
- {79, LYE_C1CHAR}, /* O */
- {80, LYE_C1CHAR}, /* P */
- {81, LYE_C1CHAR}, /* Q */
- {82, LYE_C1CHAR}, /* R */
- {83, LYE_C1CHAR}, /* S */
- {84, LYE_C1CHAR}, /* T */
- {85, LYE_C1CHAR}, /* U */
- {86, LYE_C1CHAR}, /* V */
- {87, LYE_C1CHAR}, /* W */
- {88, LYE_C1CHAR}, /* X */
- {89, LYE_C1CHAR}, /* Y */
- {90, LYE_C1CHAR}, /* Z */
- {91, LYE_C1CHAR}, /* [ */
- {92, LYE_C1CHAR}, /* \ */
- {93, LYE_C1CHAR}, /* ] */
- {94, LYE_C1CHAR}, /* ^ */
- {95, LYE_C1CHAR}, /* _ */
- {96, LYE_UNMOD}, /* ` */
- {97, LYE_BOL}, /* a */
- {98, LYE_BACKW}, /* b */
- {99, LYE_UNMOD}, /* c */
- {100, LYE_DELNW}, /* d */
- {101, LYK_EDITTEXTAREA | LYE_FORM_LAC}, /* e */
- {102, LYE_FORWW}, /* f */
- {103, LYK_GROWTEXTAREA | LYE_FORM_LAC}, /* g */
- {104, LYE_CHAR}, /* h */
- {105, LYK_INSERTFILE | LYE_FORM_LAC}, /* i */
- {106, LYE_CHAR}, /* j */
- {107, LYE_ERASE}, /* k */
- {108, LYE_LOWER}, /* l */
- {109, LYE_CHAR}, /* m */
- {110, LYE_FORM_PASS}, /* n */
- {111, LYE_UNMOD}, /* o */
- {112, LYE_CHAR}, /* p */
- {117, LYE_UPPER}, /* u */
- {122, LYE_UNMOD}, /* z */
- {123, LYE_UNMOD}, /* { */
- {124, LYE_UNMOD}, /* | */
- {125, LYE_UNMOD}, /* } */
- {126, LYE_UNMOD}, /* ~ */
- {127, LYE_DELPW},
+ {CTL('A'), LYE_BOL},
+ {CTL('B'), LYE_BACKW},
+ {CTL('C'), LYE_UNMOD},
+ {CTL('D'), LYK_NEXT_LINK | LYE_FORM_LAC},
+ {CTL('E'), LYK_EDITTEXTAREA | LYE_FORM_LAC},
+ {CTL('F'), LYE_FORWW},
+ {CTL('G'), LYE_ABORT},
+ {CTL('H'), LYE_DELPW},
+ {CTL('I'), LYE_UNMOD},
+ {CTL('J'), LYE_ENTER},
+ {CTL('K'), LYK_LPOS_NEXT_LINK | LYE_FORM_LAC},
+ {CTL('L'), LYE_FORM_PASS},
+ {CTL('M'), LYE_ENTER},
+ {CTL('N'), LYE_FORWW},
+ {CTL('O'), LYE_UNMOD},
+ {CTL('P'), LYE_BACKW},
+ {CTL('R'), LYE_BACKW},
+ {CTL('U'), LYE_FORM_PASS},
+ {CTL('W'), LYE_KILLREG},
+ {CTL('X'), LYE_XPMARK},
+ {CTL('Y'), LYE_UNMOD},
+ {CTL('Z'), LYE_FORM_PASS},
+ {CTL('\\'), LYE_FORM_PASS},
+ {CTL(']'), LYE_FORM_PASS},
+ {CTL('^'), LYE_UNMOD},
+ {' ', LYE_UNMOD},
+ {'!', LYE_UNMOD},
+ {'"', LYE_UNMOD},
+ {'#', LYE_UNMOD},
+ {'$', LYE_UNMOD},
+ {'%', LYE_UNMOD},
+ {'&', LYE_UNMOD},
+ {'\'', LYE_UNMOD},
+ {'(', LYE_UNMOD},
+ {')', LYE_UNMOD},
+ {'*', LYE_UNMOD},
+ {'+', LYE_UNMOD},
+ {',', LYE_UNMOD},
+ {'-', LYE_UNMOD},
+ {'.', LYE_UNMOD},
+ {'/', LYE_FORM_PASS},
+ {'0', LYE_UNMOD},
+ {'1', LYE_UNMOD},
+ {'2', LYE_UNMOD},
+ {'3', LYE_UNMOD},
+ {'4', LYE_UNMOD},
+ {'5', LYE_UNMOD},
+ {'6', LYE_UNMOD},
+ {'7', LYE_UNMOD},
+ {'8', LYE_UNMOD},
+ {'9', LYE_UNMOD},
+ {':', LYE_UNMOD},
+ {';', LYE_UNMOD},
+ {'<', LYK_HOME | LYE_FORM_LAC},
+ {'=', LYE_UNMOD},
+ {'>', LYK_END | LYE_FORM_LAC},
+ {'?', LYE_UNMOD},
+ {'@', LYE_C1CHAR},
+ {'A', LYE_C1CHAR},
+ {'B', LYE_C1CHAR},
+ {'C', LYE_C1CHAR},
+ {'D', LYE_C1CHAR},
+ {'E', LYE_C1CHAR},
+ {'F', LYE_C1CHAR},
+ {'G', LYE_C1CHAR},
+ {'H', LYE_C1CHAR},
+ {'I', LYE_C1CHAR},
+ {'J', LYE_C1CHAR},
+ {'K', LYE_C1CHAR},
+ {'L', LYE_C1CHAR},
+ {'M', LYE_C1CHAR},
+ {'N', LYE_C1CHAR},
+ {'O', LYE_C1CHAR},
+ {'P', LYE_C1CHAR},
+ {'Q', LYE_C1CHAR},
+ {'R', LYE_C1CHAR},
+ {'S', LYE_C1CHAR},
+ {'T', LYE_C1CHAR},
+ {'U', LYE_C1CHAR},
+ {'V', LYE_C1CHAR},
+ {'W', LYE_C1CHAR},
+ {'X', LYE_C1CHAR},
+ {'Y', LYE_C1CHAR},
+ {'Z', LYE_C1CHAR},
+ {'[', LYE_C1CHAR},
+ {'\\', LYE_C1CHAR},
+ {']', LYE_C1CHAR},
+ {'^', LYE_C1CHAR},
+ {'_', LYE_C1CHAR},
+ {'`', LYE_UNMOD},
+ {'a', LYE_BOL},
+ {'b', LYE_BACKW},
+ {'c', LYE_UNMOD},
+ {'d', LYE_DELNW},
+ {'e', LYK_EDITTEXTAREA | LYE_FORM_LAC},
+ {'f', LYE_FORWW},
+ {'g', LYK_GROWTEXTAREA | LYE_FORM_LAC},
+ {'h', LYE_CHAR},
+ {'i', LYK_INSERTFILE | LYE_FORM_LAC},
+ {'j', LYE_CHAR},
+ {'k', LYE_ERASE},
+ {'l', LYE_LOWER},
+ {'m', LYE_CHAR},
+ {'n', LYE_FORM_PASS},
+ {'o', LYE_UNMOD},
+ {'p', LYE_CHAR},
+ {'u', LYE_UPPER},
+ {'z', LYE_UNMOD},
+ {'{', LYE_UNMOD},
+ {'|', LYE_UNMOD},
+ {'}', LYE_UNMOD},
+ {'~', LYE_UNMOD},
+ {DEL_KEY, LYE_DELPW},
{160, LYE_UNMOD},
{161, LYE_UNMOD},
{162, LYE_UNMOD},
@@ -340,26 +340,26 @@ static const LYEditInit initMod1Binding[] =
{253, LYE_UNMOD},
{254, LYE_UNMOD},
{255, LYE_UNMOD},
- {256, LYE_UNMOD}, /* UPARROW_KEY */
- {257, LYE_UNMOD}, /* DNARROW_KEY */
- {258, LYE_UNMOD}, /* RTARROW_KEY */
- {259, LYE_UNMOD}, /* LTARROW_KEY */
- {260, LYE_UNMOD}, /* PGDOWN_KEY */
- {261, LYE_UNMOD}, /* PGUP_KEY */
- {262, LYE_FORM_PASS}, /* HOME_KEY */
- {263, LYE_FORM_PASS}, /* END_KEY */
- {264, LYK_DWIMHELP | LYE_FORM_LAC}, /* F1 */
- {265, LYE_UNMOD}, /* DO_KEY */
+ {UPARROW_KEY, LYE_UNMOD},
+ {DNARROW_KEY, LYE_UNMOD},
+ {RTARROW_KEY, LYE_UNMOD},
+ {LTARROW_KEY, LYE_UNMOD},
+ {PGDOWN_KEY, LYE_UNMOD},
+ {PGUP_KEY, LYE_UNMOD},
+ {HOME_KEY, LYE_FORM_PASS},
+ {END_KEY, LYE_FORM_PASS},
+ {F1_KEY, LYK_DWIMHELP | LYE_FORM_LAC},
+ {DO_KEY, LYE_UNMOD},
#if (defined(_WINDOWS) || defined(__DJGPP__))
- {266, LYE_UNMOD}, /* FIND_KEY */
- {267, LYE_UNMOD}, /* SELECT_KEY */
+ {FIND_KEY, LYE_UNMOD},
+ {SELECT_KEY, LYE_UNMOD},
#else
- {266, LYK_WHEREIS | LYE_FORM_LAC}, /* FIND_KEY */
- {267, LYK_NEXT | LYE_FORM_LAC}, /* SELECT_KEY */
+ {FIND_KEY, LYK_WHEREIS | LYE_FORM_LAC},
+ {SELECT_KEY, LYK_NEXT | LYE_FORM_LAC},
#endif
- {268, LYE_UNMOD}, /* INSERT_KEY */
- {270, LYE_UNMOD}, /* DO_NOTHING */
- {271, LYE_UNMOD}, /* BACKTAB_KEY */
+ {INSERT_KEY, LYE_UNMOD},
+ {DO_NOTHING, LYE_UNMOD},
+ {BACKTAB_KEY, LYE_UNMOD},
#if (defined(_WINDOWS) || defined(__DJGPP__)) && defined(USE_SLANG) && !defined(DJGPP_KEYHANDLER)
{272, LYE_DELPW},
#else
@@ -378,127 +378,127 @@ LYEditConfig LYModifierBindings[] =
static const LYEditInit initDefaultEditor[] =
{
- {1, LYE_BOL}, /* ^B */
- {2, LYE_DELPW}, /* ^C */
- {3, LYE_ABORT}, /* ^D */
- {4, LYE_DELN}, /* ^E */
- {5, LYE_EOL}, /* ^F */
- {6, LYE_DELNW}, /* ^G */
- {7, LYE_ABORT}, /* ^H */
- {8, LYE_DELP}, /* ^I */
- {9, LYE_TAB}, /* ^J */
- {10, LYE_ENTER}, /* ^K */
- {11, LYE_LOWER}, /* ^L */
- {13, LYE_ENTER}, /* ^N */
- {14, LYE_FORWW}, /* ^O */
- {15, LYE_ABORT}, /* ^P */
- {16, LYE_BACKW}, /* ^Q */
- {18, LYE_DELN}, /* ^S */
- {20, LYE_UPPER}, /* ^U */
- {21, LYE_ERASE}, /* ^V */
- {22, LYE_LKCMD}, /* ^W */
+ {CTL('A'), LYE_BOL},
+ {CTL('B'), LYE_DELPW},
+ {CTL('C'), LYE_ABORT},
+ {CTL('D'), LYE_DELN},
+ {CTL('E'), LYE_EOL},
+ {CTL('F'), LYE_DELNW},
+ {CTL('G'), LYE_ABORT},
+ {CTL('H'), LYE_DELP},
+ {CTL('I'), LYE_TAB},
+ {CTL('J'), LYE_ENTER},
+ {CTL('K'), LYE_LOWER},
+ {CTL('M'), LYE_ENTER},
+ {CTL('N'), LYE_FORWW},
+ {CTL('O'), LYE_ABORT},
+ {CTL('P'), LYE_BACKW},
+ {CTL('R'), LYE_DELN},
+ {CTL('T'), LYE_UPPER},
+ {CTL('U'), LYE_ERASE},
+ {CTL('V'), LYE_LKCMD},
#ifdef CAN_CUT_AND_PASTE
- {23, LYE_PASTE}, /* ^X */
+ {CTL('W'), LYE_PASTE},
#endif
- {24, LYE_SETM1}, /* ^Y */
- {30, LYE_SWMAP}, /* ^_ */
- {31, LYE_DELEL}, /* ^` */
- {32, LYE_CHAR}, /* */
- {33, LYE_CHAR}, /* ! */
- {34, LYE_CHAR}, /* " */
- {35, LYE_CHAR}, /* # */
- {36, LYE_CHAR}, /* $ */
- {37, LYE_CHAR}, /* % */
- {38, LYE_CHAR}, /* & */
- {39, LYE_CHAR}, /* ' */
- {40, LYE_CHAR}, /* ( */
- {41, LYE_CHAR}, /* ) */
- {42, LYE_CHAR}, /* * */
- {43, LYE_CHAR}, /* + */
- {44, LYE_CHAR}, /* , */
- {45, LYE_CHAR}, /* - */
- {46, LYE_CHAR}, /* . */
- {47, LYE_CHAR}, /* / */
- {48, LYE_CHAR}, /* 0 */
- {49, LYE_CHAR}, /* 1 */
- {50, LYE_CHAR}, /* 2 */
- {51, LYE_CHAR}, /* 3 */
- {52, LYE_CHAR}, /* 4 */
- {53, LYE_CHAR}, /* 5 */
- {54, LYE_CHAR}, /* 6 */
- {55, LYE_CHAR}, /* 7 */
- {56, LYE_CHAR}, /* 8 */
- {57, LYE_CHAR}, /* 9 */
- {58, LYE_CHAR}, /* : */
- {59, LYE_CHAR}, /* ; */
- {60, LYE_CHAR}, /* < */
- {61, LYE_CHAR}, /* = */
- {62, LYE_CHAR}, /* > */
- {63, LYE_CHAR}, /* ? */
- {64, LYE_CHAR}, /* @ */
- {65, LYE_CHAR}, /* A */
- {66, LYE_CHAR}, /* B */
- {67, LYE_CHAR}, /* C */
- {68, LYE_CHAR}, /* D */
- {69, LYE_CHAR}, /* E */
- {70, LYE_CHAR}, /* F */
- {71, LYE_CHAR}, /* G */
- {72, LYE_CHAR}, /* H */
- {73, LYE_CHAR}, /* I */
- {74, LYE_CHAR}, /* J */
- {75, LYE_CHAR}, /* K */
- {76, LYE_CHAR}, /* L */
- {77, LYE_CHAR}, /* M */
- {78, LYE_CHAR}, /* N */
- {79, LYE_CHAR}, /* O */
- {80, LYE_CHAR}, /* P */
- {81, LYE_CHAR}, /* Q */
- {82, LYE_CHAR}, /* R */
- {83, LYE_CHAR}, /* S */
- {84, LYE_CHAR}, /* T */
- {85, LYE_CHAR}, /* U */
- {86, LYE_CHAR}, /* V */
- {87, LYE_CHAR}, /* W */
- {88, LYE_CHAR}, /* X */
- {89, LYE_CHAR}, /* Y */
- {90, LYE_CHAR}, /* Z */
- {91, LYE_CHAR}, /* [ */
- {92, LYE_CHAR}, /* \ */
- {93, LYE_CHAR}, /* ] */
- {94, LYE_CHAR}, /* ^ */
- {95, LYE_CHAR}, /* _ */
- {96, LYE_CHAR}, /* ` */
- {97, LYE_CHAR}, /* a */
- {98, LYE_CHAR}, /* b */
- {99, LYE_CHAR}, /* c */
- {100, LYE_CHAR}, /* d */
- {101, LYE_CHAR}, /* e */
- {102, LYE_CHAR}, /* f */
- {103, LYE_CHAR}, /* g */
- {104, LYE_CHAR}, /* h */
- {105, LYE_CHAR}, /* i */
- {106, LYE_CHAR}, /* j */
- {107, LYE_CHAR}, /* k */
- {108, LYE_CHAR}, /* l */
- {109, LYE_CHAR}, /* m */
- {110, LYE_CHAR}, /* n */
- {111, LYE_CHAR}, /* o */
- {112, LYE_CHAR}, /* p */
- {113, LYE_CHAR}, /* q */
- {114, LYE_CHAR}, /* r */
- {115, LYE_CHAR}, /* s */
- {116, LYE_CHAR}, /* t */
- {117, LYE_CHAR}, /* u */
- {118, LYE_CHAR}, /* v */
- {119, LYE_CHAR}, /* w */
- {120, LYE_CHAR}, /* x */
- {121, LYE_CHAR}, /* y */
- {122, LYE_CHAR}, /* z */
- {123, LYE_CHAR}, /* { */
- {124, LYE_CHAR}, /* | */
- {125, LYE_CHAR}, /* } */
- {126, LYE_CHAR}, /* ~ */
- {127, LYE_DELP},
+ {CTL('X'), LYE_SETM1},
+ {CTL('^'), LYE_SWMAP},
+ {CTL('_'), LYE_DELEL},
+ {' ', LYE_CHAR},
+ {'!', LYE_CHAR},
+ {'"', LYE_CHAR},
+ {'#', LYE_CHAR},
+ {'$', LYE_CHAR},
+ {'%', LYE_CHAR},
+ {'&', LYE_CHAR},
+ {'\'', LYE_CHAR},
+ {'(', LYE_CHAR},
+ {')', LYE_CHAR},
+ {'*', LYE_CHAR},
+ {'+', LYE_CHAR},
+ {',', LYE_CHAR},
+ {'-', LYE_CHAR},
+ {'.', LYE_CHAR},
+ {'/', LYE_CHAR},
+ {'0', LYE_CHAR},
+ {'1', LYE_CHAR},
+ {'2', LYE_CHAR},
+ {'3', LYE_CHAR},
+ {'4', LYE_CHAR},
+ {'5', LYE_CHAR},
+ {'6', LYE_CHAR},
+ {'7', LYE_CHAR},
+ {'8', LYE_CHAR},
+ {'9', LYE_CHAR},
+ {':', LYE_CHAR},
+ {';', LYE_CHAR},
+ {'<', LYE_CHAR},
+ {'=', LYE_CHAR},
+ {'>', LYE_CHAR},
+ {'?', LYE_CHAR},
+ {'@', LYE_CHAR},
+ {'A', LYE_CHAR},
+ {'B', LYE_CHAR},
+ {'C', LYE_CHAR},
+ {'D', LYE_CHAR},
+ {'E', LYE_CHAR},
+ {'F', LYE_CHAR},
+ {'G', LYE_CHAR},
+ {'H', LYE_CHAR},
+ {'I', LYE_CHAR},
+ {'J', LYE_CHAR},
+ {'K', LYE_CHAR},
+ {'L', LYE_CHAR},
+ {'M', LYE_CHAR},
+ {'N', LYE_CHAR},
+ {'O', LYE_CHAR},
+ {'P', LYE_CHAR},
+ {'Q', LYE_CHAR},
+ {'R', LYE_CHAR},
+ {'S', LYE_CHAR},
+ {'T', LYE_CHAR},
+ {'U', LYE_CHAR},
+ {'V', LYE_CHAR},
+ {'W', LYE_CHAR},
+ {'X', LYE_CHAR},
+ {'Y', LYE_CHAR},
+ {'Z', LYE_CHAR},
+ {'[', LYE_CHAR},
+ {'\\', LYE_CHAR},
+ {']', LYE_CHAR},
+ {'^', LYE_CHAR},
+ {'_', LYE_CHAR},
+ {'`', LYE_CHAR},
+ {'a', LYE_CHAR},
+ {'b', LYE_CHAR},
+ {'c', LYE_CHAR},
+ {'d', LYE_CHAR},
+ {'e', LYE_CHAR},
+ {'f', LYE_CHAR},
+ {'g', LYE_CHAR},
+ {'h', LYE_CHAR},
+ {'i', LYE_CHAR},
+ {'j', LYE_CHAR},
+ {'k', LYE_CHAR},
+ {'l', LYE_CHAR},
+ {'m', LYE_CHAR},
+ {'n', LYE_CHAR},
+ {'o', LYE_CHAR},
+ {'p', LYE_CHAR},
+ {'q', LYE_CHAR},
+ {'r', LYE_CHAR},
+ {'s', LYE_CHAR},
+ {'t', LYE_CHAR},
+ {'u', LYE_CHAR},
+ {'v', LYE_CHAR},
+ {'w', LYE_CHAR},
+ {'x', LYE_CHAR},
+ {'y', LYE_CHAR},
+ {'z', LYE_CHAR},
+ {'{', LYE_CHAR},
+ {'|', LYE_CHAR},
+ {'}', LYE_CHAR},
+ {'~', LYE_CHAR},
+ {DEL_KEY, LYE_DELP},
{128, LYE_CHAR},
{129, LYE_CHAR},
{130, LYE_CHAR},
@@ -631,22 +631,22 @@ static const LYEditInit initDefaultEditor[] =
{253, LYE_CHAR},
{254, LYE_CHAR},
{255, LYE_CHAR},
- {256, LYE_FORM_PASS}, /* UPARROW_KEY */
- {257, LYE_FORM_PASS}, /* DNARROW_KEY */
- {258, LYE_FORW}, /* RTARROW_KEY */
- {259, LYE_BACK}, /* LTARROW_KEY */
- {260, LYE_FORM_PASS}, /* PGDOWN_KEY */
- {261, LYE_FORM_PASS}, /* PGUP_KEY */
- {262, LYE_BOL}, /* HOME_KEY */
- {263, LYE_EOL}, /* END_KEY */
- {264, LYE_FORM_PASS}, /* F1_KEY */
+ {UPARROW_KEY, LYE_FORM_PASS},
+ {DNARROW_KEY, LYE_FORM_PASS},
+ {RTARROW_KEY, LYE_FORW},
+ {LTARROW_KEY, LYE_BACK},
+ {PGDOWN_KEY, LYE_FORM_PASS},
+ {PGUP_KEY, LYE_FORM_PASS},
+ {HOME_KEY, LYE_BOL},
+ {END_KEY, LYE_EOL},
+ {F1_KEY, LYE_FORM_PASS},
#if !(defined(_WINDOWS) || defined(__DJGPP__))
- {265, LYE_TAB}, /* DO_KEY */
- {266, LYE_BOL}, /* FIND_KEY */
- {267, LYE_EOL}, /* SELECT_KEY */
+ {DO_KEY, LYE_TAB},
+ {FIND_KEY, LYE_BOL},
+ {SELECT_KEY, LYE_EOL},
#endif
- {269, LYE_DELP}, /* REMOVE_KEY */
- {271, LYE_FORM_PASS}, /* BACKTAB_KEY */
+ {REMOVE_KEY, LYE_DELP},
+ {BACKTAB_KEY, LYE_FORM_PASS},
#if (defined(_WINDOWS) || defined(__DJGPP__)) && defined(USE_SLANG) && !defined(DJGPP_KEYHANDLER)
{272, LYE_DELP},
{273, LYE_ENTER},
@@ -657,127 +657,127 @@ static const LYEditInit initDefaultEditor[] =
#ifdef USE_ALT_BINDINGS
static const LYEditInit initBetterEditor[] =
{
- {1, LYE_BOL}, /* ^B */
- {2, LYE_BACK}, /* ^C */
- {3, LYE_ABORT}, /* ^D */
- {4, LYE_DELN}, /* ^E */
- {5, LYE_EOL}, /* ^F */
- {6, LYE_FORW}, /* ^G */
- {7, LYE_ABORT}, /* ^H */
- {8, LYE_DELP}, /* ^I */
- {9, LYE_ENTER}, /* ^J */
- {10, LYE_ENTER}, /* ^K */
- {11, LYE_DELEL}, /* ^L */
- {13, LYE_ENTER}, /* ^N */
- {14, LYE_FORWW}, /* ^O */
- {15, LYE_ABORT}, /* ^P */
- {16, LYE_BACKW}, /* ^Q */
- {18, LYE_DELPW}, /* ^S */
- {20, LYE_DELNW}, /* ^U */
- {21, LYE_ERASE}, /* ^V */
- {22, LYE_LKCMD}, /* ^W */
+ {CTL('A'), LYE_BOL},
+ {CTL('B'), LYE_BACK},
+ {CTL('C'), LYE_ABORT},
+ {CTL('D'), LYE_DELN},
+ {CTL('E'), LYE_EOL},
+ {CTL('F'), LYE_FORW},
+ {CTL('G'), LYE_ABORT},
+ {CTL('H'), LYE_DELP},
+ {CTL('I'), LYE_ENTER},
+ {CTL('J'), LYE_ENTER},
+ {CTL('K'), LYE_DELEL},
+ {CTL('M'), LYE_ENTER},
+ {CTL('N'), LYE_FORWW},
+ {CTL('O'), LYE_ABORT},
+ {CTL('P'), LYE_BACKW},
+ {CTL('R'), LYE_DELPW},
+ {CTL('T'), LYE_DELNW},
+ {CTL('U'), LYE_ERASE},
+ {CTL('V'), LYE_LKCMD},
#ifdef CAN_CUT_AND_PASTE
- {23, LYE_PASTE}, /* ^X */
+ {CTL('W'), LYE_PASTE},
#endif
- {24, LYE_SETM1}, /* ^Y */
- {30, LYE_UPPER}, /* ^_ */
- {31, LYE_LOWER}, /* ^` */
- {32, LYE_CHAR}, /* */
- {33, LYE_CHAR}, /* ! */
- {34, LYE_CHAR}, /* " */
- {35, LYE_CHAR}, /* # */
- {36, LYE_CHAR}, /* $ */
- {37, LYE_CHAR}, /* % */
- {38, LYE_CHAR}, /* & */
- {39, LYE_CHAR}, /* ' */
- {40, LYE_CHAR}, /* ( */
- {41, LYE_CHAR}, /* ) */
- {42, LYE_CHAR}, /* * */
- {43, LYE_CHAR}, /* + */
- {44, LYE_CHAR}, /* , */
- {45, LYE_CHAR}, /* - */
- {46, LYE_CHAR}, /* . */
- {47, LYE_CHAR}, /* / */
- {48, LYE_CHAR}, /* 0 */
- {49, LYE_CHAR}, /* 1 */
- {50, LYE_CHAR}, /* 2 */
- {51, LYE_CHAR}, /* 3 */
- {52, LYE_CHAR}, /* 4 */
- {53, LYE_CHAR}, /* 5 */
- {54, LYE_CHAR}, /* 6 */
- {55, LYE_CHAR}, /* 7 */
- {56, LYE_CHAR}, /* 8 */
- {57, LYE_CHAR}, /* 9 */
- {58, LYE_CHAR}, /* : */
- {59, LYE_CHAR}, /* ; */
- {60, LYE_CHAR}, /* < */
- {61, LYE_CHAR}, /* = */
- {62, LYE_CHAR}, /* > */
- {63, LYE_CHAR}, /* ? */
- {64, LYE_CHAR}, /* @ */
- {65, LYE_CHAR}, /* A */
- {66, LYE_CHAR}, /* B */
- {67, LYE_CHAR}, /* C */
- {68, LYE_CHAR}, /* D */
- {69, LYE_CHAR}, /* E */
- {70, LYE_CHAR}, /* F */
- {71, LYE_CHAR}, /* G */
- {72, LYE_CHAR}, /* H */
- {73, LYE_CHAR}, /* I */
- {74, LYE_CHAR}, /* J */
- {75, LYE_CHAR}, /* K */
- {76, LYE_CHAR}, /* L */
- {77, LYE_CHAR}, /* M */
- {78, LYE_CHAR}, /* N */
- {79, LYE_CHAR}, /* O */
- {80, LYE_CHAR}, /* P */
- {81, LYE_CHAR}, /* Q */
- {82, LYE_CHAR}, /* R */
- {83, LYE_CHAR}, /* S */
- {84, LYE_CHAR}, /* T */
- {85, LYE_CHAR}, /* U */
- {86, LYE_CHAR}, /* V */
- {87, LYE_CHAR}, /* W */
- {88, LYE_CHAR}, /* X */
- {89, LYE_CHAR}, /* Y */
- {90, LYE_CHAR}, /* Z */
- {91, LYE_CHAR}, /* [ */
- {92, LYE_CHAR}, /* \ */
- {93, LYE_CHAR}, /* ] */
- {94, LYE_CHAR}, /* ^ */
- {95, LYE_CHAR}, /* _ */
- {96, LYE_CHAR}, /* ` */
- {97, LYE_CHAR}, /* a */
- {98, LYE_CHAR}, /* b */
- {99, LYE_CHAR}, /* c */
- {100, LYE_CHAR}, /* d */
- {101, LYE_CHAR}, /* e */
- {102, LYE_CHAR}, /* f */
- {103, LYE_CHAR}, /* g */
- {104, LYE_CHAR}, /* h */
- {105, LYE_CHAR}, /* i */
- {106, LYE_CHAR}, /* j */
- {107, LYE_CHAR}, /* k */
- {108, LYE_CHAR}, /* l */
- {109, LYE_CHAR}, /* m */
- {110, LYE_CHAR}, /* n */
- {111, LYE_CHAR}, /* o */
- {112, LYE_CHAR}, /* p */
- {113, LYE_CHAR}, /* q */
- {114, LYE_CHAR}, /* r */
- {115, LYE_CHAR}, /* s */
- {116, LYE_CHAR}, /* t */
- {117, LYE_CHAR}, /* u */
- {118, LYE_CHAR}, /* v */
- {119, LYE_CHAR}, /* w */
- {120, LYE_CHAR}, /* x */
- {121, LYE_CHAR}, /* y */
- {122, LYE_CHAR}, /* z */
- {123, LYE_CHAR}, /* { */
- {124, LYE_CHAR}, /* | */
- {125, LYE_CHAR}, /* } */
- {126, LYE_CHAR}, /* ~ */
- {127, LYE_DELP},
+ {CTL('X'), LYE_SETM1},
+ {CTL('^'), LYE_UPPER},
+ {CTL('_'), LYE_LOWER},
+ {' ', LYE_CHAR},
+ {'!', LYE_CHAR},
+ {'"', LYE_CHAR},
+ {'#', LYE_CHAR},
+ {'$', LYE_CHAR},
+ {'%', LYE_CHAR},
+ {'&', LYE_CHAR},
+ {'\'', LYE_CHAR},
+ {'(', LYE_CHAR},
+ {')', LYE_CHAR},
+ {'*', LYE_CHAR},
+ {'+', LYE_CHAR},
+ {',', LYE_CHAR},
+ {'-', LYE_CHAR},
+ {'.', LYE_CHAR},
+ {'/', LYE_CHAR},
+ {'0', LYE_CHAR},
+ {'1', LYE_CHAR},
+ {'2', LYE_CHAR},
+ {'3', LYE_CHAR},
+ {'4', LYE_CHAR},
+ {'5', LYE_CHAR},
+ {'6', LYE_CHAR},
+ {'7', LYE_CHAR},
+ {'8', LYE_CHAR},
+ {'9', LYE_CHAR},
+ {':', LYE_CHAR},
+ {';', LYE_CHAR},
+ {'<', LYE_CHAR},
+ {'=', LYE_CHAR},
+ {'>', LYE_CHAR},
+ {'?', LYE_CHAR},
+ {'@', LYE_CHAR},
+ {'A', LYE_CHAR},
+ {'B', LYE_CHAR},
+ {'C', LYE_CHAR},
+ {'D', LYE_CHAR},
+ {'E', LYE_CHAR},
+ {'F', LYE_CHAR},
+ {'G', LYE_CHAR},
+ {'H', LYE_CHAR},
+ {'I', LYE_CHAR},
+ {'J', LYE_CHAR},
+ {'K', LYE_CHAR},
+ {'L', LYE_CHAR},
+ {'M', LYE_CHAR},
+ {'N', LYE_CHAR},
+ {'O', LYE_CHAR},
+ {'P', LYE_CHAR},
+ {'Q', LYE_CHAR},
+ {'R', LYE_CHAR},
+ {'S', LYE_CHAR},
+ {'T', LYE_CHAR},
+ {'U', LYE_CHAR},
+ {'V', LYE_CHAR},
+ {'W', LYE_CHAR},
+ {'X', LYE_CHAR},
+ {'Y', LYE_CHAR},
+ {'Z', LYE_CHAR},
+ {'[', LYE_CHAR},
+ {'\\', LYE_CHAR},
+ {']', LYE_CHAR},
+ {'^', LYE_CHAR},
+ {'_', LYE_CHAR},
+ {'`', LYE_CHAR},
+ {'a', LYE_CHAR},
+ {'b', LYE_CHAR},
+ {'c', LYE_CHAR},
+ {'d', LYE_CHAR},
+ {'e', LYE_CHAR},
+ {'f', LYE_CHAR},
+ {'g', LYE_CHAR},
+ {'h', LYE_CHAR},
+ {'i', LYE_CHAR},
+ {'j', LYE_CHAR},
+ {'k', LYE_CHAR},
+ {'l', LYE_CHAR},
+ {'m', LYE_CHAR},
+ {'n', LYE_CHAR},
+ {'o', LYE_CHAR},
+ {'p', LYE_CHAR},
+ {'q', LYE_CHAR},
+ {'r', LYE_CHAR},
+ {'s', LYE_CHAR},
+ {'t', LYE_CHAR},
+ {'u', LYE_CHAR},
+ {'v', LYE_CHAR},
+ {'w', LYE_CHAR},
+ {'x', LYE_CHAR},
+ {'y', LYE_CHAR},
+ {'z', LYE_CHAR},
+ {'{', LYE_CHAR},
+ {'|', LYE_CHAR},
+ {'}', LYE_CHAR},
+ {'~', LYE_CHAR},
+ {DEL_KEY, LYE_DELP},
{128, LYE_CHAR},
{129, LYE_CHAR},
{130, LYE_CHAR},
@@ -910,22 +910,22 @@ static const LYEditInit initBetterEditor[] =
{253, LYE_CHAR},
{254, LYE_CHAR},
{255, LYE_CHAR},
- {256, LYE_FORM_PASS}, /* UPARROW_KEY */
- {257, LYE_FORM_PASS}, /* DNARROW_KEY */
- {258, LYE_FORW}, /* RTARROW_KEY */
- {259, LYE_BACK}, /* LTARROW_KEY */
- {260, LYE_FORM_PASS}, /* PGDOWN_KEY */
- {261, LYE_FORM_PASS}, /* PGUP_KEY */
- {262, LYE_BOL}, /* HOME_KEY */
- {263, LYE_EOL}, /* END_KEY */
- {264, LYE_FORM_PASS}, /* F1_KEY */
+ {UPARROW_KEY, LYE_FORM_PASS},
+ {DNARROW_KEY, LYE_FORM_PASS},
+ {RTARROW_KEY, LYE_FORW},
+ {LTARROW_KEY, LYE_BACK},
+ {PGDOWN_KEY, LYE_FORM_PASS},
+ {PGUP_KEY, LYE_FORM_PASS},
+ {HOME_KEY, LYE_BOL},
+ {END_KEY, LYE_EOL},
+ {F1_KEY, LYE_FORM_PASS},
#if !(defined(_WINDOWS) || defined(__DJGPP__))
- {265, LYE_TAB}, /* DO_KEY */
- {266, LYE_BOL}, /* FIND_KEY */
- {267, LYE_EOL}, /* SELECT_KEY */
+ {DO_KEY, LYE_TAB},
+ {FIND_KEY, LYE_BOL},
+ {SELECT_KEY, LYE_EOL},
#endif
- {269, LYE_DELP}, /* REMOVE_KEY */
- {271, LYE_FORM_PASS}, /* BACKTAB_KEY */
+ {REMOVE_KEY, LYE_DELP},
+ {BACKTAB_KEY, LYE_FORM_PASS},
#if (defined(_WINDOWS) || defined(__DJGPP__)) && defined(USE_SLANG) && !defined(DJGPP_KEYHANDLER)
{272, LYE_DELP},
{273, LYE_ENTER},
@@ -935,133 +935,133 @@ static const LYEditInit initBetterEditor[] =
static const LYEditInit initBashlikeEditor[] =
{
- {0, LYE_SETMARK}, /* nul */
- {1, LYE_BOL}, /* ^B */
- {2, LYE_BACK}, /* ^C */
- {3, LYE_ABORT}, /* ^D */
- {4, LYE_DELN}, /* ^E */
- {5, LYE_EOL | LYE_DF}, /* ^F */
- {6, LYE_FORW}, /* ^G */
- {7, LYE_ABORT}, /* ^H */
- {8, LYE_DELP}, /* ^I */
- {9, LYE_TAB}, /* ^J */
- {10, LYE_ENTER}, /* ^K */
- {11, LYE_DELEL | LYE_DF}, /* ^L */
- {12, LYE_FORM_PASS}, /* ^M */
- {13, LYE_ENTER}, /* ^N */
- {14, LYE_FORM_PASS}, /* ^O */
- {15, LYE_FORM_PASS}, /* ^P */
- {16, LYE_FORM_PASS}, /* ^Q */
- {18, LYE_BACKW}, /* ^S */
- {19, LYE_FORWW}, /* XOFF */
- {20, LYE_TPOS}, /* ^U */
- {21, LYE_DELBL}, /* ^V */
- {22, LYE_LKCMD}, /* ^W */
- {23, LYE_DELPW}, /* ^X */
- {24, LYE_SETM1}, /* ^Y */
- {25, LYE_YANK}, /* ^Z */
- {26, LYE_FORM_PASS}, /* ^[ */
- {27, LYE_SETM2}, /* ^\ */
- {28, LYE_FORM_PASS}, /* ^] */
- {29, LYE_FORM_PASS}, /* ^^ */
- {30, LYE_SWMAP}, /* ^_ */
- {31, LYE_ABORT}, /* ^` */
- {32, LYE_CHAR}, /* */
- {33, LYE_CHAR}, /* ! */
- {34, LYE_CHAR}, /* " */
- {35, LYE_CHAR}, /* # */
- {36, LYE_CHAR}, /* $ */
- {37, LYE_CHAR}, /* % */
- {38, LYE_CHAR}, /* & */
- {39, LYE_CHAR}, /* ' */
- {40, LYE_CHAR}, /* ( */
- {41, LYE_CHAR}, /* ) */
- {42, LYE_CHAR}, /* * */
- {43, LYE_CHAR}, /* + */
- {44, LYE_CHAR}, /* , */
- {45, LYE_CHAR}, /* - */
- {46, LYE_CHAR}, /* . */
- {47, LYE_CHAR}, /* / */
- {48, LYE_CHAR}, /* 0 */
- {49, LYE_CHAR}, /* 1 */
- {50, LYE_CHAR}, /* 2 */
- {51, LYE_CHAR}, /* 3 */
- {52, LYE_CHAR}, /* 4 */
- {53, LYE_CHAR}, /* 5 */
- {54, LYE_CHAR}, /* 6 */
- {55, LYE_CHAR}, /* 7 */
- {56, LYE_CHAR}, /* 8 */
- {57, LYE_CHAR}, /* 9 */
- {58, LYE_CHAR}, /* : */
- {59, LYE_CHAR}, /* ; */
- {60, LYE_CHAR}, /* < */
- {61, LYE_CHAR}, /* = */
- {62, LYE_CHAR}, /* > */
- {63, LYE_CHAR}, /* ? */
- {64, LYE_CHAR}, /* @ */
- {65, LYE_CHAR}, /* A */
- {66, LYE_CHAR}, /* B */
- {67, LYE_CHAR}, /* C */
- {68, LYE_CHAR}, /* D */
- {69, LYE_CHAR}, /* E */
- {70, LYE_CHAR}, /* F */
- {71, LYE_CHAR}, /* G */
- {72, LYE_CHAR}, /* H */
- {73, LYE_CHAR}, /* I */
- {74, LYE_CHAR}, /* J */
- {75, LYE_CHAR}, /* K */
- {76, LYE_CHAR}, /* L */
- {77, LYE_CHAR}, /* M */
- {78, LYE_CHAR}, /* N */
- {79, LYE_CHAR}, /* O */
- {80, LYE_CHAR}, /* P */
- {81, LYE_CHAR}, /* Q */
- {82, LYE_CHAR}, /* R */
- {83, LYE_CHAR}, /* S */
- {84, LYE_CHAR}, /* T */
- {85, LYE_CHAR}, /* U */
- {86, LYE_CHAR}, /* V */
- {87, LYE_CHAR}, /* W */
- {88, LYE_CHAR}, /* X */
- {89, LYE_CHAR}, /* Y */
- {90, LYE_CHAR}, /* Z */
- {91, LYE_CHAR}, /* [ */
- {92, LYE_CHAR}, /* \ */
- {93, LYE_CHAR}, /* ] */
- {94, LYE_CHAR}, /* ^ */
- {95, LYE_CHAR}, /* _ */
- {96, LYE_CHAR}, /* ` */
- {97, LYE_CHAR}, /* a */
- {98, LYE_CHAR}, /* b */
- {99, LYE_CHAR}, /* c */
- {100, LYE_CHAR}, /* d */
- {101, LYE_CHAR}, /* e */
- {102, LYE_CHAR}, /* f */
- {103, LYE_CHAR}, /* g */
- {104, LYE_CHAR}, /* h */
- {105, LYE_CHAR}, /* i */
- {106, LYE_CHAR}, /* j */
- {107, LYE_CHAR}, /* k */
- {108, LYE_CHAR}, /* l */
- {109, LYE_CHAR}, /* m */
- {110, LYE_CHAR}, /* n */
- {111, LYE_CHAR}, /* o */
- {112, LYE_CHAR}, /* p */
- {113, LYE_CHAR}, /* q */
- {114, LYE_CHAR}, /* r */
- {115, LYE_CHAR}, /* s */
- {116, LYE_CHAR}, /* t */
- {117, LYE_CHAR}, /* u */
- {118, LYE_CHAR}, /* v */
- {119, LYE_CHAR}, /* w */
- {120, LYE_CHAR}, /* x */
- {121, LYE_CHAR}, /* y */
- {122, LYE_CHAR}, /* z */
- {123, LYE_CHAR}, /* { */
- {124, LYE_CHAR}, /* | */
- {125, LYE_CHAR}, /* } */
- {126, LYE_CHAR}, /* ~ */
- {127, LYE_DELP},
+ {CTL('@'), LYE_SETMARK},
+ {CTL('A'), LYE_BOL},
+ {CTL('B'), LYE_BACK},
+ {CTL('C'), LYE_ABORT},
+ {CTL('D'), LYE_DELN},
+ {CTL('E'), LYE_EOL | LYE_DF},
+ {CTL('F'), LYE_FORW},
+ {CTL('G'), LYE_ABORT},
+ {CTL('H'), LYE_DELP},
+ {CTL('I'), LYE_TAB},
+ {CTL('J'), LYE_ENTER},
+ {CTL('K'), LYE_DELEL | LYE_DF},
+ {CTL('L'), LYE_FORM_PASS},
+ {CTL('M'), LYE_ENTER},
+ {CTL('N'), LYE_FORM_PASS},
+ {CTL('O'), LYE_FORM_PASS},
+ {CTL('P'), LYE_FORM_PASS},
+ {CTL('R'), LYE_BACKW},
+ {CTL('S'), LYE_FORWW},
+ {CTL('T'), LYE_TPOS},
+ {CTL('U'), LYE_DELBL},
+ {CTL('V'), LYE_LKCMD},
+ {CTL('W'), LYE_DELPW},
+ {CTL('X'), LYE_SETM1},
+ {CTL('Y'), LYE_YANK},
+ {CTL('Z'), LYE_FORM_PASS},
+ {CTL('['), LYE_SETM2},
+ {CTL('\\'), LYE_FORM_PASS},
+ {CTL(']'), LYE_FORM_PASS},
+ {CTL('^'), LYE_SWMAP},
+ {CTL('_'), LYE_ABORT},
+ {' ', LYE_CHAR},
+ {'!', LYE_CHAR},
+ {'"', LYE_CHAR},
+ {'#', LYE_CHAR},
+ {'$', LYE_CHAR},
+ {'%', LYE_CHAR},
+ {'&', LYE_CHAR},
+ {'\'', LYE_CHAR},
+ {'(', LYE_CHAR},
+ {')', LYE_CHAR},
+ {'*', LYE_CHAR},
+ {'+', LYE_CHAR},
+ {',', LYE_CHAR},
+ {'-', LYE_CHAR},
+ {'.', LYE_CHAR},
+ {'/', LYE_CHAR},
+ {'0', LYE_CHAR},
+ {'1', LYE_CHAR},
+ {'2', LYE_CHAR},
+ {'3', LYE_CHAR},
+ {'4', LYE_CHAR},
+ {'5', LYE_CHAR},
+ {'6', LYE_CHAR},
+ {'7', LYE_CHAR},
+ {'8', LYE_CHAR},
+ {'9', LYE_CHAR},
+ {':', LYE_CHAR},
+ {';', LYE_CHAR},
+ {'<', LYE_CHAR},
+ {'=', LYE_CHAR},
+ {'>', LYE_CHAR},
+ {'?', LYE_CHAR},
+ {'@', LYE_CHAR},
+ {'A', LYE_CHAR},
+ {'B', LYE_CHAR},
+ {'C', LYE_CHAR},
+ {'D', LYE_CHAR},
+ {'E', LYE_CHAR},
+ {'F', LYE_CHAR},
+ {'G', LYE_CHAR},
+ {'H', LYE_CHAR},
+ {'I', LYE_CHAR},
+ {'J', LYE_CHAR},
+ {'K', LYE_CHAR},
+ {'L', LYE_CHAR},
+ {'M', LYE_CHAR},
+ {'N', LYE_CHAR},
+ {'O', LYE_CHAR},
+ {'P', LYE_CHAR},
+ {'Q', LYE_CHAR},
+ {'R', LYE_CHAR},
+ {'S', LYE_CHAR},
+ {'T', LYE_CHAR},
+ {'U', LYE_CHAR},
+ {'V', LYE_CHAR},
+ {'W', LYE_CHAR},
+ {'X', LYE_CHAR},
+ {'Y', LYE_CHAR},
+ {'Z', LYE_CHAR},
+ {'[', LYE_CHAR},
+ {'\\', LYE_CHAR},
+ {']', LYE_CHAR},
+ {'^', LYE_CHAR},
+ {'_', LYE_CHAR},
+ {'`', LYE_CHAR},
+ {'a', LYE_CHAR},
+ {'b', LYE_CHAR},
+ {'c', LYE_CHAR},
+ {'d', LYE_CHAR},
+ {'e', LYE_CHAR},
+ {'f', LYE_CHAR},
+ {'g', LYE_CHAR},
+ {'h', LYE_CHAR},
+ {'i', LYE_CHAR},
+ {'j', LYE_CHAR},
+ {'k', LYE_CHAR},
+ {'l', LYE_CHAR},
+ {'m', LYE_CHAR},
+ {'n', LYE_CHAR},
+ {'o', LYE_CHAR},
+ {'p', LYE_CHAR},
+ {'q', LYE_CHAR},
+ {'r', LYE_CHAR},
+ {'s', LYE_CHAR},
+ {'t', LYE_CHAR},
+ {'u', LYE_CHAR},
+ {'v', LYE_CHAR},
+ {'w', LYE_CHAR},
+ {'x', LYE_CHAR},
+ {'y', LYE_CHAR},
+ {'z', LYE_CHAR},
+ {'{', LYE_CHAR},
+ {'|', LYE_CHAR},
+ {'}', LYE_CHAR},
+ {'~', LYE_CHAR},
+ {DEL_KEY, LYE_DELP},
{128, LYE_CHAR},
{129, LYE_CHAR},
{130, LYE_CHAR},
@@ -1190,22 +1190,22 @@ static const LYEditInit initBashlikeEditor[] =
{253, LYE_CHAR},
{254, LYE_CHAR},
{255, LYE_CHAR},
- {256, LYE_FORM_PASS}, /* UPARROW_KEY */
- {257, LYE_FORM_PASS}, /* DNARROW_KEY */
- {258, LYE_FORW}, /* RTARROW_KEY */
- {259, LYE_BACK}, /* LTARROW_KEY */
- {260, LYE_FORM_PASS}, /* PGDOWN_KEY */
- {261, LYE_FORM_PASS}, /* PGUP_KEY */
- {262, LYE_BOL}, /* HOME_KEY */
- {263, LYE_EOL}, /* END_KEY */
- {264, LYE_FORM_PASS}, /* F1_KEY */
+ {UPARROW_KEY, LYE_FORM_PASS},
+ {DNARROW_KEY, LYE_FORM_PASS},
+ {RTARROW_KEY, LYE_FORW},
+ {LTARROW_KEY, LYE_BACK},
+ {PGDOWN_KEY, LYE_FORM_PASS},
+ {PGUP_KEY, LYE_FORM_PASS},
+ {HOME_KEY, LYE_BOL},
+ {END_KEY, LYE_EOL},
+ {F1_KEY, LYE_FORM_PASS},
#if !(defined(_WINDOWS) || defined(__DJGPP__))
- {265, LYE_TAB}, /* DO_KEY */
- {266, LYE_BOL}, /* FIND_KEY */
- {267, LYE_EOL}, /* SELECT_KEY */
+ {DO_KEY, LYE_TAB},
+ {FIND_KEY, LYE_BOL},
+ {SELECT_KEY, LYE_EOL},
#endif
- {269, LYE_DELN}, /* REMOVE_KEY */
- {271, LYE_FORM_PASS}, /* BACKTAB_KEY */
+ {REMOVE_KEY, LYE_DELN},
+ {BACKTAB_KEY, LYE_FORM_PASS},
#if (defined(_WINDOWS) || defined(__DJGPP__)) && defined(USE_SLANG) && !defined(DJGPP_KEYHANDLER)
{272, LYE_DELP},
{273, LYE_ENTER},
diff --git a/src/LYForms.c b/src/LYForms.c
index fa8000d..d74d9d0 100644
--- a/src/LYForms.c
+++ b/src/LYForms.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYForms.c,v 1.111 2013/12/07 13:46:58 tom Exp $ */
+/* $LynxId: LYForms.c,v 1.117 2015/12/15 01:32:45 tom Exp $ */
#include <HTUtils.h>
#include <HTCJK.h>
#include <HTTP.h>
@@ -855,6 +855,12 @@ static int form_getstr(int cur,
return (ch);
}
+#ifdef TEXTFIELDS_MAY_NEED_ACTIVATION
+#define TMA_PANEL(fp,np) ((for_what == FOR_PANEL) ? fp : np)
+#else
+#define TMA_PANEL(fp,np) np
+#endif
+
/*
* Display statusline info tailored for the current form field.
*/
@@ -866,30 +872,47 @@ void show_formlink_statusline(const FormInfo * form,
if (FormIsReadonly(form))
statusline(FORM_LINK_PASSWORD_UNM_MSG);
else
-#ifdef TEXTFIELDS_MAY_NEED_ACTIVATION
- if (for_what == FOR_PANEL)
- statusline(FORM_LINK_PASSWORD_MESSAGE_INA);
- else
-#endif
- statusline(FORM_LINK_PASSWORD_MESSAGE);
+ statusline(TMA_PANEL(FORM_LINK_PASSWORD_MESSAGE_INA,
+ FORM_LINK_PASSWORD_MESSAGE));
break;
case F_OPTION_LIST_TYPE:
- if (FormIsReadonly(form))
+ if (FormIsReadonly(form)) {
statusline(FORM_LINK_OPTION_LIST_UNM_MSG);
- else
+ } else if (fields_are_named()) {
+ char *submit_str = NULL;
+
+ HTSprintf0(&submit_str, FORM_LINK_OPTION_LIST_ADV_MSG, form->name);
+ statusline(submit_str);
+ FREE(submit_str);
+ } else {
statusline(FORM_LINK_OPTION_LIST_MESSAGE);
+ }
break;
case F_CHECKBOX_TYPE:
- if (FormIsReadonly(form))
+ if (FormIsReadonly(form)) {
statusline(FORM_LINK_CHECKBOX_UNM_MSG);
- else
+ } else if (fields_are_named()) {
+ char *submit_str = NULL;
+
+ HTSprintf0(&submit_str, FORM_LINK_CHECKBOX_ADV_MSG, form->name);
+ statusline(submit_str);
+ FREE(submit_str);
+ } else {
statusline(FORM_LINK_CHECKBOX_MESSAGE);
+ }
break;
case F_RADIO_TYPE:
- if (FormIsReadonly(form))
+ if (FormIsReadonly(form)) {
statusline(FORM_LINK_RADIO_UNM_MSG);
- else
+ } else if (fields_are_named()) {
+ char *submit_str = NULL;
+
+ HTSprintf0(&submit_str, FORM_LINK_RADIO_ADV_MSG, form->name);
+ statusline(submit_str);
+ FREE(submit_str);
+ } else {
statusline(FORM_LINK_RADIO_MESSAGE);
+ }
break;
case F_TEXT_SUBMIT_TYPE:
if (FormIsReadonly(form)) {
@@ -899,41 +922,25 @@ void show_formlink_statusline(const FormInfo * form,
if (no_mail)
statusline(FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG);
else
-#ifdef TEXTFIELDS_MAY_NEED_ACTIVATION
- if (for_what == FOR_PANEL)
- statusline(FORM_TEXT_SUBMIT_MAILTO_MSG_INA);
- else
-#endif
- statusline(FORM_LINK_TEXT_SUBMIT_MAILTO_MSG);
+ statusline(TMA_PANEL(FORM_TEXT_SUBMIT_MAILTO_MSG_INA,
+ FORM_LINK_TEXT_SUBMIT_MAILTO_MSG));
} else if (form->no_cache) {
-#ifdef TEXTFIELDS_MAY_NEED_ACTIVATION
- if (for_what == FOR_PANEL)
- statusline(FORM_TEXT_RESUBMIT_MESSAGE_INA);
- else
-#endif
- statusline(FORM_LINK_TEXT_RESUBMIT_MESSAGE);
+ statusline(TMA_PANEL(FORM_TEXT_RESUBMIT_MESSAGE_INA,
+ FORM_LINK_TEXT_RESUBMIT_MESSAGE));
} else {
char *submit_str = NULL;
char *xkey_info = key_for_func_ext(LYK_NOCACHE, for_what);
if (non_empty(xkey_info)) {
-#ifdef TEXTFIELDS_MAY_NEED_ACTIVATION
- if (for_what == FOR_PANEL)
- HTSprintf0(&submit_str, FORM_TEXT_SUBMIT_MESSAGE_INA_X,
- xkey_info);
- else
-#endif
- HTSprintf0(&submit_str, FORM_LINK_TEXT_SUBMIT_MESSAGE_X,
- xkey_info);
+ HTSprintf0(&submit_str,
+ TMA_PANEL(FORM_TEXT_SUBMIT_MESSAGE_INA_X,
+ FORM_LINK_TEXT_SUBMIT_MESSAGE_X),
+ xkey_info);
statusline(submit_str);
FREE(submit_str);
} else {
-#ifdef TEXTFIELDS_MAY_NEED_ACTIVATION
- if (for_what == FOR_PANEL)
- statusline(FORM_LINK_TEXT_SUBMIT_MESSAGE_INA);
- else
-#endif
- statusline(FORM_LINK_TEXT_SUBMIT_MESSAGE);
+ statusline(TMA_PANEL(FORM_LINK_TEXT_SUBMIT_MESSAGE_INA,
+ FORM_LINK_TEXT_SUBMIT_MESSAGE));
}
FREE(xkey_info);
}
@@ -989,10 +996,17 @@ void show_formlink_statusline(const FormInfo * form,
statusline(FORM_LINK_RESET_MESSAGE);
break;
case F_BUTTON_TYPE:
- if (FormIsReadonly(form))
+ if (FormIsReadonly(form)) {
statusline(FORM_LINK_BUTTON_DIS_MSG);
- else
+ } else if (fields_are_named()) {
+ char *submit_str = NULL;
+
+ HTSprintf0(&submit_str, FORM_LINK_BUTTON_ADV_MSG, form->name);
+ statusline(submit_str);
+ FREE(submit_str);
+ } else {
statusline(FORM_LINK_BUTTON_MESSAGE);
+ }
break;
case F_FILE_TYPE:
if (FormIsReadonly(form))
@@ -1001,15 +1015,21 @@ void show_formlink_statusline(const FormInfo * form,
statusline(FORM_LINK_FILE_MESSAGE);
break;
case F_TEXT_TYPE:
- if (FormIsReadonly(form))
+ if (FormIsReadonly(form)) {
statusline(FORM_LINK_TEXT_UNM_MSG);
- else
-#ifdef TEXTFIELDS_MAY_NEED_ACTIVATION
- if (for_what == FOR_PANEL)
- statusline(FORM_LINK_TEXT_MESSAGE_INA);
- else
-#endif
- statusline(FORM_LINK_TEXT_MESSAGE);
+ } else if (fields_are_named()) {
+ char *submit_str = NULL;
+
+ HTSprintf0(&submit_str,
+ TMA_PANEL(FORM_LINK_TEXT_ADV_MSG_INA,
+ FORM_LINK_TEXT_ADV_MSG),
+ form->name);
+ statusline(submit_str);
+ FREE(submit_str);
+ } else {
+ statusline(TMA_PANEL(FORM_LINK_TEXT_MESSAGE_INA,
+ FORM_LINK_TEXT_MESSAGE));
+ }
break;
case F_TEXTAREA_TYPE:
if (FormIsReadonly(form)) {
@@ -1026,23 +1046,32 @@ void show_formlink_statusline(const FormInfo * form,
#endif
}
if (non_empty(xkey_info)) {
-#ifdef TEXTFIELDS_MAY_NEED_ACTIVATION
- if (for_what == FOR_PANEL)
- HTSprintf0(&submit_str, FORM_LINK_TEXTAREA_MESSAGE_INA_E,
+ if (fields_are_named()) {
+ HTSprintf0(&submit_str,
+ TMA_PANEL(FORM_LINK_TEXTAREA_ADV_MSG_INA_E,
+ FORM_LINK_TEXTAREA_ADV_MSG_E),
+ form->name,
xkey_info);
- else
-#endif
- HTSprintf0(&submit_str, FORM_LINK_TEXTAREA_MESSAGE_E,
+ } else {
+ HTSprintf0(&submit_str,
+ TMA_PANEL(FORM_LINK_TEXTAREA_MESSAGE_INA_E,
+ FORM_LINK_TEXTAREA_MESSAGE_E),
xkey_info);
+ }
statusline(submit_str);
FREE(submit_str);
} else {
-#ifdef TEXTFIELDS_MAY_NEED_ACTIVATION
- if (for_what == FOR_PANEL)
- statusline(FORM_LINK_TEXTAREA_MESSAGE_INA);
- else
-#endif
- statusline(FORM_LINK_TEXTAREA_MESSAGE);
+ if (fields_are_named()) {
+ HTSprintf0(&submit_str,
+ TMA_PANEL(FORM_LINK_TEXTAREA_ADV_MSG_INA,
+ FORM_LINK_TEXTAREA_ADV_MSG),
+ form->name);
+ statusline(submit_str);
+ FREE(submit_str);
+ } else {
+ statusline(TMA_PANEL(FORM_LINK_TEXTAREA_MESSAGE_INA,
+ FORM_LINK_TEXTAREA_MESSAGE));
+ }
}
FREE(xkey_info);
}
diff --git a/src/LYGlobalDefs.h b/src/LYGlobalDefs.h
index 59e34cf..0e27a76 100644
--- a/src/LYGlobalDefs.h
+++ b/src/LYGlobalDefs.h
@@ -1,5 +1,5 @@
/*
- * $LynxId: LYGlobalDefs.h,v 1.138 2014/02/04 01:25:39 tom Exp $
+ * $LynxId: LYGlobalDefs.h,v 1.141 2015/12/18 00:35:49 tom Exp $
*
* global variable definitions
*/
@@ -141,6 +141,8 @@ extern "C" {
#define fields_are_numbered() \
(keypad_mode == FIELDS_ARE_NUMBERED || \
keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED)
+#define fields_are_named() \
+ (user_mode == ADVANCED_MODE)
#define HIDDENLINKS_MERGE 0
#define HIDDENLINKS_SEPARATE 1
@@ -536,6 +538,15 @@ extern "C" {
extern int LYHiddenLinks;
extern char *SSL_cert_file; /* Default CA CERT file */
+ extern char *SSL_client_cert_file; /* Default client CERT file */
+ extern char *SSL_client_key_file; /* Default client key file */
+
+ typedef enum {
+ HTTP_1_0
+ ,HTTP_1_1
+ } HTTP_LEVEL;
+
+ extern int HTprotocolLevel;
extern int Old_DTD;
diff --git a/src/LYHistory.c b/src/LYHistory.c
index 016fe7b..3f13bbd 100644
--- a/src/LYHistory.c
+++ b/src/LYHistory.c
@@ -1,5 +1,5 @@
/*
- * $LynxId: LYHistory.c,v 1.86 2013/10/19 00:46:43 tom Exp $
+ * $LynxId: LYHistory.c,v 1.87 2015/12/16 01:45:14 tom Exp $
*/
#include <HTUtils.h>
#include <HTTP.h>
@@ -627,7 +627,7 @@ int LYhist_next(DocInfo *doc, DocInfo *newdoc)
void LYpop_num(int number,
DocInfo *doc)
{
- if (number >= 0 && nhist + nhist_extra > number) {
+ if (number >= 0 && (nhist + nhist_extra) > number) {
doc->link = HDOC(number).link;
doc->line = HDOC(number).line;
StrAllocCopy(doc->title, HDOC(number).title);
diff --git a/src/LYIcon.rc b/src/LYIcon.rc
index aefc76e..d73a3ab 100644
--- a/src/LYIcon.rc
+++ b/src/LYIcon.rc
@@ -1,12 +1,12 @@
-// $LynxId: LYIcon.rc,v 1.18 2015/04/15 00:19:14 tom Exp $
+// $LynxId: LYIcon.rc,v 1.20 2015/09/17 22:43:49 tom Exp $
#include <windows.h>
100 ICON "../samples/lynx.ico"
VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,8,9,1006
-PRODUCTVERSION 2,8,9,1006
+FILEVERSION 2,8,9,1007
+PRODUCTVERSION 2,8,9,1007
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -17,14 +17,14 @@ BEGIN
BEGIN
BLOCK "040904B0"
BEGIN
- VALUE "CompanyName", "http://lynx.isc.org"
+ VALUE "CompanyName", "http://invisible-island.net/lynx"
VALUE "FileDescription", "Lynx - web browser"
- VALUE "FileVersion", "2.8.9.1006"
+ VALUE "FileVersion", "2.8.9.1007"
VALUE "InternalName", "Lynx"
VALUE "LegalCopyright", "�1997-2015 Thomas E. Dickey"
VALUE "OriginalFilename", "lynx.exe"
VALUE "ProductName", "Lynx - web browser"
- VALUE "ProductVersion", "2.8.9.1006"
+ VALUE "ProductVersion", "2.8.9.1007"
END
END
BLOCK "VarFileInfo"
diff --git a/src/LYKeymap.c b/src/LYKeymap.c
index c8d3a6c..4d24983 100644
--- a/src/LYKeymap.c
+++ b/src/LYKeymap.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYKeymap.c,v 1.113 2014/12/09 01:48:50 tom Exp $ */
+/* $LynxId: LYKeymap.c,v 1.118 2015/12/17 01:27:51 tom Exp $ */
#include <HTUtils.h>
#include <LYUtils.h>
#include <LYGlobalDefs.h>
@@ -58,146 +58,146 @@ LYKeymap_t keymap[KEYMAP_SIZE];
static const LYEditInit initKeymapData[] =
{
- {1, LYK_DO_NOTHING}, /* nul */
- {2, LYK_HOME}, /* ^B */
- {3, LYK_PREV_PAGE}, /* ^C */
- {5, LYK_ABORT}, /* ^E */
- {6, LYK_END}, /* ^F */
- {7, LYK_NEXT_PAGE}, /* ^G */
- {9, LYK_HISTORY}, /* ^I */
- {10, LYK_FASTFORW_LINK}, /* ^J */
- {11, LYK_ACTIVATE}, /* ^K */
- {12, LYK_COOKIE_JAR}, /* ^L */
- {13, LYK_REFRESH}, /* ^M */
- {14, LYK_ACTIVATE}, /* ^N */
- {15, LYK_DOWN_TWO}, /* ^O */
- {17, LYK_UP_TWO}, /* ^Q */
- {18, LYK_CHANGE_CENTER}, /* XON */
- {19, LYK_RELOAD}, /* ^S */
- {20, LYK_TO_CLIPBOARD}, /* XOFF */
- {21, LYK_TRACE_TOGGLE}, /* ^U */
- {22, LYK_NEXT_DOC}, /* ^V */
- {23, LYK_SWITCH_DTD}, /* ^W */
- {24, LYK_REFRESH}, /* ^X */
- {25, LYK_CACHE_JAR}, /* ^Y */
- {27, LYK_MAXSCREEN_TOGGLE}, /* ^Z */
- {33, LYK_NEXT_PAGE}, /* */
- {34, LYK_SHELL}, /* ! */
- {35, LYK_SOFT_DQUOTES}, /* " */
- {36, LYK_TOOLBAR}, /* # */
- {37, LYK_LAST_LINK}, /* $ */
- {40, LYK_HISTORICAL}, /* ' */
- {41, LYK_UP_HALF}, /* ( */
- {42, LYK_DOWN_HALF}, /* ) */
- {43, LYK_IMAGE_TOGGLE}, /* * */
- {44, LYK_NEXT_PAGE}, /* + */
- {45, LYK_EXTERN_PAGE}, /* , */
- {46, LYK_PREV_PAGE}, /* - */
- {47, LYK_EXTERN_LINK}, /* . */
- {48, LYK_WHEREIS}, /* / */
- {49, LYK_F_LINK_NUM}, /* 0 */
- {50, LYK_1}, /* 1 */
- {51, LYK_2}, /* 2 */
- {52, LYK_3}, /* 3 */
- {53, LYK_4}, /* 4 */
- {54, LYK_5}, /* 5 */
- {55, LYK_6}, /* 6 */
- {56, LYK_7}, /* 7 */
- {57, LYK_8}, /* 8 */
- {58, LYK_9}, /* 9 */
- {59, LYK_COMMAND}, /* : */
- {60, LYK_TRACE_LOG}, /* ; */
- {61, LYK_UP_LINK}, /* < */
- {62, LYK_INFO}, /* = */
- {63, LYK_DOWN_LINK}, /* > */
- {64, LYK_HELP}, /* ? */
- {65, LYK_RAW_TOGGLE}, /* @ */
- {66, LYK_ADDRLIST}, /* A */
- {67, LYK_PREV_PAGE}, /* B */
+ {KTL('@'), LYK_DO_NOTHING},
+ {KTL('A'), LYK_HOME},
+ {KTL('B'), LYK_PREV_PAGE},
+ {KTL('D'), LYK_ABORT},
+ {KTL('E'), LYK_END},
+ {KTL('F'), LYK_NEXT_PAGE},
+ {KTL('H'), LYK_HISTORY},
+ {KTL('I'), LYK_FASTFORW_LINK},
+ {KTL('J'), LYK_ACTIVATE},
+ {KTL('K'), LYK_COOKIE_JAR},
+ {KTL('L'), LYK_REFRESH},
+ {KTL('M'), LYK_ACTIVATE},
+ {KTL('N'), LYK_DOWN_TWO},
+ {KTL('P'), LYK_UP_TWO},
+ {KTL('Q'), LYK_CHANGE_CENTER},
+ {KTL('R'), LYK_RELOAD},
+ {KTL('S'), LYK_TO_CLIPBOARD},
+ {KTL('T'), LYK_TRACE_TOGGLE},
+ {KTL('U'), LYK_NEXT_DOC},
+ {KTL('V'), LYK_SWITCH_DTD},
+ {KTL('W'), LYK_REFRESH},
+ {KTL('X'), LYK_CACHE_JAR},
+ {KTL('Z'), LYK_MAXSCREEN_TOGGLE},
+ {KHR(' '), LYK_NEXT_PAGE},
+ {KHR('!'), LYK_SHELL},
+ {KHR('"'), LYK_SOFT_DQUOTES},
+ {KHR('#'), LYK_TOOLBAR},
+ {KHR('$'), LYK_LAST_LINK},
+ {KHR('\''), LYK_HISTORICAL},
+ {KHR('('), LYK_UP_HALF},
+ {KHR(')'), LYK_DOWN_HALF},
+ {KHR('*'), LYK_IMAGE_TOGGLE},
+ {KHR('+'), LYK_NEXT_PAGE},
+ {KHR(','), LYK_EXTERN_PAGE},
+ {KHR('-'), LYK_PREV_PAGE},
+ {KHR('.'), LYK_EXTERN_LINK},
+ {KHR('/'), LYK_WHEREIS},
+ {KHR('0'), LYK_F_LINK_NUM},
+ {KHR('1'), LYK_1},
+ {KHR('2'), LYK_2},
+ {KHR('3'), LYK_3},
+ {KHR('4'), LYK_4},
+ {KHR('5'), LYK_5},
+ {KHR('6'), LYK_6},
+ {KHR('7'), LYK_7},
+ {KHR('8'), LYK_8},
+ {KHR('9'), LYK_9},
+ {KHR(':'), LYK_COMMAND},
+ {KHR(';'), LYK_TRACE_LOG},
+ {KHR('<'), LYK_UP_LINK},
+ {KHR('='), LYK_INFO},
+ {KHR('>'), LYK_DOWN_LINK},
+ {KHR('?'), LYK_HELP},
+ {KHR('@'), LYK_RAW_TOGGLE},
+ {KHR('A'), LYK_ADDRLIST},
+ {KHR('B'), LYK_PREV_PAGE},
#ifdef SUPPORT_CHDIR
- {68, LYK_CHDIR}, /* C */
+ {KHR('C'), LYK_CHDIR},
#else
- {68, LYK_COMMENT}, /* C */
+ {KHR('C'), LYK_COMMENT},
#endif
- {69, LYK_DOWNLOAD}, /* D */
- {70, LYK_ELGOTO}, /* E */
- {71, LYK_DIRED_MENU}, /* F */
- {72, LYK_ECGOTO}, /* G */
- {73, LYK_HELP}, /* H */
- {74, LYK_INDEX}, /* I */
+ {KHR('D'), LYK_DOWNLOAD},
+ {KHR('E'), LYK_ELGOTO},
+ {KHR('F'), LYK_DIRED_MENU},
+ {KHR('G'), LYK_ECGOTO},
+ {KHR('H'), LYK_HELP},
+ {KHR('I'), LYK_INDEX},
#ifdef KANJI_CODE_OVERRIDE
- {75, LYK_CHANGE_KCODE}, /* J */
+ {KHR('J'), LYK_CHANGE_KCODE},
#else
- {75, LYK_JUMP}, /* J */
+ {KHR('J'), LYK_JUMP},
#endif
- {76, LYK_KEYMAP}, /* K */
- {77, LYK_LIST}, /* L */
- {78, LYK_MAIN_MENU}, /* M */
- {79, LYK_PREV}, /* N */
- {80, LYK_OPTIONS}, /* O */
- {81, LYK_PRINT}, /* P */
- {82, LYK_ABORT}, /* Q */
- {83, LYK_DEL_BOOKMARK}, /* R */
- {84, LYK_INDEX_SEARCH}, /* S */
- {85, LYK_TAG_LINK}, /* T */
- {86, LYK_PREV_DOC}, /* U */
- {87, LYK_VLINKS}, /* V */
- {89, LYK_NOCACHE}, /* X */
- {91, LYK_INTERRUPT}, /* Z */
- {92, LYK_INLINE_TOGGLE}, /* [ */
- {93, LYK_SOURCE}, /* \ */
- {94, LYK_HEAD}, /* ] */
- {95, LYK_FIRST_LINK}, /* ^ */
- {96, LYK_CLEAR_AUTH}, /* _ */
- {97, LYK_MINIMAL}, /* ` */
- {98, LYK_ADD_BOOKMARK}, /* a */
- {99, LYK_PREV_PAGE}, /* b */
- {100, LYK_COMMENT}, /* c */
- {101, LYK_DOWNLOAD}, /* d */
- {102, LYK_EDIT}, /* e */
- {103, LYK_DIRED_MENU}, /* f */
- {104, LYK_GOTO}, /* g */
- {105, LYK_HELP}, /* h */
- {106, LYK_INDEX}, /* i */
- {107, LYK_JUMP}, /* j */
- {108, LYK_KEYMAP}, /* k */
- {109, LYK_LIST}, /* l */
- {110, LYK_MAIN_MENU}, /* m */
- {111, LYK_NEXT}, /* n */
- {112, LYK_OPTIONS}, /* o */
- {113, LYK_PRINT}, /* p */
- {114, LYK_QUIT}, /* q */
- {115, LYK_DEL_BOOKMARK}, /* r */
- {116, LYK_INDEX_SEARCH}, /* s */
- {117, LYK_TAG_LINK}, /* t */
- {118, LYK_PREV_DOC}, /* u */
- {119, LYK_VIEW_BOOKMARK}, /* v */
- {121, LYK_NOCACHE}, /* x */
- {123, LYK_INTERRUPT}, /* z */
- {124, LYK_SHIFT_LEFT}, /* { */
- {125, LYK_LINEWRAP_TOGGLE}, /* | */
- {126, LYK_SHIFT_RIGHT}, /* } */
- {127, LYK_NESTED_TABLES}, /* ~ */
- {128, LYK_HISTORY}, /* DEL */
- {257, LYK_PREV_LINK}, /* UPARROW_KEY */
- {258, LYK_NEXT_LINK}, /* DNARROW_KEY */
- {259, LYK_ACTIVATE}, /* RTARROW_KEY */
- {260, LYK_PREV_DOC}, /* LTARROW_KEY */
- {261, LYK_NEXT_PAGE}, /* PGDOWN_KEY */
- {262, LYK_PREV_PAGE}, /* PGUP_KEY */
- {263, LYK_HOME}, /* HOME_KEY */
- {264, LYK_END}, /* END_KEY */
- {265, LYK_DWIMHELP}, /* F1_KEY */
+ {KHR('K'), LYK_KEYMAP},
+ {KHR('L'), LYK_LIST},
+ {KHR('M'), LYK_MAIN_MENU},
+ {KHR('N'), LYK_PREV},
+ {KHR('O'), LYK_OPTIONS},
+ {KHR('P'), LYK_PRINT},
+ {KHR('Q'), LYK_ABORT},
+ {KHR('R'), LYK_DEL_BOOKMARK},
+ {KHR('S'), LYK_INDEX_SEARCH},
+ {KHR('T'), LYK_TAG_LINK},
+ {KHR('U'), LYK_PREV_DOC},
+ {KHR('V'), LYK_VLINKS},
+ {KHR('X'), LYK_NOCACHE},
+ {KHR('Z'), LYK_INTERRUPT},
+ {KHR('['), LYK_INLINE_TOGGLE},
+ {KHR('\\'), LYK_SOURCE},
+ {KHR(']'), LYK_HEAD},
+ {KHR('^'), LYK_FIRST_LINK},
+ {KHR('_'), LYK_CLEAR_AUTH},
+ {KHR('`'), LYK_MINIMAL},
+ {KHR('a'), LYK_ADD_BOOKMARK},
+ {KHR('b'), LYK_PREV_PAGE},
+ {KHR('c'), LYK_COMMENT},
+ {KHR('d'), LYK_DOWNLOAD},
+ {KHR('e'), LYK_EDIT},
+ {KHR('f'), LYK_DIRED_MENU},
+ {KHR('g'), LYK_GOTO},
+ {KHR('h'), LYK_HELP},
+ {KHR('i'), LYK_INDEX},
+ {KHR('j'), LYK_JUMP},
+ {KHR('k'), LYK_KEYMAP},
+ {KHR('l'), LYK_LIST},
+ {KHR('m'), LYK_MAIN_MENU},
+ {KHR('n'), LYK_NEXT},
+ {KHR('o'), LYK_OPTIONS},
+ {KHR('p'), LYK_PRINT},
+ {KHR('q'), LYK_QUIT},
+ {KHR('r'), LYK_DEL_BOOKMARK},
+ {KHR('s'), LYK_INDEX_SEARCH},
+ {KHR('t'), LYK_TAG_LINK},
+ {KHR('u'), LYK_PREV_DOC},
+ {KHR('v'), LYK_VIEW_BOOKMARK},
+ {KHR('x'), LYK_NOCACHE},
+ {KHR('z'), LYK_INTERRUPT},
+ {KHR('{'), LYK_SHIFT_LEFT},
+ {KHR('|'), LYK_LINEWRAP_TOGGLE},
+ {KHR('}'), LYK_SHIFT_RIGHT},
+ {KHR('~'), LYK_NESTED_TABLES},
+ {KHR(DEL_KEY), LYK_HISTORY},
+ {KHR(UPARROW_KEY), LYK_PREV_LINK},
+ {KHR(DNARROW_KEY), LYK_NEXT_LINK},
+ {KHR(RTARROW_KEY), LYK_ACTIVATE},
+ {KHR(LTARROW_KEY), LYK_PREV_DOC},
+ {KHR(PGDOWN_KEY), LYK_NEXT_PAGE},
+ {KHR(PGUP_KEY), LYK_PREV_PAGE},
+ {KHR(HOME_KEY), LYK_HOME},
+ {KHR(END_KEY), LYK_END},
+ {KHR(F1_KEY), LYK_DWIMHELP},
#if !(defined(_WINDOWS) || defined(__DJGPP__))
- {266, LYK_ACTIVATE}, /* DO_KEY */
- {267, LYK_HOME}, /* FIND_KEY */
- {268, LYK_END}, /* SELECT_KEY */
+ {KHR(DO_KEY), LYK_ACTIVATE},
+ {KHR(FIND_KEY), LYK_HOME},
+ {KHR(SELECT_KEY), LYK_END},
#endif
- {269, LYK_UP_TWO}, /* INSERT_KEY */
- {270, LYK_DOWN_TWO}, /* REMOVE_KEY */
- {271, LYK_DO_NOTHING}, /* DO_NOTHING */
- {272, LYK_FASTBACKW_LINK}, /* BACKTAB_KEY */
- {282, LYK_DO_NOTHING}, /* F11_KEY */
+ {KHR(INSERT_KEY), LYK_UP_TWO},
+ {KHR(REMOVE_KEY), LYK_DOWN_TWO},
+ {KHR(DO_NOTHING), LYK_DO_NOTHING},
+ {KHR(BACKTAB_KEY), LYK_FASTBACKW_LINK},
+ {KHR(F11_KEY), LYK_DO_NOTHING},
#ifdef DJGPP_KEYHANDLER
{302, LYK_ABORT},
#endif /* DJGPP_KEYHANDLER */
@@ -424,10 +424,10 @@ static Kcmd revmap[] =
"search within the current document"),
DATA(
LYK_PREV, "PREV",
- "search for the previous occurence"),
+ "search for the previous occurrence"),
DATA(
LYK_NEXT, "NEXT",
- "search for the next occurence"),
+ "search for the next occurrence"),
DATA(
LYK_COMMENT, "COMMENT",
"send a comment to the author of the current document"),
@@ -852,7 +852,9 @@ static char *pretty_html(int c)
for (n = 0; n < TABLESIZE(table); n++) {
if (c == table[n].code) {
found = TRUE;
- LYStrNCpy(dst, table[n].name, sizeof(dst) - 1);
+ LYStrNCpy(dst,
+ table[n].name,
+ sizeof(buf) - (size_t) ((dst - buf) - 1));
adj += (int) strlen(dst) - 1;
dst += (int) strlen(dst);
break;
diff --git a/src/LYKeymap.h b/src/LYKeymap.h
index d5a4b21..a06db04 100644
--- a/src/LYKeymap.h
+++ b/src/LYKeymap.h
@@ -1,4 +1,4 @@
-/* $LynxId: LYKeymap.h,v 1.53 2013/10/20 22:11:03 tom Exp $ */
+/* $LynxId: LYKeymap.h,v 1.55 2015/10/07 23:34:55 tom Exp $ */
#ifndef LYKEYMAP_H
#define LYKEYMAP_H
@@ -52,6 +52,11 @@ extern "C" {
extern LYKeymap_t key_override[];
#endif
+/* readable mapping for characters in edit- and key-maps */
+#define CTL(c) ((c) & 0x1f)
+#define KHR(c) ((c) + 1)
+#define KTL(c) (CTL(c) + 1)
+
/* * * LynxKeyCodes * * */
#define LKC_ISLECLAC 0x8000 /* flag: contains lynxaction + editaction */
#define LKC_MOD1 0x4000 /* a modifier bit - currently for ^x-map */
diff --git a/src/LYMain.c b/src/LYMain.c
index 33277aa..f70bc3b 100644
--- a/src/LYMain.c
+++ b/src/LYMain.c
@@ -1,5 +1,5 @@
/*
- * $LynxId: LYMain.c,v 1.253 2014/02/12 23:48:36 tom Exp $
+ * $LynxId: LYMain.c,v 1.260 2015/12/18 00:34:45 tom Exp $
*/
#include <HTUtils.h>
#include <HTTP.h>
@@ -554,6 +554,10 @@ BOOLEAN LYNoISMAPifUSEMAP = FALSE; /* Omit ISMAP link if MAP present? */
int LYHiddenLinks = HIDDENLINKS_SEPARATE; /* Show hidden links? */
char *SSL_cert_file = NULL; /* Default CA CERT file */
+char *SSL_client_cert_file = NULL;
+char *SSL_client_key_file = NULL;
+
+int HTprotocolLevel = HTTP_1_0;
int Old_DTD = NO;
static BOOLEAN DTD_recovery = NO;
@@ -1579,6 +1583,25 @@ int main(int argc,
*/
read_cfg(lynx_cfg_file, "main program", 1, (FILE *) 0);
+ {
+ static char *client_keyfile = NULL;
+ static char *client_certfile = NULL;
+
+ if ((client_keyfile = LYGetEnv("SSL_CLIENT_KEY_FILE")) != NULL) {
+ CTRACE((tfp,
+ "HTGetSSLHandle: client keyfile is set to %s by SSL_CLIENT_KEY_FILE\n",
+ client_keyfile));
+ StrAllocCopy(SSL_client_key_file, client_keyfile);
+ }
+
+ if ((client_certfile = LYGetEnv("SSL_CLIENT_CERT_FILE")) != NULL) {
+ CTRACE((tfp,
+ "HTGetSSLHandle: client certfile is set to %s by SSL_CLIENT_CERT_FILE\n",
+ client_certfile));
+ StrAllocCopy(SSL_client_cert_file, client_certfile);
+ }
+ }
+
#if defined(USE_COLOR_STYLE)
if (!dump_output_immediately) {
init_color_styles(&lynx_lss_file2, default_color_styles);
@@ -3208,11 +3231,14 @@ static int version_fun(char *next_arg GCC_UNUSED)
printf("%s\n", result);
free(result);
-#ifndef __DATE__
-#define __DATE__ ""
-#endif
-#ifndef __TIME__
-#define __TIME__ ""
+/*
+ * Define NO_BUILDSTAMP if you really want an executable with no timestamp in
+ * the -version message.
+ */
+#ifdef NO_BUILDSTAMP
+#define BUILDSTAMP ""
+#else
+#define BUILDSTAMP " (" __DATE__ " " __TIME__ ")"
#endif
/*
@@ -3220,32 +3246,24 @@ static int version_fun(char *next_arg GCC_UNUSED)
* systems, according to predefined compiler symbols.
*/
#ifdef SYSTEM_NAME
- printf(gettext("Built on %s %s %s\n"), SYSTEM_NAME, __DATE__, __TIME__);
-#else
-#ifdef __CYGWIN__
- printf("Compiled by CYGWIN (%s %s).\n", __DATE__, __TIME__);
-#else
-#ifdef __BORLANDC__
- printf("Compiled by Borland C++ (%s %s).\n", __DATE__, __TIME__);
-#else
-#ifdef _MSC_VER
- printf("Compiled by Microsoft Visual C++ (%s %s).\n", __DATE__, __TIME__);
-#else
-#ifdef __DJGPP__
- printf("Compiled by DJGPP (%s %s).\n", __DATE__, __TIME__);
-#else
- printf("Compiled at (%s %s).\n", __DATE__, __TIME__);
-#endif /* __DJGPP__ */
-#endif /* _MSC_VER */
-#endif /* __BORLANDC__ */
-#endif /* __CYGWIN__ */
+ printf(gettext("Built on %s%s.\n"), SYSTEM_NAME, BUILDSTAMP);
+#elif defined(__CYGWIN__)
+ printf("Compiled by CYGWIN%s.\n", BUILDSTAMP);
+#elif defined(__BORLANDC__)
+ printf("Compiled by Borland C++%s.\n", BUILDSTAMP);
+#elif defined(_MSC_VER)
+ printf("Compiled by Microsoft Visual C++%s.\n", BUILDSTAMP);
+#elif defined(__DJGPP__)
+ printf("Compiled by DJGPP%s.\n", BUILDSTAMP);
+#elif !defined(NO_BUILDSTAMP)
+ printf("Compiled at %s %s.\n", __DATE__, __TIME__);
#endif
puts("");
puts(gettext("Copyrights held by the Lynx Developers Group,"));
puts(gettext("the University of Kansas, CERN, and other contributors."));
puts(gettext("Distributed under the GNU General Public License (Version 2)."));
- puts(gettext("See http://lynx.isc.org/ and the online help for more information."));
+ puts(gettext("See http://lynx.invisible-island.net/ and the online help for more information."));
puts("");
#ifdef USE_SSL
#if defined(OPENSSL_VERSION_TEXT) && !defined(LIBGNUTLS_VERSION)
diff --git a/src/LYOptions.c b/src/LYOptions.c
index 5e7415e..5ee1853 100644
--- a/src/LYOptions.c
+++ b/src/LYOptions.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYOptions.c,v 1.165 2014/12/21 21:27:45 tom Exp $ */
+/* $LynxId: LYOptions.c,v 1.168 2015/12/18 01:01:21 tom Exp $ */
#include <HTUtils.h>
#include <HTFTP.h>
#include <HTTP.h> /* 'reloading' flag */
@@ -1593,9 +1593,13 @@ static int widest_choice(STRING2PTR choices)
static void show_choice(const char *choice,
int width)
{
- int len = (int) strlen(choice);
+ int len = 0;
- LYaddstr(choice);
+ if (choice != 0) {
+ len = (int) strlen(choice);
+
+ LYaddstr(choice);
+ }
while (len++ < width)
LYaddch(' ');
}
@@ -2439,11 +2443,22 @@ static OptValues encoding_values[] =
/*
* Headers transferred to remote server
*/
+static const char *http_protocol_string = RC_HTTP_PROTOCOL;
+static OptValues http_protocol_values[] =
+{
+ {HTTP_1_0, N_("HTTP 1.0"), "HTTP_1_0"},
+ {HTTP_1_1, N_("HTTP 1.1"), "HTTP_1_1"},
+ {0, 0, 0}
+};
+
static const char *preferred_doc_char_string = RC_PREFERRED_CHARSET;
static const char *preferred_doc_lang_string = RC_PREFERRED_LANGUAGE;
static const char *send_user_agent_string = RC_SEND_USERAGENT;
static const char *user_agent_string = RC_USERAGENT;
+static const char *ssl_client_certificate_file = RC_SSL_CLIENT_CERT_FILE;
+static const char *ssl_client_key_file = RC_SSL_CLIENT_KEY_FILE;
+
#define PutHeader(fp, Name) \
fprintf(fp, "\n%s<em>%s</em>\n", MARGIN_STR, LYEntifyTitle(&buffer, Name));
@@ -3255,11 +3270,28 @@ int postoptions(DocInfo *newdoc)
}
}
+ /*
+ * HTTP protocol: SELECT
+ */
+ if (!strcmp(data[i].tag, http_protocol_string)) {
+ GetOptValues(http_protocol_values, data[i].value, &HTprotocolLevel);
+ }
+
/* Send User Agent: INPUT */
if (!strcmp(data[i].tag, send_user_agent_string)) {
LYSendUserAgent = (BOOLEAN) !strcasecomp(data[i].value, "ON");
}
+ if (!strcmp(data[i].tag, ssl_client_certificate_file)) {
+ FREE(SSL_client_cert_file);
+ StrAllocCopy(SSL_client_cert_file, data[i].value);
+ }
+
+ if (!strcmp(data[i].tag, ssl_client_key_file)) {
+ FREE(SSL_client_key_file);
+ StrAllocCopy(SSL_client_key_file, data[i].value);
+ }
+
/* User Agent: INPUT */
if (!strcmp(data[i].tag, user_agent_string) && (!no_useragent)) {
if (strcmp(LYUserAgent, data[i].value)) {
@@ -3729,6 +3761,15 @@ static int gen_options(char **newfile)
BeginSelect(fp0, ssl_prompt_string);
PutOptValues(fp0, ssl_noprompt, prompt_values);
EndSelect(fp0);
+
+ PutLabel(fp0, gettext("SSL client certificate file"), ssl_client_certificate_file);
+ PutTextInput(fp0, ssl_client_certificate_file,
+ NonNull(SSL_client_cert_file), text_len, "");
+
+ PutLabel(fp0, gettext("SSL client key file"), ssl_client_key_file);
+ PutTextInput(fp0, ssl_client_key_file,
+ NonNull(SSL_client_key_file), text_len, "");
+
#endif
PutHeader(fp0, gettext("Keyboard Input"));
@@ -4016,6 +4057,12 @@ static int gen_options(char **newfile)
PutTextInput(fp0, preferred_doc_lang_string,
NonNull(language), cset_len + 2, "");
+ /* HTTP protocol SELECT */
+ PutLabel(fp0, gettext("HTTP protocol"), http_protocol_string);
+ BeginSelect(fp0, http_protocol_string);
+ PutOptValues(fp0, HTprotocolLevel, http_protocol_values);
+ EndSelect(fp0);
+
/* User Agent: INPUT */
if (!no_useragent) {
PutLabel(fp0, gettext("Send User-Agent header"), send_user_agent_string);
diff --git a/src/LYReadCFG.c b/src/LYReadCFG.c
index 6266ff9..d2ae340 100644
--- a/src/LYReadCFG.c
+++ b/src/LYReadCFG.c
@@ -1,5 +1,5 @@
/*
- * $LynxId: LYReadCFG.c,v 1.184 2014/02/12 23:59:11 tom Exp $
+ * $LynxId: LYReadCFG.c,v 1.187 2015/12/18 01:58:34 tom Exp $
*/
#ifndef NO_RULES
#include <HTRules.h>
@@ -1559,6 +1559,7 @@ static Config_Type Config_Table [] =
PARSE_FUN(RC_HTMLSRC_ATTRNAME_XFORM, read_htmlsrc_attrname_xform),
PARSE_FUN(RC_HTMLSRC_TAGNAME_XFORM, read_htmlsrc_tagname_xform),
#endif
+ PARSE_FUN(RC_HTTP_PROTOCOL, get_http_protocol),
PARSE_Env(RC_HTTP_PROXY, 0),
PARSE_Env(RC_HTTPS_PROXY, 0),
PARSE_REQ(RC_INCLUDE, 0),
@@ -1719,6 +1720,8 @@ static Config_Type Config_Table [] =
PARSE_ENU(RC_SOURCE_CACHE_FOR_ABORTED, LYCacheSourceForAborted, tbl_abort_source_cache),
#endif
PARSE_STR(RC_SSL_CERT_FILE, SSL_cert_file),
+ PARSE_STR(RC_SSL_CLIENT_CERT_FILE, SSL_client_cert_file),
+ PARSE_STR(RC_SSL_CLIENT_KEY_FILE, SSL_client_key_file),
PARSE_FUN(RC_STARTFILE, startfile_fun),
PARSE_FUN(RC_STATUS_BUFFER_SIZE, status_buffer_size_fun),
PARSE_SET(RC_STRIP_DOTDOT_URLS, LYStripDotDotURLs),
diff --git a/src/LYSession.c b/src/LYSession.c
index 99884d1..8f55b76 100644
--- a/src/LYSession.c
+++ b/src/LYSession.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYSession.c,v 1.9 2013/11/28 11:21:22 tom Exp $ */
+/* $LynxId: LYSession.c,v 1.11 2015/09/19 17:40:20 tom Exp $ */
#include <LYSession.h>
@@ -20,7 +20,7 @@
* / hereby
* / reduce
* g file://localhost/COPYRIGHT
- * g http://lynx.isc.org
+ * g http://lynx.invisible-island.net
* h 1 -1 file://localhost/COPYRIGHT Entry into main screen
* h 1 0 LYNXCACHE:/ Cache Jar
* h 1 16 file://localhost/usr/local/share/lynx_help/Lynx_users_guide.html#Cache Lynx Users Guide v2.8.6
diff --git a/src/LYStrings.c b/src/LYStrings.c
index 64418ab..b9411f8 100644
--- a/src/LYStrings.c
+++ b/src/LYStrings.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYStrings.c,v 1.260 2014/12/09 01:49:18 tom Exp $ */
+/* $LynxId: LYStrings.c,v 1.263 2015/12/16 01:18:53 tom Exp $ */
#include <HTUtils.h>
#include <HTCJK.h>
#include <UCAux.h>
@@ -4126,6 +4126,32 @@ static void draw_option(WINDOW * win, int entry,
#endif /* USE_SLANG */
}
+static void show_popup_status(int cur_choice,
+ STRING2PTR choices,
+ int disabled,
+ int for_mouse)
+{
+ if (disabled) {
+ _statusline(CHOICE_LIST_UNM_MSG);
+ } else if (!for_mouse) {
+ if (fields_are_named()) {
+ char *status_msg = NULL;
+
+ HTSprintf0(&status_msg, CHOICE_LIST_ADV_MSG, choices[cur_choice]);
+ _statusline(status_msg);
+ FREE(status_msg);
+ } else {
+ _statusline(CHOICE_LIST_MESSAGE);
+ }
+#if defined(USE_MOUSE) && (defined(NCURSES) || defined(PDCURSES))
+ } else {
+ _statusline(MOUSE_CHOICE_MESSAGE);
+#endif
+ }
+}
+
+#define SHOW_POPUP_STATUS() show_popup_status(cur_choice, choices, disabled, for_mouse)
+
/*
* This function offers the choices for values of an option via a popup window
* which functions like that for selection of options in a form. - FM
@@ -4165,7 +4191,6 @@ int LYhandlePopupList(int cur_choice,
BOOLEAN ReDraw = FALSE;
int number;
char buffer[MAX_LINE];
- const char *popup_status_msg = NULL;
STRING2PTR Cptr = NULL;
#define CAN_SCROLL_DOWN 1
@@ -4327,20 +4352,7 @@ int LYhandlePopupList(int cur_choice,
width -= Lnum;
bottom += top;
- /*
- * Clear the command line and write the popup statusline. - FM
- */
- if (disabled) {
- popup_status_msg = CHOICE_LIST_UNM_MSG;
- } else if (!for_mouse) {
- popup_status_msg = CHOICE_LIST_MESSAGE;
-#if defined(USE_MOUSE) && (defined(NCURSES) || defined(PDCURSES))
- } else {
- popup_status_msg =
- gettext("Left mouse button or return to select, arrow keys to scroll.");
-#endif
- }
- _statusline(popup_status_msg);
+ SHOW_POPUP_STATUS();
/*
* Set up the window_offset for choices.
@@ -4487,12 +4499,12 @@ int LYhandlePopupList(int cur_choice,
if (number <= 1) {
if (window_offset == 0) {
HTUserMsg(ALREADY_AT_OPTION_BEGIN);
- _statusline(popup_status_msg);
+ SHOW_POPUP_STATUS();
break;
}
window_offset = 0;
cur_choice = 0;
- _statusline(popup_status_msg);
+ SHOW_POPUP_STATUS();
goto redraw;
}
@@ -4503,7 +4515,7 @@ int LYhandlePopupList(int cur_choice,
if (number >= npages) {
if (window_offset >= ((num_choices - length) + 1)) {
HTUserMsg(ALREADY_AT_OPTION_END);
- _statusline(popup_status_msg);
+ SHOW_POPUP_STATUS();
break;
}
window_offset = ((npages - 1) * length);
@@ -4512,7 +4524,7 @@ int LYhandlePopupList(int cur_choice,
}
if (cur_choice < window_offset)
cur_choice = window_offset;
- _statusline(popup_status_msg);
+ SHOW_POPUP_STATUS();
goto redraw;
}
@@ -4525,11 +4537,11 @@ int LYhandlePopupList(int cur_choice,
HTSprintf0(&msg, ALREADY_AT_OPTION_PAGE, number);
HTUserMsg(msg);
FREE(msg);
- _statusline(popup_status_msg);
+ SHOW_POPUP_STATUS();
break;
}
cur_choice = window_offset = ((number - 1) * length);
- _statusline(popup_status_msg);
+ SHOW_POPUP_STATUS();
goto redraw;
}
@@ -4569,7 +4581,7 @@ int LYhandlePopupList(int cur_choice,
HTSprintf0(&msg, OPTION_ALREADY_CURRENT, (number + 1));
HTUserMsg(msg);
FREE(msg);
- _statusline(popup_status_msg);
+ SHOW_POPUP_STATUS();
break;
}
@@ -4590,7 +4602,7 @@ int LYhandlePopupList(int cur_choice,
if (window_offset < 0)
window_offset = 0;
}
- _statusline(popup_status_msg);
+ SHOW_POPUP_STATUS();
goto redraw;
}
@@ -4604,7 +4616,7 @@ int LYhandlePopupList(int cur_choice,
/*
* Restore the popup statusline. - FM
*/
- _statusline(popup_status_msg);
+ SHOW_POPUP_STATUS();
break;
case LYK_PREV_LINK:
@@ -5028,7 +5040,7 @@ int LYhandlePopupList(int cur_choice,
* Restore the popup statusline and reset the search variables. -
* FM
*/
- _statusline(popup_status_msg);
+ SHOW_POPUP_STATUS();
BStrCopy0(prev_target, "");
QueryTotal = (search_queries ? HTList_count(search_queries)
: 0);
@@ -5137,7 +5149,7 @@ int LYgetBString(bstring **inputline,
LYFinishEdit(edit);
result = ch;
done = TRUE;
- break;
+ continue;
}
ch |= InputMods;
InputMods = 0;
@@ -5226,7 +5238,7 @@ int LYgetBString(bstring **inputline,
LYFinishEdit(edit);
result = ch;
done = TRUE;
- break;
+ continue;
#ifdef CAN_CUT_AND_PASTE
case LYE_PASTE:
@@ -5279,7 +5291,7 @@ int LYgetBString(bstring **inputline,
LYFinishEdit(edit);
BStrCopy0(*inputline, "");
done = TRUE;
- break;
+ continue;
case LYE_STOP:
CTRACE((tfp, "LYgetstr LYE_STOP\n"));
@@ -5288,7 +5300,7 @@ int LYgetBString(bstring **inputline,
LYFinishEdit(edit);
BStrCopy0(*inputline, "");
done = TRUE;
- break;
+ continue;
#else
#ifdef ENHANCED_LINEEDIT
disableEditMark();
diff --git a/src/LYStrings.h b/src/LYStrings.h
index 6f368a4..c75b3a8 100644
--- a/src/LYStrings.h
+++ b/src/LYStrings.h
@@ -1,5 +1,5 @@
/*
- * $LynxId: LYStrings.h,v 1.114 2014/12/09 01:49:51 tom Exp $
+ * $LynxId: LYStrings.h,v 1.116 2015/10/07 23:20:48 tom Exp $
*/
#ifndef LYSTRINGS_H
#define LYSTRINGS_H
@@ -145,6 +145,7 @@ extern "C" {
*/
typedef enum {
UNKNOWN_KEY = -1
+ ,DEL_KEY = 127
,UPARROW_KEY = 256
,DNARROW_KEY
,RTARROW_KEY
diff --git a/src/LYrcFile.c b/src/LYrcFile.c
index fd751e4..31ada64 100644
--- a/src/LYrcFile.c
+++ b/src/LYrcFile.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYrcFile.c,v 1.92 2013/11/28 11:22:53 tom Exp $ */
+/* $LynxId: LYrcFile.c,v 1.95 2015/12/18 01:57:45 tom Exp $ */
#include <HTUtils.h>
#include <HTFTP.h>
#include <LYUtils.h>
@@ -26,6 +26,12 @@ static Config_Enum tbl_DTD_recovery[] = {
{ NULL, -1 },
};
+static Config_Enum tbl_HTTP_protocol[] = {
+ { "1.0", HTTP_1_0 },
+ { "1.1", HTTP_1_1 },
+ { NULL, -1 },
+};
+
static Config_Enum tbl_bad_html[] = {
{ "ignore", BAD_HTML_IGNORE },
{ "trace", BAD_HTML_TRACE },
@@ -303,6 +309,22 @@ static void put_editor(FILE *fp, struct config_type *tbl)
fprintf(fp, "%s=%s\n\n", tbl->name, NonNull(editor));
}
+int get_http_protocol(char *value)
+{
+ int found = HTprotocolLevel;
+
+ if (LYgetEnum(tbl_HTTP_protocol, value, &found)
+ && HTprotocolLevel != found) {
+ HTprotocolLevel = found;
+ }
+ return 0;
+}
+
+static void put_http_protocol(FILE *fp, struct config_type *tbl)
+{
+ fprintf(fp, "%s=%s\n\n", tbl->name, LYputEnum(tbl_HTTP_protocol, HTprotocolLevel));
+}
+
int get_tagsoup(char *value)
{
int found = Old_DTD;
@@ -430,6 +452,8 @@ file lists such as FTP directories. The options are:\n\
MAYBE_SET(RC_FTP_PASSIVE, ftp_passive, MSG_ENABLE_LYNXRC),
#endif
MAYBE_SET(RC_HTML5_CHARSETS, html5_charsets, MSG_ENABLE_LYNXRC),
+ MAYBE_FUN(RC_HTTP_PROTOCOL, get_http_protocol, put_http_protocol,
+ MSG_ENABLE_LYNXRC),
#ifdef EXP_KEYBOARD_LAYOUT
PARSE_ARY(RC_KBLAYOUT, current_layout, LYKbLayoutNames, NULL),
#endif
@@ -661,8 +685,10 @@ BOOL LYsetRcValue(const char *name, const char *param)
ParseUnionPtr q;
BOOL changed = TRUE;
char *value = NULL;
+ char *orig_value = NULL;
StrAllocCopy(value, param);
+ orig_value = value;
value = LYSkipBlanks(value);
CTRACE2(TRACE_CFG, (tfp, "LYrcFile %s:%s\n", name, value));
@@ -754,7 +780,7 @@ BOOL LYsetRcValue(const char *name, const char *param)
changed = FALSE;
break;
}
- FREE(value);
+ FREE(orig_value);
return changed;
}
diff --git a/src/LYrcFile.h b/src/LYrcFile.h
index 5c8a4e1..32003b6 100644
--- a/src/LYrcFile.h
+++ b/src/LYrcFile.h
@@ -1,5 +1,5 @@
/*
- * $LynxId: LYrcFile.h,v 1.45 2014/02/12 23:42:24 tom Exp $
+ * $LynxId: LYrcFile.h,v 1.48 2015/12/18 01:58:05 tom Exp $
*/
#ifndef LYRCFILE_H
#define LYRCFILE_H
@@ -107,6 +107,7 @@
#define RC_HTMLSRC_ATTRNAME_XFORM "htmlsrc_attrname_xform"
#define RC_HTMLSRC_TAGNAME_XFORM "htmlsrc_tagname_xform"
#define RC_HTTPS_PROXY "https_proxy"
+#define RC_HTTP_PROTOCOL "http_protocol"
#define RC_HTTP_PROXY "http_proxy"
#define RC_INCLUDE "include"
#define RC_INFLATE_PATH "inflate_path"
@@ -234,6 +235,8 @@
#define RC_SOURCE_CACHE "source_cache"
#define RC_SOURCE_CACHE_FOR_ABORTED "source_cache_for_aborted"
#define RC_SSL_CERT_FILE "ssl_cert_file"
+#define RC_SSL_CLIENT_CERT_FILE "ssl_client_cert_file"
+#define RC_SSL_CLIENT_KEY_FILE "ssl_client_key_file"
#define RC_STARTFILE "startfile"
#define RC_STATUS_BUFFER_SIZE "status_buffer_size"
#define RC_STRIP_DOTDOT_URLS "strip_dotdot_urls"
@@ -296,6 +299,7 @@ extern BOOL LYsetRcValue(const char *name, const char *param);
extern BOOL will_save_rc(const char *name);
extern const char *LYputEnum(Config_Enum * table, int value);
extern int enable_lynxrc(char *value);
+extern int get_http_protocol(char *value);
extern int get_tagsoup(char *value);
extern int save_rc(FILE *);
extern void read_rc(FILE *);
diff --git a/src/UCdomap.c b/src/UCdomap.c
index 7a32290..3023bbb 100644
--- a/src/UCdomap.c
+++ b/src/UCdomap.c
@@ -1,5 +1,5 @@
/*
- * $LynxId: UCdomap.c,v 1.99 2014/12/10 09:47:34 tom Exp $
+ * $LynxId: UCdomap.c,v 1.101 2015/10/02 11:25:55 tom Exp $
*
* UCdomap.c
* =========
@@ -7,9 +7,10 @@
* This is a Lynx chartrans engine, its external calls are in UCMap.h
*
* Derived from code in the Linux kernel console driver.
- * The GNU Public Licence therefore applies, see
- * the file COPYING in the top-level directory
- * which should come with every Lynx distribution.
+ *
+ * The GNU General Public License therefore applies, see the file
+ * COPYING in the top-level directory which should come with every Lynx
+ * distribution.
*
* [ original comment: - KW ]
*
diff --git a/src/chrtrans/makefile.in b/src/chrtrans/makefile.in
index 042657c..5978a86 100644
--- a/src/chrtrans/makefile.in
+++ b/src/chrtrans/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.39 2014/01/19 14:42:43 tom Exp $
+# $LynxId: makefile.in,v 1.40 2015/10/08 00:26:34 Atsuhito.Kohda Exp $
#
# Makefile for the makeuctb and unicode tables.
#
@@ -123,7 +123,7 @@ OBJS = makeuctb$o
C_SRC = $(OBJS:$o=.c)
$(MAKEUCTB) : $(OBJS)
- $(BUILD_CC) $(CC_OPTS) $(BUILD_LDFLAGS) -o $@ $(OBJS) $(INTLLIB) $(BUILD_LIBS)
+ $(BUILD_CC) $(CC_OPTS) $(LDFLAGS) $(BUILD_LDFLAGS) -o $@ $(OBJS) $(INTLLIB) $(BUILD_LIBS)
makeuctb$o : $(srcdir)/UCkd.h $(srcdir)/makeuctb.c
diff --git a/src/tidy_tls.c b/src/tidy_tls.c
index f6dea81..af5d07d 100644
--- a/src/tidy_tls.c
+++ b/src/tidy_tls.c
@@ -1,6 +1,6 @@
/*
- * $LynxId: tidy_tls.c,v 1.24 2014/11/30 23:28:13 tom Exp $
- * Copyright 2008-2013,2014 Thomas E. Dickey
+ * $LynxId: tidy_tls.c,v 1.33 2015/12/16 01:23:11 tom Exp $
+ * Copyright 2008-2014,2015 Thomas E. Dickey
* with fix Copyright 2008 by Thomas Viehmann
*
* Required libraries:
@@ -19,12 +19,6 @@
#include <libtasn1.h> /* ASN1_SUCCESS,etc */
#include <string.h>
-#ifdef HAVE_GNUTLS_PRIORITY_SET_DIRECT
-#define USE_SET_DIRECT 1
-#else
-#define USE_SET_DIRECT 0
-#endif
-
#define typeCalloc(type) (type *) calloc(1, sizeof(type))
static int last_error = 0;
@@ -76,7 +70,7 @@ static int ExtractCertificate(const gnutls_datum_t *cert, X509_NAME * result, in
const char *ERR_error_string(unsigned long e, char *buffer)
{
(void) buffer;
- return gnutls_strerror(-e);
+ return gnutls_strerror((int) -e);
}
/*
@@ -88,7 +82,7 @@ unsigned long ERR_get_error(void)
{
unsigned long rc;
- rc = -last_error;
+ rc = (unsigned long) (-last_error);
last_error = 0;
return rc;
@@ -102,7 +96,7 @@ int RAND_bytes(unsigned char *buffer, int num)
int rc;
#ifdef HAVE_GNUTLS_RND
- rc = gnutls_rnd(GNUTLS_RND_KEY, buffer, num);
+ rc = gnutls_rnd(GNUTLS_RND_KEY, buffer, (size_t) num);
#else
gcry_randomize(buffer, num, GCRY_VERY_STRONG_RANDOM);
rc = 1;
@@ -131,7 +125,7 @@ const char *RAND_file_name(char *buffer, size_t len)
int RAND_load_file(const char *name, long maxbytes)
{
(void) name;
- return maxbytes;
+ return (int) maxbytes;
}
/*
@@ -174,7 +168,7 @@ int SSL_CIPHER_get_bits(SSL_CIPHER * cipher, int *bits)
int result = 0;
if (cipher) {
- result = (8 * gnutls_cipher_get_key_size(cipher->encrypts));
+ result = (8 * (int) gnutls_cipher_get_key_size(cipher->encrypts));
}
if (bits)
@@ -268,116 +262,6 @@ void SSL_CTX_set_verify(SSL_CTX * ctx, int verify_mode,
ctx->verify_callback = verify_callback;
}
-#if USE_SET_DIRECT
-/*
- * Functions such as this are normally part of an API; lack of planning makes
- * these necessary in application code.
- */
-#define IdsToString(type, func, ids) \
- char *result = 0; \
- size_t need = 8 + strlen(type); \
- const char *name; \
- int pass; \
- int n; \
- for (pass = 0; pass < 2; ++pass) { \
- for (n = 0; n < GNUTLS_MAX_ALGORITHM_NUM; ++n) { \
- name = 0; \
- if (ids[n] == 0) \
- break; \
- if ((name = func(ids[n])) != 0) { \
- if (pass) { \
- sprintf(result + strlen(result), ":+%s%s", type, name); \
- } else { \
- need += 4 + strlen(type) + strlen(name); \
- } \
- } \
- } \
- if (!pass) { \
- result = malloc(need); \
- if (!result) \
- break; \
- result[0] = '\0'; \
- } \
- } \
- CTRACE((tfp, "->%s\n", result)); \
- return result
-
-/*
- * Given an array of compression id's, convert to string for GNUTLS.
- */
-static char *StringOfCIPHER(int *id_ptr)
-{
- IdsToString("", gnutls_cipher_get_name, id_ptr);
-}
-
-/*
- * Given an array of compression id's, convert to string for GNUTLS.
- */
-static char *StringOfCOMP(int *id_ptr)
-{
- IdsToString("COMP-", gnutls_compression_get_name, id_ptr);
-}
-
-/*
- * Given an array of key-exchange id's, convert to string for GNUTLS.
- */
-static char *StringOfKX(int *id_ptr)
-{
- IdsToString("", gnutls_kx_get_name, id_ptr);
-}
-
-/*
- * Given an array of MAC algorithm id's, convert to string for GNUTLS.
- */
-static char *StringOfMAC(int *id_ptr)
-{
- IdsToString("", gnutls_mac_get_name, id_ptr);
-}
-
-/*
- * Given an array of protocol id's, convert to string for GNUTLS.
- */
-static char *StringOfVERS(int *vers_ptr)
-{
- IdsToString("VERS-", gnutls_protocol_get_name, vers_ptr);
-}
-
-static void UpdatePriority(SSL * ssl)
-{
- SSL_METHOD *method = ssl->ctx->method;
- char *complete = 0;
- char *pnames;
- const char *err_pos = 0;
- int code;
-
- StrAllocCopy(complete, "NONE");
- if ((pnames = StringOfVERS(method->priority.protocol)) != 0) {
- StrAllocCat(complete, pnames);
- free(pnames);
- }
- if ((pnames = StringOfCIPHER(method->priority.encrypts)) != 0) {
- StrAllocCat(complete, pnames);
- free(pnames);
- }
- if ((pnames = StringOfCOMP(method->priority.compress)) != 0) {
- StrAllocCat(complete, pnames);
- free(pnames);
- }
- if ((pnames = StringOfKX(method->priority.key_xchg)) != 0) {
- StrAllocCat(complete, pnames);
- free(pnames);
- }
- if ((pnames = StringOfMAC(method->priority.msg_code)) != 0) {
- StrAllocCat(complete, pnames);
- free(pnames);
- }
- CTRACE((tfp, "set priorities %s\n", complete));
- code = gnutls_priority_set_direct(ssl->gnutls_state, complete, &err_pos);
- CTRACE((tfp, "CHECK %d:%s\n", code, NonNull(err_pos)));
- FREE(complete);
-}
-#endif /* USE_SET_DIRECT */
-
static void RemoveProtocol(SSL * ssl, int protocol)
{
int j, k;
@@ -395,12 +279,7 @@ static void RemoveProtocol(SSL * ssl, int protocol)
}
if (changed) {
-#if USE_SET_DIRECT
- CTRACE((tfp, "RemoveProtocol\n"));
- UpdatePriority(ssl);
-#else
gnutls_protocol_set_priority(ssl->gnutls_state, protocols);
-#endif
}
}
@@ -542,21 +421,7 @@ SSL *SSL_new(SSL_CTX * ctx)
ssl->ctx = ctx;
gnutls_init(&ssl->gnutls_state, ctx->method->connend);
-
-#if USE_SET_DIRECT
- UpdatePriority(ssl);
-#else
- gnutls_protocol_set_priority(ssl->gnutls_state,
- ctx->method->priority.protocol);
- gnutls_cipher_set_priority(ssl->gnutls_state,
- ctx->method->priority.encrypts);
- gnutls_compression_set_priority(ssl->gnutls_state,
- ctx->method->priority.compress);
- gnutls_kx_set_priority(ssl->gnutls_state,
- ctx->method->priority.key_xchg);
- gnutls_mac_set_priority(ssl->gnutls_state,
- ctx->method->priority.msg_code);
-#endif
+ gnutls_set_default_priority(ssl->gnutls_state);
gnutls_credentials_set(ssl->gnutls_state, GNUTLS_CRD_CERTIFICATE,
ssl->gnutls_cred);
@@ -564,11 +429,11 @@ SSL *SSL_new(SSL_CTX * ctx)
gnutls_certificate_set_x509_trust_file(ssl->gnutls_cred,
ctx->certfile,
ctx->certfile_type);
- if (ctx->keyfile)
+ if (ctx->client_keyfile)
gnutls_certificate_set_x509_key_file(ssl->gnutls_cred,
- ctx->certfile,
- ctx->keyfile,
- ctx->keyfile_type);
+ ctx->client_certfile,
+ ctx->client_keyfile,
+ ctx->client_keyfile_type);
ssl->verify_mode = ctx->verify_mode;
ssl->verify_callback = ctx->verify_callback;
@@ -576,8 +441,11 @@ SSL *SSL_new(SSL_CTX * ctx)
ssl->rfd = (gnutls_transport_ptr_t) (-1);
ssl->wfd = (gnutls_transport_ptr_t) (-1);
+ ssl->bytes_sent = 0;
+ ssl->sendbuffer = 0;
}
}
+
return ssl;
}
@@ -589,7 +457,16 @@ int SSL_read(SSL * ssl, void *buffer, int length)
{
int rc;
- rc = gnutls_record_recv(ssl->gnutls_state, buffer, length);
+ rc = (int) gnutls_record_recv(ssl->gnutls_state, buffer, (size_t) length);
+
+ if (rc < 0 && gnutls_error_is_fatal(rc) == 0) {
+ if (rc == GNUTLS_E_REHANDSHAKE) {
+ (void) gnutls_handshake(ssl->gnutls_state);
+ gnutls_record_send(ssl->gnutls_state, ssl->sendbuffer, (size_t) ssl->bytes_sent);
+ rc = (int) gnutls_record_recv(ssl->gnutls_state, buffer, (size_t) length);
+ }
+ }
+
ssl->last_error = rc;
if (rc < 0) {
@@ -618,12 +495,18 @@ int SSL_write(SSL * ssl, const void *buffer, int length)
{
int rc;
- rc = gnutls_record_send(ssl->gnutls_state, buffer, length);
+ rc = (int) gnutls_record_send(ssl->gnutls_state, buffer, (size_t) length);
ssl->last_error = rc;
if (rc < 0) {
last_error = rc;
rc = 0;
+ } else {
+ size_t need = (size_t) rc;
+
+ free(ssl->sendbuffer);
+ ssl->sendbuffer = malloc(need);
+ ssl->bytes_sent = need;
}
return rc;
@@ -704,7 +587,7 @@ SSL_METHOD *SSLv23_client_method(void)
static int add_name(char *target, int len, const char *tag, const char *data)
{
if (*data != '\0') {
- int need = strlen(tag) + 2;
+ int need = (int) strlen(tag) + 2;
target += strlen(target);
if (need < len) {
@@ -714,10 +597,10 @@ static int add_name(char *target, int len, const char *tag, const char *data)
len -= need;
target += need;
}
- need = strlen(data);
+ need = (int) strlen(data);
if (need >= len - 1)
need = len - 1;
- strncat(target, data, need)[need] = '\0';
+ strncat(target, data, (size_t) need)[need] = '\0';
}
return len;
}
diff --git a/userdefs.h b/userdefs.h
index 5d6842e..e829eea 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1,5 +1,5 @@
/*
- * $LynxId: userdefs.h,v 1.306 2015/04/15 00:19:14 tom Exp $
+ * $LynxId: userdefs.h,v 1.316 2015/12/18 10:24:31 tom Exp $
*
* Lynx - Hypertext navigation system
*
@@ -483,7 +483,7 @@
* Normally we expect you will connect to a remote site, e.g., the Lynx starting
* site:
*/
-#define STARTFILE "http://lynx.isc.org/"
+#define STARTFILE "http://lynx.invisible-island.net/"
/*
* As an alternative, you may want to use a local URL. A good choice for this
* is the user's home directory:
@@ -502,12 +502,12 @@
* for this distribution (use SHELL syntax including the device
* on VMS systems).
* The default HELPFILE is:
- * http://lynx.isc.org/release/breakout/lynx_help/lynx_help_main.html
+ * http://lynx.invisible-island.net/lynx_help/lynx_help_main.html
* This should be changed here or in lynx.cfg to the local path.
* The definition here can be overridden at run time by defining a
* "LYNX_HELPFILE" environment variable.
*/
-#define HELPFILE "http://lynx.isc.org/release/breakout/lynx_help/lynx_help_main.html"
+#define HELPFILE "http://lynx.invisible-island.net/lynx_help/lynx_help_main.html"
/* #define HELPFILE "file://localhost/PATH_TO/lynx_help/lynx_help_main.html" */
/*****************************
@@ -1442,11 +1442,11 @@
* the version definition with the Project Version on checkout. Just
* ignore it. - kw */
/* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.8.9dev.6"
-#define LYNX_WWW_HOME "http://lynx.isc.org/"
-#define LYNX_WWW_DIST "http://lynx.isc.org/current/"
+#define LYNX_VERSION "2.8.9dev.7"
+#define LYNX_WWW_HOME "http://lynx.invisible-island.net/"
+#define LYNX_WWW_DIST "http://lynx.invisible-island.net/current/"
/* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
-#define LYNX_DATE "Wed, 06 May 2015 17:56:19 -0700"
+#define LYNX_DATE "Fri, 18 Dec 2015 05:24:31 -0500"
#define LYNX_DATE_OFF 5 /* truncate the automatically-generated date */
#define LYNX_DATE_LEN 11 /* truncate the automatically-generated date */
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-lynx/lynx-cur.git
More information about the pkg-lynx-commits
mailing list