--- lynx-cur-2.8.8dev.3.orig/debian/README.Debian +++ lynx-cur-2.8.8dev.3/debian/README.Debian @@ -0,0 +1,66 @@ +lynx-cur for Debian +---------------------- + +Developemnet version of lynx with NLS support. + +* /usr/bin/lynx is defined through alternatives and real binary is +/usr/bin/lynx.cur and /usr/bin/lynx will call /usr/bin/lynx.cur by default. + +We recommend strongly to install lynx-cur-wrapper if you are a novice user +of lynx, especially you are not iso-8859-1 user. But the current maintainer +does not know about this so please let me know any deficiency you find. + +* In /etc/lynx-cur/lynx.cfg, we set + +EXTERNAL:ftp:w3m %s:TRUE +EXTERNAL:file:w3m %s:TRUE +EXTERNAL:http:w3m %s:TRUE +EXTERNAL:http:wget %s:TRUE +EXTERNAL:http:wget -r %s:TRUE +EXTERNAL:ftp:netscape %s:TRUE +EXTERNAL:file:netscape %s:TRUE +EXTERNAL:http:netscape %s:TRUE + +which gives a popup menu when you press '.' or ',' for the current link +or page respectively, + +SUFFIX:.deb:application/octet-stream +SUFFIX:.tgz:application/octet-stream + +and + +INCLUDE:~/.lynx/colors:COLOR +INCLUDE:~/.lynx/keymap:KEYMAP +INCLUDE:~/.lynx/viewers:VIEWER +INCLUDE:~/.lynx/external:EXTERNAL + +the latter will enable you to alter options privately by the files +~/.lynx/colors etc. + +* In /etc/lynx-cur/local.cfg, you may check the settings of + +STARTFILE:, NNTPSERVER: + +but STARTFILE: will be set appropriately if you install correctly. + +* In /etc/lynx-cur/lynx.cfg, you might want to modify the settings of + +LOCAL_DOMAIN:, SAVE_SPACE: + +* If you use always option "-use_mouse" then it may be useful to set +alias lynx 'lynx -use_mouse' +in appropriate file, for example .bashrc or .tcshrc + +* lynx will be in color mode but if this causes any troubles do: + +1) In Lynx Options Menu, set option "show color" as "NEVER" +then the default is changed to monochrome. + +2) If you do not want to change default setting, then try +lynx -nocolor + +ncursesw caused a problem with 2.8.6dev.6 patch so --with-screen=ncursesw +to --with-screen=ncurses, and changed Build-Depends libncursesw5-dev to +libncurses5-dev + + -- Atsuhito KOHDA , Wed, 7 Jul 1999 07:29:50 +0900 --- lynx-cur-2.8.8dev.3.orig/debian/changelog +++ lynx-cur-2.8.8dev.3/debian/changelog @@ -0,0 +1,1370 @@ +lynx-cur (2.8.8dev.3-3) unstable; urgency=low + + * Fixed a problem of ssl connection by a patch from the upstream. + Closes: #579501 + + -- Atsuhito KOHDA Thu, 06 May 2010 10:48:26 +0900 + +lynx-cur (2.8.8dev.3-2) unstable; urgency=low + + * Fixed a small error in 2.8.8dev.3 + + -- Atsuhito KOHDA Tue, 27 Apr 2010 20:45:15 +0900 + +lynx-cur (2.8.8dev.3-1) unstable; urgency=low + + * New Upstream Release. + - modify print_wwwfile_to_fd() to add field values to the printed form + Closes: #574940 + - correct a place where LYStrExtent2 was used where byte-count is needed + Closes: #561363 + + -- Atsuhito KOHDA Mon, 26 Apr 2010 15:22:19 +0900 + +lynx-cur (2.8.8dev.2-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Dropped empty lynx-cur-wrapper.postrm + * Fix pending l10n issues. Debconf translations: + - Finnish (Esko Arajärvi). Closes: #537446 + + -- Christian Perrier Fri, 19 Mar 2010 06:42:57 +0100 + +lynx-cur (2.8.8dev.2-1) unstable; urgency=low + + * New Upstream Release. + - modify trimming of URI in LYSetCookie() to eliminate trimming of + final leaf (Closes: #460108) + * Updated rules, control and patches files. + * Changed lynx.cfg and now we set LOCALE_CHARSET:TRUE + * Added libidn11-dev to Build-Depends to fix #541694 (Closes: #541694) + + -- Atsuhito KOHDA Sun, 19 Dec 2009 20:04:44 +0900 + +lynx-cur (2.8.8dev.1-1) unstable; urgency=low + + * New Upstream Release. + - add optional support for IDNA using GNU libidn (Closes: #352596) + - ignore LEFT-TO-RIGHT-MARK (U+200E) in HTML files (Closes: #408835) + - correct check for return-value from gnutls_certificate_verify_peers2(), + which caused some sites to be treated as if they were version-1 X.509 CAs + (Closes: #231609) + - change compiled-in default for SYSLOG_REQUESTED_URLS to false. + (Closes: #537907) + + -- Atsuhito KOHDA Mon, 31 Aug 2009 20:04:44 +0900 + +lynx-cur (2.8.7rel.1-1) unstable; urgency=low + + * New Upstream Release. + * Linked against libbsd to fix a security problem. (Closes: #532520) + + -- Atsuhito KOHDA Wed, 8 Jul 2009 21:08:12 +0900 + +lynx-cur (2.8.7pre6-1) unstable; urgency=low + + * New Upstream Release. + + -- Atsuhito KOHDA Wed, 24 Jun 2009 12:24:37 +0900 + +lynx-cur (2.8.7pre5-1) unstable; urgency=low + + * New Upstream Release. + + -- Atsuhito KOHDA Sun, 7 Jun 2009 21:50:20 +0900 + +lynx-cur (2.8.7pre4-1) unstable; urgency=low + + * New Upstream Release. + - amend fix for Debian #388622 (Closes: #388622) + - suppress check for "disabled" attribute in a select, as a workaround + (Closes: #525934) + - accommodate (in)compatibility "feature" in HTML5 draft (Closes: #514897) + - Sanitize build-dependencies. Applied suggested patch which I forgot + to do in former versions. (Closes: #481767) + * Sanitize build-dependencies. Removed exim4, bzip2, unzip, zip also. + There remain sharutils, telnet, openssh-client now. + * Uncomment SSL_CERT_FILE line in lynx.cfg (Closes: #529482) + + -- Atsuhito KOHDA Wed, 27 May 2009 12:44:09 +0900 + +lynx-cur (2.8.7pre2-1) unstable; urgency=low + + * New Upstream Release. + - modify Lynx's DTD information. (Closes: #398986) + - correct length of padding with underscores. (Closes: #519199) + - fix a few cases where PUTC's intended for pretty-src would display in the + HTML view. (Closes: #521489) + * Can use persistent cookies now but please edit /etc/lynx-cur/lynx.cfg + and make it looks as "PERSISTENT_COOKIES:TRUE" (Closes: #426481) + * Updated patch-1 so it should be applied cleanly. + * Fixed typo in 2.8.7pre1-1 changelog. + + -- Atsuhito KOHDA Fri, 01 May 2009 13:02:04 +0900 + +lynx-cur (2.8.7pre1-1) unstable; urgency=low + + * New Upstream Release. + * Changed default setting in lynx.cfg "SHOW_CURSOR:TRUE" for test. + There could be more smart way however. (Closes: #516726) + + -- Atsuhito KOHDA Sun, 22 Mar 2009 18:14:38 +0900 + +lynx-cur (2.8.7dev13-1) unstable; urgency=low + + * New Upstream Release. + * Stopped to apply patches/patch-2 which was unnecessary anymore. + + -- Atsuhito KOHDA Mon, 02 Feb 2009 19:57:58 +0900 + +lynx-cur (2.8.7dev12-2) unstable; urgency=low + + * Fixed broken UTF-8 displaying in local files with dev12. + The patch is fetched from lynx-dev ML and stored in patches/patch-2. + + -- Atsuhito KOHDA Tue, 20 Jan 2009 09:50:51 +0900 + +lynx-cur (2.8.7dev12-1) unstable; urgency=low + + * New Upstream Release. + * Removed unnecessary patch-2 and updated patch-1 + * Fixed Description, i.e. removed reference to lynx. (Closes: #509929) + * It seemed I forgot to close #258859 which was fixed long time ago. + (Closes: #258859) + * Clean up preinst a bit. + + -- Atsuhito KOHDA Fri, 02 Jan 2009 20:48:55 +0900 + +lynx-cur (2.8.7dev11-2) unstable; urgency=low + + * Fix HTFile.c with a patch of Thomas Dickey. (Closes: #509321) + * Fix lynx.cur.wrapper so that it will read the default lynx.cfg + (Closes: #509411) + + -- Atsuhito KOHDA Tue, 23 Dec 2008 17:08:55 +0900 + +lynx-cur (2.8.7dev11-1) unstable; urgency=low + + * New Upstream Release (2.8.7dev11). Also applied lynx2.8.7dev.11a.patch. + * A patch of Thomas Viehmann was merged in the upstream so removed it + from debian/patches/00list file. + + -- Atsuhito KOHDA Thu, 18 Dec 2008 22:03:36 +0900 + +lynx-cur (2.8.7dev10-5) unstable; urgency=low + + * Fixed postinst and now a handling of local.cfg should be correct. + (Closes: #492468) + + -- Atsuhito KOHDA Sun, 23 Nov 2008 07:51:09 +0900 + +lynx-cur (2.8.7dev10-4) unstable; urgency=low + + * Oops, I overlooked Thomas Viehmann's upload and fix. Sorry Thomas! + * Reduced Build-Dependency. (Closes: #506210) + * Added Homepage in control. (Closes: #506278) + + -- Atsuhito KOHDA Fri, 21 Nov 2008 09:02:02 +0900 + +lynx-cur (2.8.7dev10-3) unstable; urgency=low + + * Fixed postinst so that it didn't touch local.cfg if it wasn't a regular + file. (Closes: #492468) + + -- Atsuhito KOHDA Fri, 26 Sep 2008 12:38:16 +0900 + +lynx-cur (2.8.7dev10-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * fix src/tidy_tls.c X509_get_issuer_name to actually take the issuer + DN of the present certificate and not hope that it is the same as + taking the subject DN of the "next" certificate which + may or may not exist. Closes: #499945 + This is debian/patches/patch-3. + + -- Thomas Viehmann Fri, 03 Oct 2008 23:24:41 +0200 + +lynx-cur (2.8.7dev10-2) unstable; urgency=low + + * Installed new (dummy) lynx-cur-wrapper.postrm because an old version, + which was empty, caused an error. + + -- Atsuhito KOHDA Thu, 25 Sep 2008 08:11:00 +0900 + +lynx-cur (2.8.7dev10-1) unstable; urgency=low + + * New Upstream Release. + - modify initial active link in download-page (Closes: #376259) + - revise introductory comment written to ".lynxrc" (Closes: #461158) + - suppress computation in TrimmedLength() for source-view (Closes: #204515) + - adapt/extend parsdate.y from tin to improve parsing of cookie expiration + times (Closes: #480144) + + -- Atsuhito KOHDA Wed, 24 Sep 2008 11:55:24 +0900 + +lynx-cur (2.8.7dev9-2) unstable; urgency=low + + * Andreas' efforts keep this package in Debian. Thanks Andreas Metzler. + * Debconf translations: + - Japanese. Closes: #493674 + - Italian. Closes: #493959 + + -- Atsuhito KOHDA Tue, 02 Sep 2008 10:40:21 +0900 + +lynx-cur (2.8.7dev9-1.2) unstable; urgency=low + + * Non-maintainer upload. + * Downgrade priority of debconf question for homepage to "low". + Closes: #489489 + * Disable debconf priority high note about existence of /etc/lynx.cfg. (Due + to debconf preconfiguration it would be shown even if upgrading the lynx + dummy package would correctly take care of the issue.) Closes: #489485 + * Build with --enable-ipv6. (Regression from lynx package and release + target.) Closes: #489484,#480414 + + -- Andreas Metzler Sat, 12 Jul 2008 09:31:43 +0000 + +lynx-cur (2.8.7dev9-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Remove local.cfg on purge instead of remove. Closes: #474928 + * Revamp handling of debconf managed configuration file local.cfg as + described in debconf-devel(7). + Closes: #474926 + * lynx-cur-wrapper: Simply ship the /etc/lynx-cur/lynx-??.cfg as dpkg + conffiles instead of generating (and removing) them in the + maintainerscripts. Closes: #481778,#481774 + * Add a dummy package lynx, which switches from lynx to lynx-cur. The old + stable codebase (lynx) is dead; upstream suggest using the lynx-cur + releases. + Closes: #369386 + * lynx-cur does not provide lynx anymore. It is not completely necessary + since the dummy package lynx pulls in lynx-cur. The provides broke + upgrades from lynx (installed ok) lynx-cur (deinstall ok config-files). + + -- Andreas Metzler Sat, 05 Jul 2008 10:21:38 +0200 + +lynx-cur (2.8.7dev9-1) unstable; urgency=low + + * New Upstream Release. + * Resurrect "--with-gnutls" option because it doesn't cause any license + problem now. + + -- Atsuhito KOHDA Mon, 5 May 2008 21:33:42 +0900 + +lynx-cur (2.8.7dev8-1) unstable; urgency=low + + * New Upstream Release. + * Fixed Section field of doc-base file. + + -- Atsuhito KOHDA Thu, 13 Mar 2008 00:03:36 +0900 + +lynx-cur (2.8.7dev7-4) unstable; urgency=low + + * Stop linking to gnutls library because its license (GPLv3+) conflicts + with that of lynx itself (GPLv2). (Closes: #468768) + + -- Atsuhito KOHDA Mon, 10 Mar 2008 22:09:36 +0900 + +lynx-cur (2.8.7dev7-3) unstable; urgency=low + + * Changed "exim4-daemon-light | mail-transport-agent" in Build-Depends. + * Fixed wrong changelog entry of 2.8.7dev7-2; removed wrong statement + referring to userdefs.h + + -- Atsuhito KOHDA Thu, 20 Sep 2007 17:58:05 +0900 + +lynx-cur (2.8.7dev7-2) unstable; urgency=low + + * Oops, with pbuilder, there is no bzip2, etc. unless we set them in + Build-Depends. I noticed this with a bug report from Ivan Avramovic + . Thanks Ivan! + For later reference: Added in Build-Depends: zip, unzip, sharutils, + bzip2, ncompress, telnet, openssh-client, exim4-daemon-light + This also should fix sendmail settings. (Closes: #398004, #439070) + + -- Atsuhito KOHDA Fri, 24 Aug 2007 14:10:08 +0900 + +lynx-cur (2.8.7dev7-1) unstable; urgency=low + + * New Upstream Release. (Closes: #428536) + * Follows the new menu hierarchy. + * Fixed lintian warnings (debian-rules-ignores-make-clean-error and + translated-default-field and also removed unnecessary COPYING.asc, + COPYHEADE.asc). + + -- Atsuhito KOHDA Fri, 03 Aug 2007 10:03:48 +0900 + +lynx-cur (2.8.7dev5-1) unstable; urgency=low + + * New Upstream Release. + * Build with pbuilder for the first time. + * Removed patch-2 because upstream's makefile.in was refined. + + -- Atsuhito KOHDA Sat, 19 May 2007 00:06:27 +0900 + +lynx-cur (2.8.7dev4-2) unstable; urgency=low + + * Added translations of debconf templates. (Closes: #418900, #420212) + - nl.po, thanks to "cobaco (aka Bart Cornelis)" + - pt.po, thanks to Miguel Figueiredo and + Traduz - Portuguese Translation Team . + + -- Atsuhito KOHDA Mon, 23 Apr 2007 07:16:20 +0900 + +lynx-cur (2.8.7dev4-1) unstable; urgency=low + + * New Upstream Release. This version fixed the following (Closes: #396949) + * Updated patch-1, patch-2 for this version. + + -- Atsuhito KOHDA Thu, 16 Nov 2006 08:39:02 +0900 + +lynx-cur (2.8.7dev2-1) unstable; urgency=low + + * New Upstream Release. + - modify logic for reading PERSONAL_EXTENSION_MAP and PERSONAL_MAILCAP to + ensure that they are files that are controlled only by the user. The + default values for these allow lynx to read configuration information + from the user's current directory at lynx's startup (Closes: #396949) + * Modified makefile.in slightly in order not scare people. + + -- Atsuhito KOHDA Tue, 7 Nov 2006 14:11:36 +0900 + +lynx-cur (2.8.7dev1-1) unstable; urgency=low + + * New Upstream Release. + + -- Atsuhito KOHDA Fri, 13 Oct 2006 09:48:33 +0900 + +lynx-cur (2.8.6pre5-1) unstable; urgency=low + + * New Upstream Release. + * Updated patch-1 to be appliable for the current lynx.cfg and + about_lynx.html + + -- Atsuhito KOHDA Wed, 4 Oct 2006 13:54:17 +0900 + +lynx-cur (2.8.6pre4-1) unstable; urgency=low + + * New Upstream Release. + * Oops, I forgot to update ca.po in the former package! + I updated certainly this time. Sorry and thanks to Jordà Polo + (Closes: #375969) + * Some bugs fixed already. + - Documented in manpage (Closes: #292393) + - 2006-05-29 (2.8.6dev.18) + * suppress OpenSSL URL from version message if it happens to be built + using GNU TLS -TD (Closes: #336741) + - documented in the lynx_url_support.html file (Closes: #303084) + + -- Atsuhito KOHDA Fri, 22 Sep 2006 11:22:23 +0900 + +lynx-cur (2.8.6pre3-1) unstable; urgency=low + + * New Upstream Release. + - if the side-effect of getfile() is unneeded, we restore the link number + as well as the line number (Closes: #386561) + + -- Atsuhito KOHDA Mon, 11 Sep 2006 20:28:52 +0900 + +lynx-cur (2.8.6pre2-1) unstable; urgency=low + + * New Upstream Release. + - add -stderr option to write error messages when doing a -dump -or -source. + (Closes: #375736) + - ensure the number of "extra" blanks in a line is greater than zero before + attempting to perform text-justification (Closes: #363538) + - fix a sign-extension in alignment case-statement in split_line() + (Closes: #360832, #372670) + * Upstream changed --enable-color-style enabled by default so I followed it. + * Updated translations of debconf templates. Thanks to all. + - fr.po, Philippe Batailler + - cs.po, Miroslav Kure + - ru.po, Yuri Kozlov + - de.po, Jens Nachtigall + - sv.po, Daniel Nylander + - pt_BR.po, Andre Luis Lopes + - vi.po, Clytie Siddall + - es.po, David Martínez Moreno + (Closes: #373615, #373998) + * There was no time to upload 2.8.6dev19 because 2.8.6pre2 was released + so soon. + + -- Atsuhito KOHDA Mon, 4 Sep 2006 11:04:25 +0900 + +lynx-cur (2.8.6dev18-2.1) unstable; urgency=low + + * Fixed rules more systematically. I guess this could fix FTBFS bug. + (Closes: #372075) + + -- Atsuhito KOHDA Tue, 13 Jun 2006 23:48:34 +0900 + +lynx-cur (2.8.6dev18-2) unstable; urgency=low + + * Fixed rules (added -A option to dh_installdirs). Thanks to + Benjamin Seidenberg + I'll fix this more systematically later. (Closes: #372075) + + -- Atsuhito KOHDA Tue, 13 Jun 2006 10:08:10 +0900 + +lynx-cur (2.8.6dev18-1) unstable; urgency=low + + * New upstream release. + * Adapted Elimar Riesebieter packaging. Thanks Elimar Riesebieter + (Closes: #352507) + - Change short description in templates. + - Added debconf-updatepo to the clean target in rules. + - Changed version according to upstream version. + - Don't upgrade via patches anymore. Upstream tarball used. + - Introduced dpatch. + - Bumped Standard version -- no changes needed. + - Reworked rules + - introduced DH_OPTIONS + - Cleaned up + - Reworked bashism in debian/postinst. + - Set compatibility to 4 in debian/compat. + - Corrected fsf adress in copyright. + - patch-2 was included upstream some versions ago, so commented in + patches/00list. + - There should be no more "Unreversed patch detected!" in the buildlogs + anymore. This was because the patches where applied to the diff file. + - Should be (almost) lintian clean now. + + -- Atsuhito KOHDA Sun, 4 Jun 2006 08:22:06 +0900 + +lynx-cur (2.8.6-20) unstable; urgency=low + + * Added "--enable-justify-elts" option and changed "JUSTIFY:TRUE" in lynx.cfg + * Reverted ncursesw again! This fixed broken utf-8 support. + (Closes: #252856, #240069) + + -- Atsuhito KOHDA Thu, 2 Feb 2006 14:39:06 +0900 + +lynx-cur (2.8.6-19) unstable; urgency=low + + * This is of 2.8.6dev.17 + - modify parsing of filename from Content-Disposition so that the name is not + truncated on embedded whitespace. (Closes: #291716) + - fixes to source-view of ftp:// and file:// URLs, i.e., eliminate redundant + PRE's, add DOCTYPE and meta tags (Closes: #347989) + - Upstream author taught us that a bug was fixed as a side-effect of + 2.8.6dev.14 (modify initialization so that "cat options.txt | lynx - " + will allow interactive use). (Closes: #284677) + * Oops, I mistyped dev version of a patch in 2.8.6-18. Fixed. + + -- Atsuhito KOHDA Fri, 27 Jan 2006 08:10:54 +0900 + +lynx-cur (2.8.6-18) unstable; urgency=low + + * This is of 2.8.6dev.16 + - print the contents of image maps, if any, at the end of a dump + (Closes: #335593) + - fix off-by-one line calculation that allowed the last page to be blank + (Closes: #330413) + - strip unneeded " " from translation when building info page using + wide curses (Closes: #342877) + + -- Atsuhito KOHDA Mon, 19 Dec 2005 09:01:05 +0900 + +lynx-cur (2.8.6-17) unstable; urgency=low + + * This is of 2.8.6dev.15 + * Corrected wrong dev number(dev.13 to dev.14) in 2.8.6-16 + + -- Atsuhito KOHDA Mon, 31 Oct 2005 21:07:59 +0900 + +lynx-cur (2.8.6-16) unstable; urgency=low + + * This is of 2.8.6dev.14 (closes: #334423) + - eliminate fixed-size buffers in LYExpandHostForURL() to guard against + buffer overflow resulting from too-long domain prefix/suffix data from + lynx.cfg (report by Ulf Harnhammar, CAN-2005-3120) -TD + * Added Swedish translation for debconf messages. Thanks to Daniel Nylander + (closes: #332360) + + -- Atsuhito KOHDA Tue, 18 Oct 2005 08:27:39 +0900 + +lynx-cur (2.8.6-15) unstable; urgency=low + + * Updated Build-Dependency on libgnutls-dev. + * Fixed Dependency on debconf (with ${misc:Depends}) suggested by + Joey Hess . + + -- Atsuhito KOHDA Wed, 3 Aug 2005 10:05:29 +0900 + +lynx-cur (2.8.6-14) unstable; urgency=low + + * This is of 2.8.6dev.13 + + -- Atsuhito KOHDA Wed, 8 Jun 2005 16:57:54 +0900 + +lynx-cur (2.8.6-13) unstable; urgency=low + + * This is of 2.8.6dev.12 + + -- Atsuhito KOHDA Sun, 5 Jun 2005 08:18:01 +0900 + +lynx-cur (2.8.6-12) unstable; urgency=low + + * Added Vietnamese translation for debconf messages. Thanks to Clytie + Siddall (Closes: #309056) + + -- Atsuhito KOHDA Mon, 16 May 2005 11:28:40 +0900 + +lynx-cur (2.8.6-11) unstable; urgency=low + + * Corrected `head -n 1' instead of `head -1' in postinst. Thanks to + Robert Luberda (Closes: #308845) + + -- Atsuhito KOHDA Fri, 13 May 2005 07:11:36 +0900 + +lynx-cur (2.8.6-10) unstable; urgency=low + + * Added Czech translation of debconf messages. Thanks to Miroslav Kure + (Closes: #308026) + + -- Atsuhito KOHDA Wed, 11 May 2005 11:04:43 +0900 + +lynx-cur (2.8.6-9) unstable; urgency=low + + * This is of 2.8.6dev.11 + * syslog'ing of URLs didn't seem to be an appropriate default setting and + it could be enabled with a setting in lynx.cfg or a command line option + if lynx was compiled with --enable-syslog. So I decided to compile lynx + with --enable-syslog but to set "SYSLOG_REQUESTED_URLS:FALSE" in lynx.cfg + You can enable it with a command line option "syslog-urls=on" or with + editting lynx.cfg appropriately. (Closes: #288480) + + -- Atsuhito KOHDA Thu, 6 Jan 2005 11:10:15 +0900 + +lynx-cur (2.8.6-8) unstable; urgency=low + + * This is of 2.8.6dev.10 + - syslog'ing of URLs was now an option in lynx.cfg or in command line. + (Closes: #282739) + - fixed gap in title from newline. (Closes: #284679) + - fixed can't climb to the root directory. (Closes: #285140) + + -- Atsuhito KOHDA Mon, 3 Jan 2005 11:05:58 +0900 + +lynx-cur (2.8.6-7) unstable; urgency=low + + * Fixed Build-Depends on libncurses5-dev (from wrong libncuresew5-dev). + (Closes: #282699) + * Removed duplicated changelog in 2.8.6-6 + + -- Atsuhito KOHDA Wed, 24 Nov 2004 09:35:06 +0900 + +lynx-cur (2.8.6-6) unstable; urgency=low + + * This is of 2.8.6dev.8 + * Changed --with-screen option from ncursesw to ncurses because there + was a problem with ncursesw and the patches since 2.8.6dev6 + * The followings were fixed with 2.8.6-5 which was not uploaded. + - modify template for temporary-directory name, adding "lynx" prefix + (Closes: #267356) + - add -listonly option and -nonumbers option (Closes: #255571) + - we should check #240069 and #254603 + * Updated de.po Thanks to Jens Nachtigall + (Closes: #276902) + * Fixed lynx-cur.1; removed (misplaced) Japanese characters. + + -- Atsuhito KOHDA Fri, 19 Nov 2004 09:32:29 +0900 + +lynx-cur (2.8.6-5) unstable; urgency=low + + * This is of 2.8.6dev.7 + * Fixed lynx-cur.1; removed (misplaced) Japanese characters. + * Changed options of configure a bit. + - added --enable-forms-options --enable-justify-elts --enable-partial + --enable-read-eta --enable-scrollbar --enable-syslog + + -- Atsuhito KOHDA Mon, 18 Oct 2004 07:46:37 +0900 + +lynx-cur (2.8.6-4) unstable; urgency=low + + * Fixed dependency on libgnutls. (Closes: #264755) + + -- Atsuhito KOHDA Tue, 10 Aug 2004 23:07:01 +0900 + +lynx-cur (2.8.6-3) unstable; urgency=low + + * This is of 2.8.6dev.5 + - lynx accepts multiple URLs on the command line (Closes: #177062) + + -- Atsuhito KOHDA Thu, 1 Jul 2004 10:05:58 +0900 + +lynx-cur (2.8.6-2) unstable; urgency=low + + * This is of 2.8.6dev.4 + - refined Japanes and UTF-8 support with --enable-japanese-utf8 + configure option. + - fixed a problem of unable to reach google. + + -- Atsuhito KOHDA Mon, 24 May 2004 11:21:14 +0900 + +lynx-cur (2.8.6-1) unstable; urgency=low + + * New upstream release. This is of 2.8.6dev.3 + * Added support for utf-8 to lynx-cur-wrapper experimentally. It would + work only with mlterm at present. + - added handling of *.utf-8 in debian/lynx script. + - added code for lynx-utf.cfg in lynx-cur-wrapper.{postinst,postrm} + * Refine update-alternatives for /usr/bin/lynx; used --slave for manual page. + - renamed lynx.1 to lynx.cur.1 in rules. + - lowered the priority because lynx used priority 20 + * Used update-alternatives for www-browser. (Closes: #238803) + - modified lynx-cur{-wrapper}.{postinst,prerm} + * Fixed menu (according to lintian error). + * Removed non-used conffiles, docs. + + -- Atsuhito KOHDA Thu, 10 May 2004 13:22:29 +0900 + +lynx-cur (2.8.5-20) unstable; urgency=low + + * This is of 2.8.5pre5 + * Updated po/da.po of upstream lynx-cur message catalogue. Thanks to Morten + Bo Johansen (Closes: #230633) + + -- Atsuhito KOHDA Wed, 4 Feb 2004 09:47:57 +0900 + +lynx-cur (2.8.5-19) unstable; urgency=low + + * This is of 2.8.5pre4 + * Improved long description a bit more. Thanks to Florent Rougon + + + -- Atsuhito KOHDA Thu, 29 Jan 2004 09:58:08 +0900 + +lynx-cur (2.8.5-18) unstable; urgency=low + + * This is of 2.8.5pre3 + * Improved the long description. (Closes: #229448) + + -- Atsuhito KOHDA Sun, 25 Jan 2004 18:31:44 +0900 + +lynx-cur (2.8.5-17) unstable; urgency=low + + * Added support for nested-tables (experimentally). + * Changed --with-screen option from ncurses to ncursesw. + + -- Atsuhito KOHDA Fri, 23 Jan 2004 11:18:20 +0900 + +lynx-cur (2.8.5-16) unstable; urgency=low + + * This is of 2.8.5pre1 and 2.8.5pre2 + * Updated copyright file. + * Cleaned up documents. Now almost all documents would be in docs + and removed lynx_help/COPYHEADER under /usr/share/doc/lynx-cur + So we modified about_lynx.html correspondingly. + + -- Atsuhito KOHDA Mon, 19 Jan 2004 22:18:34 +0900 + +lynx-cur (2.8.5-15) unstable; urgency=low + + * This is of dev.17 + * po/uk.po refused a patch so modified manually. This was a side-effect + of CVS maintenance and never an original problem ;) + * Added HTTPS support with gnutls, but this was yet experimental. + (Closes: #205438) + + -- Atsuhito KOHDA Mon, 12 Jan 2004 20:12:17 +0900 + +lynx-cur (2.8.5-14) unstable; urgency=low + + * New/updated ru.po, thanks to Ilgiz Kalmetev + (Closes: #214373) + + -- Atsuhito KOHDA Mon, 6 Oct 2003 21:59:37 +0900 + +lynx-cur (2.8.5-13) unstable; urgency=low + + * Added pt_BR.po, thanks to Andre Luis Lopes + (Closes: #197534) + + -- Atsuhito KOHDA Sat, 21 Jun 2003 21:18:53 +0900 + +lynx-cur (2.8.5-12) unstable; urgency=low + + * This is of dev.16 + + -- Atsuhito KOHDA Mon, 2 Jun 2003 15:01:43 +0900 + +lynx-cur (2.8.5-11) unstable; urgency=low + + * Oops, I forgot to update! This is of dev.15 + * Fixed fr.po (Closes: #190256) + + -- Atsuhito KOHDA Thu, 29 May 2003 16:25:53 +0900 + +lynx-cur (2.8.5-10) unstable; urgency=low + + * Removed ssl support because the licenses don't permit lynx with ssl. + (Closes: #187972) + + -- Atsuhito KOHDA Mon, 7 Apr 2003 21:00:53 +0900 + +lynx-cur (2.8.5-9) unstable; urgency=low + + * Updated fr.po, thanks to Philippe Batailler + (Closes: #186369) + * Now supported ssl. I suspected Replaces: lynx, lynx-ssl seemed too strong + so removed it now. (Closes: #186872) + * Fixed Build-Depends on debhelper with the correct version. + + -- Atsuhito KOHDA Mon, 7 Apr 2003 13:46:40 +0900 + +lynx-cur (2.8.5-8) unstable; urgency=low + + * Replaced templates.fr with the correct one, I hope. Thanks to + Denis Barbier (Closes: #183058) + * Changed default URL to www.debian.org + * Fixed config to avoid infinite loops. Thanks to Robert Luberda + (Closes: #183096) + + -- Atsuhito KOHDA Mon, 3 Mar 2003 07:28:43 +0900 + +lynx-cur (2.8.5-7) unstable; urgency=low + + * This is of dev.14 + + -- Atsuhito KOHDA Thu, 6 Feb 2003 08:16:00 +0900 + +lynx-cur (2.8.5-6) unstable; urgency=low + + * This is of dev.13 + + -- Atsuhito KOHDA Fri, 24 Jan 2003 10:30:16 +0900 + +lynx-cur (2.8.5-5) unstable; urgency=low + + * Moved lynx-cur-wrapper stuffs to binary-indep in rules. (Closes: #174372) + + -- Atsuhito KOHDA Fri, 27 Dec 2002 12:23:23 +0900 + +lynx-cur (2.8.5-4) unstable; urgency=low + + * This is of dev.12 and this fixed memory leak problem! + + -- Atsuhito KOHDA Thu, 19 Dec 2002 11:39:42 +0900 + +lynx-cur (2.8.5-3.5) unstable; urgency=low + + * This is of dev.11 (dev.10 was skipped in upstream) + + -- Atsuhito KOHDA Mon, 2 Dec 2002 17:01:52 +0900 + +lynx-cur (2.8.5-3.4) unstable; urgency=low + + * Fixed prerm so that "update-alternatives --remove" would not be called + at upgrade. + * Modified patch-1 according to modification of lynx.cfg with dev.9 patch. + + -- Atsuhito KOHDA Mon, 7 Oct 2002 12:58:42 +0900 + +lynx-cur (2.8.5-3.3) unstable; urgency=low + + * This is of dev.9 + + -- Atsuhito KOHDA Mon, 7 Oct 2002 10:24:12 +0900 + +lynx-cur (2.8.5-3.2) unstable; urgency=low + + * Fixed lintian warning; mv etc_lynx.cfg stuffs from postinst to config. + + -- Atsuhito KOHDA Tue, 24 Sep 2002 12:08:09 +0900 + +lynx-cur (2.8.5-3.1) unstable; urgency=low + + * Added support of gnome-terminal and jfbterm in lynx-cur-wrapper. + + -- Atsuhito KOHDA Tue, 13 Aug 2002 13:22:53 +0900 + +lynx-cur (2.8.5-3) unstable; urgency=low + + * Added new french translation of templates contributed by Philippe + Batailler (closes: #151720) + + -- Atsuhito KOHDA Sat, 6 Jul 2002 21:09:04 +0900 + +lynx-cur (2.8.5-2.6) unstable; urgency=low + + * This is of dev.8 and the patches of Hataguchi Takeshi was included + in dev.8 patch so we didn't apply patch-2 anymore. + * I reverted config.{guess,sub} to those of dev.8 because they were + updated and I believed this would not cause trouble with mips. + + -- Atsuhito KOHDA Sun, 2 Jun 2002 08:56:40 +0900 + +lynx-cur (2.8.5-2.5) unstable; urgency=low + + * Added catalan translation of templates contributed by Antoni Bella + (closes: #139735) + * Applied the patch of Hataguchi Takeshi + for hilighting problem found in lynx-dev (Sat, 9 Mar 2002); patch-2. + + -- Atsuhito KOHDA Tue, 26 Mar 2002 13:39:57 +0900 + +lynx-cur (2.8.5-2.4) unstable; urgency=low + + * Added --enable-default-colors to configure options. Thanks to + MATSUDA Yoh-ichi for reporting this. + * Applied the patch of Hataguchi Takeshi + for hilighting problem found in lynx-dev (Thu, 7 Feb 2002); patch-2. + + -- Atsuhito KOHDA Mon, 18 Feb 2002 17:03:58 +0900 + +lynx-cur (2.8.5-2.3) unstable; urgency=low + + * Replaced config.guess with that of autotools-dev so that lynx-cur + can be built in mips. (closes: #131056) + + -- Atsuhito KOHDA Sun, 27 Jan 2002 09:45:03 +0900 + +lynx-cur (2.8.5-2.2) unstable; urgency=low + + * This is of dev.7 + + -- Atsuhito KOHDA Tue, 8 Jan 2002 07:29:52 +0900 + +lynx-cur (2.8.5-2.1) unstable; urgency=low + + * This is of dev.6 + + -- Atsuhito KOHDA Wed, 2 Jan 2002 19:15:54 +0900 + +lynx-cur (2.8.5-2) unstable; urgency=low + + * This is of dev.5 + + -- Atsuhito KOHDA Tue, 20 Nov 2001 09:56:31 +0900 + +lynx-cur (2.8.5-1.9) unstable; urgency=low + + * This is of dev.4 + * Used ncurses instead of slang. This enables us to reduce a script lynx + substantially because we need not to fiddle with TERM any more. + * Added lynx-cur.1 to fix lintian error. + * Modified debian/config so that dpkg-reconfigure would work. + + -- Atsuhito KOHDA Fri, 9 Nov 2001 10:02:46 +0900 + +lynx-cur (2.8.5-1.7) unstable; urgency=low + + * Fixed lynx_help/about_lynx.html because we did not install "COPYING". + * Supported building with debugging information through the environment + variable `DEB_BUILD_OPTIONS' + * Also rewrote rules a bit substantially. + * Updated Standards-Version: 3.5.1 + + -- Atsuhito KOHDA Wed, 10 Oct 2001 10:35:58 +0900 + +lynx-cur (2.8.5-1.4) unstable; urgency=low + + * This is of dev.3 + * Fixed Priority (optional to extra). Conflict with lynx perhaps forced + this, I guessed. + * Closed bug really this time. (closes: #114387) + + -- Atsuhito KOHDA Sat, 6 Oct 2001 08:15:41 +0900 + +lynx-cur (2.8.5-1.3) unstable; urgency=low + + * Versioned up because of the former failure. + + -- Atsuhito KOHDA Fri, 5 Oct 2001 14:37:45 +0900 + +lynx-cur (2.8.5-1.2) unstable; urgency=low + + * Added russian translation of templates contributed by ilgiz kalmetev + (closes: #114387) + * Moved local.cfg.in from /etc/lynx-cur/ to doc/lynx-cur + * Added External application support to lynx.cfg, now you can see Tables + with w3m, for example, from lynx. + * Fixed lintian errors, updated Standards-Version: 3.2.1 and changed + debconf (>=0.5.00) in Depends field. + + -- Atsuhito KOHDA Thu, 4 Oct 2001 13:43:11 +0900 + +lynx-cur (2.8.5-1.1) unstable; urgency=low + + * This is of dev.2 + + -- Atsuhito KOHDA Thu, 16 Aug 2001 09:43:45 +0900 + +lynx-cur (2.8.5-1) unstable; urgency=low + + * New Upstream Release. This is of 2.8.5dev.1 and same as 2.8.4rel.1a + + -- Atsuhito KOHDA Wed, 25 Jul 2001 10:58:03 +0900 + +lynx-cur (2.8.4-4) unstable; urgency=low + + * This is of rel.1, that is, this is Lynx v2.8.4 release. + + -- Atsuhito KOHDA Thu, 19 Jul 2001 09:57:03 +0900 + +lynx-cur (2.8.4-3.8) unstable; urgency=low + + * This is of pre.5 + * Fixed typos in this file (pre.3 -> pre.4 in 3.7, filed -> field in 3.5). + + -- Atsuhito KOHDA Mon, 16 Jul 2001 09:03:05 +0900 + +lynx-cur (2.8.4-3.7) unstable; urgency=low + + * This is of pre.4 + * Modified patch-1 to eliminate warnings after pre.3 (Debian specific). + + -- Atsuhito KOHDA Wed, 11 Jul 2001 07:38:57 +0900 + +lynx-cur (2.8.4-3.6) unstable; urgency=low + + * This is of pre.3 + + -- Atsuhito KOHDA Tue, 10 Jul 2001 09:23:57 +0900 + +lynx-cur (2.8.4-3.5) unstable; urgency=low + + * This is of pre.2 + * Added gettext to Build-Depends: field. (closes: #100366) + + -- Atsuhito KOHDA Mon, 11 Jun 2001 14:46:22 +0900 + +lynx-cur (2.8.4-3.4) unstable; urgency=low + + * This is of dev.21 + pre.1 + + -- Atsuhito KOHDA Mon, 4 Jun 2001 07:39:27 +0900 + +lynx-cur (2.8.4-3.3) unstable; urgency=low + + * Added german translation of templates contributed by + . (closes: #94130) + * Changed deprecated 'isdefault' to 'seen' in debconf config. This is + borrowed from lynx, thanks Matthew Danish . + * Updated ja.po of http://www2.iro.umontreal.ca/~pinard/po/ (closes: #99091) + + -- Atsuhito KOHDA Thu, 19 Apr 2001 10:03:03 +0900 + +lynx-cur (2.8.4-3.2) unstable; urgency=low + + * This is of dev.20 and this version wouldn't need curses lib any more. + (closes: #88089) + * Adopted spanish translation of templates contributed by + Carlos Valdivia Yage . (closes: #92374) + * Refined handling of local.cfg a bit. + + -- Atsuhito KOHDA Mon, 2 Apr 2001 10:26:31 +0900 + +lynx-cur (2.8.4-3.1) unstable; urgency=low + + * This is of dev.19 + + -- Atsuhito KOHDA Tue, 27 Feb 2001 13:20:04 +0900 + +lynx-cur (2.8.4-3) unstable; urgency=low + + * Official Debian Release. (closes: #85798) + * Standards-Version: 3.1.1, at least. + + -- Atsuhito KOHDA Fri, 16 Feb 2001 16:41:56 +0900 + +lynx-cur (2.8.4-2.11) unstable; urgency=low + + * This is of dev.18 and aims to merge Debian. + * Separates wrapper part to lynx-cur-wrapper. + + -- Atsuhito KOHDA Mon, 12 Feb 2001 14:32:33 +0900 + +lynx-cur (2.8.4-2.9) unstable; urgency=low + + * This is of dev.16 and ja.po was included in original distribution now. + * Added docs/README.ssl + + -- Atsuhito KOHDA Wed, 3 Jan 2001 09:21:56 +0900 + +lynx-cur (2.8.4-2.8) unstable; urgency=low + + * This is of dev.15 and we used lynx2.8.4dev.15.tar.bz2 instead of patch. + * Updated ja.po of PO-Revision-Date: 2000-10-11 09:47+09:00 + + -- Atsuhito KOHDA Sat, 23 Dec 2000 10:03:22 +0900 + +lynx-cur (2.8.4-2.7) unstable; urgency=low + + * This is of dev.14. + + -- Atsuhito Kohda Sat, 4 Nov 2000 09:19:05 +0900 + +lynx-cur (2.8.4-2.6) unstable; urgency=low + + * This is of dev.13. + + -- Atsuhito Kohda Thu, 26 Oct 2000 07:56:58 +0900 + +lynx-cur (2.8.4-2.5) unstable; urgency=low + + * This is of dev.11. + + -- Atsuhito Kohda Thu, 19 Oct 2000 11:17:38 +0900 + +lynx-cur (2.8.4-2.4) unstable; urgency=low + + * This is of dev.10. + + -- Atsuhito Kohda Fri, 22 Sep 2000 13:46:58 +0900 + +lynx-cur (2.8.4-2.3) unstable; urgency=low + + * This is of dev.9. This fixes serious damage of dev.8. + + -- Atsuhito Kohda Sat, 2 Sep 2000 08:59:18 +0900 + +lynx-cur (2.8.4-2.2) unstable; urgency=low + + * This is of dev.8 and refined version of multibyte character patch for + status line by Takeshi Hataguchi is merged now. + + -- Atsuhito Kohda Fri, 25 Aug 2000 16:41:15 +0900 + +lynx-cur (2.8.4-2.1) unstable; urgency=low + + * Apply refined version of multibyte character patch for status line by + Takeshi Hataguchi + + -- Atsuhito Kohda Tue, 8 Aug 2000 11:36:23 +0900 + +lynx-cur (2.8.4-2) unstable; urgency=low + + * This is of dev.7 and multibyte character patch for status line by + Takeshi Hataguchi is merged now. + + -- Atsuhito Kohda Fri, 4 Aug 2000 07:24:05 +0900 + +lynx-cur (2.8.4-1.9) unstable; urgency=low + + * This is of dev.6 + + -- Atsuhito Kohda Tue, 18 Jul 2000 14:49:44 +0900 + +lynx-cur (2.8.4-1.8) unstable; urgency=low + + * Apply multibyte character patch for status line by Takeshi Hataguchi + + + -- Atsuhito Kohda Sun, 9 Jul 2000 07:55:50 +0900 + +lynx-cur (2.8.4-1.7) unstable; urgency=low + + * Add --without-included-gettext to configure option. + * Refine post{inst,rm} and preinst. + + -- Atsuhito Kohda Thu, 29 Jun 2000 11:27:42 +0900 + +lynx-cur (2.8.4-1.6) unstable; urgency=low + + * Add settings for da.po in lynx script, postinst etc. which I forgot + by mistake. + + -- Atsuhito Kohda Tue, 27 Jun 2000 07:38:51 +0900 + +lynx-cur (2.8.4-1.5) unstable; urgency=low + + * This is of dev.4 + + -- Atsuhito Kohda Sun, 25 Jun 2000 09:14:19 +0900 + +lynx-cur (2.8.4-1.4) unstable; urgency=low + + * Fix patch-1 so that warnings disappear in dev.3 + * Updated ru.po and added da.po + + -- Atsuhito Kohda Thu, 8 Jun 2000 09:38:54 +0900 + +lynx-cur (2.8.4-1.3) unstable; urgency=low + + * This is of dev.3 + * Disabled PREPEND_BASE_TO_SOURCE in default lynx.cfg as lynx of Debian + which I forgot in 1.1 (sorry). + * Updated ja.po ("PO-Revision-Date: 2000-05-29 09:47+09:00\n") which was + downloaded from; + http://www.iro.umontreal.ca/contrib/po/trans/ja/lynx-2.8.3.rel1.ja.po + + -- Atsuhito Kohda Tue, 23 May 2000 08:39:39 +0900 + +lynx-cur (2.8.4-1.2) unstable; urgency=low + + * Updated ja.po ("PO-Revision-Date: 2000-05-19 21:43+0900\n") + + -- Atsuhito Kohda Sun, 21 May 2000 08:38:15 +0900 + +lynx-cur (2.8.4-1.1) unstable; urgency=low + + * Refine lynx script according to the suggestions of Klaus Weide + and also of Kenshi Muto + and of "Ken N." . Thanks all. + * Use INCLUDE so that sizes of lynx-*.cfg etc. reduce according to the + suggestions of Klaus Weide . + * Remove --enable-charset-choice from configure option, this is also + suggested by Klaus Weide . + * Replace ja.po with that of Masayuki Hatta . + Thanks Masayuki Hatta. + * Add configure options used in lynx of Debian. + * Disabled PREPEND_BASE_TO_SOURCE in default lynx.cfg as lynx of Debian. + * Add '-rm -f intl/libintl.h' to rules unless 2nd time debuild fails. + * Replace cs, de, fr, nl, pt_BR, ru, sl po files with lynx 2.8.3 + + -- Atsuhito Kohda Thu, 18 May 2000 11:19:36 +0900 + +lynx-cur (2.8.4-1) unstable; urgency=low + + * New Upstream Release. This is of dev.1 + * Refine lynx script and post{inst, rm} so that they can be used both + lynx-ja and lynx-cur with little modification. + + -- Atsuhito Kohda Sat, 6 May 2000 09:31:50 +0900 + +lynx-cur (2.8.3-3.4) unstable; urgency=low + + * This is of rel.1 + + -- Atsuhito Kohda Mon, 24 Apr 2000 08:48:57 +0900 + +lynx-cur (2.8.3-3.3) unstable; urgency=low + + * This is of pre.7 + * Delete SITE_DEFS="-DSUPPORT_MULTIBYTE_EDIT" from rules. This is not + necessary any more. + + -- Atsuhito Kohda Fri, 21 Apr 2000 11:55:31 +0900 + +lynx-cur (2.8.3-3.2) unstable; urgency=low + + * This is of pre.6 and the patch of Hataguchi Takeshi + seems included. + + -- Atsuhito Kohda Wed, 19 Apr 2000 10:45:16 +0900 + +lynx-cur (2.8.3-3.1) unstable; urgency=low + + * This is of pre.5 + * Fix HELPFILE in lynx.cfg which is duplicated by mistake. + + -- Atsuhito Kohda Sat, 15 Apr 2000 10:02:42 +0900 + +lynx-cur (2.8.3-3) unstable; urgency=low + + * This is of pre.4 + + -- Atsuhito Kohda Wed, 12 Apr 2000 11:09:40 +0900 + +lynx-cur (2.8.3-2.10) unstable; urgency=low + + * This is of pre.3 + * Apply the patch of Hataguchi Takeshi + + -- Atsuhito Kohda Mon, 10 Apr 2000 07:44:41 +0900 + +lynx-cur (2.8.3-2.9) unstable; urgency=low + + * This is of pre.2 + + -- Atsuhito Kohda Tue, 4 Apr 2000 09:16:00 +0900 + +lynx-cur (2.8.3-2.8) unstable; urgency=low + + * Add README.jp which was forgotten by accident. + + -- Atsuhito Kohda Mon, 3 Apr 2000 07:18:25 +0900 + +lynx-cur (2.8.3-2.7) unstable; urgency=low + + * This is of pre.1 + + -- Atsuhito Kohda Sun, 2 Apr 2000 15:19:02 +0900 + +lynx-cur (2.8.3-2.6) unstable; urgency=low + + * This is of dev.23 + + -- Atsuhito Kohda Thu, 30 Mar 2000 17:39:14 +0900 + +lynx-cur (2.8.3-2.5) unstable; urgency=low + + * This is of dev.22 + + -- Atsuhito Kohda Tue, 14 Mar 2000 12:47:13 +0900 + +lynx-cur (2.8.3-2.4) unstable; urgency=low + + * This is of dev.21 + * Remove --enable-kanji following CHANGES. + + -- Atsuhito Kohda Wed, 1 Mar 2000 10:09:04 +0900 + +lynx-cur (2.8.3-2.3) frozen-jp unstable-jp; urgency=low + + * This is of dev.20; this version seems to improve handling of Japanese text + so into frozen-jp too but might be final for frozen-jp. + * Add "--enable-charset-choice --enable-kanji --enable-cjk" to configure. + + -- Atsuhito Kohda Fri, 25 Feb 2000 08:08:19 +0900 + +lynx-cur (2.8.3-2.2) frozen-jp unstable-jp; urgency=low + + * Add frozen-jp because this is BUG fix version of 2.8.3-1.9 which + is in frozen-jp. + * Change template of debconf a bit so that it will show an important + note on /etc/lynx.cnf to a user. + + -- Atsuhito Kohda Sat, 19 Feb 2000 08:59:46 +0900 + +lynx-cur (2.8.3-2.1) unstable; urgency=low + + * Fix configure option for new location of lynx.cfg (with --libdir). + + -- Atsuhito Kohda Tue, 1 Feb 2000 07:42:20 +0900 + +lynx-cur (2.8.3-2) unstable; urgency=low + + * Add debconf support. + * Move lynx-*.cfg and lynx.cfg* into /etc/lynx-cur directory. + (close Bug#JP/1137) + + -- Atsuhito Kohda Wed, 26 Jan 2000 08:22:58 +0900 + +lynx-cur (2.8.3-1.9) unstable; urgency=low + + * This is of dev.18 + * Update to Standards-Version: 3.0.0 + + -- Atsuhito Kohda Tue, 11 Jan 2000 16:35:55 +0900 + +lynx-cur (2.8.3-1.8) unstable; urgency=low + + * This is of dev.17 and lynx.cfg changed much so we change postinst + to reduce lynx-*.cfg and lynx.cfg.* + + -- Atsuhito Kohda Thu, 16 Dec 1999 15:31:30 +0900 + +lynx-cur (2.8.3-1.7) unstable; urgency=low + + * This is of dev.16 + + -- Atsuhito Kohda Sat, 11 Dec 1999 08:36:49 +0900 + +lynx-cur (2.8.3-1.6) unstable; urgency=low + + * This is of dev.15 and for unstable not for experimental as former one. + * Fix wrong lynx.cfg.blck because COLOR settings of original lynx.cfg of + 2.8.3 is quite different from that of 2.8.2 + * Delete --enable-default-colors configure option again. + + -- Atsuhito Kohda Thu, 18 Nov 1999 15:26:39 +0900 + +lynx-cur (2.8.3-1.5) experimental; urgency=low + + * This is of dev.14 + + -- Atsuhito Kohda Sun, 7 Nov 1999 09:09:45 +0900 + +lynx-cur (2.8.3-1.4) experimental; urgency=low + + * This is of dev.13 + + -- Atsuhito Kohda Fri, 29 Oct 1999 14:58:27 +0900 + +lynx-cur (2.8.3-1.3) experimental; urgency=low + + * This is of dev.12 + + -- Atsuhito Kohda Fri, 15 Oct 1999 08:19:06 +0900 + +lynx-cur (2.8.3-1.2.9) experimental; urgency=low + + * This is of dev.10 + * Change dhelp to doc-base + * Remove COPYING and CHANGES from doc/lynx-cur/ + and correspondingly change lynx_help/about_lynx.html + * Replace fr.po with that of 2.8.2 + + -- Atsuhito Kohda Mon, 4 Oct 1999 12:20:08 +0900 + +lynx-cur (2.8.3-1.2.8) experimental; urgency=low + + * This is of dev.9 + * Fix wrong HELPFILE entry of lynx.cfg for gzip-help. + + -- Atsuhito Kohda Wed, 15 Sep 1999 10:45:32 +0900 + +lynx-cur (2.8.3-1.2.7) experimental; urgency=low + + * This is of dev.8 + + -- Atsuhito Kohda Sun, 29 Aug 1999 08:17:44 +0900 + +lynx-cur (2.8.3-1.2.6) experimental; urgency=low + + * This is of dev.6 + + -- Atsuhito Kohda Sun, 15 Aug 1999 13:10:58 +0900 + +lynx-cur (2.8.3-1.2.5) experimental; urgency=low + + * Change wrong unstable to experimental. + + -- Atsuhito Kohda Mon, 2 Aug 1999 08:08:18 +0900 + +lynx-cur (2.8.3-1.2.4) unstable; urgency=low + + * Fix script lynx for TERM of krxvt entry. + + -- Atsuhito Kohda Sun, 1 Aug 1999 09:27:29 +0900 + +lynx-cur (2.8.3-1.2.3) experimental; urgency=low + + * This is of dev.5 + * Use slang again and add -DSUPPORT_MULTIBYTE_EDIT to option of make + + -- Atsuhito Kohda Sat, 31 Jul 1999 09:13:23 +0900 + +lynx-cur (2.8.3-1.2.2) experimental; urgency=low + + * Use slang-ja instead of slang + * Move /usr/doc/lynx-cur to /usr/share/doc/lynx-cur as per the FHS + also /usr/man to /usr/share/man + * Remove duplicated update-menu and update-mime from post{inst,rm} because + dh_installmenu and dh_installmime created them. + * Add dhelp support + * Remove "unset TERMCAP" and "export COLORTERM=kterm" from kterm entry in + script lynx. + * Add lynx.cfg.dflt for default color and use option --enable-default-colors. + * Add include directive for private alternation of options. + + -- Atsuhito Kohda Fri, 16 Jul 1999 13:10:38 +0900 + +lynx-cur (2.8.3-1.2) experimental; urgency=low + + * This is of dev.4 + * Add support of spanish, portguese and swedish but experimental. + * Refine script lynx a bit. + * Change de.po from original to http://www.slcc.edu/lynx/po/de.po + + -- Atsuhito Kohda Wed, 14 Jul 1999 16:47:48 +1000 + +lynx-cur (2.8.3-1.1) experimental; urgency=low + + * Modify script lynx slightly + + -- Atsuhito Kohda Thu, 8 Jul 1999 07:45:46 +1000 + +lynx-cur (2.8.3-1) experimental; urgency=low + + * Initial Release. This is of dev.3 + + -- Atsuhito Kohda Wed, 23 Jun 1999 11:35:02 +1000 + +Local variables: +mode: debian-changelog +End: --- lynx-cur-2.8.8dev.3.orig/debian/compat +++ lynx-cur-2.8.8dev.3/debian/compat @@ -0,0 +1 @@ +7 --- lynx-cur-2.8.8dev.3.orig/debian/config +++ lynx-cur-2.8.8dev.3/debian/config @@ -0,0 +1,60 @@ +#!/bin/sh -e + +CONFIGFILE=/etc/lynx-cur/local.cfg + + +# Use debconf. +. /usr/share/debconf/confmodule + +# Establish the preliminaries. +db_version +db_title 'Lynx-cur Configuration' + +if [ -e $CONFIGFILE ]; then + # parse configfile + if grep -q '^STARTFILE:' $CONFIGFILE ; then + defaulturl=`sed -n '/^STARTFILE:/{s/^STARTFILE://p}' < $CONFIGFILE` + # Store values from config file into debconf_db + db_set lynx-cur/defaulturl "$defaulturl" + fi +else + #set a sane default value if no preconfiguration has yet happened + # (either by preseeding debconf or by pre-generating local.cfg + db_fget lynx-cur/defaulturl seen + if [ "$RET" = false ]; then + if [ ! -z "`dnsdomainname`" ]; then + db_set lynx-cur/defaulturl "http://www.`dnsdomainname`/" + else + db_reset lynx-cur/defaulturl + fi + fi +fi + +ok='' +while [ -z "$ok" ]; do + +# Ask the user what url should be displayed by default. + db_input low lynx-cur/defaulturl || true + db_go || true + +# Do some syntax checking on the url and see if it's ok. + db_get lynx-cur/defaulturl + + case "$RET" in + http:*|ftp:*|news:*|nntp:*|gopher:*|file:*|/*) + ok=1 + ;; + *) + # Set default flag so the user is prompted again. + db_fset lynx-cur/defaulturl seen false + ;; + esac +done + +## # Important note to a user +## if [ -f /etc/lynx.cfg ]; then +## db_input high lynx-cur/etc_lynx.cfg || true +## db_go || true +## fi + +# vim:tabstop=4:expandtab:shiftwidth=4 --- lynx-cur-2.8.8dev.3.orig/debian/control +++ lynx-cur-2.8.8dev.3/debian/control @@ -0,0 +1,39 @@ +Source: lynx-cur +Section: web +Priority: extra +Maintainer: Atsuhito KOHDA +Homepage: http://lynx.isc.org/ +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 + +Package: lynx-cur +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Provides: www-browser, news-reader +Conflicts: lynx (<< 2.8.7dev9-1.1), lynx-ssl +Recommends: mime-support +Suggests: lynx-cur-wrapper +Description: Text-mode WWW Browser with NLS support (development version) + Lynx is a fully-featured World Wide Web (WWW) client for users running + cursor-addressable, character-cell display devices. + It is very fast and easy to use. It will display HTML documents + containing links to files residing on the local system, + as well as files residing on remote systems running Gopher, HTTP, FTP, + WAIS, and NNTP servers. + . + This package contains a development version of lynx. + +Package: lynx-cur-wrapper +Architecture: all +Depends: lynx-cur, ${misc:Depends} +Description: Wrapper for lynx-cur + This wrapper will provide almost all basic setup of lynx mainly for novice + users using LANG environment variable so a user needs essentially nothing + to do except setting LANG appropriately. + +Package: lynx +Architecture: all +Depends: lynx-cur (>= ${source:Version}), ${misc:Depends} +Description: Text-mode WWW Browser (transitional package) + This is a transitional package and can safely be removed; see the + lynx-cur package instead. --- lynx-cur-2.8.8dev.3.orig/debian/copyright +++ lynx-cur-2.8.8dev.3/debian/copyright @@ -0,0 +1,34 @@ +This package was debianized by Atsuhito KOHDA on +Wed, 7 Jul 1999 07:29:50 +0900. + +It was downloaded from + +Upstream Author: lynx-dev + +Copyright: + +== from COPYHEADER == + +/* Copyright (C) 1995 University of Kansas. + + This file is part of Lynx, a text-based WWW browser. + + Lynx is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License, version 2, as + published by the Free Software Foundation. + + Lynx is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Any licensing or usage questions should be directed to Michael + Grobe . +*/ + +On Debian GNU/Linux systems, the complete text of the GNU General Public +License can be found in the `/usr/share/common-licenses' directory. --- lynx-cur-2.8.8dev.3.orig/debian/dirs +++ lynx-cur-2.8.8dev.3/debian/dirs @@ -0,0 +1 @@ +usr/bin --- lynx-cur-2.8.8dev.3.orig/debian/doc-base +++ lynx-cur-2.8.8dev.3/debian/doc-base @@ -0,0 +1,10 @@ +Document: lynx-cur +Title: Debian Lynx Manual +Author: Michael Grobe et al. +Abstract: This manual describes what lynx-cur is + and how it can be used on Debian systems. +Section: Network/Web Browsing + +Format: HTML +Index: /usr/share/doc/lynx-cur/lynx_help/lynx_help_main.html.gz +Files: /usr/share/doc/lynx-cur/lynx_help/*.html.gz --- lynx-cur-2.8.8dev.3.orig/debian/local.cfg +++ lynx-cur-2.8.8dev.3/debian/local.cfg @@ -0,0 +1,2 @@ +STARTFILE:Not-Configured-Yet +#NNTPSERVER:news.server.dom --- lynx-cur-2.8.8dev.3.orig/debian/lynx-cur-wrapper.README.Debian +++ lynx-cur-2.8.8dev.3/debian/lynx-cur-wrapper.README.Debian @@ -0,0 +1,26 @@ +lynx-cur-wrapper for Debian +---------------------- + +A wrapper script for lynx-cur. + +lynx is defined through alternatives and real script is lynx-cur and +lynx-cur will call a binary lynx.cur with appropriate settings but if not, +please modify /usr/bin/lynx-cur. (Check /usr/bin/lynx-cur if you need.) + +This wrapper will provide every basic setup for lynx mainly for novice users +using LANG environment variable so a user needs essentially nothing to do +except setting LANG appropriately. + +But the current maintainer does not know about this issue so precisely +so please let me know any deficiency if you find. + +NOTE: +0) we added utf-8 support experimentally. It would work only with mlterm + and uxterm at present. Try the following for mlterm (same for uxterm); + LANG=ja_JP.UTF-8 mlterm & + and on mlterm, run "lynx" and see if lynx works fine or not ;-) + +1) with -use_mouse in kterm, EXTERNAL w3m does not work! + +2) the original lynx (2.8.5dev.1) deleted several po files; + es it ko no pl pt zh. --- lynx-cur-2.8.8dev.3.orig/debian/lynx-cur-wrapper.copyright +++ lynx-cur-2.8.8dev.3/debian/lynx-cur-wrapper.copyright @@ -0,0 +1,4 @@ +This is Debian specific and is under GPL. + +On Debian GNU/Linux systems, the complete text of the GNU General Public +License can be found in the `/usr/share/common-licenses' directory. --- lynx-cur-2.8.8dev.3.orig/debian/lynx-cur-wrapper.dirs +++ lynx-cur-2.8.8dev.3/debian/lynx-cur-wrapper.dirs @@ -0,0 +1 @@ +usr/bin --- lynx-cur-2.8.8dev.3.orig/debian/lynx-cur-wrapper.install +++ lynx-cur-2.8.8dev.3/debian/lynx-cur-wrapper.install @@ -0,0 +1 @@ +debian/lynx-cur-wrapper-conffiles/* /etc/lynx-cur/ --- lynx-cur-2.8.8dev.3.orig/debian/lynx-cur-wrapper.postinst +++ lynx-cur-2.8.8dev.3/debian/lynx-cur-wrapper.postinst @@ -0,0 +1,26 @@ +#!/bin/sh +# postinst script for lynx-cur + +pack=lynx-cur +cnfdir=/etc/${pack} + +set -e + +if [ "$1" != configure ]; then exit 0; fi + +update-alternatives --install /usr/bin/www-browser www-browser \ + /usr/bin/lynx-cur 45 \ + --slave /usr/share/man/man1/www-browser.1.gz www-browser.1.gz \ + /usr/share/man/man1/lynx-cur.1.gz + +update-alternatives --install /usr/bin/lynx lynx /usr/bin/lynx-cur 16 \ + --slave /usr/share/man/man1/lynx.1.gz lynx.1.gz \ + /usr/share/man/man1/lynx-cur.1.gz + + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- lynx-cur-2.8.8dev.3.orig/debian/lynx-cur-wrapper.prerm +++ lynx-cur-2.8.8dev.3/debian/lynx-cur-wrapper.prerm @@ -0,0 +1,26 @@ +#! /bin/sh +# prerm script for lynx-cur +# +# see: dh_installdeb(1) + +set -e + +case "$1" in + remove|deconfigure) + update-alternatives --remove www-browser /usr/bin/lynx-cur + update-alternatives --remove lynx /usr/bin/lynx-cur + ;; + failed-upgrade|upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- lynx-cur-2.8.8dev.3.orig/debian/lynx-cur.1 +++ lynx-cur-2.8.8dev.3/debian/lynx-cur.1 @@ -0,0 +1,35 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH LYNX-CUR 1 "Oct 10, 2001" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +lynx-cur \- a wrapper for lynx/lynx.cur +.SH DESCRIPTION +This manual page documents briefly the +.B lynx-cur +command. +This manual page was written for the Debian GNU/Linux distribution +because the original program is Debian specific. +.PP +This will provide almost all basic setup of lynx mainly for novice users +using LANG environment variable, please look into /usr/bin/lynx-cur. +Furthermore lynx will be linked to lynx-cur so you need not call lynx-cur +explicitly. +.SH SEE ALSO +.BR lynx.cur (1). +.SH AUTHOR +This manual page was written by Atsuhito KOHDA , +for the Debian GNU/Linux system (but may be used by others). --- lynx-cur-2.8.8dev.3.orig/debian/lynx.cur.wrappper +++ lynx-cur-2.8.8dev.3/debian/lynx.cur.wrappper @@ -0,0 +1,100 @@ +#!/bin/sh + +cnfdir=/etc/lynx-cur +binary=lynx.cur +### default settings +OPT="" + +# nl=dutch no=norwegian pl=polish pt=portuguese sl=slovenia sv=swedish +# chinese=zh_CN.GB2312 and/or zh_TW.Big5 korean=ko_KR.eucKR + +case $LANG in + *.utf-8|*.UTF-8) flg=utf ;; + cs*) flg=cs ;; + da*) flg=da ;; + de*) flg=de ;; + es*) flg=es ;; + fr*) flg=fr ;; + it*) flg=it ;; + ja*) flg=ja ;; + ko*) flg=ko ;; + nl*) flg=nl ;; + no*) flg=no ;; + pl*) flg=pl ;; + pt*) flg=pt ;; + ru*) flg=ru ;; + sl*) flg=sl ;; + sv*) flg=sv ;; + zh*) flg=zh ;; + *) flg= ;; +esac + +if [ X$LYNX_CFG = X ] ; then + if [ X$flg = Xja ] ; then +### +### Japanese environment +### + if [ X$DISPLAY = X ] ; then +############ non-X ############# + if [ X$TERM = Xkon -o X$TERM = Xjfbterm ] ; then +### kon or jfbterm? + exec /usr/bin/${binary} -cfg=${cnfdir}/lynx.cfg.blck ${1+"$@"} + elif [ X$TERM = Xlinux ] ; then +### linux console ? + export LANG=C + exec /usr/bin/${binary} -cfg=${cnfdir}/lynx.cfg ${1+"$@"} + else +### unsure, so should be the default. + exec /usr/bin/${binary} -cfg=${cnfdir}/lynx.cfg ${1+"$@"} + fi + else +########## X Window ############ + if [ X$TERM = Xkterm ] ; then + if [ X$COLORTERM = X -o X$COLORTERM = Xrxvt-xpm -o X$COLORTERM = Xrxvt ] +### kterm or non-package krxvt ? + then + exec /usr/bin/${binary} -cfg=${cnfdir}/lynx-ja.cfg ${1+"$@"} +# If reverse video +# exec /usr/bin/${binary} -cfg=${cnfdir}/lynx.cfg.blck ${1+"$@"} + fi + elif [ X$COLORTERM = Xrxvt-xpm -o X$COLORTERM = Xgnome-terminal ] ; then +### krxvt or gnome-terminal? + exec /usr/bin/${binary} -cfg=${cnfdir}/lynx-ja.cfg ${1+"$@"} + elif [ X$COLORTERM = Xrxvt -o X$TERM = Xxterm-debian -o X$TERM = Xxterm ] + then +### rxvt or xterm ? + export LANG=C + exec /usr/bin/${binary} -cfg=${cnfdir}/lynx.cfg ${1+"$@"} + else +### unsure, so should be the default. + exec /usr/bin/${binary} -cfg=${cnfdir}/lynx.cfg ${1+"$@"} + fi + fi +### +### Unicode ? + elif [ X$flg = Xutf ]; then + if [ X$TERM = Xmlterm ] + then +### mlterm ? + exec /usr/bin/${binary} -cfg=${cnfdir}/lynx-utf.cfg ${1+"$@"} + elif [ X$TERM = Xxterm ] + then +### uxterm ? + exec /usr/bin/${binary} -cfg=${cnfdir}/lynx-utf.cfg ${1+"$@"} + else +### unsure, so should be the default. + exec /usr/bin/${binary} -cfg=${cnfdir}/lynx.cfg ${1+"$@"} + fi +### +### non-Japanese environment ? +### + else + if [ X$flg != X ] ; then + exec /usr/bin/${binary} -cfg=${cnfdir}/lynx-${flg}.cfg ${1+"$@"} + else + exec /usr/bin/${binary} -cfg=${cnfdir}/lynx.cfg ${1+"$@"} + fi + fi +else + exec /usr/bin/${binary} ${1+"$@"} +fi --- lynx-cur-2.8.8dev.3.orig/debian/lynx.preinst +++ lynx-cur-2.8.8dev.3/debian/lynx.preinst @@ -0,0 +1,48 @@ +#!/bin/sh + +set -e + +# Inspired by +# http://wiki.debian.org/DpkgConffileHandling +# Remove a no-longer used conffile +rm_or_moveconffile() { + PKGNAME="$1" + CONFFILE="$2" + NEWDIR="$3" + if [ -e "$CONFFILE" ]; then + md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" + old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`" + if [ "$md5sum" != "$old_md5sum" ]; then + test -e "$NEWDIR" || mkdir -m 755 -p "$NEWDIR" + echo "Obsolete conffile $CONFFILE has been modified by you." 1>&2 + if [ -e "$NEWDIR/`basename $CONFFILE`" ]; then + echo "replacement conffile $NEWDIR/`basename $CONFFILE` already exists." 1>&2 + echo "Saving as $CONFFILE.dpkg-bak ..." 1>&2 + mv -f "$CONFFILE" "$CONFFILE".dpkg-bak + else + echo "Moving conffile $CONFFILE to new location $NEWDIR" 1>&2 + mv -f "$CONFFILE" "$NEWDIR/" + fi + else + echo "Removing obsolete conffile $CONFFILE ..." 1>&2 + rm -f "$CONFFILE" + fi + fi +} + + + +case "$1" in + install|upgrade) + # Upgrading from a a real, non-dummy lynx package. + if dpkg --compare-versions "$2" 'lt-nl' '2.8.7dev9-1.1' ; then + update-alternatives --quiet --remove www-browser /usr/bin/lynx + update-alternatives --quiet --remove lynx /usr/bin/lynx.stable + rm_or_moveconffile lynx /etc/lynx.cfg /etc/lynx-cur + rm_or_moveconffile lynx /etc/lynx.lss /etc/lynx-cur + fi + ;; + *) +esac + +#DEBHELPER# --- lynx-cur-2.8.8dev.3.orig/debian/menu +++ lynx-cur-2.8.8dev.3/debian/menu @@ -0,0 +1,2 @@ +?package(lynx-cur):needs="text" section="Applications/Network/Web Browsing"\ + title="Lynx-cur" command="lynx" --- lynx-cur-2.8.8dev.3.orig/debian/mime +++ lynx-cur-2.8.8dev.3/debian/mime @@ -0,0 +1,2 @@ +text/html; /usr/bin/lynx -force_html %s; needsterminal; description=HTML Text; nametemplate=%s.html; priority=3 +text/html; /usr/bin/lynx -dump -force_html %s; copiousoutput; description=HTML Text; nametemplate=%s.html; priority=2 --- lynx-cur-2.8.8dev.3.orig/debian/postinst +++ lynx-cur-2.8.8dev.3/debian/postinst @@ -0,0 +1,63 @@ +#!/bin/sh +# postinst script for lynx-beta +pack=lynx-cur +cnfdir=/etc/${pack} +CONFIGFILE=${cnfdir}/local.cfg + +set -e + +if [ "$1" != configure ]; then exit 0; fi + +update-alternatives --install /usr/bin/www-browser www-browser \ + /usr/bin/lynx.cur 40 \ + --slave /usr/share/man/man1/www-browser.1.gz www-browser.1.gz \ + /usr/share/man/man1/lynx.cur.1.gz + +update-alternatives --install /usr/bin/lynx lynx /usr/bin/lynx.cur 15 \ + --slave /usr/share/man/man1/lynx.1.gz lynx.1.gz \ + /usr/share/man/man1/lynx.cur.1.gz + +# do not try managing $CONFIGfile if it exists, but is not a regular file +if test -f $CONFIGFILE && ! test -L $CONFIGFILE ; then + +# Use debconf. +. /usr/share/debconf/confmodule + +if [ ! -f $CONFIGFILE ] ; then + cat << EOF > $CONFIGFILE +# local overides for lynx-cur configuration +STARTFILE:Not-Configured-Yet +EOF + chmod 644 $CONFIGFILE +fi + +cp -a $CONFIGFILE $CONFIGFILE.tmp + +db_get ${pack}/defaulturl +# escape colons +defaulturl=`echo "$RET" | sed -e 's_:_\\\\:_g'` + +# Check whether /etc/news/server exists and sync its value to NNTPSERVER setting: +if [ -e /etc/news/server ] ; then + NNTPSERVER=`grep -s -v '^#' /etc/news/server | head -n 1` +fi + +# add missing lines +test -z "$defaulturl" || grep -Eq '^STARTFILE:' $CONFIGFILE || \ + echo "STARTFILE:Not-Configured-Yet" >> $CONFIGFILE +test -z "$NNTPSERVER" || grep -Eq '^NNTPSERVER:' $CONFIGFILE || \ + echo "NNTPSERVER:Not-Configured-Yet" >> $CONFIGFILE + +sed -e "s:^STARTFILE\\:.*:STARTFILE\\:${defaulturl}:" \ + -e "s/^NNTPSERVER:.*/NNTPSERVER:${NNTPSERVER}/" \ + < $CONFIGFILE > $CONFIGFILE.tmp +mv -f $CONFIGFILE.tmp $CONFIGFILE + +fi + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- lynx-cur-2.8.8dev.3.orig/debian/postrm +++ lynx-cur-2.8.8dev.3/debian/postrm @@ -0,0 +1,16 @@ +#! /bin/sh +# postrm script for lynx-cur +pack=lynx-cur +cnfdir=/etc/${pack} + +set -e + +if [ "$1" = "purge" ]; then + rm -f ${cnfdir}/local.cfg +fi + + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# --- lynx-cur-2.8.8dev.3.orig/debian/preinst +++ lynx-cur-2.8.8dev.3/debian/preinst @@ -0,0 +1,24 @@ +#!/bin/sh +pack=lynx-cur + +set -e + +case "$1" in + install|upgrade) + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- lynx-cur-2.8.8dev.3.orig/debian/prerm +++ lynx-cur-2.8.8dev.3/debian/prerm @@ -0,0 +1,26 @@ +#! /bin/sh +# prerm script for lynx-cur +# +# see: dh_installdeb(1) + +set -e + +case "$1" in + remove|deconfigure) + update-alternatives --remove www-browser /usr/bin/lynx.cur + update-alternatives --remove lynx /usr/bin/lynx.cur + ;; + failed-upgrade|upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- lynx-cur-2.8.8dev.3.orig/debian/rules +++ lynx-cur-2.8.8dev.3/debian/rules @@ -0,0 +1,149 @@ +#!/usr/bin/make -f +#-*- makefile -*- +# Made with the aid of dh_make, by Craig Small +# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. +# Some lines taken from debmake, by Christoph Lameter. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# Uncomment this to turn on debug mode. +#export DEB_BUILD_OPTIONS="debug nostrip" + +#export DH_COMPAT=4 +export DH_OPTIONS= + +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) +DEBOP=--enable-debug +else +DEBOP= +endif + +PACKAGE := $(shell dpkg-parsechangelog| \ + sed -n 's/^Source: \(.*\)$$/\1/p') +DSTDIR := $(CURDIR)/debian/$(PACKAGE) +BINDIR := $(DSTDIR)/usr/bin +DOCDIR := $(DSTDIR)/usr/share/doc/$(PACKAGE) +SUBPACK := $(PACKAGE)-wrapper +SUBDIR := $(CURDIR)/debian/$(SUBPACK) + +include /usr/share/dpatch/dpatch.make + +configure: configure-stamp +configure-stamp: patch-stamp + dh_testdir + # Add here commands to configure the package. + env cf_cv_SYSTEM_MAIL=/usr/sbin/sendmail \ + COMPRESS=/usr/bin/compress BZIP2=/bin/bzip2 UNZIP=/usr/bin/unzip \ + ZIP=/usr/bin/zip \ + LIBS="-lbsd" \ + ./configure --prefix=/usr --libexecdir=/usr/lib \ + --sysconfdir=/etc/lynx-cur --localstatedir=/var \ + --libdir=/etc/lynx-cur --enable-8bit-toupper --enable-externs \ + --enable-nsl-fork --enable-cgi-links --enable-exec-links \ + --enable-exec-scripts --enable-persistent-cookies --enable-nls \ + --enable-gzip-help --enable-prettysrc --enable-source-cache \ + --enable-cjk --enable-default-colors --enable-nested-tables \ + --enable-japanese-utf8 --enable-ipv6 \ + --enable-forms-options --enable-justify-elts --enable-partial \ + --enable-read-eta --enable-scrollbar --enable-syslog \ + --with-zlib --without-included-gettext \ + --with-screen=ncursesw --enable-justify-elts \ + --with-gnutls=/usr --enable-ipv6 --enable-persistent-cookies \ + ${DEBOP} +# --with-nss-compat --with-gnutls=/usr --enable-gnutls-compat +# --enable-color-style --enable-charset-choice --enable-font-switch + + touch configure-stamp + +build: configure-stamp build-stamp +build-stamp: + dh_testdir + + # Add here commands to compile the package. + $(MAKE) x=".cur" + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + debconf-updatepo + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + [ ! -f makefile ] || $(MAKE) distclean x=".cur" + -rm -f intl/libintl.h + + dh_clean + +install: install-indep install-arch +install-indep: + dh_testdir + dh_testroot + dh_prep + dh_installdirs -i + install -m 755 debian/lynx.cur.wrappper $(SUBDIR)/usr/bin/lynx-cur + +install-arch: + dh_testdir + dh_testroot + dh_prep -s + dh_installdirs -s +# chmod +x scripts/*.sh + # Add here commands to install the package into debian/$(package). + $(MAKE) install-full x=".cur" prefix=$(DSTDIR)/usr \ + libdir=$(DSTDIR)/etc/$(PACKAGE) \ + sysconfdir=$(DSTDIR)/etc/$(PACKAGE) docdir=$(DOCDIR) \ + helpdir=$(DOCDIR)/lynx_help \ + mandir=$(DSTDIR)/usr/share/man/man1 + cd $(DOCDIR) ; rm -rf samples test + cd $(DOCDIR) ; rm -f COPYING lynx_help/COPYING lynx_help/COPYHEADER \ + CHANGES COPYING.asc COPYHEADER.asc + cd $(DSTDIR)/usr/share/man/man1 ; mv lynx.1 lynx.cur.1 + +# Build architecture-independent files here. +# for lynx-cur-wrapper +binary-indep: DH_OPTIONS=-i +binary-indep: build install-indep + dh_testdir + dh_testroot + dh_installdocs + dh_installman debian/lynx-cur.1 + dh_installchangelogs + dh_install + dh_link + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture-dependent files here. +binary-arch: DH_OPTIONS=-a +binary-arch: build install-arch + dh_testdir + dh_testroot + dh_installdebconf + dh_installdocs + dh_installmenu + dh_installmime + dh_installchangelogs CHANGES + dh_install + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +source diff: + @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary --- lynx-cur-2.8.8dev.3.orig/debian/templates +++ lynx-cur-2.8.8dev.3/debian/templates @@ -0,0 +1,16 @@ +Template: lynx-cur/defaulturl +Type: string +Default: http://www.debian.org/ +_Description: Lynx's homepage: + Please enter the default URL to use if none is given when invoking lynx. + . + You must enter either a full URL (including the "http://", etc.) or an + absolute pathname. + +Template: lynx-cur/etc_lynx.cfg +Type: note +_Description: Please check old /etc/lynx.cfg + /etc/lynx.cfg is found but the configuration file of lynx-cur is + /etc/lynx-cur/lynx.cfg so /etc/lynx.cfg would be of lynx or lynx-ssl. + . + Please check it and it will be better to PURGE lynx or lynx-ssl. --- lynx-cur-2.8.8dev.3.orig/debian/po/POTFILES.in +++ lynx-cur-2.8.8dev.3/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] templates --- lynx-cur-2.8.8dev.3.orig/debian/po/ca.po +++ lynx-cur-2.8.8dev.3/debian/po/ca.po @@ -0,0 +1,68 @@ +# +# Catalan translation for lynx-cur package. +# Copyright (C) 2006 Atsuhito Kohda. +# This file is distributed under the same license as the lynx-cur package. +# +# Jordà Polo , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: 2.8.6dev18\n" +"Report-Msgid-Bugs-To: lynx-cur@packages.debian.org\n" +"POT-Creation-Date: 2010-05-06 11:38+0900\n" +"PO-Revision-Date: 2006-06-16 20:56+0200\n" +"Last-Translator: Jordà Polo \n" +"Language-Team: Català \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "Lynx's homepage:" +msgstr "Pàgina inicial de Lynx:" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"Please enter the default URL to use if none is given when invoking lynx." +msgstr "" +"Si us plau, introduïu la URL que s'usarà per defecte si s'executa lynx sense " +"arguments." + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"You must enter either a full URL (including the \"http://\", etc.) or an " +"absolute pathname." +msgstr "" +"Heu d'introduir una URL completa (incloent \"http://\", etc.) o una ruta " +"absoluta." + +#. Type: note +#. Description +#: ../templates:2001 +msgid "Please check old /etc/lynx.cfg" +msgstr "Si us plau comproveu l'antic /etc/lynx.cfg" + +#. Type: note +#. Description +#: ../templates:2001 +msgid "" +"/etc/lynx.cfg is found but the configuration file of lynx-cur is /etc/lynx-" +"cur/lynx.cfg so /etc/lynx.cfg would be of lynx or lynx-ssl." +msgstr "" +"/etc/lynx.cfg existeix però el fitxer de configuració de lynx-cur és /etc/" +"lynx-cur/lynx.cfg, pel que /etc/lynx.cfg deu ser de lynx o lynx-ssl." + +#. Type: note +#. Description +#: ../templates:2001 +msgid "Please check it and it will be better to PURGE lynx or lynx-ssl." +msgstr "Si us plau, comproveu-ho i millor que PURGUEU lynx o lynx-ssl." + +#~ msgid "http://www.debian.org/" +#~ msgstr "http://www.debian.org/" --- lynx-cur-2.8.8dev.3.orig/debian/po/cs.po +++ lynx-cur-2.8.8dev.3/debian/po/cs.po @@ -0,0 +1,74 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: lynx-cur\n" +"Report-Msgid-Bugs-To: lynx-cur@packages.debian.org\n" +"POT-Creation-Date: 2010-05-06 11:38+0900\n" +"PO-Revision-Date: 2006-06-16 10:40+0200\n" +"Last-Translator: Miroslav Kure \n" +"Language-Team: Czech \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "Lynx's homepage:" +msgstr "Domovská stránka lynxu:" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"Please enter the default URL to use if none is given when invoking lynx." +msgstr "" +"Zadejte výchozí URL, které se použije, pokud při startu lynxu žádné nezadáte." + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"You must enter either a full URL (including the \"http://\", etc.) or an " +"absolute pathname." +msgstr "Musíte zadat buď celé URL (včetně \"http://\") nebo absolutní cestu." + +#. Type: note +#. Description +#: ../templates:2001 +msgid "Please check old /etc/lynx.cfg" +msgstr "Zkontrolujte starý /etc/lynx.cfg" + +#. Type: note +#. Description +#: ../templates:2001 +msgid "" +"/etc/lynx.cfg is found but the configuration file of lynx-cur is /etc/lynx-" +"cur/lynx.cfg so /etc/lynx.cfg would be of lynx or lynx-ssl." +msgstr "" +"Byl sice nalezen soubor /etc/lynx.cfg, ale lynx-cur používá konfigurační " +"soubor /etc/lynx-cur/lynx.cfg, takže nalezený /etc/lynx.cfg patří asi balíku " +"lynx nebo lynx-ssl." + +#. Type: note +#. Description +#: ../templates:2001 +msgid "Please check it and it will be better to PURGE lynx or lynx-ssl." +msgstr "" +"Bude lepší, když soubor zkontrolujete a poté lynx nebo lynx-ssl ze systému " +"VYČISTÍTE." + +#~ msgid "http://www.debian.org/" +#~ msgstr "http://www.debian.org/" --- lynx-cur-2.8.8dev.3.orig/debian/po/de.po +++ lynx-cur-2.8.8dev.3/debian/po/de.po @@ -0,0 +1,81 @@ +# translation of de.po_[DSOzya].po to German +# translation of de.po_[DSOzya].po to German +# translation of de.po to German +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# Jens Nachtigall , 2004, 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: de.po_[DSOzya]\n" +"Report-Msgid-Bugs-To: lynx-cur@packages.debian.org\n" +"POT-Creation-Date: 2010-05-06 11:38+0900\n" +"PO-Revision-Date: 2006-06-17 09:23+0200\n" +"Last-Translator: Jens Nachtigall \n" +"Language-Team: German \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.10.2\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "Lynx's homepage:" +msgstr "Startseite von lynx:" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"Please enter the default URL to use if none is given when invoking lynx." +msgstr "" +"Bitte geben Sie die Standard-URL ein, die lynx verwenden soll, wenn Sie beim " +"Aufruf von lynx keine andere URL angeben." + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"You must enter either a full URL (including the \"http://\", etc.) or an " +"absolute pathname." +msgstr "" +"Sie müssen entweder die komplette URL (inklusive »http://« usw.) oder den " +"absoluten Pfad-Namen angeben." + +#. Type: note +#. Description +#: ../templates:2001 +msgid "Please check old /etc/lynx.cfg" +msgstr "Bitte überprüfen Sie die alte /etc/lynx.cfg" + +#. Type: note +#. Description +#: ../templates:2001 +msgid "" +"/etc/lynx.cfg is found but the configuration file of lynx-cur is /etc/lynx-" +"cur/lynx.cfg so /etc/lynx.cfg would be of lynx or lynx-ssl." +msgstr "" +"/etc/lynx.cfg wurde gefunden, aber die Konfigurationsdatei von lynx-cur ist /" +"etc/lynx-cur/lynx.cfg. Daher stammt /etc/lynx.cfg vermutlich von lynx oder " +"lynx-ssl." + +#. Type: note +#. Description +#: ../templates:2001 +msgid "Please check it and it will be better to PURGE lynx or lynx-ssl." +msgstr "" +"Bitte überprüfen Sie das. Es ist besser, wenn Sie lynx oder lynx-ssl " +"VOLLSTÄNDIG entfernen (engl. »purge«)." + +#~ msgid "http://www.debian.org/" +#~ msgstr "http://www.debian.org/" --- lynx-cur-2.8.8dev.3.orig/debian/po/es.po +++ lynx-cur-2.8.8dev.3/debian/po/es.po @@ -0,0 +1,78 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: 2.8.6dev18\n" +"Report-Msgid-Bugs-To: lynx-cur@packages.debian.org\n" +"POT-Creation-Date: 2010-05-06 11:38+0900\n" +"PO-Revision-Date: 2006-06-19 12:14+0200\n" +"Last-Translator: David Martnez Moreno \n" +"Language-Team: Spanish Translation Team \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "Lynx's homepage:" +msgstr "Pgina de inicio de lynx:" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"Please enter the default URL to use if none is given when invoking lynx." +msgstr "" +"Por favor, introduzca el URL a usar por defecto si se llama a lynx sin " +"argumentos." + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"You must enter either a full URL (including the \"http://\", etc.) or an " +"absolute pathname." +msgstr "" +"Debe introducir un URL completo (incluyendo \"http://\", etc.) o una ruta " +"absoluta." + +#. Type: note +#. Description +#: ../templates:2001 +msgid "Please check old /etc/lynx.cfg" +msgstr "Por favor, compruebe el fichero antiguo /etc/lynx.cfg." + +#. Type: note +#. Description +#: ../templates:2001 +msgid "" +"/etc/lynx.cfg is found but the configuration file of lynx-cur is /etc/lynx-" +"cur/lynx.cfg so /etc/lynx.cfg would be of lynx or lynx-ssl." +msgstr "" +"/etc/lynx.cfg existe en su sistema pero el fichero de configuracin de lynx-" +"cur es /etc/lynx-cur/lynx.cfg, por lo que /etc/lynx.cfg pertenecera a lynx " +"o lynx-ssl." + +#. Type: note +#. Description +#: ../templates:2001 +msgid "Please check it and it will be better to PURGE lynx or lynx-ssl." +msgstr "" +"Por favor, comprubelo. Le recomendamos PURGAR lynx o lynx-ssl (para " +"eliminar sus ficheros de configuracin)." + +#~ msgid "http://www.debian.org/" +#~ msgstr "http://www.es.debian.org/" --- lynx-cur-2.8.8dev.3.orig/debian/po/fi.po +++ lynx-cur-2.8.8dev.3/debian/po/fi.po @@ -0,0 +1,67 @@ +# Copyright (C) 2009 +# This file is distributed under the same license as the lynx-cur package. +# +# Esko Arajärvi , 2009. +msgid "" +msgstr "" +"Project-Id-Version: lynx-cur\n" +"Report-Msgid-Bugs-To: lynx-cur@packages.debian.org\n" +"POT-Creation-Date: 2009-03-23 08:33+0900\n" +"PO-Revision-Date: 2009-07-18 14:16+0300\n" +"Last-Translator: Esko Arajärvi \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 0.3\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "Lynx's homepage:" +msgstr "Lynx-kotisivu:" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"Please enter the default URL to use if none is given when invoking lynx." +msgstr "" +"Anna URL, joka ladataan, jos lynxiä käynnistettäessä ei anneta URLia " +"parametrina." + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"You must enter either a full URL (including the \"http://\", etc.) or an " +"absolute pathname." +msgstr "" +"Tämän täytyy olla täydellinen URL (sisältäen alun ”http://” jne.) tai " +"täydellinen tiedostopolku." + +#. Type: note +#. Description +#: ../templates:2001 +msgid "Please check old /etc/lynx.cfg" +msgstr "Tarkista vanha /etc/lynx.cfg" + +#. Type: note +#. Description +#: ../templates:2001 +msgid "" +"/etc/lynx.cfg is found but the configuration file of lynx-cur is /etc/lynx-" +"cur/lynx.cfg so /etc/lynx.cfg would be of lynx or lynx-ssl." +msgstr "" +"Paketin lyn-cur asetustiedosto on /etc/lynx-cur/lynx.cfg. Järjestelmästä " +"kuitenkin löytyi tiedosto /etc/lynx.cfg, joka kuulunee paketille lynx tai " +"lynx-ssl." + +#. Type: note +#. Description +#: ../templates:2001 +msgid "Please check it and it will be better to PURGE lynx or lynx-ssl." +msgstr "" +"Tarkista kyseinen tiedosto. Pakettien lynx ja lynx-ssl siivoamista " +"suositellaan." --- lynx-cur-2.8.8dev.3.orig/debian/po/fr.po +++ lynx-cur-2.8.8dev.3/debian/po/fr.po @@ -0,0 +1,76 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: lynx-cur 2.8.5-8\n" +"Report-Msgid-Bugs-To: lynx-cur@packages.debian.org\n" +"POT-Creation-Date: 2010-05-06 11:38+0900\n" +"PO-Revision-Date: 2006-06-14 17:19+0200\n" +"Last-Translator: Philippe Batailler \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "Lynx's homepage:" +msgstr "Page d'accueil de lynx:" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"Please enter the default URL to use if none is given when invoking lynx." +msgstr "" +"Veuillez donner l'URL par dfaut utiliser quand aucune page n'est indique " +"au lancement de lynx." + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"You must enter either a full URL (including the \"http://\", etc.) or an " +"absolute pathname." +msgstr "" +"Vous devez donner soit l'URL complte (avec http://, etc.) soit un chemin " +"complet." + +#. Type: note +#. Description +#: ../templates:2001 +msgid "Please check old /etc/lynx.cfg" +msgstr "Veuillez examiner l'ancien fichier /etc/lynx.cfg" + +#. Type: note +#. Description +#: ../templates:2001 +msgid "" +"/etc/lynx.cfg is found but the configuration file of lynx-cur is /etc/lynx-" +"cur/lynx.cfg so /etc/lynx.cfg would be of lynx or lynx-ssl." +msgstr "" +"/etc/lynx.cfg existe mais le fichier de configuration de lynx-cur est /etc/" +"lynx-cur/lynx.cfg; /etc/lynx.cfg appartient sans doute lynx ou lynx-ssl." + +#. Type: note +#. Description +#: ../templates:2001 +msgid "Please check it and it will be better to PURGE lynx or lynx-ssl." +msgstr "" +"Veuillez le vrifier. Il est prfrable de purger lynx ou lynx-ssl si " +"c'est le cas." + +#~ msgid "http://www.debian.org/" +#~ msgstr "http://www.debian.org/" --- lynx-cur-2.8.8dev.3.orig/debian/po/it.po +++ lynx-cur-2.8.8dev.3/debian/po/it.po @@ -0,0 +1,64 @@ +# Italian (it) translation of debconf templates for lynx-cur +# Copyright (C) 2008 Software in the Public Interest +# This file is distributed under the same license as the lynx-cur package. +# Luca Monducci , 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: lynx-cur 2.8.7dev9\n" +"Report-Msgid-Bugs-To: lynx-cur@packages.debian.org\n" +"POT-Creation-Date: 2008-05-06 07:30+0900\n" +"PO-Revision-Date: 2008-08-04 16:01+0200\n" +"Last-Translator: Luca Monducci \n" +"Language-Team: Italian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "Lynx's homepage:" +msgstr "Pagina iniziale di Lynx:" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"Please enter the default URL to use if none is given when invoking lynx." +msgstr "" +"Inserire l'URL predefinito da usare quando lynx è richiamato senza." + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"You must enter either a full URL (including the \"http://\", etc.) or an " +"absolute pathname." +msgstr "" +"Si deve inserire un URL completo (includendo \"http://\", ecc.) oppure un " +"percorso assoluto." + +#. Type: note +#. Description +#: ../templates:2001 +msgid "Please check old /etc/lynx.cfg" +msgstr "Esaminare il vecchio file /etc/lynx.cfg" + +#. Type: note +#. Description +#: ../templates:2001 +msgid "" +"/etc/lynx.cfg is found but the configuration file of lynx-cur is /etc/lynx-" +"cur/lynx.cfg so /etc/lynx.cfg would be of lynx or lynx-ssl." +msgstr "" +"Il file /etc/lynx.cfg esiste ma il file di configurazione di lynx-cur è /etc" +"/lynx-cur/lynx.cfg quindi /etc/lynx.cfg è quello di lynx o lynx-ssl." + +#. Type: note +#. Description +#: ../templates:2001 +msgid "Please check it and it will be better to PURGE lynx or lynx-ssl." +msgstr "" +"Si consiglia di esaminarlo e preferibilmente di rimuovere completamente il " +"pacchetto lynx o lynx-ssl." --- lynx-cur-2.8.8dev.3.orig/debian/po/ja.po +++ lynx-cur-2.8.8dev.3/debian/po/ja.po @@ -0,0 +1,70 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: lynx-cur 2.8.7dev9-1.2\n" +"Report-Msgid-Bugs-To: lynx-cur@packages.debian.org\n" +"POT-Creation-Date: 2008-05-06 07:30+0900\n" +"PO-Revision-Date: 2008-08-03 21:04+0900\n" +"Last-Translator: Hideki Yamane (Debian-JP) \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "Lynx's homepage:" +msgstr "lynx のホームページ:" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"Please enter the default URL to use if none is given when invoking lynx." +msgstr "" +"何も指定せずに lynx を起動したときのデフォルト URL を入力してください。" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"You must enter either a full URL (including the \"http://\", etc.) or an " +"absolute pathname." +msgstr "" +"\"http://\" の部分を含む完全な URL か、絶対パス名を入力する必要があります。" + +#. Type: note +#. Description +#: ../templates:2001 +msgid "Please check old /etc/lynx.cfg" +msgstr "古い /etc/lynx.cfg をチェックしてください。" + +#. Type: note +#. Description +#: ../templates:2001 +msgid "" +"/etc/lynx.cfg is found but the configuration file of lynx-cur is /etc/lynx-" +"cur/lynx.cfg so /etc/lynx.cfg would be of lynx or lynx-ssl." +msgstr "" +"/etc/lynx.cfg が見付かりました。lynx-cur の設定ファイルは /etc/lynx-cur/lynx." +"cfg なので、この /etc/lynx.cfg は lynx か lynx-ssl の設定ファイルと思われま" +"す。" + +#. Type: note +#. Description +#: ../templates:2001 +msgid "Please check it and it will be better to PURGE lynx or lynx-ssl." +msgstr "確認後、lynx あるいは lynx-ssl を完全に削除 (purge) することをお勧めします。" --- lynx-cur-2.8.8dev.3.orig/debian/po/nl.po +++ lynx-cur-2.8.8dev.3/debian/po/nl.po @@ -0,0 +1,70 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: lynx-cur\n" +"Report-Msgid-Bugs-To: lynx-cur@packages.debian.org\n" +"POT-Creation-Date: 2010-05-06 11:38+0900\n" +"PO-Revision-Date: 2007-03-13 22:06+0100\n" +"Last-Translator: Bart Cornelis \n" +"Language-Team: debian-l10n-dutch \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Dutch\n" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "Lynx's homepage:" +msgstr "Door lynx te gebruiken thuispagina:" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"Please enter the default URL to use if none is given when invoking lynx." +msgstr "" +"Welk internet-adres (URL) dient standaard gebruikt te worden wanneer lynx " +"zonder url aangeroepen wordt?" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"You must enter either a full URL (including the \"http://\", etc.) or an " +"absolute pathname." +msgstr "" +"U dient of een volledige URL in te geven (dus met de 'http://' en " +"dergelijke), of een absolute bestandsnaam in te geven." + +#. Type: note +#. Description +#: ../templates:2001 +msgid "Please check old /etc/lynx.cfg" +msgstr "Gelieve het oude bestand /etc/lynx.cfg te controleren." + +#. Type: note +#. Description +#: ../templates:2001 +msgid "" +"/etc/lynx.cfg is found but the configuration file of lynx-cur is /etc/lynx-" +"cur/lynx.cfg so /etc/lynx.cfg would be of lynx or lynx-ssl." +msgstr "" +"Er is een bestand '/etc/lynx.cfg' aangetroffen. Het configuratiebestand van " +"lynx-cur is echter '/etc/lynx.cfg'. Dit bestand is waarschijnlijk van of het " +"'lynx'-pakket of het 'lynx-ssl'-pakket." + +#. Type: note +#. Description +#: ../templates:2001 +msgid "Please check it and it will be better to PURGE lynx or lynx-ssl." +msgstr "" +"Gelieve dit na te kijken; het is aan te raden om lynx en/of lynx-ssl te " +"wissen." + +#~ msgid "http://www.debian.org/" +#~ msgstr "http://www.debian.org/" --- lynx-cur-2.8.8dev.3.orig/debian/po/pt.po +++ lynx-cur-2.8.8dev.3/debian/po/pt.po @@ -0,0 +1,69 @@ +# Portuguese translations for lynx-cur package. +# Copyright (C) 2007 Miguel Figueiredo +# This file is distributed under the same license as the lynx-cur package. +# Miguel Figueiredo , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: lynx-cur\n" +"Report-Msgid-Bugs-To: lynx-cur@packages.debian.org\n" +"POT-Creation-Date: 2010-05-06 11:38+0900\n" +"PO-Revision-Date: 2007-04-19 22:19+0100\n" +"Last-Translator: Miguel Figueiredo \n" +"Language-Team: Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "Lynx's homepage:" +msgstr "'homepage' do Lynx:" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"Please enter the default URL to use if none is given when invoking lynx." +msgstr "" +"Por favor introduza o URL por omissão a utilizar se não for indicado nenhum " +"ao invocar o lynx." + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"You must enter either a full URL (including the \"http://\", etc.) or an " +"absolute pathname." +msgstr "" +"Tem de introduzir ou um URL completo (incluindo o \"http://\", etc.) ou um " +"caminho absoluto." + +#. Type: note +#. Description +#: ../templates:2001 +msgid "Please check old /etc/lynx.cfg" +msgstr "Por favor verifique o antigo /etc/lynx.cfg" + +#. Type: note +#. Description +#: ../templates:2001 +msgid "" +"/etc/lynx.cfg is found but the configuration file of lynx-cur is /etc/lynx-" +"cur/lynx.cfg so /etc/lynx.cfg would be of lynx or lynx-ssl." +msgstr "" +"Foi encontrado o /etc/lynx.cfg mas o ficheiro de configuração do lynx-cur é /" +"etc/lynx-cur/lynx.cfg por isso o /etc/lynx.cfg deverá ser do lynx ou do lynx-" +"ssl." + +#. Type: note +#. Description +#: ../templates:2001 +msgid "Please check it and it will be better to PURGE lynx or lynx-ssl." +msgstr "" +"Por favor verifique-o e será melhor fazer 'PURGE' ao lynx ou ao lynx-ssl." + +#~ msgid "http://www.debian.org/" +#~ msgstr "http://www.debian.org/" --- lynx-cur-2.8.8dev.3.orig/debian/po/pt_BR.po +++ lynx-cur-2.8.8dev.3/debian/po/pt_BR.po @@ -0,0 +1,77 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: lynx-cur_2.8.5-12\n" +"Report-Msgid-Bugs-To: lynx-cur@packages.debian.org\n" +"POT-Creation-Date: 2010-05-06 11:38+0900\n" +"PO-Revision-Date: 2006-06-19 00:22-0300\n" +"Last-Translator: André Luís Lopes \n" +"Language-Team: l10n portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "Lynx's homepage:" +msgstr "Página inicial do lynx :" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"Please enter the default URL to use if none is given when invoking lynx." +msgstr "" +"Por favor, informe a URL padrão a ser usada caso nenhuma página seja " +"informada como parâmetro na execução do lynx." + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"You must enter either a full URL (including the \"http://\", etc.) or an " +"absolute pathname." +msgstr "" +"Você deverá informar uma URL completa (incluindo o \"http://\", etc.) ou um " +"caminho absoluto." + +#. Type: note +#. Description +#: ../templates:2001 +msgid "Please check old /etc/lynx.cfg" +msgstr "Por favor, confira o antigo arquivo /etc/lynx.cfg" + +#. Type: note +#. Description +#: ../templates:2001 +msgid "" +"/etc/lynx.cfg is found but the configuration file of lynx-cur is /etc/lynx-" +"cur/lynx.cfg so /etc/lynx.cfg would be of lynx or lynx-ssl." +msgstr "" +"O arquivo /etc/lynx.cfg foi encontrado, mas o arquivo de configuração para o " +"lynx-cur é /etc/lynx-cur/lynx.cfg, então /etc/lynx.cfg deve ser do lynx ou " +"lynx-ssl." + +#. Type: note +#. Description +#: ../templates:2001 +msgid "Please check it and it will be better to PURGE lynx or lynx-ssl." +msgstr "" +"Por favor, confira esse arquivo. Seria melhor expurgar (remover " +"completamente) o pacote lynx ou o pacote lynx-ssl." + +#~ msgid "http://www.debian.org/" +#~ msgstr "http://www.debian.org/" --- lynx-cur-2.8.8dev.3.orig/debian/po/ru.po +++ lynx-cur-2.8.8dev.3/debian/po/ru.po @@ -0,0 +1,81 @@ +# translation of lynx-cur_2.8.6dev18-2.1_ru.po to Russian +# translation of lynx-cur_2.8.5-13.po to russian +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# +# Ilgiz Kalmetev , 2003. +# Yuri Kozlov , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: lynx-cur_2.8.5-13\n" +"Report-Msgid-Bugs-To: lynx-cur@packages.debian.org\n" +"POT-Creation-Date: 2010-05-06 11:38+0900\n" +"PO-Revision-Date: 2006-06-16 21:44+0300\n" +"Last-Translator: Yuri Kozlov \n" +"Language-Team: Russian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.9.1\n" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "Lynx's homepage:" +msgstr "Страница по умолчанию:" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"Please enter the default URL to use if none is given when invoking lynx." +msgstr "" +"Пожалуйста, введите URL, который будет использоваться по умолчанию при " +"запуске lynx без параметров." + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"You must enter either a full URL (including the \"http://\", etc.) or an " +"absolute pathname." +msgstr "" +"Вы должны ввести либо полный URL (включая \"http://\" и т.д.), либо " +"абсолютный путь." + +#. Type: note +#. Description +#: ../templates:2001 +msgid "Please check old /etc/lynx.cfg" +msgstr "Пожалуйста, проверьте старый файл /etc/lynx.cfg" + +#. Type: note +#. Description +#: ../templates:2001 +msgid "" +"/etc/lynx.cfg is found but the configuration file of lynx-cur is /etc/lynx-" +"cur/lynx.cfg so /etc/lynx.cfg would be of lynx or lynx-ssl." +msgstr "" +"Найден файл /etc/lynx.cfg, но lynx-cur использует в качестве файла настроек " +"файл /etc/lynx-cur/lynx.cfg, так что файл /etc/lynx.cfg принадлежит lynx или " +"lynx-ssl." + +#. Type: note +#. Description +#: ../templates:2001 +msgid "Please check it and it will be better to PURGE lynx or lynx-ssl." +msgstr "" +"Пожалуйста, проверьте это и будет лучше ПОЛНОСТЬЮ УДАЛИТЬ (PURGE) lynx или " +"lynx-ssl." + +#~ msgid "http://www.debian.org/" +#~ msgstr "http://www.debian.org/" --- lynx-cur-2.8.8dev.3.orig/debian/po/sv.po +++ lynx-cur-2.8.8dev.3/debian/po/sv.po @@ -0,0 +1,72 @@ +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# Developers do not need to manually edit POT or PO files. +# , fuzzy +# +# +msgid "" +msgstr "" +"Project-Id-Version: lynx-cur 2.8.6-15\n" +"Report-Msgid-Bugs-To: lynx-cur@packages.debian.org\n" +"POT-Creation-Date: 2010-05-06 11:38+0900\n" +"PO-Revision-Date: 2006-06-17 11:04+0100\n" +"Last-Translator: Daniel Nylander \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "Lynx's homepage:" +msgstr "Lynx hemsida:" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"Please enter the default URL to use if none is given when invoking lynx." +msgstr "Ange standard-URLen att anvnda om ingen URL anges nr lynx startas." + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"You must enter either a full URL (including the \"http://\", etc.) or an " +"absolute pathname." +msgstr "" +"Du mste ange antingen en fullstndig URL (inkluderat http:// etc.) eller en " +"absolut skvg." + +#. Type: note +#. Description +#: ../templates:2001 +msgid "Please check old /etc/lynx.cfg" +msgstr "Kontrollera den gamla /etc/lynx.cfg" + +#. Type: note +#. Description +#: ../templates:2001 +msgid "" +"/etc/lynx.cfg is found but the configuration file of lynx-cur is /etc/lynx-" +"cur/lynx.cfg so /etc/lynx.cfg would be of lynx or lynx-ssl." +msgstr "" +"/etc/lynx.cfg hittades men konfigurationsfilen fr lynx-cur r /etc/lynx-cur/" +"lynx.cfg s /etc/lynx.cfg br vara fr lynx eller lynx-ssl." + +#. Type: note +#. Description +#: ../templates:2001 +msgid "Please check it and it will be better to PURGE lynx or lynx-ssl." +msgstr "" +"Kontrollera det och det r bttre att AVINSTALLERA lynx eller lynx-ssl." + +#~ msgid "http://www.debian.org/" +#~ msgstr "http://www.debian.org/" --- lynx-cur-2.8.8dev.3.orig/debian/po/templates.pot +++ lynx-cur-2.8.8dev.3/debian/po/templates.pot @@ -0,0 +1,58 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: lynx-cur@packages.debian.org\n" +"POT-Creation-Date: 2010-05-06 11:38+0900\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "Lynx's homepage:" +msgstr "" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"Please enter the default URL to use if none is given when invoking lynx." +msgstr "" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"You must enter either a full URL (including the \"http://\", etc.) or an " +"absolute pathname." +msgstr "" + +#. Type: note +#. Description +#: ../templates:2001 +msgid "Please check old /etc/lynx.cfg" +msgstr "" + +#. Type: note +#. Description +#: ../templates:2001 +msgid "" +"/etc/lynx.cfg is found but the configuration file of lynx-cur is /etc/lynx-" +"cur/lynx.cfg so /etc/lynx.cfg would be of lynx or lynx-ssl." +msgstr "" + +#. Type: note +#. Description +#: ../templates:2001 +msgid "Please check it and it will be better to PURGE lynx or lynx-ssl." +msgstr "" --- lynx-cur-2.8.8dev.3.orig/debian/po/vi.po +++ lynx-cur-2.8.8dev.3/debian/po/vi.po @@ -0,0 +1,68 @@ +# Vietnamese Translation for lynx-cur. +# Copyright © 2006 Free Software Foundation, Inc. +# Clytie Siddall , 2005-2006. +# +msgid "" +msgstr "" +"Project-Id-Version: lynx-cur 2.8.6dev18-3\n" +"Report-Msgid-Bugs-To: lynx-cur@packages.debian.org\n" +"POT-Creation-Date: 2010-05-06 11:38+0900\n" +"PO-Revision-Date: 2006-06-18 15:46+0930\n" +"Last-Translator: Clytie Siddall \n" +"Language-Team: Vietnamese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0\n" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "Lynx's homepage:" +msgstr "Trang chủ của Lynx:" + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"Please enter the default URL to use if none is given when invoking lynx." +msgstr "" +"Hãy nhập địa chỉ Mạng mặc định cần dùng nếu không được đưa ra khi gọi trình " +"Lynx." + +#. Type: string +#. Description +#: ../templates:1001 +msgid "" +"You must enter either a full URL (including the \"http://\", etc.) or an " +"absolute pathname." +msgstr "" +"Bạn phải nhập hoặc một địa chỉ Mạng đầy đủ (v.d. http://www.miền.com/) hoặc " +"một tên đường dẫn tuyệt đối." + +#. Type: note +#. Description +#: ../templates:2001 +msgid "Please check old /etc/lynx.cfg" +msgstr "Hãy xem lại tập tin cấu hình cũ " + +#. Type: note +#. Description +#: ../templates:2001 +msgid "" +"/etc/lynx.cfg is found but the configuration file of lynx-cur is /etc/lynx-" +"cur/lynx.cfg so /etc/lynx.cfg would be of lynx or lynx-ssl." +msgstr "" +"Đã tìm tập tin cấu hình nhưng mà tập tin cấu hình của trình " +"Lynx-cur là thì tập tin thuộc về " +"trình Lynx chính nó, hay Lynx-ssl." + +#. Type: note +#. Description +#: ../templates:2001 +msgid "Please check it and it will be better to PURGE lynx or lynx-ssl." +msgstr "Hãy xem lại nó, và khuyên bạn TẨY gói Lynx hay Lynx-ssl." + +# URL: do not translate/ địa chỉ Mạng: đừng dịch +#~ msgid "http://www.debian.org/" +#~ msgstr "http://www.debian.org/" --- lynx-cur-2.8.8dev.3.orig/debian/patches/00list +++ lynx-cur-2.8.8dev.3/debian/patches/00list @@ -0,0 +1,3 @@ +patch-1 +patch-2 +patch-3 --- lynx-cur-2.8.8dev.3.orig/debian/patches/patch-1 +++ lynx-cur-2.8.8dev.3/debian/patches/patch-1 @@ -0,0 +1,222 @@ +#! /bin/sh -e +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Align the manpage to Debian behaviour + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch -f --no-backup-if-mismatch --dry-run -p0 < $0 && patch -f --no-backup-if-mismatch -p0 < $0;; + -unpatch) patch -f --no-backup-if-mismatch -R -p0 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac +exit 0 + +@DPATCH@ +--- lynx.cfg.orig 2009-12-20 21:36:23.000000000 +0900 ++++ lynx.cfg 2009-12-20 21:33:07.000000000 +0900 +@@ -93,7 +93,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.isc.org/ + # + # As an alternative, you may want to use a local URL. A good choice for this is + # the user's home directory: +@@ -118,9 +118,10 @@ + # This definition will be overridden if the "LYNX_HELPFILE" environment + # variable has been set. + # +-HELPFILE:http://lynx.isc.org/release/lynx2-8-7/lynx_help/lynx_help_main.html ++#HELPFILE:http://lynx.isc.org/release/lynx2-8-7/lynx_help/lynx_help_main.html + .ex +-#HELPFILE:file://localhost/PATH_TO/lynx_help/lynx_help_main.html ++##HELPFILE:file://localhost/PATH_TO/lynx_help/lynx_help_main.html ++HELPFILE:file://localhost/usr/share/doc/lynx-cur/lynx_help/lynx_help_main.html + + + .h2 DEFAULT_INDEX_FILE +@@ -442,7 +443,7 @@ + # Lynx (case insensitive). + # Find RFC 1345 at http://www.ics.uci.edu/pub/ietf/uri/rfc1345.txt . + # +-#CHARACTER_SET:iso-8859-1 ++CHARACTER_SET:iso-8859-1 + + .h2 LOCALE_CHARSET + # LOCALE_CHARSET overrides CHARACTER_SET if true, using the current locale to +@@ -453,6 +454,7 @@ + # happens to give useful values, but other implementations are not guaranteed + # to do this. + #LOCALE_CHARSET:FALSE ++LOCALE_CHARSET:TRUE + + + .h2 ASSUME_CHARSET +@@ -539,7 +541,7 @@ + # compatibility problems with other browsers, see also PREPEND_BASE_TO_SOURCE. + # Note that the prepending is not done for -source dumps. + # +-#PREPEND_CHARSET_TO_SOURCE:TRUE ++PREPEND_CHARSET_TO_SOURCE:FALSE + + + .h2 NCR_IN_BOOKMARKS +@@ -595,7 +597,7 @@ + # the 'o'ptions menu and save that preference in their RC file. + # This may be a comma-separated list of languages in decreasing preference. + # +-#PREFERRED_LANGUAGE:en ++PREFERRED_LANGUAGE:en + + + .h2 PREFERRED_CHARSET +@@ -794,7 +796,7 @@ + # 'o'ptions menu and saved in the RC file, and always can be toggled + # via the -show_cursor command line switch. + # +-#SHOW_CURSOR:FALSE ++SHOW_CURSOR:TRUE + + .h2 UNDERLINE_LINKS + # UNDERLINE_LINKS controls whether links are underlined by default, or shown +@@ -987,8 +989,8 @@ + # executed. This is much less dangerous than enabling all execution + # links, but can still be dangerous. + # +-#LOCAL_EXECUTION_LINKS_ALWAYS_ON:FALSE +-#LOCAL_EXECUTION_LINKS_ON_BUT_NOT_REMOTE:FALSE ++LOCAL_EXECUTION_LINKS_ALWAYS_ON:FALSE ++LOCAL_EXECUTION_LINKS_ON_BUT_NOT_REMOTE:FALSE + + + .h2 TRUSTED_EXEC +@@ -1036,7 +1038,7 @@ + # as well (i.e., they will only be able to access lynxexec or lynxprog + # URLs which meet any ALWAYS_TRUSTED_EXEC rules). + # +-#TRUSTED_EXEC:none ++TRUSTED_EXEC:none + + + .h2 ALWAYS_TRUSTED_EXEC +@@ -1058,7 +1060,7 @@ + # + # The default ALWAYS_TRUSTED_EXEC rule is "none". + # +-#ALWAYS_TRUSTED_EXEC:none ++ALWAYS_TRUSTED_EXEC:none + + + .h2 TRUSTED_LYNXCGI +@@ -1078,7 +1080,7 @@ + # + # The default TRUSTED_LYNXCGI rule is "none". + # +-#TRUSTED_LYNXCGI:none ++TRUSTED_LYNXCGI:none + + + .h2 LYNXCGI_ENVIRONMENT +@@ -1416,7 +1418,7 @@ + # The default is FALSE, so that the feature needs to be enabled here + # explicitly if you want it. + # +-#PERSISTENT_COOKIES:FALSE ++PERSISTENT_COOKIES:FALSE + + + .h2 COOKIE_FILE +@@ -1869,7 +1871,7 @@ + # and not forced TRUE, the user can regulate it via the 'o'ptions menu (and + # may save the preference in the RC file). + # +-#NO_DOT_FILES:TRUE ++NO_DOT_FILES:FALSE + + + .h1 Internal Behavior +@@ -2152,13 +2154,13 @@ + # + # Unix: + # ==== +-#GLOBAL_EXTENSION_MAP:/usr/local/lib/mosaic/mime.types ++GLOBAL_EXTENSION_MAP:/etc/mime.types + # VMS: + # === + #GLOBAL_EXTENSION_MAP:Lynx_Dir:mime.types + # + # Unix (sought in user's home directory): +-#PERSONAL_EXTENSION_MAP:.mime.types ++PERSONAL_EXTENSION_MAP:.mime.types + # VMS (sought in user's sys$login directory): + #PERSONAL_EXTENSION_MAP:mime.types + +@@ -2295,6 +2297,8 @@ + #SUFFIX:.dms:application/x-dms + #SUFFIX:.html:text/html + #SUFFIX:.txt:text/plain ++SUFFIX:.tgz:application/octet-stream ++SUFFIX:.deb:application/octet-stream + + + .h2 XLOADIMAGE_COMMAND +@@ -2399,13 +2403,13 @@ + # + # Unix: + # ==== +-#GLOBAL_MAILCAP:/usr/local/lib/mosaic/mailcap ++GLOBAL_MAILCAP:/etc/mailcap + # VMS: + # === + #GLOBAL_MAILCAP:Lynx_Dir:mailcap + # + # Sought in user's home (Unix) or sys$login (VMS) directory. +-#PERSONAL_MAILCAP:.mailcap ++PERSONAL_MAILCAP:.mailcap + + .h2 PREFERRED_MEDIA_TYPES + # When doing a GET, lynx lists the MIME types which it knows how to present +@@ -3604,7 +3608,7 @@ + # should accept, in case the $SSL_CERT_FILE environment variable is not set, + # e.g., + # +-#SSL_CERT_FILE:/etc/ssl/certs/ca-certificates.crt ++SSL_CERT_FILE:/etc/ssl/certs/ca-certificates.crt + #SSL_CERT_FILE:NULL + + .h1 Appearance +@@ -3628,7 +3632,7 @@ + + .h2 SYSLOG_REQUESTED_URLS + # Log the requested URLs using the syslog interface. +-#SYSLOG_REQUESTED_URLS:TRUE ++SYSLOG_REQUESTED_URLS:FALSE + + .h2 SYSLOG_TEXT + # Add the given text to calls made to syslog, to distinguish Lynx from other +@@ -3667,3 +3671,19 @@ + # + # The default size (if not overridden in userdefs.h) is 40. + #STATUS_BUFFER_SIZE:40 ++ ++# external ++EXTERNAL:ftp:w3m %s:TRUE ++EXTERNAL:file:w3m %s:TRUE ++EXTERNAL:http:w3m %s:TRUE ++EXTERNAL:http:wget %s:TRUE ++EXTERNAL:http:wget -r %s:TRUE ++EXTERNAL:ftp:netscape %s:TRUE ++EXTERNAL:file:netscape %s:TRUE ++EXTERNAL:http:netscape %s:TRUE ++# include ++INCLUDE:/etc/lynx-cur/local.cfg ++INCLUDE:~/.lynx/colors:COLOR ++INCLUDE:~/.lynx/keymap:KEYMAP ++INCLUDE:~/.lynx/viewers:VIEWER ++INCLUDE:~/.lynx/external:EXTERNAL --- lynx-cur-2.8.8dev.3.orig/debian/patches/patch-2 +++ lynx-cur-2.8.8dev.3/debian/patches/patch-2 @@ -0,0 +1,35 @@ +#! /bin/sh -e +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: a patch for SSL_CERT_FILE + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch -f --no-backup-if-mismatch --dry-run -p0 < $0 && patch -f --no-backup-if-mismatch -p0 < $0;; + -unpatch) patch -f --no-backup-if-mismatch -R -p0 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac +exit 0 + +@DPATCH@ +--- lynx_help/about_lynx.html.orgl Tue Oct 9 12:34:06 2001 ++++ lynx_help/about_lynx.html Tue Oct 9 12:35:16 2001 +@@ -54,10 +54,9 @@ + is the work of developers on the + lynx-dev mailing list. + It is distributed +-without restrictions on usage or redistribution +-under the GNU +-General Public License (Version 2). ++without restrictions on usage or redistribution ++under the GNU ++General Public License (Version 2). + +

Lynx was built over an early version of the Common Code Library + developed by the CERN WWW Project. That code is copyrighted by CERN. --- lynx-cur-2.8.8dev.3.orig/debian/patches/patch-3 +++ lynx-cur-2.8.8dev.3/debian/patches/patch-3 @@ -0,0 +1,20397 @@ +#! /bin/sh -e +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: 2.8.8dev.3d in lynx-dev ML + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch -f --no-backup-if-mismatch --dry-run -p1 < $0 && patch -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac +exit 0 + +@DPATCH@ +--- lynx-cur-2.8.8dev.3.orig/CHANGES ++++ lynx-cur-2.8.8dev.3/CHANGES +@@ -1,8 +1,12 @@ +--- $LynxId: CHANGES,v 1.472 2010/04/25 22:41:14 tom Exp $ ++-- $LynxId: CHANGES,v 1.473 2010/04/26 10:45:06 tom Exp $ + =============================================================================== + Changes since Lynx 2.8 release + =============================================================================== + ++2010-04-26 (2.8.8dev.4) ++* further improvements to print_wwwfile_to_fd() -TD ++ + corrected length used for radio/checkboxes. ++ + 2010-04-25 (2.8.8dev.3) + * modify print_wwwfile_to_fd() to add field values to the printed form (Debian + #574940) -TD +--- lynx-cur-2.8.8dev.3.orig/src/GridText.c ++++ lynx-cur-2.8.8dev.3/src/GridText.c +@@ -1,5 +1,5 @@ + /* +- * $LynxId: GridText.c,v 1.178 2010/04/25 20:22:51 tom Exp $ ++ * $LynxId: GridText.c,v 1.179 2010/04/26 10:44:14 tom Exp $ + * + * Character grid hypertext object + * =============================== +@@ -7945,7 +7945,7 @@ + p->filler = ' '; + break; + } +- p->length = strlen(input->value); ++ p->length = strlen(p->value); + + if ((q = result[anchor->line_num]) != NULL) { + /* insert, ordering by offset */ +# patch by Thomas E. Dickey +# created Thu May 6 00:56:09 UTC 2010 +# ------------------------------------------------------------------------------ +# aclocal.m4 | 110 - +# configure | 6253 ++++++++++++++++++++++++++++++----------------------------- +# 2 files changed, 3329 insertions(+), 3034 deletions(-) +# ------------------------------------------------------------------------------ +Index: aclocal.m4 +--- lynx2.8.8dev.3c+/aclocal.m4 2010-04-24 15:04:21.000000000 +0000 ++++ lynx2.8.8dev.3d/aclocal.m4 2010-05-06 00:47:28.000000000 +0000 +@@ -1,11 +1,11 @@ +-dnl $LynxId: aclocal.m4,v 1.158 2010/04/24 15:04:21 tom Exp $ ++dnl $LynxId: aclocal.m4,v 1.159 2010/05/06 00:47:28 tom Exp $ + dnl Macros for auto-configure script. + dnl by T.E.Dickey + dnl and Jim Spath + dnl and Philippe De Muyter + dnl + dnl Created: 1997/1/28 +-dnl Updated: 2010/4/24 ++dnl Updated: 2010/5/5 + dnl + dnl The autoconf used in Lynx development is GNU autoconf 2.13 or 2.52, patched + dnl by Thomas Dickey. See your local GNU archives, and this URL: +@@ -2196,7 +2196,7 @@ + ]) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_FIND_LINKAGE version: 16 updated: 2010/04/21 06:20:50 ++dnl CF_FIND_LINKAGE version: 18 updated: 2010/05/05 20:27:55 + dnl --------------- + dnl Find a library (specifically the linkage used in the code fragment), + dnl searching for it if it is not already in the library path. +@@ -2225,18 +2225,23 @@ + + CF_MSG_LOG([Starting [FIND_LINKAGE]($3,$6)]) + ++cf_save_LIBS="$LIBS" ++ + AC_TRY_LINK([$1],[$2],[ + cf_cv_find_linkage_$3=yes ++ cf_cv_header_path_$3=/usr/include ++ cf_cv_library_path_$3=/usr/lib + ],[ + +-cf_save_LIBS="$LIBS" + LIBS="-l$3 $7 $cf_save_LIBS" + + AC_TRY_LINK([$1],[$2],[ + cf_cv_find_linkage_$3=yes ++ cf_cv_header_path_$3=/usr/include ++ cf_cv_library_path_$3=/usr/lib + cf_cv_library_file_$3="-l$3" + ],[ +- cf_cv_find_linkage_$3=no ++ cf_cv_find_linkage_$3=no + LIBS="$cf_save_LIBS" + + CF_VERBOSE(find linkage for $3 library) +@@ -2298,7 +2303,6 @@ + ]) + fi + done +- LIBS="$cf_save_LIBS" + CPPFLAGS="$cf_save_CPPFLAGS" + LDFLAGS="$cf_save_LDFLAGS" + fi +@@ -2309,6 +2313,8 @@ + ],$7) + ]) + ++LIBS="$cf_save_LIBS" ++ + if test "$cf_cv_find_linkage_$3" = yes ; then + ifelse([$4],,[ + CF_ADD_INCDIR($cf_cv_header_path_$3) +@@ -2781,7 +2787,7 @@ + AC_SUBST(EXTRA_CFLAGS) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_GNUTLS version: 16 updated: 2009/11/20 05:36:52 ++dnl CF_GNUTLS version: 17 updated: 2010/05/05 20:27:55 + dnl --------- + dnl Check for gnutls library (TLS "is" SSL) + dnl $1 = the [optional] directory in which the library may be found +@@ -2789,6 +2795,7 @@ + AC_DEFUN([CF_GNUTLS],[ + AC_REQUIRE([CF_PKG_CONFIG]) + cf_cv_have_gnutls=no ++ cf_cv_pkg_config_ssl=no + + CF_ADD_OPTIONAL_PATH($1, [ssl library]) + +@@ -2803,6 +2810,7 @@ + if "$PKG_CONFIG" --exists $cf_pkg_gnutls ; then + CF_VERBOSE(... found $cf_pkg_gnutls in pkg-config) + cf_cv_have_gnutls=yes ++ cf_cv_pkg_config_ssl=yes + + cf_cflags_ssl=`$PKG_CONFIG --cflags $cf_pkg_gnutls` + cf_libs_ssl=`$PKG_CONFIG --libs $cf_pkg_gnutls` +@@ -2858,20 +2866,24 @@ + fi + + if test "$cf_cv_have_gnutls" = yes ; then +- if test -n "$cf_cv_header_path_gnutls" ; then ++ if test "$cf_cv_pkg_config_ssl" != yes ; then ++ if test -n "$cf_cv_header_path_gnutls" ; then ++ AC_DEFINE(USE_SSL) ++ case $cf_cv_header_path_gnutls in ++ /usr/include/gnutls) ++ ;; ++ *) ++ CF_ADD_INCDIR($cf_cv_header_path_gnutls) ++ ;; ++ esac ++ fi ++ if test -n "$cf_cv_library_path_gnutls" ; then ++ CF_ADD_LIBDIR($cf_cv_library_path_gnutls) ++ fi ++ LIBS="-lgnutls -lgcrypt $LIBS" ++ else + AC_DEFINE(USE_SSL) +- case $cf_cv_header_path_gnutls in +- /usr/include/gnutls) +- ;; +- *) +- CF_ADD_INCDIR($cf_cv_header_path_gnutls) +- ;; +- esac + fi +- if test -n "$cf_cv_library_path_gnutls" ; then +- CF_ADD_LIBDIR($cf_cv_library_path_gnutls) +- fi +- LIBS="-lgnutls -lgcrypt $LIBS" + + ifelse($2,, + [if test "$cf_pkg_gnutls" = none ; then +@@ -2916,7 +2928,7 @@ + test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_HEADER_PATH version: 11 updated: 2010/04/21 06:20:50 ++dnl CF_HEADER_PATH version: 12 updated: 2010/05/05 05:22:40 + dnl -------------- + dnl Construct a search-list of directories for a nonstandard header-file + dnl +@@ -2935,7 +2947,8 @@ + case $cf_header_path in #(vi + -I*) + cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` +- cf_header_path_list="$cf_header_path_list $cf_header_path" ++ CF_ADD_SUBDIR_PATH($1,$2,include,$cf_header_path,NONE) ++ cf_header_path_list="$cf_header_path_list [$]$1" + ;; + esac + done +@@ -4631,7 +4644,7 @@ + test $cf_cv_slang_unix = yes && AC_DEFINE(REAL_UNIX_SYSTEM) + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_SOCKS version: 7 updated: 2010/04/21 06:20:50 ++dnl CF_SOCKS version: 8 updated: 2010/05/05 20:27:55 + dnl -------- + dnl Check for socks library + dnl $1 = the [optional] directory in which the library may be found +@@ -4642,11 +4655,9 @@ + ],[ + Raccept((char *)0) + ], +- socks, +- cf_cv_have_socks=yes, +- cf_cv_have_socks=no) ++ socks) + +- if test "$cf_cv_have_socks" = yes ; then ++ if test "x$cf_cv_find_linkage_socks" = "xyes" ; then + AC_DEFINE(SOCKS) + + AC_DEFINE(accept,Raccept) +@@ -4657,10 +4668,6 @@ + AC_DEFINE(listen,Rlisten) + AC_DEFINE(recvfrom,Rrecvfrom) + AC_DEFINE(select,Rselect) +- +- CF_ADD_INCDIR($cf_cv_header_path_socks) +- CF_ADD_LIBDIR($cf_cv_library_path_socks) +- LIBS="$cf_cv_library_file_socks $LIBS" + else + AC_MSG_ERROR(cannot link with socks library) + fi +@@ -4796,13 +4803,14 @@ + esac + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_SSL version: 20 updated: 2010/04/20 18:27:30 ++dnl CF_SSL version: 21 updated: 2010/05/05 20:27:55 + dnl ------ + dnl Check for ssl library + dnl $1 = [optional] directory in which the library may be found, set by AC_ARG_WITH + AC_DEFUN([CF_SSL],[ + AC_REQUIRE([CF_PKG_CONFIG]) + cf_cv_have_ssl=no ++ cf_cv_pkg_config_ssl=no + + # command-line option, etc., override default behavior + CF_ADD_OPTIONAL_PATH($1, [ssl library]) +@@ -4814,6 +4822,7 @@ + yes) # if no explicit directory given, try pkg-config + if "$PKG_CONFIG" --exists openssl ; then + cf_cv_have_ssl=yes ++ cf_cv_pkg_config_ssl=yes + + cf_cflags_ssl=`$PKG_CONFIG --cflags openssl` + cf_libs_ssl=`$PKG_CONFIG --libs openssl` +@@ -4884,19 +4893,21 @@ + openssl, + $cf_extra_ssl_libs) + +- if test "$cf_cv_have_ssl" = yes ; then +- if test -n "$cf_cv_library_path_ssl" ; then +- CF_ADD_LIBDIR($cf_cv_library_path_ssl) +- fi +- LIBS="-lssl $cf_extra_ssl_libs $LIBS" +- if test -n "$cf_cv_header_path_ssl" ; then +- case $cf_cv_header_path_ssl in #(vi +- /usr/include/openssl) #(vi +- ;; +- *) +- CF_ADD_INCDIR($cf_cv_header_path_ssl) +- ;; +- esac ++ if test "$cf_cv_pkg_config_ssl" != yes ; then ++ if test "$cf_cv_have_ssl" = yes ; then ++ if test -n "$cf_cv_library_path_ssl" ; then ++ CF_ADD_LIBDIR($cf_cv_library_path_ssl) ++ fi ++ LIBS="-lssl $cf_extra_ssl_libs $LIBS" ++ if test -n "$cf_cv_header_path_ssl" ; then ++ case $cf_cv_header_path_ssl in #(vi ++ /usr/include/openssl) #(vi ++ ;; ++ *) ++ CF_ADD_INCDIR($cf_cv_header_path_ssl) ++ ;; ++ esac ++ fi + fi + fi + fi +@@ -5745,7 +5756,7 @@ + fi + ])dnl + dnl --------------------------------------------------------------------------- +-dnl CF_WITH_IDNA version: 5 updated: 2010/04/21 06:20:50 ++dnl CF_WITH_IDNA version: 7 updated: 2010/05/05 20:27:55 + dnl ------------ + dnl Check for libidn, use it if found. + dnl +@@ -5759,12 +5770,11 @@ + ],[ + char *output = 0; + int code = idna_to_ascii_8z("name", &output, IDNA_USE_STD3_ASCII_RULES); +-],idn,[ ++],idn) ++ ++if test "x$cf_cv_find_linkage_idn" = xyes ; then + AC_DEFINE(USE_IDNA) +- CF_ADD_INCDIR($cf_cv_header_path_idn) +- CF_ADD_LIBDIR($cf_cv_library_path_idn) +- LIBS="$cf_cv_library_file_idn $LIBS" +-]) ++fi + ])dnl + dnl --------------------------------------------------------------------------- + dnl CF_WITH_PATH version: 8 updated: 2007/05/13 13:16:35 +Index: configure +--- lynx2.8.8dev.3c+/configure 2010-04-25 23:44:30.000000000 +0000 ++++ lynx2.8.8dev.3d/configure 2010-05-06 00:55:33.000000000 +0000 +@@ -1,5 +1,5 @@ + #! /bin/sh +-# From configure.in 2.8.8dev.2. ++# From configure.in 2.8.8dev.3. + # Guess values for system-dependent variables and create Makefiles. + # Generated by Autoconf 2.52.20100320. + # +@@ -6481,8 +6481,10 @@ + + echo "${as_me-configure}:6482: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5 + ++cf_save_LIBS="$LIBS" ++ + cat >conftest.$ac_ext <<_ACEOF +-#line 6485 "configure" ++#line 6487 "configure" + #include "confdefs.h" + + #include +@@ -6501,29 +6503,30 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6504: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6506: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6507: \$? = $ac_status" >&5 ++ echo "$as_me:6509: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6510: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6512: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6513: \$? = $ac_status" >&5 ++ echo "$as_me:6515: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_iconv=yes ++ cf_cv_header_path_iconv=/usr/include ++ cf_cv_library_path_iconv=/usr/lib + + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + +-cf_save_LIBS="$LIBS" + LIBS="-liconv $cf_save_LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 6526 "configure" ++#line 6529 "configure" + #include "confdefs.h" + + #include +@@ -6542,33 +6545,35 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6545: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6548: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6548: \$? = $ac_status" >&5 ++ echo "$as_me:6551: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6551: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6554: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6554: \$? = $ac_status" >&5 ++ echo "$as_me:6557: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_iconv=yes ++ cf_cv_header_path_iconv=/usr/include ++ cf_cv_library_path_iconv=/usr/lib + cf_cv_library_file_iconv="-liconv" + + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + +- cf_cv_find_linkage_iconv=no ++ cf_cv_find_linkage_iconv=no + LIBS="$cf_save_LIBS" + + test -n "$verbose" && echo " find linkage for iconv library" 1>&6 + +-echo "${as_me-configure}:6569: testing find linkage for iconv library ..." 1>&5 ++echo "${as_me-configure}:6574: testing find linkage for iconv library ..." 1>&5 + +-echo "${as_me-configure}:6571: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5 ++echo "${as_me-configure}:6576: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5 + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -6583,7 +6588,19 @@ + case $cf_header_path in #(vi + -I*) + cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` +- cf_header_path_list="$cf_header_path_list $cf_header_path" ++ ++test "$cf_header_path" != "NONE" && \ ++test -d "$cf_header_path" && \ ++ { ++ test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" ++ test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" ++ test -d $cf_header_path/include/iconv && cf_search="$cf_search $cf_header_path/include/iconv" ++ test -d $cf_header_path/include/iconv/include && cf_search="$cf_search $cf_header_path/include/iconv/include" ++ test -d $cf_header_path/iconv/include && cf_search="$cf_search $cf_header_path/iconv/include" ++ test -d $cf_header_path/iconv/include/iconv && cf_search="$cf_search $cf_header_path/iconv/include/iconv" ++} ++ ++ cf_header_path_list="$cf_header_path_list $cf_search" + ;; + esac + done +@@ -6669,11 +6686,11 @@ + 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}:6672: testing ... testing $cf_cv_header_path_iconv ..." 1>&5 ++echo "${as_me-configure}:6689: 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 6676 "configure" ++#line 6693 "configure" + #include "confdefs.h" + + #include +@@ -6692,21 +6709,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:6695: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6712: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6698: \$? = $ac_status" >&5 ++ echo "$as_me:6715: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:6701: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6718: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6704: \$? = $ac_status" >&5 ++ echo "$as_me:6721: \$? = $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}:6709: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5 ++echo "${as_me-configure}:6726: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5 + + cf_cv_find_linkage_iconv=maybe + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -6724,7 +6741,7 @@ + + if test "$cf_cv_find_linkage_iconv" = maybe ; then + +-echo "${as_me-configure}:6727: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5 ++echo "${as_me-configure}:6744: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" +@@ -6821,13 +6838,13 @@ + 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}:6824: testing ... testing $cf_cv_library_path_iconv ..." 1>&5 ++echo "${as_me-configure}:6841: 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 6830 "configure" ++#line 6847 "configure" + #include "confdefs.h" + + #include +@@ -6846,21 +6863,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:6849: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:6866: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:6852: \$? = $ac_status" >&5 ++ echo "$as_me:6869: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:6855: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6872: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6858: \$? = $ac_status" >&5 ++ echo "$as_me:6875: \$? = $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}:6863: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5 ++echo "${as_me-configure}:6880: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5 + + cf_cv_find_linkage_iconv=yes + cf_cv_library_file_iconv="-liconv" +@@ -6877,7 +6894,6 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi + done +- LIBS="$cf_save_LIBS" + CPPFLAGS="$cf_save_CPPFLAGS" + LDFLAGS="$cf_save_LDFLAGS" + fi +@@ -6892,6 +6908,8 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + ++LIBS="$cf_save_LIBS" ++ + if test "$cf_cv_find_linkage_iconv" = yes ; then + am_cv_func_iconv=yes + else +@@ -6899,7 +6917,7 @@ + fi + + fi +-echo "$as_me:6902: result: $am_cv_func_iconv" >&5 ++echo "$as_me:6920: result: $am_cv_func_iconv" >&5 + echo "${ECHO_T}$am_cv_func_iconv" >&6 + + if test "$am_cv_func_iconv" = yes; then +@@ -6908,14 +6926,14 @@ + #define HAVE_ICONV 1 + EOF + +- echo "$as_me:6911: checking if the declaration of iconv() needs const." >&5 ++ echo "$as_me:6929: 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 6918 "configure" ++#line 6936 "configure" + #include "confdefs.h" + + #include +@@ -6940,16 +6958,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:6943: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:6961: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:6946: \$? = $ac_status" >&5 ++ echo "$as_me:6964: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:6949: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:6967: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:6952: \$? = $ac_status" >&5 ++ echo "$as_me:6970: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + am_cv_proto_iconv_const=no + else +@@ -6959,7 +6977,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:6962: result: $am_cv_proto_iconv_const" >&5 ++echo "$as_me:6980: 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 +@@ -7001,7 +7019,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 7004 "configure" ++#line 7022 "configure" + #include "confdefs.h" + #include + int +@@ -7013,16 +7031,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7016: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7034: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7019: \$? = $ac_status" >&5 ++ echo "$as_me:7037: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7022: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7040: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7025: \$? = $ac_status" >&5 ++ echo "$as_me:7043: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -7039,7 +7057,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:7042: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:7060: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -7076,7 +7094,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me-configure}:7079: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me-configure}:7097: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -7087,13 +7105,13 @@ + fi + fi + +- echo "$as_me:7090: checking for nl_langinfo and CODESET" >&5 ++ echo "$as_me:7108: 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 7096 "configure" ++#line 7114 "configure" + #include "confdefs.h" + #include + int +@@ -7105,16 +7123,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7108: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7126: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7111: \$? = $ac_status" >&5 ++ echo "$as_me:7129: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7114: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7132: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7117: \$? = $ac_status" >&5 ++ echo "$as_me:7135: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + am_cv_langinfo_codeset=yes + else +@@ -7125,7 +7143,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:7128: result: $am_cv_langinfo_codeset" >&5 ++echo "$as_me:7146: result: $am_cv_langinfo_codeset" >&5 + echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 + if test $am_cv_langinfo_codeset = yes; then + +@@ -7136,13 +7154,13 @@ + fi + + if test $ac_cv_header_locale_h = yes; then +- echo "$as_me:7139: checking for LC_MESSAGES" >&5 ++ echo "$as_me:7157: 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 7145 "configure" ++#line 7163 "configure" + #include "confdefs.h" + #include + int +@@ -7154,16 +7172,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7157: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7175: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7160: \$? = $ac_status" >&5 ++ echo "$as_me:7178: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7163: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7181: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7166: \$? = $ac_status" >&5 ++ echo "$as_me:7184: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + am_cv_val_LC_MESSAGES=yes + else +@@ -7173,7 +7191,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:7176: result: $am_cv_val_LC_MESSAGES" >&5 ++echo "$as_me:7194: 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 + +@@ -7183,7 +7201,7 @@ + + fi + fi +- echo "$as_me:7186: checking whether NLS is requested" >&5 ++ echo "$as_me:7204: 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. +@@ -7193,7 +7211,7 @@ + else + USE_NLS=no + fi; +- echo "$as_me:7196: result: $USE_NLS" >&5 ++ echo "$as_me:7214: result: $USE_NLS" >&5 + echo "${ECHO_T}$USE_NLS" >&6 + + BUILD_INCLUDED_LIBINTL=no +@@ -7206,7 +7224,7 @@ + #define ENABLE_NLS 1 + EOF + +- echo "$as_me:7209: checking whether included gettext is requested" >&5 ++ echo "$as_me:7227: 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. +@@ -7216,7 +7234,7 @@ + else + nls_cv_force_use_gnu_gettext=no + fi; +- echo "$as_me:7219: result: $nls_cv_force_use_gnu_gettext" >&5 ++ echo "$as_me:7237: 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" +@@ -7225,7 +7243,7 @@ + + cf_save_LIBS_1="$LIBS" + LIBS="$LIBICONV $LIBS" +- echo "$as_me:7228: checking for libintl.h and gettext()" >&5 ++ echo "$as_me:7246: 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 +@@ -7236,10 +7254,12 @@ + cf_cv_header_path_intl= + cf_cv_library_path_intl= + +-echo "${as_me-configure}:7239: testing Starting FIND_LINKAGE(intl,) ..." 1>&5 ++echo "${as_me-configure}:7257: testing Starting FIND_LINKAGE(intl,) ..." 1>&5 ++ ++cf_save_LIBS="$LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 7242 "configure" ++#line 7262 "configure" + #include "confdefs.h" + + #include +@@ -7259,29 +7279,30 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7262: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7282: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7265: \$? = $ac_status" >&5 ++ echo "$as_me:7285: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7268: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7288: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7271: \$? = $ac_status" >&5 ++ echo "$as_me:7291: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_intl=yes ++ cf_cv_header_path_intl=/usr/include ++ cf_cv_library_path_intl=/usr/lib + + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + +-cf_save_LIBS="$LIBS" + LIBS="-lintl $cf_save_LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 7284 "configure" ++#line 7305 "configure" + #include "confdefs.h" + + #include +@@ -7301,33 +7322,35 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7304: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7325: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7307: \$? = $ac_status" >&5 ++ echo "$as_me:7328: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7310: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7331: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7313: \$? = $ac_status" >&5 ++ echo "$as_me:7334: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_intl=yes ++ cf_cv_header_path_intl=/usr/include ++ cf_cv_library_path_intl=/usr/lib + cf_cv_library_file_intl="-lintl" + + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + +- cf_cv_find_linkage_intl=no ++ cf_cv_find_linkage_intl=no + LIBS="$cf_save_LIBS" + + test -n "$verbose" && echo " find linkage for intl library" 1>&6 + +-echo "${as_me-configure}:7328: testing find linkage for intl library ..." 1>&5 ++echo "${as_me-configure}:7351: testing find linkage for intl library ..." 1>&5 + +-echo "${as_me-configure}:7330: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5 ++echo "${as_me-configure}:7353: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5 + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -7342,7 +7365,19 @@ + case $cf_header_path in #(vi + -I*) + cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` +- cf_header_path_list="$cf_header_path_list $cf_header_path" ++ ++test "$cf_header_path" != "NONE" && \ ++test -d "$cf_header_path" && \ ++ { ++ test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" ++ test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" ++ test -d $cf_header_path/include/intl && cf_search="$cf_search $cf_header_path/include/intl" ++ test -d $cf_header_path/include/intl/include && cf_search="$cf_search $cf_header_path/include/intl/include" ++ test -d $cf_header_path/intl/include && cf_search="$cf_search $cf_header_path/intl/include" ++ test -d $cf_header_path/intl/include/intl && cf_search="$cf_search $cf_header_path/intl/include/intl" ++} ++ ++ cf_header_path_list="$cf_header_path_list $cf_search" + ;; + esac + done +@@ -7428,11 +7463,11 @@ + 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}:7431: testing ... testing $cf_cv_header_path_intl ..." 1>&5 ++echo "${as_me-configure}:7466: 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 7435 "configure" ++#line 7470 "configure" + #include "confdefs.h" + + #include +@@ -7452,21 +7487,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7455: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7490: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7458: \$? = $ac_status" >&5 ++ echo "$as_me:7493: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7461: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7496: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7464: \$? = $ac_status" >&5 ++ echo "$as_me:7499: \$? = $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}:7469: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5 ++echo "${as_me-configure}:7504: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5 + + cf_cv_find_linkage_intl=maybe + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -7484,7 +7519,7 @@ + + if test "$cf_cv_find_linkage_intl" = maybe ; then + +-echo "${as_me-configure}:7487: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5 ++echo "${as_me-configure}:7522: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" +@@ -7581,13 +7616,13 @@ + 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}:7584: testing ... testing $cf_cv_library_path_intl ..." 1>&5 ++echo "${as_me-configure}:7619: 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 7590 "configure" ++#line 7625 "configure" + #include "confdefs.h" + + #include +@@ -7607,21 +7642,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7610: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7645: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7613: \$? = $ac_status" >&5 ++ echo "$as_me:7648: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7616: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7651: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7619: \$? = $ac_status" >&5 ++ echo "$as_me:7654: \$? = $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}:7624: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5 ++echo "${as_me-configure}:7659: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5 + + cf_cv_find_linkage_intl=yes + cf_cv_library_file_intl="-lintl" +@@ -7638,7 +7673,6 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi + done +- LIBS="$cf_save_LIBS" + CPPFLAGS="$cf_save_CPPFLAGS" + LDFLAGS="$cf_save_LDFLAGS" + fi +@@ -7653,6 +7687,8 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + ++LIBS="$cf_save_LIBS" ++ + if test "$cf_cv_find_linkage_intl" = yes ; then + cf_cv_func_gettext=yes + else +@@ -7660,7 +7696,7 @@ + fi + + fi +-echo "$as_me:7663: result: $cf_cv_func_gettext" >&5 ++echo "$as_me:7699: result: $cf_cv_func_gettext" >&5 + echo "${ECHO_T}$cf_cv_func_gettext" >&6 + LIBS="$cf_save_LIBS_1" + +@@ -7699,7 +7735,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 7702 "configure" ++#line 7738 "configure" + #include "confdefs.h" + #include + int +@@ -7711,16 +7747,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:7714: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:7750: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:7717: \$? = $ac_status" >&5 ++ echo "$as_me:7753: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:7720: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7756: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7723: \$? = $ac_status" >&5 ++ echo "$as_me:7759: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -7737,7 +7773,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:7740: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:7776: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -7774,7 +7810,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me-configure}:7777: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me-configure}:7813: testing adding $cf_add_libdir to library-path ..." 1>&5 + + INTLLIBS="-L$cf_add_libdir $INTLLIBS" + fi +@@ -7790,13 +7826,13 @@ + for ac_func in dcgettext + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:7793: checking for $ac_func" >&5 ++echo "$as_me:7829: 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 7799 "configure" ++#line 7835 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. */ +@@ -7827,16 +7863,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:7830: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:7866: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:7833: \$? = $ac_status" >&5 ++ echo "$as_me:7869: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:7836: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:7872: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:7839: \$? = $ac_status" >&5 ++ echo "$as_me:7875: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -7846,7 +7882,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:7849: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:7885: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:7900: 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 +@@ -7888,16 +7924,16 @@ + fi + MSGFMT="$ac_cv_path_MSGFMT" + if test "$MSGFMT" != ":"; then +- echo "$as_me:7891: result: $MSGFMT" >&5 ++ echo "$as_me:7927: result: $MSGFMT" >&5 + echo "${ECHO_T}$MSGFMT" >&6 + else +- echo "$as_me:7894: result: no" >&5 ++ echo "$as_me:7930: 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:7900: checking for $ac_word" >&5 ++echo "$as_me:7936: 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 +@@ -7914,7 +7950,7 @@ + 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:7917: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:7953: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -7926,17 +7962,17 @@ + GMSGFMT=$ac_cv_path_GMSGFMT + + if test -n "$GMSGFMT"; then +- echo "$as_me:7929: result: $GMSGFMT" >&5 ++ echo "$as_me:7965: result: $GMSGFMT" >&5 + echo "${ECHO_T}$GMSGFMT" >&6 + else +- echo "$as_me:7932: result: no" >&5 ++ echo "$as_me:7968: 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:7939: checking for $ac_word" >&5 ++echo "$as_me:7975: 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 +@@ -7963,10 +7999,10 @@ + fi + XGETTEXT="$ac_cv_path_XGETTEXT" + if test "$XGETTEXT" != ":"; then +- echo "$as_me:7966: result: $XGETTEXT" >&5 ++ echo "$as_me:8002: result: $XGETTEXT" >&5 + echo "${ECHO_T}$XGETTEXT" >&6 + else +- echo "$as_me:7969: result: no" >&5 ++ echo "$as_me:8005: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -7981,7 +8017,7 @@ + + if test "$nls_cv_use_gnu_gettext" = "yes"; then + if test ! -d $srcdir/intl ; then +- { { echo "$as_me:7984: error: no NLS library is packaged with this application" >&5 ++ { { echo "$as_me:8020: 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 +@@ -7989,7 +8025,7 @@ + # Extract the first word of "msgfmt", so it can be a program name with args. + + set dummy msgfmt; ac_word=$2 +-echo "$as_me:7992: checking for $ac_word" >&5 ++echo "$as_me:8028: 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 +@@ -8016,16 +8052,16 @@ + fi + MSGFMT="$ac_cv_path_MSGFMT" + if test "$MSGFMT" != ":"; then +- echo "$as_me:8019: result: $MSGFMT" >&5 ++ echo "$as_me:8055: result: $MSGFMT" >&5 + echo "${ECHO_T}$MSGFMT" >&6 + else +- echo "$as_me:8022: result: no" >&5 ++ echo "$as_me:8058: 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:8028: checking for $ac_word" >&5 ++echo "$as_me:8064: 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 +@@ -8042,7 +8078,7 @@ + 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:8045: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:8081: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -8054,17 +8090,17 @@ + GMSGFMT=$ac_cv_path_GMSGFMT + + if test -n "$GMSGFMT"; then +- echo "$as_me:8057: result: $GMSGFMT" >&5 ++ echo "$as_me:8093: result: $GMSGFMT" >&5 + echo "${ECHO_T}$GMSGFMT" >&6 + else +- echo "$as_me:8060: result: no" >&5 ++ echo "$as_me:8096: 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:8067: checking for $ac_word" >&5 ++echo "$as_me:8103: 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 +@@ -8091,10 +8127,10 @@ + fi + XGETTEXT="$ac_cv_path_XGETTEXT" + if test "$XGETTEXT" != ":"; then +- echo "$as_me:8094: result: $XGETTEXT" >&5 ++ echo "$as_me:8130: result: $XGETTEXT" >&5 + echo "${ECHO_T}$XGETTEXT" >&6 + else +- echo "$as_me:8097: result: no" >&5 ++ echo "$as_me:8133: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -8109,7 +8145,7 @@ + if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then + : ; + else +- echo "$as_me:8112: result: found msgfmt program is not GNU msgfmt; ignore it" >&5 ++ echo "$as_me:8148: 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 +@@ -8119,7 +8155,7 @@ + if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then + : ; + else +- echo "$as_me:8122: result: found xgettext program is not GNU xgettext; ignore it" >&5 ++ echo "$as_me:8158: 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 +@@ -8139,7 +8175,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:8142: checking for $ac_word" >&5 ++echo "$as_me:8178: 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 +@@ -8154,7 +8190,7 @@ + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue + ac_cv_prog_INTLBISON="$ac_prog" +-echo "$as_me:8157: found $ac_dir/$ac_word" >&5 ++echo "$as_me:8193: found $ac_dir/$ac_word" >&5 + break + done + +@@ -8162,10 +8198,10 @@ + fi + INTLBISON=$ac_cv_prog_INTLBISON + if test -n "$INTLBISON"; then +- echo "$as_me:8165: result: $INTLBISON" >&5 ++ echo "$as_me:8201: result: $INTLBISON" >&5 + echo "${ECHO_T}$INTLBISON" >&6 + else +- echo "$as_me:8168: result: no" >&5 ++ echo "$as_me:8204: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -8175,7 +8211,7 @@ + if test -z "$INTLBISON"; then + ac_verc_fail=yes + else +- echo "$as_me:8178: checking version of bison" >&5 ++ echo "$as_me:8214: 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 +@@ -8184,7 +8220,7 @@ + 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:8187: result: $ac_prog_version" >&5 ++ echo "$as_me:8223: result: $ac_prog_version" >&5 + echo "${ECHO_T}$ac_prog_version" >&6 + fi + if test $ac_verc_fail = yes; then +@@ -8210,7 +8246,7 @@ + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else +- echo "$as_me:8213: checking for catalogs to be installed" >&5 ++ echo "$as_me:8249: 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 +@@ -8230,7 +8266,7 @@ + fi + done + LINGUAS=$NEW_LINGUAS +- echo "$as_me:8233: result: $LINGUAS" >&5 ++ echo "$as_me:8269: result: $LINGUAS" >&5 + echo "${ECHO_T}$LINGUAS" >&6 + fi + +@@ -8263,7 +8299,7 @@ + use_our_messages=no + if test "$USE_NLS" = yes ; then + if test -d $srcdir/po ; then +-echo "$as_me:8266: checking if we should use included message-library" >&5 ++echo "$as_me:8302: 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. +@@ -8274,7 +8310,7 @@ + use_our_messages=yes + fi; + fi +-echo "$as_me:8277: result: $use_our_messages" >&5 ++echo "$as_me:8313: result: $use_our_messages" >&5 + echo "${ECHO_T}$use_our_messages" >&6 + fi + +@@ -8315,23 +8351,23 @@ + for ac_header in libintl.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:8318: checking for $ac_header" >&5 ++echo "$as_me:8354: 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 8324 "configure" ++#line 8360 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:8328: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:8364: \"$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:8334: \$? = $ac_status" >&5 ++ echo "$as_me:8370: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -8350,7 +8386,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:8353: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:8389: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 ++ { { echo "$as_me:8472: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -8442,7 +8478,7 @@ + fi + NLS_DATADIR="$withval" + +-echo "$as_me:8445: checking if you want full utility pathnames" >&5 ++echo "$as_me:8481: 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. +@@ -8459,13 +8495,13 @@ + with_full_paths=yes + + fi; +-echo "$as_me:8462: result: $with_full_paths" >&5 ++echo "$as_me:8498: 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:8468: checking for system mailer" >&5 ++echo "$as_me:8504: 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 +@@ -8485,13 +8521,13 @@ + + fi + +-echo "$as_me:8488: result: $cf_cv_SYSTEM_MAIL" >&5 ++echo "$as_me:8524: result: $cf_cv_SYSTEM_MAIL" >&5 + echo "${ECHO_T}$cf_cv_SYSTEM_MAIL" >&6 + cat >>confdefs.h <&5 ++echo "$as_me:8530: 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 +@@ -8507,7 +8543,7 @@ + + fi + +-echo "$as_me:8510: result: $cf_cv_system_mail_flags" >&5 ++echo "$as_me:8546: result: $cf_cv_system_mail_flags" >&5 + echo "${ECHO_T}$cf_cv_system_mail_flags" >&6 + cat >>confdefs.h <&5 ++echo "$as_me:8591: 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 8562 "configure" ++#line 8598 "configure" + #include "confdefs.h" + #include + int +@@ -8574,16 +8610,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8577: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8613: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8580: \$? = $ac_status" >&5 ++ echo "$as_me:8616: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8583: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8619: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8586: \$? = $ac_status" >&5 ++ echo "$as_me:8622: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_source=no + else +@@ -8592,7 +8628,7 @@ + cf_save="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" + cat >conftest.$ac_ext <<_ACEOF +-#line 8595 "configure" ++#line 8631 "configure" + #include "confdefs.h" + #include + int +@@ -8607,16 +8643,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8610: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8646: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8613: \$? = $ac_status" >&5 ++ echo "$as_me:8649: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8616: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8652: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8619: \$? = $ac_status" >&5 ++ echo "$as_me:8655: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_gnu_source=no + else +@@ -8631,7 +8667,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:8634: result: $cf_cv_gnu_source" >&5 ++echo "$as_me:8670: 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" + +@@ -8661,14 +8697,14 @@ + cf_xopen_source="-D__EXTENSIONS__" + ;; + *) +- echo "$as_me:8664: checking if we should define _XOPEN_SOURCE" >&5 ++ echo "$as_me:8700: 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 8671 "configure" ++#line 8707 "configure" + #include "confdefs.h" + #include + int +@@ -8683,16 +8719,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8686: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8722: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8689: \$? = $ac_status" >&5 ++ echo "$as_me:8725: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8692: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8728: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8695: \$? = $ac_status" >&5 ++ echo "$as_me:8731: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_xopen_source=no + else +@@ -8701,7 +8737,7 @@ + cf_save="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + cat >conftest.$ac_ext <<_ACEOF +-#line 8704 "configure" ++#line 8740 "configure" + #include "confdefs.h" + #include + int +@@ -8716,16 +8752,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8719: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8755: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8722: \$? = $ac_status" >&5 ++ echo "$as_me:8758: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8725: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8761: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8728: \$? = $ac_status" >&5 ++ echo "$as_me:8764: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_xopen_source=no + else +@@ -8740,7 +8776,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:8743: result: $cf_cv_xopen_source" >&5 ++echo "$as_me:8779: result: $cf_cv_xopen_source" >&5 + echo "${ECHO_T}$cf_cv_xopen_source" >&6 + if test "$cf_cv_xopen_source" != no ; then + +@@ -8847,16 +8883,16 @@ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` + +-echo "$as_me:8850: checking if we should define _POSIX_C_SOURCE" >&5 ++echo "$as_me:8886: 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}:8856: testing if the symbol is already defined go no further ..." 1>&5 ++echo "${as_me-configure}:8892: testing if the symbol is already defined go no further ..." 1>&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 8859 "configure" ++#line 8895 "configure" + #include "confdefs.h" + #include + int +@@ -8871,16 +8907,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8874: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8910: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8877: \$? = $ac_status" >&5 ++ echo "$as_me:8913: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8880: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8916: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8883: \$? = $ac_status" >&5 ++ echo "$as_me:8919: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_posix_c_source=no + else +@@ -8901,7 +8937,7 @@ + esac + if test "$cf_want_posix_source" = yes ; then + cat >conftest.$ac_ext <<_ACEOF +-#line 8904 "configure" ++#line 8940 "configure" + #include "confdefs.h" + #include + int +@@ -8916,16 +8952,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8919: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8955: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8922: \$? = $ac_status" >&5 ++ echo "$as_me:8958: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8925: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:8961: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8928: \$? = $ac_status" >&5 ++ echo "$as_me:8964: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -8936,15 +8972,15 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + fi + +-echo "${as_me-configure}:8939: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 ++echo "${as_me-configure}:8975: 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}:8944: testing if the second compile does not leave our definition intact error ..." 1>&5 ++echo "${as_me-configure}:8980: testing if the second compile does not leave our definition intact error ..." 1>&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 8947 "configure" ++#line 8983 "configure" + #include "confdefs.h" + #include + int +@@ -8959,16 +8995,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:8962: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:8998: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:8965: \$? = $ac_status" >&5 ++ echo "$as_me:9001: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:8968: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9004: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:8971: \$? = $ac_status" >&5 ++ echo "$as_me:9007: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -8984,7 +9020,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:8987: result: $cf_cv_posix_c_source" >&5 ++echo "$as_me:9023: 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 +@@ -9156,14 +9192,14 @@ + + fi + +-echo "$as_me:9159: checking if SIGWINCH is defined" >&5 ++echo "$as_me:9195: 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 9166 "configure" ++#line 9202 "configure" + #include "confdefs.h" + + #include +@@ -9178,23 +9214,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9181: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9217: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9184: \$? = $ac_status" >&5 ++ echo "$as_me:9220: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:9187: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9223: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9190: \$? = $ac_status" >&5 ++ echo "$as_me:9226: \$? = $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 9197 "configure" ++#line 9233 "configure" + #include "confdefs.h" + + #undef _XOPEN_SOURCE +@@ -9212,16 +9248,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9215: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9251: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9218: \$? = $ac_status" >&5 ++ echo "$as_me:9254: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:9221: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9257: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9224: \$? = $ac_status" >&5 ++ echo "$as_me:9260: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_define_sigwinch=maybe + else +@@ -9235,11 +9271,11 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:9238: result: $cf_cv_define_sigwinch" >&5 ++echo "$as_me:9274: 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:9242: checking for actual SIGWINCH definition" >&5 ++echo "$as_me:9278: 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 +@@ -9250,7 +9286,7 @@ + while test $cf_sigwinch != 1 + do + cat >conftest.$ac_ext <<_ACEOF +-#line 9253 "configure" ++#line 9289 "configure" + #include "confdefs.h" + + #undef _XOPEN_SOURCE +@@ -9272,16 +9308,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9275: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9311: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9278: \$? = $ac_status" >&5 ++ echo "$as_me:9314: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:9281: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9317: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9284: \$? = $ac_status" >&5 ++ echo "$as_me:9320: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_fixup_sigwinch=$cf_sigwinch + break +@@ -9295,7 +9331,7 @@ + done + + fi +-echo "$as_me:9298: result: $cf_cv_fixup_sigwinch" >&5 ++echo "$as_me:9334: result: $cf_cv_fixup_sigwinch" >&5 + echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 + + if test "$cf_cv_fixup_sigwinch" != unknown ; then +@@ -9307,7 +9343,7 @@ + + test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 + +-echo "${as_me-configure}:9310: testing checking additions to CFLAGS ..." 1>&5 ++echo "${as_me-configure}:9346: testing checking additions to CFLAGS ..." 1>&5 + + cf_check_cflags="$CFLAGS" + cf_check_cppflags="$CPPFLAGS" +@@ -9378,7 +9414,7 @@ + if test -n "$cf_new_cflags" ; then + test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 + +-echo "${as_me-configure}:9381: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 ++echo "${as_me-configure}:9417: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 + + CFLAGS="$CFLAGS $cf_new_cflags" + fi +@@ -9386,7 +9422,7 @@ + if test -n "$cf_new_cppflags" ; then + test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 + +-echo "${as_me-configure}:9389: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 ++echo "${as_me-configure}:9425: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 + + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" + fi +@@ -9394,14 +9430,14 @@ + 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}:9397: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 ++echo "${as_me-configure}:9433: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" + fi + + if test "$cf_check_cflags" != "$CFLAGS" ; then + cat >conftest.$ac_ext <<_ACEOF +-#line 9404 "configure" ++#line 9440 "configure" + #include "confdefs.h" + #include + int +@@ -9413,16 +9449,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9416: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9452: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9419: \$? = $ac_status" >&5 ++ echo "$as_me:9455: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9422: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9458: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9425: \$? = $ac_status" >&5 ++ echo "$as_me:9461: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -9430,12 +9466,12 @@ + cat conftest.$ac_ext >&5 + test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 + +-echo "${as_me-configure}:9433: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 ++echo "${as_me-configure}:9469: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 + + if test "$cf_check_cppflags" != "$CPPFLAGS" ; then + test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 + +-echo "${as_me-configure}:9438: testing but keeping change to \$CPPFLAGS ..." 1>&5 ++echo "${as_me-configure}:9474: testing but keeping change to \$CPPFLAGS ..." 1>&5 + + fi + CFLAGS="$cf_check_flags" +@@ -9447,7 +9483,7 @@ + + ### Look for network libraries first, since some functions (such as gethostname) + ### are used in a lot of places. +-echo "$as_me:9450: checking if you want NSS compatible SSL libraries" >&5 ++echo "$as_me:9486: 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 +@@ -9462,10 +9498,10 @@ + fi; + + fi +-echo "$as_me:9465: result: $cf_cv_use_libnss_compat" >&5 ++echo "$as_me:9501: result: $cf_cv_use_libnss_compat" >&5 + echo "${ECHO_T}$cf_cv_use_libnss_compat" >&6 + +-echo "$as_me:9468: checking if you want ssl library" >&5 ++echo "$as_me:9504: 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 +@@ -9480,10 +9516,10 @@ + fi; + + fi +-echo "$as_me:9483: result: $cf_cv_use_libssl" >&5 ++echo "$as_me:9519: result: $cf_cv_use_libssl" >&5 + echo "${ECHO_T}$cf_cv_use_libssl" >&6 + +-echo "$as_me:9486: checking if you want gnutls support" >&5 ++echo "$as_me:9522: 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 +@@ -9498,11 +9534,11 @@ + fi; + + fi +-echo "$as_me:9501: result: $cf_cv_use_libgnutls" >&5 ++echo "$as_me:9537: 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:9505: checking if you want gnutls-openssl compat" >&5 ++echo "$as_me:9541: 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 +@@ -9517,10 +9553,10 @@ + fi; + + fi +-echo "$as_me:9520: result: $cf_cv_gnutls_compat" >&5 ++echo "$as_me:9556: result: $cf_cv_gnutls_compat" >&5 + echo "${ECHO_T}$cf_cv_gnutls_compat" >&6 + +-echo "$as_me:9523: checking if you want socks library" >&5 ++echo "$as_me:9559: 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 +@@ -9535,10 +9571,10 @@ + fi; + + fi +-echo "$as_me:9538: result: $cf_cv_use_libsocks" >&5 ++echo "$as_me:9574: result: $cf_cv_use_libsocks" >&5 + echo "${ECHO_T}$cf_cv_use_libsocks" >&6 + +-echo "$as_me:9541: checking if you want socks5 library" >&5 ++echo "$as_me:9577: 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 +@@ -9553,7 +9589,7 @@ + fi; + + fi +-echo "$as_me:9556: result: $cf_cv_use_libsocks5" >&5 ++echo "$as_me:9592: result: $cf_cv_use_libsocks5" >&5 + echo "${ECHO_T}$cf_cv_use_libsocks5" >&6 + + if test "x$cf_cv_use_libsocks" != xno ; then +@@ -9592,7 +9628,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 9595 "configure" ++#line 9631 "configure" + #include "confdefs.h" + #include + int +@@ -9604,16 +9640,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9607: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9643: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9610: \$? = $ac_status" >&5 ++ echo "$as_me:9646: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:9613: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9649: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9616: \$? = $ac_status" >&5 ++ echo "$as_me:9652: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -9630,7 +9666,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:9633: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:9669: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -9671,7 +9707,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 9674 "configure" ++#line 9710 "configure" + #include "confdefs.h" + #include + int +@@ -9683,16 +9719,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:9686: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:9722: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:9689: \$? = $ac_status" >&5 ++ echo "$as_me:9725: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:9692: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9728: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9695: \$? = $ac_status" >&5 ++ echo "$as_me:9731: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -9709,7 +9745,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:9712: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:9748: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -9725,7 +9761,7 @@ + fi + + else +-{ { echo "$as_me:9728: error: cannot find socks library under $cf_cv_use_libsocks" >&5 ++{ { echo "$as_me:9764: 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 +@@ -9750,7 +9786,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me-configure}:9753: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me-configure}:9789: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -9779,7 +9815,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me-configure}:9782: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me-configure}:9818: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -9788,7 +9824,7 @@ + fi + + else +-{ { echo "$as_me:9791: error: cannot find socks library under $cf_cv_use_libsocks" >&5 ++{ { echo "$as_me:9827: 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 +@@ -9802,10 +9838,12 @@ + cf_cv_header_path_socks= + cf_cv_library_path_socks= + +-echo "${as_me-configure}:9805: testing Starting FIND_LINKAGE(socks,) ..." 1>&5 ++echo "${as_me-configure}:9841: testing Starting FIND_LINKAGE(socks,) ..." 1>&5 ++ ++cf_save_LIBS="$LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 9808 "configure" ++#line 9846 "configure" + #include "confdefs.h" + + #include +@@ -9821,29 +9859,30 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9824: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9862: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9827: \$? = $ac_status" >&5 ++ echo "$as_me:9865: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9830: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9868: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9833: \$? = $ac_status" >&5 ++ echo "$as_me:9871: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_socks=yes ++ cf_cv_header_path_socks=/usr/include ++ cf_cv_library_path_socks=/usr/lib + + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + +-cf_save_LIBS="$LIBS" + LIBS="-lsocks $cf_save_LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 9846 "configure" ++#line 9885 "configure" + #include "confdefs.h" + + #include +@@ -9859,33 +9898,35 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:9862: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:9901: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:9865: \$? = $ac_status" >&5 ++ echo "$as_me:9904: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:9868: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:9907: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:9871: \$? = $ac_status" >&5 ++ echo "$as_me:9910: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_socks=yes ++ cf_cv_header_path_socks=/usr/include ++ cf_cv_library_path_socks=/usr/lib + cf_cv_library_file_socks="-lsocks" + + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + +- cf_cv_find_linkage_socks=no ++ cf_cv_find_linkage_socks=no + LIBS="$cf_save_LIBS" + + test -n "$verbose" && echo " find linkage for socks library" 1>&6 + +-echo "${as_me-configure}:9886: testing find linkage for socks library ..." 1>&5 ++echo "${as_me-configure}:9927: testing find linkage for socks library ..." 1>&5 + +-echo "${as_me-configure}:9888: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5 ++echo "${as_me-configure}:9929: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5 + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -9900,7 +9941,19 @@ + case $cf_header_path in #(vi + -I*) + cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` +- cf_header_path_list="$cf_header_path_list $cf_header_path" ++ ++test "$cf_header_path" != "NONE" && \ ++test -d "$cf_header_path" && \ ++ { ++ test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" ++ test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" ++ test -d $cf_header_path/include/socks && cf_search="$cf_search $cf_header_path/include/socks" ++ test -d $cf_header_path/include/socks/include && cf_search="$cf_search $cf_header_path/include/socks/include" ++ test -d $cf_header_path/socks/include && cf_search="$cf_search $cf_header_path/socks/include" ++ test -d $cf_header_path/socks/include/socks && cf_search="$cf_search $cf_header_path/socks/include/socks" ++} ++ ++ cf_header_path_list="$cf_header_path_list $cf_search" + ;; + esac + done +@@ -9986,11 +10039,11 @@ + 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}:9989: testing ... testing $cf_cv_header_path_socks ..." 1>&5 ++echo "${as_me-configure}:10042: 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 9993 "configure" ++#line 10046 "configure" + #include "confdefs.h" + + #include +@@ -10006,21 +10059,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10009: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10062: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10012: \$? = $ac_status" >&5 ++ echo "$as_me:10065: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10015: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10068: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10018: \$? = $ac_status" >&5 ++ echo "$as_me:10071: \$? = $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}:10023: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5 ++echo "${as_me-configure}:10076: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5 + + cf_cv_find_linkage_socks=maybe + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -10038,7 +10091,7 @@ + + if test "$cf_cv_find_linkage_socks" = maybe ; then + +-echo "${as_me-configure}:10041: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5 ++echo "${as_me-configure}:10094: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" +@@ -10135,13 +10188,13 @@ + 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}:10138: testing ... testing $cf_cv_library_path_socks ..." 1>&5 ++echo "${as_me-configure}:10191: 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 10144 "configure" ++#line 10197 "configure" + #include "confdefs.h" + + #include +@@ -10157,21 +10210,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10160: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10213: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10163: \$? = $ac_status" >&5 ++ echo "$as_me:10216: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10166: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10219: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10169: \$? = $ac_status" >&5 ++ echo "$as_me:10222: \$? = $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}:10174: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5 ++echo "${as_me-configure}:10227: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5 + + cf_cv_find_linkage_socks=yes + cf_cv_library_file_socks="-lsocks" +@@ -10188,7 +10241,6 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi + done +- LIBS="$cf_save_LIBS" + CPPFLAGS="$cf_save_CPPFLAGS" + LDFLAGS="$cf_save_LDFLAGS" + fi +@@ -10203,48 +10255,9 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +-if test "$cf_cv_find_linkage_socks" = yes ; then +-cf_cv_have_socks=yes +-else +-cf_cv_have_socks=no +-fi +- +- if test "$cf_cv_have_socks" = yes ; then +- cat >>confdefs.h <<\EOF +-#define SOCKS 1 +-EOF +- +- cat >>confdefs.h <<\EOF +-#define accept Raccept +-EOF +- +- cat >>confdefs.h <<\EOF +-#define bind Rbind +-EOF +- +- cat >>confdefs.h <<\EOF +-#define connect Rconnect +-EOF +- +- cat >>confdefs.h <<\EOF +-#define getpeername Rgetpeername +-EOF +- +- cat >>confdefs.h <<\EOF +-#define getsockname Rgetsockname +-EOF +- +- cat >>confdefs.h <<\EOF +-#define listen Rlisten +-EOF +- +- cat >>confdefs.h <<\EOF +-#define recvfrom Rrecvfrom +-EOF ++LIBS="$cf_save_LIBS" + +- cat >>confdefs.h <<\EOF +-#define select Rselect +-EOF ++if test "$cf_cv_find_linkage_socks" = yes ; then + + if test -n "$cf_cv_header_path_socks" ; then + for cf_add_incdir in $cf_cv_header_path_socks +@@ -10270,7 +10283,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 10273 "configure" ++#line 10286 "configure" + #include "confdefs.h" + #include + int +@@ -10282,16 +10295,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10285: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10298: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10288: \$? = $ac_status" >&5 ++ echo "$as_me:10301: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10291: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10304: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10294: \$? = $ac_status" >&5 ++ echo "$as_me:10307: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -10308,7 +10321,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:10311: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:10324: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -10342,7 +10355,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me-configure}:10345: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me-configure}:10358: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -10350,9 +10363,52 @@ + done + fi + +- LIBS="$cf_cv_library_file_socks $LIBS" ++ LIBS="-lsocks $LIBS" ++ ++else ++{ echo "$as_me:10369: WARNING: Cannot find socks library" >&5 ++echo "$as_me: WARNING: Cannot find socks library" >&2;} ++fi ++ ++ if test "x$cf_cv_find_linkage_socks" = "xyes" ; then ++ cat >>confdefs.h <<\EOF ++#define SOCKS 1 ++EOF ++ ++ cat >>confdefs.h <<\EOF ++#define accept Raccept ++EOF ++ ++ cat >>confdefs.h <<\EOF ++#define bind Rbind ++EOF ++ ++ cat >>confdefs.h <<\EOF ++#define connect Rconnect ++EOF ++ ++ cat >>confdefs.h <<\EOF ++#define getpeername Rgetpeername ++EOF ++ ++ cat >>confdefs.h <<\EOF ++#define getsockname Rgetsockname ++EOF ++ ++ cat >>confdefs.h <<\EOF ++#define listen Rlisten ++EOF ++ ++ cat >>confdefs.h <<\EOF ++#define recvfrom Rrecvfrom ++EOF ++ ++ cat >>confdefs.h <<\EOF ++#define select Rselect ++EOF ++ + else +- { { echo "$as_me:10355: error: cannot link with socks library" >&5 ++ { { echo "$as_me:10411: error: cannot link with socks library" >&5 + echo "$as_me: error: cannot link with socks library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -10393,7 +10449,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 10396 "configure" ++#line 10452 "configure" + #include "confdefs.h" + #include + int +@@ -10405,16 +10461,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10408: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10464: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10411: \$? = $ac_status" >&5 ++ echo "$as_me:10467: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10414: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10470: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10417: \$? = $ac_status" >&5 ++ echo "$as_me:10473: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -10431,7 +10487,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:10434: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:10490: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -10472,7 +10528,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 10475 "configure" ++#line 10531 "configure" + #include "confdefs.h" + #include + int +@@ -10484,16 +10540,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10487: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10543: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10490: \$? = $ac_status" >&5 ++ echo "$as_me:10546: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10493: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10549: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10496: \$? = $ac_status" >&5 ++ echo "$as_me:10552: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -10510,7 +10566,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:10513: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:10569: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -10526,7 +10582,7 @@ + fi + + else +-{ { echo "$as_me:10529: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5 ++{ { echo "$as_me:10585: 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 +@@ -10551,7 +10607,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me-configure}:10554: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me-configure}:10610: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -10580,7 +10636,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me-configure}:10583: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me-configure}:10639: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -10589,7 +10645,7 @@ + fi + + else +-{ { echo "$as_me:10592: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5 ++{ { echo "$as_me:10648: 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 +@@ -10608,11 +10664,11 @@ + #define SOCKS 1 + EOF + +-echo "$as_me:10611: checking if the socks library uses socks4 prefix" >&5 ++echo "$as_me:10667: 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 10615 "configure" ++#line 10671 "configure" + #include "confdefs.h" + + #include +@@ -10626,16 +10682,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10629: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10685: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10632: \$? = $ac_status" >&5 ++ echo "$as_me:10688: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10635: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10691: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10638: \$? = $ac_status" >&5 ++ echo "$as_me:10694: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cat >>confdefs.h <<\EOF + #define USE_SOCKS4_PREFIX 1 +@@ -10646,7 +10702,7 @@ + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + cat >conftest.$ac_ext <<_ACEOF +-#line 10649 "configure" ++#line 10705 "configure" + #include "confdefs.h" + #include + int +@@ -10658,29 +10714,29 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10661: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10717: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10664: \$? = $ac_status" >&5 ++ echo "$as_me:10720: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10667: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10723: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10670: \$? = $ac_status" >&5 ++ echo "$as_me:10726: \$? = $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:10676: error: Cannot link with socks5 library" >&5 ++{ { echo "$as_me:10732: 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:10683: result: $cf_use_socks4" >&5 ++echo "$as_me:10739: result: $cf_use_socks4" >&5 + echo "${ECHO_T}$cf_use_socks4" >&6 + + if test "$cf_use_socks4" = "yes" ; then +@@ -10735,10 +10791,10 @@ + + fi + +-echo "$as_me:10738: checking if socks5p.h is available" >&5 ++echo "$as_me:10794: 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 10741 "configure" ++#line 10797 "configure" + #include "confdefs.h" + + #define INCLUDE_PROTOTYPES +@@ -10753,16 +10809,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:10756: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:10812: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:10759: \$? = $ac_status" >&5 ++ echo "$as_me:10815: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:10762: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10818: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10765: \$? = $ac_status" >&5 ++ echo "$as_me:10821: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_use_socks5p_h=yes + else +@@ -10771,7 +10827,7 @@ + cf_use_socks5p_h=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:10774: result: $cf_use_socks5p_h" >&5 ++echo "$as_me:10830: result: $cf_use_socks5p_h" >&5 + echo "${ECHO_T}$cf_use_socks5p_h" >&6 + + test "$cf_use_socks5p_h" = yes && cat >>confdefs.h <<\EOF +@@ -10782,14 +10838,14 @@ + + cf_test_netlibs=no + +-echo "$as_me:10785: checking for network libraries" >&5 ++echo "$as_me:10841: 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:10792: result: working..." >&5 ++echo "$as_me:10848: result: working..." >&5 + echo "${ECHO_T}working..." >&6 + + cf_cv_netlibs="" +@@ -10801,23 +10857,23 @@ + 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:10804: checking for $ac_header" >&5 ++echo "$as_me:10860: 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 10810 "configure" ++#line 10866 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:10814: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:10870: \"$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:10820: \$? = $ac_status" >&5 ++ echo "$as_me:10876: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -10836,7 +10892,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:10839: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:10895: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <conftest.$ac_ext <<_ACEOF +-#line 10859 "configure" ++#line 10915 "configure" + #include "confdefs.h" + + #ifdef HAVE_WINDOWS_H +@@ -10883,22 +10939,22 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10886: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:10942: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10889: \$? = $ac_status" >&5 ++ echo "$as_me:10945: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10892: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:10948: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10895: \$? = $ac_status" >&5 ++ echo "$as_me:10951: \$? = $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:10901: error: Cannot link against winsock library" >&5 ++{ { echo "$as_me:10957: error: Cannot link against winsock library" >&5 + echo "$as_me: error: Cannot link against winsock library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -10911,13 +10967,13 @@ + for ac_func in gethostname + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:10914: checking for $ac_func" >&5 ++echo "$as_me:10970: 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 10920 "configure" ++#line 10976 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. */ +@@ -10948,16 +11004,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:10951: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11007: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:10954: \$? = $ac_status" >&5 ++ echo "$as_me:11010: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:10957: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11013: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:10960: \$? = $ac_status" >&5 ++ echo "$as_me:11016: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -10967,7 +11023,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:10970: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:11026: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:11035: 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 +@@ -10984,7 +11040,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lnsl $cf_cv_netlibs $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 10987 "configure" ++#line 11043 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -11003,16 +11059,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11006: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11062: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11009: \$? = $ac_status" >&5 ++ echo "$as_me:11065: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11012: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11068: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11015: \$? = $ac_status" >&5 ++ echo "$as_me:11071: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_nsl_gethostname=yes + else +@@ -11023,7 +11079,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:11026: result: $ac_cv_lib_nsl_gethostname" >&5 ++echo "$as_me:11082: 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 + +@@ -11040,7 +11096,7 @@ + ac_cv_func_gethostname=unknown + unset ac_cv_func_gethostname 2>/dev/null + +-echo "$as_me:11043: checking for gethostname in -lsocket" >&5 ++echo "$as_me:11099: 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 +@@ -11048,7 +11104,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsocket $cf_cv_netlibs $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 11051 "configure" ++#line 11107 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -11067,16 +11123,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11070: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11126: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11073: \$? = $ac_status" >&5 ++ echo "$as_me:11129: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11076: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11132: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11079: \$? = $ac_status" >&5 ++ echo "$as_me:11135: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_socket_gethostname=yes + else +@@ -11087,7 +11143,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:11090: result: $ac_cv_lib_socket_gethostname" >&5 ++echo "$as_me:11146: 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 + +@@ -11111,7 +11167,7 @@ + fi + done + +- echo "$as_me:11114: checking for main in -linet" >&5 ++ echo "$as_me:11170: 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 +@@ -11119,7 +11175,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-linet $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 11122 "configure" ++#line 11178 "configure" + #include "confdefs.h" + + int +@@ -11131,16 +11187,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11134: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11190: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11137: \$? = $ac_status" >&5 ++ echo "$as_me:11193: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11140: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11196: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11143: \$? = $ac_status" >&5 ++ echo "$as_me:11199: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_inet_main=yes + else +@@ -11151,7 +11207,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:11154: result: $ac_cv_lib_inet_main" >&5 ++echo "$as_me:11210: 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" +@@ -11162,13 +11218,13 @@ + for ac_func in socket + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:11165: checking for $ac_func" >&5 ++echo "$as_me:11221: 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 11171 "configure" ++#line 11227 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. */ +@@ -11199,16 +11255,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11202: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11258: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11205: \$? = $ac_status" >&5 ++ echo "$as_me:11261: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11208: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11264: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11211: \$? = $ac_status" >&5 ++ echo "$as_me:11267: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -11218,7 +11274,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:11221: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:11277: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:11286: 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 +@@ -11235,7 +11291,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsocket $cf_cv_netlibs $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 11238 "configure" ++#line 11294 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -11254,16 +11310,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11257: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11313: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11260: \$? = $ac_status" >&5 ++ echo "$as_me:11316: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11263: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11319: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11266: \$? = $ac_status" >&5 ++ echo "$as_me:11322: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_socket_socket=yes + else +@@ -11274,7 +11330,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:11277: result: $ac_cv_lib_socket_socket" >&5 ++echo "$as_me:11333: 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 + +@@ -11291,7 +11347,7 @@ + ac_cv_func_socket=unknown + unset ac_cv_func_socket 2>/dev/null + +-echo "$as_me:11294: checking for socket in -lbsd" >&5 ++echo "$as_me:11350: 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 +@@ -11299,7 +11355,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $cf_cv_netlibs $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 11302 "configure" ++#line 11358 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -11318,16 +11374,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11321: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11377: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11324: \$? = $ac_status" >&5 ++ echo "$as_me:11380: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11327: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11383: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11330: \$? = $ac_status" >&5 ++ echo "$as_me:11386: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_bsd_socket=yes + else +@@ -11338,7 +11394,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:11341: result: $ac_cv_lib_bsd_socket" >&5 ++echo "$as_me:11397: 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 + +@@ -11367,13 +11423,13 @@ + for ac_func in gethostbyname + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:11370: checking for $ac_func" >&5 ++echo "$as_me:11426: 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 11376 "configure" ++#line 11432 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. */ +@@ -11404,16 +11460,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11407: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11463: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11410: \$? = $ac_status" >&5 ++ echo "$as_me:11466: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11413: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11469: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11416: \$? = $ac_status" >&5 ++ echo "$as_me:11472: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -11423,7 +11479,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:11426: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:11482: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:11491: 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 +@@ -11440,7 +11496,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lnsl $cf_cv_netlibs $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 11443 "configure" ++#line 11499 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -11459,16 +11515,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11462: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11518: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11465: \$? = $ac_status" >&5 ++ echo "$as_me:11521: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11468: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11524: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11471: \$? = $ac_status" >&5 ++ echo "$as_me:11527: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_nsl_gethostbyname=yes + else +@@ -11479,7 +11535,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:11482: result: $ac_cv_lib_nsl_gethostbyname" >&5 ++echo "$as_me:11538: 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 + +@@ -11504,13 +11560,13 @@ + for ac_func in gethostbyname + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:11507: checking for $ac_func" >&5 ++echo "$as_me:11563: 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 11513 "configure" ++#line 11569 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. */ +@@ -11541,16 +11597,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11544: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11600: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11547: \$? = $ac_status" >&5 ++ echo "$as_me:11603: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11550: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11606: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11553: \$? = $ac_status" >&5 ++ echo "$as_me:11609: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -11560,7 +11616,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:11563: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:11619: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:11628: 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 +@@ -11577,7 +11633,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lnetwork $cf_cv_netlibs $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 11580 "configure" ++#line 11636 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -11596,16 +11652,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11599: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11655: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11602: \$? = $ac_status" >&5 ++ echo "$as_me:11658: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11605: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11661: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11608: \$? = $ac_status" >&5 ++ echo "$as_me:11664: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_network_gethostbyname=yes + else +@@ -11616,7 +11672,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:11619: result: $ac_cv_lib_network_gethostbyname" >&5 ++echo "$as_me:11675: 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 + +@@ -11641,13 +11697,13 @@ + for ac_func in strcasecmp + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:11644: checking for $ac_func" >&5 ++echo "$as_me:11700: 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 11650 "configure" ++#line 11706 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. */ +@@ -11678,16 +11734,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11681: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11737: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11684: \$? = $ac_status" >&5 ++ echo "$as_me:11740: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11687: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11743: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11690: \$? = $ac_status" >&5 ++ echo "$as_me:11746: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -11697,7 +11753,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:11700: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:11756: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:11765: 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 +@@ -11714,7 +11770,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lresolv $cf_cv_netlibs $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 11717 "configure" ++#line 11773 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -11733,16 +11789,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11736: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11792: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11739: \$? = $ac_status" >&5 ++ echo "$as_me:11795: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11742: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11798: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11745: \$? = $ac_status" >&5 ++ echo "$as_me:11801: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_resolv_strcasecmp=yes + else +@@ -11753,7 +11809,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:11756: result: $ac_cv_lib_resolv_strcasecmp" >&5 ++echo "$as_me:11812: 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 + +@@ -11794,14 +11850,14 @@ + + fi + +-echo "$as_me:11797: checking for inet_aton function" >&5 ++echo "$as_me:11853: 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 11804 "configure" ++#line 11860 "configure" + #include "confdefs.h" + #include + #include +@@ -11817,16 +11873,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11820: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11876: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11823: \$? = $ac_status" >&5 ++ echo "$as_me:11879: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11826: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11882: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11829: \$? = $ac_status" >&5 ++ echo "$as_me:11885: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_inet_aton=yes + else +@@ -11836,7 +11892,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:11839: result: $cf_cv_have_inet_aton" >&5 ++echo "$as_me:11895: 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 + cat >>confdefs.h <<\EOF +@@ -11844,14 +11900,14 @@ + EOF + + else +- echo "$as_me:11847: checking for inet_addr function" >&5 ++ echo "$as_me:11903: 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 11854 "configure" ++#line 11910 "configure" + #include "confdefs.h" + #include + #include +@@ -11867,16 +11923,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11870: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11926: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11873: \$? = $ac_status" >&5 ++ echo "$as_me:11929: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11876: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11932: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11879: \$? = $ac_status" >&5 ++ echo "$as_me:11935: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_inet_addr=yes + else +@@ -11886,10 +11942,10 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:11889: result: $cf_cv_have_inet_addr" >&5 ++echo "$as_me:11945: 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:11892: checking for library with inet_addr" >&5 ++ echo "$as_me:11948: 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 +@@ -11900,7 +11956,7 @@ + do + LIBS="$cf_save_LIBS $cf_inetlib" + cat >conftest.$ac_ext <<_ACEOF +-#line 11903 "configure" ++#line 11959 "configure" + #include "confdefs.h" + #include + #include +@@ -11916,16 +11972,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:11919: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:11975: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:11922: \$? = $ac_status" >&5 ++ echo "$as_me:11978: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:11925: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:11981: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:11928: \$? = $ac_status" >&5 ++ echo "$as_me:11984: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_lib_inet_addr=$cf_inetlib + else +@@ -11939,18 +11995,18 @@ + done + + fi +-echo "$as_me:11942: result: $cf_cv_lib_inet_addr" >&5 ++echo "$as_me:11998: 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 + LIBS="$LIBS $cf_cv_lib_inet_addr" + else +- { echo "$as_me:11947: WARNING: Unable to find library for inet_addr function" >&5 ++ { echo "$as_me:12003: 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:11953: checking if you want to use pkg-config" >&5 ++echo "$as_me:12009: 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. +@@ -11960,7 +12016,7 @@ + else + cf_pkg_config=yes + fi; +-echo "$as_me:11963: result: $cf_pkg_config" >&5 ++echo "$as_me:12019: result: $cf_pkg_config" >&5 + echo "${ECHO_T}$cf_pkg_config" >&6 + + case $cf_pkg_config in #(vi +@@ -11970,7 +12026,7 @@ + yes) #(vi + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 +-echo "$as_me:11973: checking for $ac_word" >&5 ++echo "$as_me:12029: 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 +@@ -11987,7 +12043,7 @@ + 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:11990: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:12046: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -11999,10 +12055,10 @@ + PKG_CONFIG=$ac_cv_path_PKG_CONFIG + + if test -n "$PKG_CONFIG"; then +- echo "$as_me:12002: result: $PKG_CONFIG" >&5 ++ echo "$as_me:12058: result: $PKG_CONFIG" >&5 + echo "${ECHO_T}$PKG_CONFIG" >&6 + else +- echo "$as_me:12005: result: no" >&5 ++ echo "$as_me:12061: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -12040,7 +12096,7 @@ + PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` + ;; + *) +- { { echo "$as_me:12043: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 ++ { { echo "$as_me:12099: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 + echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -12051,6 +12107,7 @@ + if test "x$cf_cv_use_libssl" != xno ; then + + cf_cv_have_ssl=no ++ cf_cv_pkg_config_ssl=no + + # command-line option, etc., override default behavior + +@@ -12088,7 +12145,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 12091 "configure" ++#line 12148 "configure" + #include "confdefs.h" + #include + int +@@ -12100,16 +12157,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12103: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12160: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12106: \$? = $ac_status" >&5 ++ echo "$as_me:12163: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:12109: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12166: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12112: \$? = $ac_status" >&5 ++ echo "$as_me:12169: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -12126,7 +12183,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:12129: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:12186: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -12167,7 +12224,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 12170 "configure" ++#line 12227 "configure" + #include "confdefs.h" + #include + int +@@ -12179,16 +12236,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12182: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12239: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12185: \$? = $ac_status" >&5 ++ echo "$as_me:12242: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:12188: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12245: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12191: \$? = $ac_status" >&5 ++ echo "$as_me:12248: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -12205,7 +12262,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:12208: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:12265: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -12221,7 +12278,7 @@ + fi + + else +-{ { echo "$as_me:12224: error: cannot find ssl library under $cf_cv_use_libssl" >&5 ++{ { echo "$as_me:12281: 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 +@@ -12246,7 +12303,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me-configure}:12249: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me-configure}:12306: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -12275,7 +12332,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me-configure}:12278: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me-configure}:12335: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -12284,7 +12341,7 @@ + fi + + else +-{ { echo "$as_me:12287: error: cannot find ssl library under $cf_cv_use_libssl" >&5 ++{ { echo "$as_me:12344: 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 +@@ -12300,6 +12357,7 @@ + yes) # if no explicit directory given, try pkg-config + if "$PKG_CONFIG" --exists openssl ; then + cf_cv_have_ssl=yes ++ cf_cv_pkg_config_ssl=yes + + cf_cflags_ssl=`$PKG_CONFIG --cflags openssl` + cf_libs_ssl=`$PKG_CONFIG --libs openssl` +@@ -12414,7 +12472,7 @@ + esac + test -n "$verbose" && echo " adding $cf_libs_ssl to LIBS" 1>&6 + +-echo "${as_me-configure}:12417: testing adding $cf_libs_ssl to LIBS ..." 1>&5 ++echo "${as_me-configure}:12475: testing adding $cf_libs_ssl to LIBS ..." 1>&5 + + LIBS="$cf_libs_ssl $LIBS" + fi +@@ -12435,7 +12493,7 @@ + *-ldl) #(vi + ;; + *) +- echo "$as_me:12438: checking for dlsym in -ldl" >&5 ++ echo "$as_me:12496: 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 +@@ -12443,7 +12501,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldl $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 12446 "configure" ++#line 12504 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -12462,16 +12520,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:12465: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12523: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12468: \$? = $ac_status" >&5 ++ echo "$as_me:12526: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:12471: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12529: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12474: \$? = $ac_status" >&5 ++ echo "$as_me:12532: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dl_dlsym=yes + else +@@ -12482,7 +12540,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:12485: result: $ac_cv_lib_dl_dlsym" >&5 ++echo "$as_me:12543: 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" +@@ -12498,10 +12556,12 @@ + cf_cv_header_path_ssl= + cf_cv_library_path_ssl= + +-echo "${as_me-configure}:12501: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5 ++echo "${as_me-configure}:12559: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5 ++ ++cf_save_LIBS="$LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 12504 "configure" ++#line 12564 "configure" + #include "confdefs.h" + + #include +@@ -12530,29 +12590,30 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:12533: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12593: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12536: \$? = $ac_status" >&5 ++ echo "$as_me:12596: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:12539: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12599: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12542: \$? = $ac_status" >&5 ++ echo "$as_me:12602: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_ssl=yes ++ cf_cv_header_path_ssl=/usr/include ++ cf_cv_library_path_ssl=/usr/lib + + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + +-cf_save_LIBS="$LIBS" + LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 12555 "configure" ++#line 12616 "configure" + #include "confdefs.h" + + #include +@@ -12581,33 +12642,35 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:12584: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12645: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12587: \$? = $ac_status" >&5 ++ echo "$as_me:12648: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:12590: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12651: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12593: \$? = $ac_status" >&5 ++ echo "$as_me:12654: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_ssl=yes ++ cf_cv_header_path_ssl=/usr/include ++ cf_cv_library_path_ssl=/usr/lib + cf_cv_library_file_ssl="-lssl" + + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + +- cf_cv_find_linkage_ssl=no ++ cf_cv_find_linkage_ssl=no + LIBS="$cf_save_LIBS" + + test -n "$verbose" && echo " find linkage for ssl library" 1>&6 + +-echo "${as_me-configure}:12608: testing find linkage for ssl library ..." 1>&5 ++echo "${as_me-configure}:12671: testing find linkage for ssl library ..." 1>&5 + +-echo "${as_me-configure}:12610: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5 ++echo "${as_me-configure}:12673: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5 + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -12622,7 +12685,19 @@ + case $cf_header_path in #(vi + -I*) + cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` +- cf_header_path_list="$cf_header_path_list $cf_header_path" ++ ++test "$cf_header_path" != "NONE" && \ ++test -d "$cf_header_path" && \ ++ { ++ test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" ++ test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" ++ test -d $cf_header_path/include/openssl && cf_search="$cf_search $cf_header_path/include/openssl" ++ test -d $cf_header_path/include/openssl/include && cf_search="$cf_search $cf_header_path/include/openssl/include" ++ test -d $cf_header_path/openssl/include && cf_search="$cf_search $cf_header_path/openssl/include" ++ test -d $cf_header_path/openssl/include/openssl && cf_search="$cf_search $cf_header_path/openssl/include/openssl" ++} ++ ++ cf_header_path_list="$cf_header_path_list $cf_search" + ;; + esac + done +@@ -12708,11 +12783,11 @@ + 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}:12711: testing ... testing $cf_cv_header_path_ssl ..." 1>&5 ++echo "${as_me-configure}:12786: 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 12715 "configure" ++#line 12790 "configure" + #include "confdefs.h" + + #include +@@ -12741,21 +12816,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:12744: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:12819: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:12747: \$? = $ac_status" >&5 ++ echo "$as_me:12822: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:12750: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12825: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12753: \$? = $ac_status" >&5 ++ echo "$as_me:12828: \$? = $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}:12758: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5 ++echo "${as_me-configure}:12833: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5 + + cf_cv_find_linkage_ssl=maybe + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -12773,7 +12848,7 @@ + + if test "$cf_cv_find_linkage_ssl" = maybe ; then + +-echo "${as_me-configure}:12776: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5 ++echo "${as_me-configure}:12851: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5 + + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" +@@ -12781,7 +12856,7 @@ + CPPFLAGS="$cf_test_CPPFLAGS" + LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 12784 "configure" ++#line 12859 "configure" + #include "confdefs.h" + + #include +@@ -12810,21 +12885,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:12813: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:12888: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12816: \$? = $ac_status" >&5 ++ echo "$as_me:12891: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:12819: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:12894: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12822: \$? = $ac_status" >&5 ++ echo "$as_me:12897: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + test -n "$verbose" && echo " ... found ssl library in system" 1>&6 + +-echo "${as_me-configure}:12827: testing ... found ssl library in system ..." 1>&5 ++echo "${as_me-configure}:12902: testing ... found ssl library in system ..." 1>&5 + + cf_cv_find_linkage_ssl=yes + else +@@ -12927,13 +13002,13 @@ + 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}:12930: testing ... testing $cf_cv_library_path_ssl ..." 1>&5 ++echo "${as_me-configure}:13005: 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 12936 "configure" ++#line 13011 "configure" + #include "confdefs.h" + + #include +@@ -12962,21 +13037,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:12965: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13040: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:12968: \$? = $ac_status" >&5 ++ echo "$as_me:13043: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:12971: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13046: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:12974: \$? = $ac_status" >&5 ++ echo "$as_me:13049: \$? = $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}:12979: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5 ++echo "${as_me-configure}:13054: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5 + + cf_cv_find_linkage_ssl=yes + cf_cv_library_file_ssl="-lssl" +@@ -12993,7 +13068,6 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi + done +- LIBS="$cf_save_LIBS" + CPPFLAGS="$cf_save_CPPFLAGS" + LDFLAGS="$cf_save_LDFLAGS" + fi +@@ -13008,14 +13082,17 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + ++LIBS="$cf_save_LIBS" ++ + if test "$cf_cv_find_linkage_ssl" = yes ; then + cf_cv_have_ssl=yes + else + cf_cv_have_ssl=no + fi + +- if test "$cf_cv_have_ssl" = yes ; then +- if test -n "$cf_cv_library_path_ssl" ; then ++ if test "$cf_cv_pkg_config_ssl" != yes ; then ++ if test "$cf_cv_have_ssl" = yes ; then ++ if test -n "$cf_cv_library_path_ssl" ; then + + if test -n "$cf_cv_library_path_ssl" ; then + for cf_add_libdir in $cf_cv_library_path_ssl +@@ -13036,7 +13113,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me-configure}:13039: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me-configure}:13116: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -13044,13 +13121,13 @@ + done + fi + +- fi +- LIBS="-lssl $cf_extra_ssl_libs $LIBS" +- if test -n "$cf_cv_header_path_ssl" ; then +- case $cf_cv_header_path_ssl in #(vi +- /usr/include/openssl) #(vi +- ;; +- *) ++ fi ++ LIBS="-lssl $cf_extra_ssl_libs $LIBS" ++ if test -n "$cf_cv_header_path_ssl" ; then ++ case $cf_cv_header_path_ssl in #(vi ++ /usr/include/openssl) #(vi ++ ;; ++ *) + + if test -n "$cf_cv_header_path_ssl" ; then + for cf_add_incdir in $cf_cv_header_path_ssl +@@ -13076,7 +13153,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 13079 "configure" ++#line 13156 "configure" + #include "confdefs.h" + #include + int +@@ -13088,16 +13165,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:13091: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13168: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13094: \$? = $ac_status" >&5 ++ echo "$as_me:13171: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:13097: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13174: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13100: \$? = $ac_status" >&5 ++ echo "$as_me:13177: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -13114,7 +13191,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:13117: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:13194: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -13129,8 +13206,9 @@ + done + fi + +- ;; +- esac ++ ;; ++ esac ++ fi + fi + fi + fi +@@ -13151,10 +13229,10 @@ + esac + fi + +-echo "$as_me:13154: checking for X509 support" >&5 ++echo "$as_me:13232: checking for X509 support" >&5 + echo $ECHO_N "checking for X509 support... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +-#line 13157 "configure" ++#line 13235 "configure" + #include "confdefs.h" + + #include +@@ -13178,16 +13256,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:13181: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13259: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:13184: \$? = $ac_status" >&5 ++ echo "$as_me:13262: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:13187: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13265: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13190: \$? = $ac_status" >&5 ++ echo "$as_me:13268: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_x509_support=yes + else +@@ -13196,7 +13274,7 @@ + cf_x509_support=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +-echo "$as_me:13199: result: $cf_x509_support" >&5 ++echo "$as_me:13277: result: $cf_x509_support" >&5 + echo "${ECHO_T}$cf_x509_support" >&6 + + if test "$cf_x509_support" = yes ; then +@@ -13212,6 +13290,7 @@ + if test "x$cf_cv_gnutls_compat" = xno ; then + + cf_cv_have_gnutls=no ++ cf_cv_pkg_config_ssl=no + + case "$cf_cv_use_libgnutls" in #(vi + no) #(vi +@@ -13247,7 +13326,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 13250 "configure" ++#line 13329 "configure" + #include "confdefs.h" + #include + int +@@ -13259,16 +13338,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:13262: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13341: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13265: \$? = $ac_status" >&5 ++ echo "$as_me:13344: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:13268: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13347: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13271: \$? = $ac_status" >&5 ++ echo "$as_me:13350: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -13285,7 +13364,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:13288: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:13367: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -13326,7 +13405,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 13329 "configure" ++#line 13408 "configure" + #include "confdefs.h" + #include + int +@@ -13338,16 +13417,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:13341: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13420: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13344: \$? = $ac_status" >&5 ++ echo "$as_me:13423: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:13347: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13426: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13350: \$? = $ac_status" >&5 ++ echo "$as_me:13429: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -13364,7 +13443,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:13367: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:13446: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -13380,7 +13459,7 @@ + fi + + else +-{ { echo "$as_me:13383: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5 ++{ { echo "$as_me:13462: 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 +@@ -13405,7 +13484,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me-configure}:13408: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me-configure}:13487: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -13434,7 +13513,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me-configure}:13437: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me-configure}:13516: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -13443,7 +13522,7 @@ + fi + + else +-{ { echo "$as_me:13446: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5 ++{ { echo "$as_me:13525: 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 +@@ -13461,14 +13540,15 @@ + 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}:13464: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5 ++echo "${as_me-configure}:13543: 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}:13469: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5 ++echo "${as_me-configure}:13548: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5 + + cf_cv_have_gnutls=yes ++ cf_cv_pkg_config_ssl=yes + + cf_cflags_ssl=`$PKG_CONFIG --cflags $cf_pkg_gnutls` + cf_libs_ssl=`$PKG_CONFIG --libs $cf_pkg_gnutls` +@@ -13577,14 +13657,14 @@ + esac + test -n "$verbose" && echo " adding $cf_libs_ssl to LIBS" 1>&6 + +-echo "${as_me-configure}:13580: testing adding $cf_libs_ssl to LIBS ..." 1>&5 ++echo "${as_me-configure}:13660: testing adding $cf_libs_ssl to LIBS ..." 1>&5 + + LIBS="$cf_libs_ssl $LIBS" + fi + else + test -n "$verbose" && echo " ... did not find $cf_pkg_gnutls in pkg-config" 1>&6 + +-echo "${as_me-configure}:13587: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5 ++echo "${as_me-configure}:13667: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5 + + cf_pkg_gnutls=none + fi +@@ -13604,10 +13684,12 @@ + cf_cv_header_path_gnutls= + cf_cv_library_path_gnutls= + +-echo "${as_me-configure}:13607: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5 ++echo "${as_me-configure}:13687: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5 ++ ++cf_save_LIBS="$LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 13610 "configure" ++#line 13692 "configure" + #include "confdefs.h" + + #include +@@ -13636,29 +13718,30 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:13639: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13721: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:13642: \$? = $ac_status" >&5 ++ echo "$as_me:13724: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:13645: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13727: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13648: \$? = $ac_status" >&5 ++ echo "$as_me:13730: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_gnutls=yes ++ cf_cv_header_path_gnutls=/usr/include ++ cf_cv_library_path_gnutls=/usr/lib + + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + +-cf_save_LIBS="$LIBS" + LIBS="-lgnutls -lgnutls -lgcrypt $cf_save_LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 13661 "configure" ++#line 13744 "configure" + #include "confdefs.h" + + #include +@@ -13687,33 +13770,35 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:13690: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:13773: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:13693: \$? = $ac_status" >&5 ++ echo "$as_me:13776: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:13696: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13779: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13699: \$? = $ac_status" >&5 ++ echo "$as_me:13782: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_gnutls=yes ++ cf_cv_header_path_gnutls=/usr/include ++ cf_cv_library_path_gnutls=/usr/lib + cf_cv_library_file_gnutls="-lgnutls" + + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + +- cf_cv_find_linkage_gnutls=no ++ cf_cv_find_linkage_gnutls=no + LIBS="$cf_save_LIBS" + + test -n "$verbose" && echo " find linkage for gnutls library" 1>&6 + +-echo "${as_me-configure}:13714: testing find linkage for gnutls library ..." 1>&5 ++echo "${as_me-configure}:13799: testing find linkage for gnutls library ..." 1>&5 + +-echo "${as_me-configure}:13716: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5 ++echo "${as_me-configure}:13801: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5 + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -13728,7 +13813,19 @@ + case $cf_header_path in #(vi + -I*) + cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` +- cf_header_path_list="$cf_header_path_list $cf_header_path" ++ ++test "$cf_header_path" != "NONE" && \ ++test -d "$cf_header_path" && \ ++ { ++ test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" ++ test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" ++ test -d $cf_header_path/include/gnutls && cf_search="$cf_search $cf_header_path/include/gnutls" ++ test -d $cf_header_path/include/gnutls/include && cf_search="$cf_search $cf_header_path/include/gnutls/include" ++ test -d $cf_header_path/gnutls/include && cf_search="$cf_search $cf_header_path/gnutls/include" ++ test -d $cf_header_path/gnutls/include/gnutls && cf_search="$cf_search $cf_header_path/gnutls/include/gnutls" ++} ++ ++ cf_header_path_list="$cf_header_path_list $cf_search" + ;; + esac + done +@@ -13814,11 +13911,11 @@ + 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}:13817: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5 ++echo "${as_me-configure}:13914: 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 13821 "configure" ++#line 13918 "configure" + #include "confdefs.h" + + #include +@@ -13847,21 +13944,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:13850: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:13947: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:13853: \$? = $ac_status" >&5 ++ echo "$as_me:13950: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:13856: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:13953: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:13859: \$? = $ac_status" >&5 ++ echo "$as_me:13956: \$? = $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}:13864: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5 ++echo "${as_me-configure}:13961: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5 + + cf_cv_find_linkage_gnutls=maybe + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -13879,7 +13976,7 @@ + + if test "$cf_cv_find_linkage_gnutls" = maybe ; then + +-echo "${as_me-configure}:13882: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5 ++echo "${as_me-configure}:13979: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" +@@ -13976,13 +14073,13 @@ + 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}:13979: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5 ++echo "${as_me-configure}:14076: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5 + + CPPFLAGS="$cf_test_CPPFLAGS" + LIBS="-lgnutls -lgnutls -lgcrypt $cf_save_LIBS" + LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_gnutls" + cat >conftest.$ac_ext <<_ACEOF +-#line 13985 "configure" ++#line 14082 "configure" + #include "confdefs.h" + + #include +@@ -14011,21 +14108,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:14014: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14111: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14017: \$? = $ac_status" >&5 ++ echo "$as_me:14114: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:14020: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14117: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14023: \$? = $ac_status" >&5 ++ echo "$as_me:14120: \$? = $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}:14028: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5 ++echo "${as_me-configure}:14125: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5 + + cf_cv_find_linkage_gnutls=yes + cf_cv_library_file_gnutls="-lgnutls" +@@ -14042,7 +14139,6 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi + done +- LIBS="$cf_save_LIBS" + CPPFLAGS="$cf_save_CPPFLAGS" + LDFLAGS="$cf_save_LDFLAGS" + fi +@@ -14057,6 +14153,8 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + ++LIBS="$cf_save_LIBS" ++ + if test "$cf_cv_find_linkage_gnutls" = yes ; then + cf_cv_have_gnutls=yes + else +@@ -14067,15 +14165,16 @@ + fi + + if test "$cf_cv_have_gnutls" = yes ; then +- if test -n "$cf_cv_header_path_gnutls" ; then +- cat >>confdefs.h <<\EOF ++ if test "$cf_cv_pkg_config_ssl" != yes ; then ++ if test -n "$cf_cv_header_path_gnutls" ; then ++ cat >>confdefs.h <<\EOF + #define USE_SSL 1 + EOF + +- case $cf_cv_header_path_gnutls in +- /usr/include/gnutls) +- ;; +- *) ++ case $cf_cv_header_path_gnutls in ++ /usr/include/gnutls) ++ ;; ++ *) + + if test -n "$cf_cv_header_path_gnutls" ; then + for cf_add_incdir in $cf_cv_header_path_gnutls +@@ -14101,7 +14200,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 14104 "configure" ++#line 14203 "configure" + #include "confdefs.h" + #include + int +@@ -14113,16 +14212,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:14116: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14215: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14119: \$? = $ac_status" >&5 ++ echo "$as_me:14218: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:14122: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14221: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14125: \$? = $ac_status" >&5 ++ echo "$as_me:14224: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -14139,7 +14238,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:14142: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:14241: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -14154,10 +14253,10 @@ + done + fi + +- ;; +- esac +- fi +- if test -n "$cf_cv_library_path_gnutls" ; then ++ ;; ++ esac ++ fi ++ if test -n "$cf_cv_library_path_gnutls" ; then + + if test -n "$cf_cv_library_path_gnutls" ; then + for cf_add_libdir in $cf_cv_library_path_gnutls +@@ -14178,7 +14277,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me-configure}:14181: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me-configure}:14280: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -14186,15 +14285,21 @@ + done + fi + ++ fi ++ LIBS="-lgnutls -lgcrypt $LIBS" ++ else ++ cat >>confdefs.h <<\EOF ++#define USE_SSL 1 ++EOF ++ + fi +- LIBS="-lgnutls -lgcrypt $LIBS" + + EXTRA_OBJS="$EXTRA_OBJS tidy_tls\$o" + +-echo "$as_me:14194: checking for X509 support" >&5 ++echo "$as_me:14299: checking for X509 support" >&5 + echo $ECHO_N "checking for X509 support... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +-#line 14197 "configure" ++#line 14302 "configure" + #include "confdefs.h" + + #include +@@ -14218,16 +14323,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:14221: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14326: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14224: \$? = $ac_status" >&5 ++ echo "$as_me:14329: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:14227: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14332: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14230: \$? = $ac_status" >&5 ++ echo "$as_me:14335: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_x509_support=yes + else +@@ -14236,7 +14341,7 @@ + cf_x509_support=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +-echo "$as_me:14239: result: $cf_x509_support" >&5 ++echo "$as_me:14344: result: $cf_x509_support" >&5 + echo "${ECHO_T}$cf_x509_support" >&6 + + if test "$cf_x509_support" = yes ; then +@@ -14251,6 +14356,7 @@ + else + + cf_cv_have_gnutls=no ++ cf_cv_pkg_config_ssl=no + + case "$cf_cv_use_libgnutls" in #(vi + no) #(vi +@@ -14286,7 +14392,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 14289 "configure" ++#line 14395 "configure" + #include "confdefs.h" + #include + int +@@ -14298,16 +14404,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:14301: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14407: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14304: \$? = $ac_status" >&5 ++ echo "$as_me:14410: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:14307: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14413: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14310: \$? = $ac_status" >&5 ++ echo "$as_me:14416: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -14324,7 +14430,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:14327: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:14433: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -14365,7 +14471,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 14368 "configure" ++#line 14474 "configure" + #include "confdefs.h" + #include + int +@@ -14377,16 +14483,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:14380: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:14486: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14383: \$? = $ac_status" >&5 ++ echo "$as_me:14489: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:14386: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14492: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14389: \$? = $ac_status" >&5 ++ echo "$as_me:14495: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -14403,7 +14509,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:14406: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:14512: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -14419,7 +14525,7 @@ + fi + + else +-{ { echo "$as_me:14422: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5 ++{ { echo "$as_me:14528: 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 +@@ -14444,7 +14550,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me-configure}:14447: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me-configure}:14553: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -14473,7 +14579,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me-configure}:14476: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me-configure}:14582: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -14482,7 +14588,7 @@ + fi + + else +-{ { echo "$as_me:14485: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5 ++{ { echo "$as_me:14591: 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 +@@ -14500,14 +14606,15 @@ + 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}:14503: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5 ++echo "${as_me-configure}:14609: 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}:14508: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5 ++echo "${as_me-configure}:14614: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5 + + cf_cv_have_gnutls=yes ++ cf_cv_pkg_config_ssl=yes + + cf_cflags_ssl=`$PKG_CONFIG --cflags $cf_pkg_gnutls` + cf_libs_ssl=`$PKG_CONFIG --libs $cf_pkg_gnutls` +@@ -14616,14 +14723,14 @@ + esac + test -n "$verbose" && echo " adding $cf_libs_ssl to LIBS" 1>&6 + +-echo "${as_me-configure}:14619: testing adding $cf_libs_ssl to LIBS ..." 1>&5 ++echo "${as_me-configure}:14726: testing adding $cf_libs_ssl to LIBS ..." 1>&5 + + LIBS="$cf_libs_ssl $LIBS" + fi + else + test -n "$verbose" && echo " ... did not find $cf_pkg_gnutls in pkg-config" 1>&6 + +-echo "${as_me-configure}:14626: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5 ++echo "${as_me-configure}:14733: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5 + + cf_pkg_gnutls=none + fi +@@ -14643,10 +14750,12 @@ + cf_cv_header_path_gnutls= + cf_cv_library_path_gnutls= + +-echo "${as_me-configure}:14646: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5 ++echo "${as_me-configure}:14753: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5 ++ ++cf_save_LIBS="$LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 14649 "configure" ++#line 14758 "configure" + #include "confdefs.h" + + #include +@@ -14675,29 +14784,30 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:14678: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14787: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14681: \$? = $ac_status" >&5 ++ echo "$as_me:14790: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:14684: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14793: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14687: \$? = $ac_status" >&5 ++ echo "$as_me:14796: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_gnutls=yes ++ cf_cv_header_path_gnutls=/usr/include ++ cf_cv_library_path_gnutls=/usr/lib + + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + +-cf_save_LIBS="$LIBS" + LIBS="-lgnutls -lgnutls-openssl -lgnutls-extra -lgnutls -lgcrypt $cf_save_LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 14700 "configure" ++#line 14810 "configure" + #include "confdefs.h" + + #include +@@ -14726,33 +14836,35 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:14729: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:14839: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:14732: \$? = $ac_status" >&5 ++ echo "$as_me:14842: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:14735: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:14845: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14738: \$? = $ac_status" >&5 ++ echo "$as_me:14848: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_gnutls=yes ++ cf_cv_header_path_gnutls=/usr/include ++ cf_cv_library_path_gnutls=/usr/lib + cf_cv_library_file_gnutls="-lgnutls" + + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + +- cf_cv_find_linkage_gnutls=no ++ cf_cv_find_linkage_gnutls=no + LIBS="$cf_save_LIBS" + + test -n "$verbose" && echo " find linkage for gnutls library" 1>&6 + +-echo "${as_me-configure}:14753: testing find linkage for gnutls library ..." 1>&5 ++echo "${as_me-configure}:14865: testing find linkage for gnutls library ..." 1>&5 + +-echo "${as_me-configure}:14755: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5 ++echo "${as_me-configure}:14867: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5 + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -14767,7 +14879,19 @@ + case $cf_header_path in #(vi + -I*) + cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` +- cf_header_path_list="$cf_header_path_list $cf_header_path" ++ ++test "$cf_header_path" != "NONE" && \ ++test -d "$cf_header_path" && \ ++ { ++ test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" ++ test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" ++ test -d $cf_header_path/include/gnutls && cf_search="$cf_search $cf_header_path/include/gnutls" ++ test -d $cf_header_path/include/gnutls/include && cf_search="$cf_search $cf_header_path/include/gnutls/include" ++ test -d $cf_header_path/gnutls/include && cf_search="$cf_search $cf_header_path/gnutls/include" ++ test -d $cf_header_path/gnutls/include/gnutls && cf_search="$cf_search $cf_header_path/gnutls/include/gnutls" ++} ++ ++ cf_header_path_list="$cf_header_path_list $cf_search" + ;; + esac + done +@@ -14853,11 +14977,11 @@ + 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}:14856: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5 ++echo "${as_me-configure}:14980: 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 14860 "configure" ++#line 14984 "configure" + #include "confdefs.h" + + #include +@@ -14886,21 +15010,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:14889: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15013: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:14892: \$? = $ac_status" >&5 ++ echo "$as_me:15016: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:14895: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15019: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:14898: \$? = $ac_status" >&5 ++ echo "$as_me:15022: \$? = $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}:14903: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5 ++echo "${as_me-configure}:15027: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5 + + cf_cv_find_linkage_gnutls=maybe + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -14918,7 +15042,7 @@ + + if test "$cf_cv_find_linkage_gnutls" = maybe ; then + +-echo "${as_me-configure}:14921: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5 ++echo "${as_me-configure}:15045: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" +@@ -15015,13 +15139,13 @@ + 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}:15018: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5 ++echo "${as_me-configure}:15142: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5 + + CPPFLAGS="$cf_test_CPPFLAGS" + LIBS="-lgnutls -lgnutls-openssl -lgnutls-extra -lgnutls -lgcrypt $cf_save_LIBS" + LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_gnutls" + cat >conftest.$ac_ext <<_ACEOF +-#line 15024 "configure" ++#line 15148 "configure" + #include "confdefs.h" + + #include +@@ -15050,21 +15174,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15053: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15177: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15056: \$? = $ac_status" >&5 ++ echo "$as_me:15180: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:15059: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15183: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15062: \$? = $ac_status" >&5 ++ echo "$as_me:15186: \$? = $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}:15067: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5 ++echo "${as_me-configure}:15191: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5 + + cf_cv_find_linkage_gnutls=yes + cf_cv_library_file_gnutls="-lgnutls" +@@ -15081,7 +15205,6 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi + done +- LIBS="$cf_save_LIBS" + CPPFLAGS="$cf_save_CPPFLAGS" + LDFLAGS="$cf_save_LDFLAGS" + fi +@@ -15096,6 +15219,8 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + ++LIBS="$cf_save_LIBS" ++ + if test "$cf_cv_find_linkage_gnutls" = yes ; then + cf_cv_have_gnutls=yes + else +@@ -15106,15 +15231,16 @@ + fi + + if test "$cf_cv_have_gnutls" = yes ; then +- if test -n "$cf_cv_header_path_gnutls" ; then +- cat >>confdefs.h <<\EOF ++ if test "$cf_cv_pkg_config_ssl" != yes ; then ++ if test -n "$cf_cv_header_path_gnutls" ; then ++ cat >>confdefs.h <<\EOF + #define USE_SSL 1 + EOF + +- case $cf_cv_header_path_gnutls in +- /usr/include/gnutls) +- ;; +- *) ++ case $cf_cv_header_path_gnutls in ++ /usr/include/gnutls) ++ ;; ++ *) + + if test -n "$cf_cv_header_path_gnutls" ; then + for cf_add_incdir in $cf_cv_header_path_gnutls +@@ -15140,7 +15266,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 15143 "configure" ++#line 15269 "configure" + #include "confdefs.h" + #include + int +@@ -15152,16 +15278,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:15155: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15281: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15158: \$? = $ac_status" >&5 ++ echo "$as_me:15284: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:15161: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15287: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15164: \$? = $ac_status" >&5 ++ echo "$as_me:15290: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -15178,7 +15304,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:15181: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:15307: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -15193,10 +15319,10 @@ + done + fi + +- ;; +- esac +- fi +- if test -n "$cf_cv_library_path_gnutls" ; then ++ ;; ++ esac ++ fi ++ if test -n "$cf_cv_library_path_gnutls" ; then + + if test -n "$cf_cv_library_path_gnutls" ; then + for cf_add_libdir in $cf_cv_library_path_gnutls +@@ -15217,7 +15343,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me-configure}:15220: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me-configure}:15346: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -15225,11 +15351,17 @@ + done + fi + ++ fi ++ LIBS="-lgnutls -lgcrypt $LIBS" ++ else ++ cat >>confdefs.h <<\EOF ++#define USE_SSL 1 ++EOF ++ + fi +- LIBS="-lgnutls -lgcrypt $LIBS" + + if test "$cf_pkg_gnutls" = none ; then +- echo "$as_me:15232: checking for SSL_connect in -lgnutls-openssl" >&5 ++ echo "$as_me:15364: 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 +@@ -15237,7 +15369,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgnutls-openssl $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 15240 "configure" ++#line 15372 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -15256,16 +15388,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15259: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15391: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15262: \$? = $ac_status" >&5 ++ echo "$as_me:15394: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:15265: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15397: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15268: \$? = $ac_status" >&5 ++ echo "$as_me:15400: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gnutls_openssl_SSL_connect=yes + else +@@ -15276,12 +15408,12 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:15279: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5 ++echo "$as_me:15411: 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 + LIBS="-lgnutls-openssl $LIBS" + else +- echo "$as_me:15284: checking for SSL_connect in -lgnutls-extra" >&5 ++ echo "$as_me:15416: 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 +@@ -15289,7 +15421,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgnutls-extra $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 15292 "configure" ++#line 15424 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -15308,16 +15440,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15311: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15443: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15314: \$? = $ac_status" >&5 ++ echo "$as_me:15446: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:15317: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15449: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15320: \$? = $ac_status" >&5 ++ echo "$as_me:15452: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gnutls_extra_SSL_connect=yes + else +@@ -15328,12 +15460,12 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:15331: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5 ++echo "$as_me:15463: 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 + LIBS="-lgnutls-extra $LIBS" + else +- { { echo "$as_me:15336: error: cannot find gnutls openssl functions" >&5 ++ { { echo "$as_me:15468: error: cannot find gnutls openssl functions" >&5 + echo "$as_me: error: cannot find gnutls openssl functions" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -15342,10 +15474,10 @@ + + fi + +-echo "$as_me:15345: checking for X509 support" >&5 ++echo "$as_me:15477: checking for X509 support" >&5 + echo $ECHO_N "checking for X509 support... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +-#line 15348 "configure" ++#line 15480 "configure" + #include "confdefs.h" + + #include +@@ -15369,16 +15501,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15372: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15504: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15375: \$? = $ac_status" >&5 ++ echo "$as_me:15507: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:15378: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15510: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15381: \$? = $ac_status" >&5 ++ echo "$as_me:15513: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_x509_support=yes + else +@@ -15387,7 +15519,7 @@ + cf_x509_support=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +-echo "$as_me:15390: result: $cf_x509_support" >&5 ++echo "$as_me:15522: result: $cf_x509_support" >&5 + echo "${ECHO_T}$cf_x509_support" >&6 + + if test "$cf_x509_support" = yes ; then +@@ -15419,7 +15551,7 @@ + ;; + yes) #(vi + +-echo "$as_me:15422: checking for SSL_get_version in -lnss_compat_ossl" >&5 ++echo "$as_me:15554: 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 +@@ -15427,7 +15559,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lnss_compat_ossl -lnss_compat_ossl $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 15430 "configure" ++#line 15562 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -15446,16 +15578,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15449: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15581: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15452: \$? = $ac_status" >&5 ++ echo "$as_me:15584: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:15455: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15587: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15458: \$? = $ac_status" >&5 ++ echo "$as_me:15590: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_nss_compat_ossl_SSL_get_version=yes + else +@@ -15466,7 +15598,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:15469: result: $ac_cv_lib_nss_compat_ossl_SSL_get_version" >&5 ++echo "$as_me:15601: 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 <&6 + +-echo "${as_me-configure}:15484: testing assume it is in $cf_ssl_root ..." 1>&5 ++echo "${as_me-configure}:15616: 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:15488: error: cannot find NSS compilant libraries" >&5 ++ { { echo "$as_me:15620: error: cannot find NSS compilant libraries" >&5 + echo "$as_me: error: cannot find NSS compilant libraries" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -15500,13 +15632,13 @@ + elif test -d $cf_cv_use_libnss_compat/../include ; then + cf_ssl_root=$cf_cv_use_libnss_compat/.. + else +- { { echo "$as_me:15503: error: cannot find NSS compilant library under $cf_cv_use_libnss_compat" >&5 ++ { { echo "$as_me:15635: 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:15509: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5 ++ { echo "$as_me:15641: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5 + echo "$as_me: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&2;} + fi + ;; +@@ -15600,10 +15732,10 @@ + fi + + if test "$cf_ssl_subincs" = yes ; then +-echo "$as_me:15603: checking for NSS compilant include directory" >&5 ++echo "$as_me:15735: 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 15606 "configure" ++#line 15738 "configure" + #include "confdefs.h" + + #include +@@ -15617,16 +15749,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:15620: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:15752: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:15623: \$? = $ac_status" >&5 ++ echo "$as_me:15755: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:15626: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15758: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15629: \$? = $ac_status" >&5 ++ echo "$as_me:15761: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_ssl_incl=yes + else +@@ -15635,7 +15767,7 @@ + cf_ssl_incl=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:15638: result: $cf_ssl_incl" >&5 ++echo "$as_me:15770: result: $cf_ssl_incl" >&5 + echo "${ECHO_T}$cf_ssl_incl" >&6 + test "$cf_ssl_incl" = yes && cat >>confdefs.h <<\EOF + #define USE_NSS_COMPAT_INCL 1 +@@ -15643,10 +15775,10 @@ + + fi + +-echo "$as_me:15646: checking if we can link to NSS compilant library" >&5 ++echo "$as_me:15778: 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 15649 "configure" ++#line 15781 "configure" + #include "confdefs.h" + + #include +@@ -15665,16 +15797,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15668: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:15800: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15671: \$? = $ac_status" >&5 ++ echo "$as_me:15803: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:15674: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:15806: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15677: \$? = $ac_status" >&5 ++ echo "$as_me:15809: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_ssl_library=yes + else +@@ -15683,7 +15815,7 @@ + cf_ssl_library=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +-echo "$as_me:15686: result: $cf_ssl_library" >&5 ++echo "$as_me:15818: result: $cf_ssl_library" >&5 + echo "${ECHO_T}$cf_ssl_library" >&6 + if test "$cf_ssl_library" = yes ; then + cat >>confdefs.h <<\EOF +@@ -15695,7 +15827,7 @@ + EOF + + else +- { { echo "$as_me:15698: error: Cannot link with NSS compilant libraries" >&5 ++ { { echo "$as_me:15830: error: Cannot link with NSS compilant libraries" >&5 + echo "$as_me: error: Cannot link with NSS compilant libraries" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -15703,7 +15835,7 @@ + fi + + ### check for ipv6 support +-echo "$as_me:15706: checking whether to enable ipv6" >&5 ++echo "$as_me:15838: 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. +@@ -15719,11 +15851,11 @@ + else + enableval=no + fi; +-echo "$as_me:15722: result: $enableval" >&5 ++echo "$as_me:15854: result: $enableval" >&5 + echo "${ECHO_T}$enableval" >&6 + if test "$enableval" = "yes"; then + +-echo "$as_me:15726: checking ipv6 stack type" >&5 ++echo "$as_me:15858: 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 +@@ -15744,7 +15876,7 @@ + ;; + inria) #(vi + cat >conftest.$ac_ext <<_ACEOF +-#line 15747 "configure" ++#line 15879 "configure" + #include "confdefs.h" + + #include +@@ -15761,7 +15893,7 @@ + ;; + kame) #(vi + cat >conftest.$ac_ext <<_ACEOF +-#line 15764 "configure" ++#line 15896 "configure" + #include "confdefs.h" + + #include +@@ -15778,7 +15910,7 @@ + ;; + linux-glibc) #(vi + cat >conftest.$ac_ext <<_ACEOF +-#line 15781 "configure" ++#line 15913 "configure" + #include "confdefs.h" + + #include +@@ -15804,7 +15936,7 @@ + ;; + toshiba) #(vi + cat >conftest.$ac_ext <<_ACEOF +-#line 15807 "configure" ++#line 15939 "configure" + #include "confdefs.h" + + #include +@@ -15821,7 +15953,7 @@ + ;; + v6d) #(vi + cat >conftest.$ac_ext <<_ACEOF +-#line 15824 "configure" ++#line 15956 "configure" + #include "confdefs.h" + + #include +@@ -15838,7 +15970,7 @@ + ;; + zeta) + cat >conftest.$ac_ext <<_ACEOF +-#line 15841 "configure" ++#line 15973 "configure" + #include "confdefs.h" + + #include +@@ -15860,13 +15992,13 @@ + done + + fi +-echo "$as_me:15863: result: $cf_cv_ipv6type" >&5 ++echo "$as_me:15995: result: $cf_cv_ipv6type" >&5 + echo "${ECHO_T}$cf_cv_ipv6type" >&6 + + cf_ipv6lib=none + cf_ipv6dir=none + +-echo "$as_me:15869: checking for IPv6 library if required" >&5 ++echo "$as_me:16001: checking for IPv6 library if required" >&5 + echo $ECHO_N "checking for IPv6 library if required... $ECHO_C" >&6 + case $cf_cv_ipv6type in #(vi + solaris) #(vi +@@ -15896,13 +16028,13 @@ + cf_ipv6dir=v6 + ;; + esac +-echo "$as_me:15899: result: $cf_ipv6lib" >&5 ++echo "$as_me:16031: result: $cf_ipv6lib" >&5 + echo "${ECHO_T}$cf_ipv6lib" >&6 + + if test "$cf_ipv6lib" != "none"; then + + cat >conftest.$ac_ext <<_ACEOF +-#line 15905 "configure" ++#line 16037 "configure" + #include "confdefs.h" + + #include +@@ -15918,16 +16050,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:15921: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16053: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:15924: \$? = $ac_status" >&5 ++ echo "$as_me:16056: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:15927: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16059: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:15930: \$? = $ac_status" >&5 ++ echo "$as_me:16062: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -15944,7 +16076,19 @@ + case $cf_header_path in #(vi + -I*) + cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` +- cf_header_path_list="$cf_header_path_list $cf_header_path" ++ ++test "$cf_header_path" != "NONE" && \ ++test -d "$cf_header_path" && \ ++ { ++ test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" ++ test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" ++ test -d $cf_header_path/include/$cf_ipv6dir && cf_search="$cf_search $cf_header_path/include/$cf_ipv6dir" ++ test -d $cf_header_path/include/$cf_ipv6dir/include && cf_search="$cf_search $cf_header_path/include/$cf_ipv6dir/include" ++ test -d $cf_header_path/$cf_ipv6dir/include && cf_search="$cf_search $cf_header_path/$cf_ipv6dir/include" ++ test -d $cf_header_path/$cf_ipv6dir/include/$cf_ipv6dir && cf_search="$cf_search $cf_header_path/$cf_ipv6dir/include/$cf_ipv6dir" ++} ++ ++ cf_header_path_list="$cf_header_path_list $cf_search" + ;; + esac + done +@@ -16055,7 +16199,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 16058 "configure" ++#line 16202 "configure" + #include "confdefs.h" + #include + int +@@ -16067,16 +16211,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:16070: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16214: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16073: \$? = $ac_status" >&5 ++ echo "$as_me:16217: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:16076: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16220: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16079: \$? = $ac_status" >&5 ++ echo "$as_me:16223: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -16093,7 +16237,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:16096: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:16240: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -16119,13 +16263,13 @@ + + eval 'cf_cv_have_lib_'$cf_ipv6lib'=no' + cf_libdir="" +- echo "$as_me:16122: checking for getaddrinfo" >&5 ++ echo "$as_me:16266: 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 16128 "configure" ++#line 16272 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char getaddrinfo (); below. */ +@@ -16156,16 +16300,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:16159: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16303: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16162: \$? = $ac_status" >&5 ++ echo "$as_me:16306: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:16165: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16309: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16168: \$? = $ac_status" >&5 ++ echo "$as_me:16312: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_getaddrinfo=yes + else +@@ -16175,18 +16319,18 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:16178: result: $ac_cv_func_getaddrinfo" >&5 ++echo "$as_me:16322: 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:16185: checking for getaddrinfo in -l$cf_ipv6lib" >&5 ++ echo "$as_me:16329: 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 16189 "configure" ++#line 16333 "configure" + #include "confdefs.h" + + #include +@@ -16202,25 +16346,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:16205: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16349: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16208: \$? = $ac_status" >&5 ++ echo "$as_me:16352: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:16211: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16355: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16214: \$? = $ac_status" >&5 ++ echo "$as_me:16358: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:16216: result: yes" >&5 ++ echo "$as_me:16360: 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:16223: result: no" >&5 ++echo "$as_me:16367: result: no" >&5 + echo "${ECHO_T}no" >&6 + + cf_search= +@@ -16310,11 +16454,11 @@ + + for cf_libdir in $cf_search + do +- echo "$as_me:16313: checking for -l$cf_ipv6lib in $cf_libdir" >&5 ++ echo "$as_me:16457: 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 16317 "configure" ++#line 16461 "configure" + #include "confdefs.h" + + #include +@@ -16330,25 +16474,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:16333: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16477: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16336: \$? = $ac_status" >&5 ++ echo "$as_me:16480: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:16339: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16483: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16342: \$? = $ac_status" >&5 ++ echo "$as_me:16486: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:16344: result: yes" >&5 ++ echo "$as_me:16488: 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:16351: result: no" >&5 ++echo "$as_me:16495: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" + fi +@@ -16363,7 +16507,7 @@ + eval 'cf_found_library=$cf_cv_have_lib_'$cf_ipv6lib + + if test $cf_found_library = no ; then +- { { echo "$as_me:16366: error: No $cf_ipv6lib library found, cannot continue. You must fetch lib$cf_ipv6lib.a ++ { { echo "$as_me:16510: 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;} +@@ -16371,7 +16515,7 @@ + fi + fi + +-echo "$as_me:16374: checking working getaddrinfo" >&5 ++echo "$as_me:16518: 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 +@@ -16381,7 +16525,7 @@ + cf_cv_getaddrinfo=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 16384 "configure" ++#line 16528 "configure" + #include "confdefs.h" + + #include +@@ -16461,15 +16605,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:16464: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:16608: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16467: \$? = $ac_status" >&5 ++ echo "$as_me:16611: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:16469: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16613: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16472: \$? = $ac_status" >&5 ++ echo "$as_me:16616: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_getaddrinfo=yes + else +@@ -16482,7 +16626,7 @@ + fi + + fi +-echo "$as_me:16485: result: $cf_cv_getaddrinfo" >&5 ++echo "$as_me:16629: result: $cf_cv_getaddrinfo" >&5 + echo "${ECHO_T}$cf_cv_getaddrinfo" >&6 + if test "$cf_cv_getaddrinfo" = yes ; then + cat >>confdefs.h <<\EOF +@@ -16497,12 +16641,12 @@ + + if test "$cf_cv_getaddrinfo" != "yes"; then + if test "$cf_cv_ipv6type" != "linux"; then +- { echo "$as_me:16500: WARNING: You must get working getaddrinfo() function, ++ { echo "$as_me:16644: 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:16505: WARNING: The getaddrinfo() implementation on your system seems be buggy. ++ { echo "$as_me:16649: 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. +@@ -16513,7 +16657,7 @@ + + fi + +-echo "$as_me:16516: checking for screen type" >&5 ++echo "$as_me:16660: 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 +@@ -16527,7 +16671,7 @@ + curses|ncurses|ncursesw|pdcurses|slang) + cf_cv_screen=$withval + ;; +-*) { { echo "$as_me:16530: error: Unexpected value" >&5 ++*) { { echo "$as_me:16674: error: Unexpected value" >&5 + echo "$as_me: error: Unexpected value" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -16536,7 +16680,7 @@ + cf_cv_screen=curses + fi; + fi +-echo "$as_me:16539: result: $cf_cv_screen" >&5 ++echo "$as_me:16683: result: $cf_cv_screen" >&5 + echo "${ECHO_T}$cf_cv_screen" >&6 + + case $cf_cv_screen in +@@ -16571,7 +16715,7 @@ + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + *) +- { { echo "$as_me:16574: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:16718: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -16590,7 +16734,7 @@ + case $cf_cv_screen in + curses) + +-echo "$as_me:16593: checking for extra include directories" >&5 ++echo "$as_me:16737: 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 +@@ -16610,11 +16754,11 @@ + esac + + fi +-echo "$as_me:16613: result: $cf_cv_curses_incdir" >&5 ++echo "$as_me:16757: 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:16617: checking if we have identified curses headers" >&5 ++echo "$as_me:16761: 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 +@@ -16628,7 +16772,7 @@ + ncurses/ncurses.h + do + cat >conftest.$ac_ext <<_ACEOF +-#line 16631 "configure" ++#line 16775 "configure" + #include "confdefs.h" + #include <${cf_header}> + int +@@ -16640,16 +16784,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:16643: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16787: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16646: \$? = $ac_status" >&5 ++ echo "$as_me:16790: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:16649: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16793: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16652: \$? = $ac_status" >&5 ++ echo "$as_me:16796: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_header=$cf_header; break + else +@@ -16660,11 +16804,11 @@ + done + + fi +-echo "$as_me:16663: result: $cf_cv_ncurses_header" >&5 ++echo "$as_me:16807: 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:16667: error: No curses header-files found" >&5 ++ { { echo "$as_me:16811: error: No curses header-files found" >&5 + echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -16674,23 +16818,23 @@ + for ac_header in $cf_cv_ncurses_header + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:16677: checking for $ac_header" >&5 ++echo "$as_me:16821: 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 16683 "configure" ++#line 16827 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:16687: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:16831: \"$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:16693: \$? = $ac_status" >&5 ++ echo "$as_me:16837: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -16709,7 +16853,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:16712: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:16856: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:16866: 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 +@@ -16737,7 +16881,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >conftest.$ac_ext <<_ACEOF +-#line 16740 "configure" ++#line 16884 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header-curses.h}> +@@ -16752,16 +16896,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:16755: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:16899: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:16758: \$? = $ac_status" >&5 ++ echo "$as_me:16902: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:16761: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:16905: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16764: \$? = $ac_status" >&5 ++ echo "$as_me:16908: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_term_header="$cf_test" +@@ -16777,7 +16921,7 @@ + done + + fi +-echo "$as_me:16780: result: $cf_cv_term_header" >&5 ++echo "$as_me:16924: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -16806,7 +16950,7 @@ + ;; + esac + +-echo "$as_me:16809: checking for ncurses version" >&5 ++echo "$as_me:16953: 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 +@@ -16832,10 +16976,10 @@ + #endif + EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" +- { (eval echo "$as_me:16835: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:16979: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:16838: \$? = $ac_status" >&5 ++ echo "$as_me:16982: \$? = $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%".*%%'` +@@ -16845,7 +16989,7 @@ + + else + cat >conftest.$ac_ext <<_ACEOF +-#line 16848 "configure" ++#line 16992 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header-curses.h}> +@@ -16870,15 +17014,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:16873: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17017: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16876: \$? = $ac_status" >&5 ++ echo "$as_me:17020: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:16878: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17022: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16881: \$? = $ac_status" >&5 ++ echo "$as_me:17025: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_ncurses_version=`cat $cf_tempfile` +@@ -16892,16 +17036,16 @@ + rm -f $cf_tempfile + + fi +-echo "$as_me:16895: result: $cf_cv_ncurses_version" >&5 ++echo "$as_me:17039: 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:16901: checking if we have identified curses libraries" >&5 ++echo "$as_me:17045: 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 16904 "configure" ++#line 17048 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header-curses.h}> + int +@@ -16913,16 +17057,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:16916: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17060: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16919: \$? = $ac_status" >&5 ++ echo "$as_me:17063: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:16922: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17066: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16925: \$? = $ac_status" >&5 ++ echo "$as_me:17069: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -16931,13 +17075,13 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +-echo "$as_me:16934: result: $cf_result" >&5 ++echo "$as_me:17078: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + + if test "$cf_result" = no ; then + case $host_os in #(vi + freebsd*) #(vi +- echo "$as_me:16940: checking for tgoto in -lmytinfo" >&5 ++ echo "$as_me:17084: 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 +@@ -16945,7 +17089,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmytinfo $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 16948 "configure" ++#line 17092 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -16964,16 +17108,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:16967: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17111: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:16970: \$? = $ac_status" >&5 ++ echo "$as_me:17114: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:16973: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17117: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:16976: \$? = $ac_status" >&5 ++ echo "$as_me:17120: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_mytinfo_tgoto=yes + else +@@ -16984,7 +17128,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:16987: result: $ac_cv_lib_mytinfo_tgoto" >&5 ++echo "$as_me:17131: 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 + LIBS="-lmytinfo $LIBS" +@@ -16992,7 +17136,7 @@ + + ;; + hpux10.*) #(vi +- echo "$as_me:16995: checking for initscr in -lcur_colr" >&5 ++ echo "$as_me:17139: 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 +@@ -17000,7 +17144,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lcur_colr $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 17003 "configure" ++#line 17147 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -17019,16 +17163,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17022: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17166: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17025: \$? = $ac_status" >&5 ++ echo "$as_me:17169: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17028: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17172: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17031: \$? = $ac_status" >&5 ++ echo "$as_me:17175: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_cur_colr_initscr=yes + else +@@ -17039,7 +17183,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:17042: result: $ac_cv_lib_cur_colr_initscr" >&5 ++echo "$as_me:17186: 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 + +@@ -17048,7 +17192,7 @@ + + else + +- echo "$as_me:17051: checking for initscr in -lHcurses" >&5 ++ echo "$as_me:17195: 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 +@@ -17056,7 +17200,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lHcurses $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 17059 "configure" ++#line 17203 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -17075,16 +17219,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17078: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17222: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17081: \$? = $ac_status" >&5 ++ echo "$as_me:17225: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17084: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17228: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17087: \$? = $ac_status" >&5 ++ echo "$as_me:17231: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_Hcurses_initscr=yes + else +@@ -17095,7 +17239,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:17098: result: $ac_cv_lib_Hcurses_initscr" >&5 ++echo "$as_me:17242: 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 + +@@ -17130,7 +17274,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me-configure}:17133: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me-configure}:17277: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -17161,7 +17305,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me-configure}:17164: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me-configure}:17308: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -17189,13 +17333,13 @@ + + # Check for library containing tgoto. Do this before curses library + # because it may be needed to link the test-case for initscr. +- echo "$as_me:17192: checking for tgoto" >&5 ++ echo "$as_me:17336: 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 17198 "configure" ++#line 17342 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char tgoto (); below. */ +@@ -17226,16 +17370,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17229: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17373: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17232: \$? = $ac_status" >&5 ++ echo "$as_me:17376: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17235: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17379: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17238: \$? = $ac_status" >&5 ++ echo "$as_me:17382: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_tgoto=yes + else +@@ -17245,7 +17389,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:17248: result: $ac_cv_func_tgoto" >&5 ++echo "$as_me:17392: 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 +@@ -17254,7 +17398,7 @@ + for cf_term_lib in $cf_check_list termcap termlib unknown + do + as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh` +-echo "$as_me:17257: checking for tgoto in -l$cf_term_lib" >&5 ++echo "$as_me:17401: 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 +@@ -17262,7 +17406,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$cf_term_lib $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 17265 "configure" ++#line 17409 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -17281,16 +17425,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17284: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17428: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17287: \$? = $ac_status" >&5 ++ echo "$as_me:17431: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17290: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17434: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17293: \$? = $ac_status" >&5 ++ echo "$as_me:17437: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Lib=yes" + else +@@ -17301,7 +17445,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:17304: result: `eval echo '${'$as_ac_Lib'}'`" >&5 ++echo "$as_me:17448: 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 +@@ -17316,7 +17460,7 @@ + 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:17319: checking for initscr in -l$cf_curs_lib" >&5 ++echo "$as_me:17463: 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 +@@ -17324,7 +17468,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-l$cf_curs_lib $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 17327 "configure" ++#line 17471 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -17343,16 +17487,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17346: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17490: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17349: \$? = $ac_status" >&5 ++ echo "$as_me:17493: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17352: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17496: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17355: \$? = $ac_status" >&5 ++ echo "$as_me:17499: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Lib=yes" + else +@@ -17363,23 +17507,23 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:17366: result: `eval echo '${'$as_ac_Lib'}'`" >&5 ++echo "$as_me:17510: 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 + fi + + done +- test $cf_curs_lib = unknown && { { echo "$as_me:17373: error: no curses library found" >&5 ++ test $cf_curs_lib = unknown && { { echo "$as_me:17517: 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:17379: checking if we can link with $cf_curs_lib library" >&5 ++ echo "$as_me:17523: 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 17382 "configure" ++#line 17526 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header-curses.h}> + int +@@ -17391,16 +17535,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17394: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17538: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17397: \$? = $ac_status" >&5 ++ echo "$as_me:17541: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17400: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17544: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17403: \$? = $ac_status" >&5 ++ echo "$as_me:17547: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -17409,18 +17553,18 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- echo "$as_me:17412: result: $cf_result" >&5 ++ echo "$as_me:17556: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 +- test $cf_result = no && { { echo "$as_me:17414: error: Cannot link curses library" >&5 ++ test $cf_result = no && { { echo "$as_me:17558: 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:17420: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 ++ echo "$as_me:17564: 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 17423 "configure" ++#line 17567 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header-curses.h}> + int +@@ -17432,16 +17576,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17435: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17579: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17438: \$? = $ac_status" >&5 ++ echo "$as_me:17582: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17441: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17585: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17444: \$? = $ac_status" >&5 ++ echo "$as_me:17588: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=no + else +@@ -17450,7 +17594,7 @@ + + LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 17453 "configure" ++#line 17597 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header-curses.h}> + int +@@ -17462,16 +17606,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17465: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17609: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17468: \$? = $ac_status" >&5 ++ echo "$as_me:17612: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17471: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17615: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17474: \$? = $ac_status" >&5 ++ echo "$as_me:17618: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -17483,13 +17627,13 @@ + + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- echo "$as_me:17486: result: $cf_result" >&5 ++ echo "$as_me:17630: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + fi + fi + fi + +-echo "$as_me:17492: checking for curses performance tradeoff" >&5 ++echo "$as_me:17636: 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 +@@ -17497,7 +17641,7 @@ + + cf_cv_curs_performance=no + cat >conftest.$ac_ext <<_ACEOF +-#line 17500 "configure" ++#line 17644 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header-curses.h}> +@@ -17516,20 +17660,20 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:17519: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17663: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17522: \$? = $ac_status" >&5 ++ echo "$as_me:17666: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:17525: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17669: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17528: \$? = $ac_status" >&5 ++ echo "$as_me:17672: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cat >conftest.$ac_ext <<_ACEOF +-#line 17532 "configure" ++#line 17676 "configure" + #include "confdefs.h" + + #define CURS_PERFORMANCE +@@ -17549,16 +17693,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:17552: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17696: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17555: \$? = $ac_status" >&5 ++ echo "$as_me:17699: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:17558: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17702: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17561: \$? = $ac_status" >&5 ++ echo "$as_me:17705: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_curs_performance=yes + else +@@ -17573,20 +17717,20 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + fi + +-echo "$as_me:17576: result: $cf_cv_curs_performance" >&5 ++echo "$as_me:17720: 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:17582: checking for curses touchline function" >&5 ++echo "$as_me:17726: 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 17589 "configure" ++#line 17733 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header-curses.h}> +@@ -17599,23 +17743,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17602: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17746: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17605: \$? = $ac_status" >&5 ++ echo "$as_me:17749: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17608: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17752: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17611: \$? = $ac_status" >&5 ++ echo "$as_me:17755: \$? = $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 17618 "configure" ++#line 17762 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header-curses.h}> +@@ -17628,16 +17772,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:17631: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:17775: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:17634: \$? = $ac_status" >&5 ++ echo "$as_me:17778: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:17637: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17781: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17640: \$? = $ac_status" >&5 ++ echo "$as_me:17784: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_curs_touchline=sysv + else +@@ -17649,7 +17793,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:17652: result: $cf_cv_curs_touchline" >&5 ++echo "$as_me:17796: result: $cf_cv_curs_touchline" >&5 + echo "${ECHO_T}$cf_cv_curs_touchline" >&6 + case "$cf_cv_curs_touchline" in #(vi + bsd) #(vi +@@ -17676,7 +17820,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:17679: checking for $ac_word" >&5 ++echo "$as_me:17823: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -17693,7 +17837,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word" +- echo "$as_me:17696: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:17840: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -17704,10 +17848,10 @@ + NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG + + if test -n "$NCURSES_CONFIG"; then +- echo "$as_me:17707: result: $NCURSES_CONFIG" >&5 ++ echo "$as_me:17851: result: $NCURSES_CONFIG" >&5 + echo "${ECHO_T}$NCURSES_CONFIG" >&6 + else +- echo "$as_me:17710: result: no" >&5 ++ echo "$as_me:17854: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -17765,7 +17909,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 17768 "configure" ++#line 17912 "configure" + #include "confdefs.h" + #include + int +@@ -17777,16 +17921,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:17780: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:17924: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17783: \$? = $ac_status" >&5 ++ echo "$as_me:17927: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:17786: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:17930: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17789: \$? = $ac_status" >&5 ++ echo "$as_me:17933: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -17803,7 +17947,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:17806: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:17950: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -17820,7 +17964,7 @@ + + } + +-echo "$as_me:17823: checking for $cf_ncuhdr_root header in include-path" >&5 ++echo "$as_me:17967: 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 +@@ -17832,7 +17976,7 @@ + do + + cat >conftest.$ac_ext <<_ACEOF +-#line 17835 "configure" ++#line 17979 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -17856,16 +18000,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:17859: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18003: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:17862: \$? = $ac_status" >&5 ++ echo "$as_me:18006: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:17865: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18009: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:17868: \$? = $ac_status" >&5 ++ echo "$as_me:18012: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_h=$cf_header + +@@ -17880,14 +18024,14 @@ + done + + fi +-echo "$as_me:17883: result: $cf_cv_ncurses_h" >&5 ++echo "$as_me:18027: 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:17890: checking for $cf_ncuhdr_root include-path" >&5 ++echo "$as_me:18034: 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 +@@ -17905,7 +18049,19 @@ + case $cf_header_path in #(vi + -I*) + cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` +- cf_header_path_list="$cf_header_path_list $cf_header_path" ++ ++test "$cf_header_path" != "NONE" && \ ++test -d "$cf_header_path" && \ ++ { ++ test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" ++ test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" ++ test -d $cf_header_path/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root" ++ test -d $cf_header_path/include/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root/include" ++ test -d $cf_header_path/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include" ++ test -d $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root" ++} ++ ++ cf_header_path_list="$cf_header_path_list $cf_search" + ;; + esac + done +@@ -18015,7 +18171,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 18018 "configure" ++#line 18174 "configure" + #include "confdefs.h" + #include + int +@@ -18027,16 +18183,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:18030: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18186: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18033: \$? = $ac_status" >&5 ++ echo "$as_me:18189: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:18036: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18192: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18039: \$? = $ac_status" >&5 ++ echo "$as_me:18195: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -18053,7 +18209,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:18056: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:18212: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -18074,7 +18230,7 @@ + do + + cat >conftest.$ac_ext <<_ACEOF +-#line 18077 "configure" ++#line 18233 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -18098,16 +18254,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:18101: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18257: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18104: \$? = $ac_status" >&5 ++ echo "$as_me:18260: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:18107: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18263: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18110: \$? = $ac_status" >&5 ++ echo "$as_me:18266: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_h2=$cf_header + +@@ -18128,12 +18284,12 @@ + CPPFLAGS="$cf_save2_CPPFLAGS" + test "$cf_cv_ncurses_h2" != no && break + done +- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:18131: error: not found" >&5 ++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:18287: error: not found" >&5 + echo "$as_me: error: not found" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:18136: result: $cf_cv_ncurses_h2" >&5 ++echo "$as_me:18292: 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%/[^/]*$%%'` +@@ -18166,7 +18322,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 18169 "configure" ++#line 18325 "configure" + #include "confdefs.h" + #include + int +@@ -18178,16 +18334,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:18181: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18337: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18184: \$? = $ac_status" >&5 ++ echo "$as_me:18340: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:18187: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18343: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18190: \$? = $ac_status" >&5 ++ echo "$as_me:18346: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -18204,7 +18360,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:18207: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:18363: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -18247,7 +18403,7 @@ + ;; + esac + +-echo "$as_me:18250: checking for terminfo header" >&5 ++echo "$as_me:18406: 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 +@@ -18265,7 +18421,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >conftest.$ac_ext <<_ACEOF +-#line 18268 "configure" ++#line 18424 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header-curses.h}> +@@ -18280,16 +18436,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:18283: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:18439: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:18286: \$? = $ac_status" >&5 ++ echo "$as_me:18442: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:18289: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18445: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18292: \$? = $ac_status" >&5 ++ echo "$as_me:18448: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_term_header="$cf_test" +@@ -18305,7 +18461,7 @@ + done + + fi +-echo "$as_me:18308: result: $cf_cv_term_header" >&5 ++echo "$as_me:18464: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -18339,7 +18495,7 @@ + #define NCURSES 1 + EOF + +-echo "$as_me:18342: checking for ncurses version" >&5 ++echo "$as_me:18498: 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 +@@ -18365,10 +18521,10 @@ + #endif + EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" +- { (eval echo "$as_me:18368: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:18524: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:18371: \$? = $ac_status" >&5 ++ echo "$as_me:18527: \$? = $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%".*%%'` +@@ -18378,7 +18534,7 @@ + + else + cat >conftest.$ac_ext <<_ACEOF +-#line 18381 "configure" ++#line 18537 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header-curses.h}> +@@ -18403,15 +18559,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:18406: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18562: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18409: \$? = $ac_status" >&5 ++ echo "$as_me:18565: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:18411: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18567: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18414: \$? = $ac_status" >&5 ++ echo "$as_me:18570: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_ncurses_version=`cat $cf_tempfile` +@@ -18425,7 +18581,7 @@ + rm -f $cf_tempfile + + fi +-echo "$as_me:18428: result: $cf_cv_ncurses_version" >&5 ++echo "$as_me:18584: 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 +@@ -18437,7 +18593,7 @@ + # to link gpm. + cf_ncurses_LIBS="" + cf_ncurses_SAVE="$LIBS" +-echo "$as_me:18440: checking for Gpm_Open in -lgpm" >&5 ++echo "$as_me:18596: 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 +@@ -18445,7 +18601,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 18448 "configure" ++#line 18604 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -18464,16 +18620,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18467: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18623: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18470: \$? = $ac_status" >&5 ++ echo "$as_me:18626: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18473: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18629: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18476: \$? = $ac_status" >&5 ++ echo "$as_me:18632: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes + else +@@ -18484,10 +18640,10 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:18487: result: $ac_cv_lib_gpm_Gpm_Open" >&5 ++echo "$as_me:18643: 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:18490: checking for initscr in -lgpm" >&5 ++ echo "$as_me:18646: 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 +@@ -18495,7 +18651,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 18498 "configure" ++#line 18654 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -18514,16 +18670,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18517: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18673: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18520: \$? = $ac_status" >&5 ++ echo "$as_me:18676: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18523: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18679: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18526: \$? = $ac_status" >&5 ++ echo "$as_me:18682: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_initscr=yes + else +@@ -18534,7 +18690,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:18537: result: $ac_cv_lib_gpm_initscr" >&5 ++echo "$as_me:18693: 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" +@@ -18549,7 +18705,7 @@ + # 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:18552: checking for tgoto in -lmytinfo" >&5 ++ echo "$as_me:18708: 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 +@@ -18557,7 +18713,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmytinfo $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 18560 "configure" ++#line 18716 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -18576,16 +18732,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18579: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18735: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18582: \$? = $ac_status" >&5 ++ echo "$as_me:18738: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18585: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18741: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18588: \$? = $ac_status" >&5 ++ echo "$as_me:18744: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_mytinfo_tgoto=yes + else +@@ -18596,7 +18752,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:18599: result: $ac_cv_lib_mytinfo_tgoto" >&5 ++echo "$as_me:18755: 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" +@@ -18630,7 +18786,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me-configure}:18633: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me-configure}:18789: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -18643,13 +18799,13 @@ + + eval 'cf_cv_have_lib_'$cf_nculib_root'=no' + cf_libdir="" +- echo "$as_me:18646: checking for initscr" >&5 ++ echo "$as_me:18802: 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 18652 "configure" ++#line 18808 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char initscr (); below. */ +@@ -18680,16 +18836,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18683: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18839: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18686: \$? = $ac_status" >&5 ++ echo "$as_me:18842: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18689: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18845: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18692: \$? = $ac_status" >&5 ++ echo "$as_me:18848: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_initscr=yes + else +@@ -18699,18 +18855,18 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:18702: result: $ac_cv_func_initscr" >&5 ++echo "$as_me:18858: 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:18709: checking for initscr in -l$cf_nculib_root" >&5 ++ echo "$as_me:18865: 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 18713 "configure" ++#line 18869 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header-curses.h}> + int +@@ -18722,25 +18878,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18725: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:18881: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18728: \$? = $ac_status" >&5 ++ echo "$as_me:18884: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18731: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:18887: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18734: \$? = $ac_status" >&5 ++ echo "$as_me:18890: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:18736: result: yes" >&5 ++ echo "$as_me:18892: 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:18743: result: no" >&5 ++echo "$as_me:18899: result: no" >&5 + echo "${ECHO_T}no" >&6 + + cf_search= +@@ -18830,11 +18986,11 @@ + + for cf_libdir in $cf_search + do +- echo "$as_me:18833: checking for -l$cf_nculib_root in $cf_libdir" >&5 ++ echo "$as_me:18989: 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 18837 "configure" ++#line 18993 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header-curses.h}> + int +@@ -18846,25 +19002,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18849: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19005: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18852: \$? = $ac_status" >&5 ++ echo "$as_me:19008: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18855: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19011: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18858: \$? = $ac_status" >&5 ++ echo "$as_me:19014: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:18860: result: yes" >&5 ++ echo "$as_me:19016: 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:18867: result: no" >&5 ++echo "$as_me:19023: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" + fi +@@ -18879,7 +19035,7 @@ + eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root + + if test $cf_found_library = no ; then +- { { echo "$as_me:18882: error: Cannot link $cf_nculib_root library" >&5 ++ { { echo "$as_me:19038: error: Cannot link $cf_nculib_root library" >&5 + echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -18887,7 +19043,7 @@ + fi + + if test -n "$cf_ncurses_LIBS" ; then +- echo "$as_me:18890: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 ++ echo "$as_me:19046: 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 +@@ -18897,7 +19053,7 @@ + fi + done + cat >conftest.$ac_ext <<_ACEOF +-#line 18900 "configure" ++#line 19056 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header-curses.h}> + int +@@ -18909,23 +19065,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18912: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19068: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18915: \$? = $ac_status" >&5 ++ echo "$as_me:19071: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18918: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19074: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18921: \$? = $ac_status" >&5 ++ echo "$as_me:19077: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:18923: result: yes" >&5 ++ echo "$as_me:19079: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-echo "$as_me:18928: result: no" >&5 ++echo "$as_me:19084: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_ncurses_SAVE" + fi +@@ -18943,7 +19099,7 @@ + ;; + ncursesw) + +-echo "$as_me:18946: checking for multibyte character support" >&5 ++echo "$as_me:19102: 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 +@@ -18951,7 +19107,7 @@ + + cf_save_LIBS="$LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 18954 "configure" ++#line 19110 "configure" + #include "confdefs.h" + + #include +@@ -18964,16 +19120,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:18967: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19123: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:18970: \$? = $ac_status" >&5 ++ echo "$as_me:19126: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:18973: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19129: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:18976: \$? = $ac_status" >&5 ++ echo "$as_me:19132: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_utf8_lib=yes + else +@@ -18985,10 +19141,12 @@ + cf_cv_header_path_utf8= + cf_cv_library_path_utf8= + +-echo "${as_me-configure}:18988: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me-configure}:19144: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 ++ ++cf_save_LIBS="$LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 18991 "configure" ++#line 19149 "configure" + #include "confdefs.h" + + #include +@@ -19001,29 +19159,30 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:19004: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19162: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19007: \$? = $ac_status" >&5 ++ echo "$as_me:19165: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:19010: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19168: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19013: \$? = $ac_status" >&5 ++ echo "$as_me:19171: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_utf8=yes ++ cf_cv_header_path_utf8=/usr/include ++ cf_cv_library_path_utf8=/usr/lib + + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + +-cf_save_LIBS="$LIBS" + LIBS="-lutf8 $cf_save_LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 19026 "configure" ++#line 19185 "configure" + #include "confdefs.h" + + #include +@@ -19036,33 +19195,35 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:19039: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19198: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19042: \$? = $ac_status" >&5 ++ echo "$as_me:19201: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:19045: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19204: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19048: \$? = $ac_status" >&5 ++ echo "$as_me:19207: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_utf8=yes ++ cf_cv_header_path_utf8=/usr/include ++ cf_cv_library_path_utf8=/usr/lib + cf_cv_library_file_utf8="-lutf8" + + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + +- cf_cv_find_linkage_utf8=no ++ cf_cv_find_linkage_utf8=no + LIBS="$cf_save_LIBS" + + test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 + +-echo "${as_me-configure}:19063: testing find linkage for utf8 library ..." 1>&5 ++echo "${as_me-configure}:19224: testing find linkage for utf8 library ..." 1>&5 + +-echo "${as_me-configure}:19065: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me-configure}:19226: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -19077,7 +19238,19 @@ + case $cf_header_path in #(vi + -I*) + cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` +- cf_header_path_list="$cf_header_path_list $cf_header_path" ++ ++test "$cf_header_path" != "NONE" && \ ++test -d "$cf_header_path" && \ ++ { ++ test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" ++ test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" ++ test -d $cf_header_path/include/utf8 && cf_search="$cf_search $cf_header_path/include/utf8" ++ test -d $cf_header_path/include/utf8/include && cf_search="$cf_search $cf_header_path/include/utf8/include" ++ test -d $cf_header_path/utf8/include && cf_search="$cf_search $cf_header_path/utf8/include" ++ test -d $cf_header_path/utf8/include/utf8 && cf_search="$cf_search $cf_header_path/utf8/include/utf8" ++} ++ ++ cf_header_path_list="$cf_header_path_list $cf_search" + ;; + esac + done +@@ -19163,11 +19336,11 @@ + 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}:19166: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 ++echo "${as_me-configure}:19339: 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 19170 "configure" ++#line 19343 "configure" + #include "confdefs.h" + + #include +@@ -19180,21 +19353,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:19183: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19356: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19186: \$? = $ac_status" >&5 ++ echo "$as_me:19359: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:19189: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19362: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19192: \$? = $ac_status" >&5 ++ echo "$as_me:19365: \$? = $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}:19197: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 ++echo "${as_me-configure}:19370: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=maybe + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -19212,7 +19385,7 @@ + + if test "$cf_cv_find_linkage_utf8" = maybe ; then + +-echo "${as_me-configure}:19215: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 ++echo "${as_me-configure}:19388: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" +@@ -19309,13 +19482,13 @@ + 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}:19312: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 ++echo "${as_me-configure}:19485: 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 19318 "configure" ++#line 19491 "configure" + #include "confdefs.h" + + #include +@@ -19328,21 +19501,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:19331: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:19504: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:19334: \$? = $ac_status" >&5 ++ echo "$as_me:19507: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:19337: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19510: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19340: \$? = $ac_status" >&5 ++ echo "$as_me:19513: \$? = $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}:19345: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 ++echo "${as_me-configure}:19518: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=yes + cf_cv_library_file_utf8="-lutf8" +@@ -19359,7 +19532,6 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi + done +- LIBS="$cf_save_LIBS" + CPPFLAGS="$cf_save_CPPFLAGS" + LDFLAGS="$cf_save_LDFLAGS" + fi +@@ -19374,6 +19546,8 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + ++LIBS="$cf_save_LIBS" ++ + if test "$cf_cv_find_linkage_utf8" = yes ; then + cf_cv_utf8_lib=add-on + else +@@ -19383,7 +19557,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:19386: result: $cf_cv_utf8_lib" >&5 ++echo "$as_me:19560: 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 +@@ -19417,7 +19591,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 19420 "configure" ++#line 19594 "configure" + #include "confdefs.h" + #include + int +@@ -19429,16 +19603,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:19432: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19606: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19435: \$? = $ac_status" >&5 ++ echo "$as_me:19609: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:19438: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19612: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19441: \$? = $ac_status" >&5 ++ echo "$as_me:19615: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -19455,7 +19629,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:19458: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:19632: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -19489,7 +19663,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me-configure}:19492: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me-configure}:19666: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -19507,7 +19681,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:19510: checking for $ac_word" >&5 ++echo "$as_me:19684: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -19524,7 +19698,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word" +- echo "$as_me:19527: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:19701: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -19535,10 +19709,10 @@ + NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG + + if test -n "$NCURSES_CONFIG"; then +- echo "$as_me:19538: result: $NCURSES_CONFIG" >&5 ++ echo "$as_me:19712: result: $NCURSES_CONFIG" >&5 + echo "${ECHO_T}$NCURSES_CONFIG" >&6 + else +- echo "$as_me:19541: result: no" >&5 ++ echo "$as_me:19715: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -19596,7 +19770,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 19599 "configure" ++#line 19773 "configure" + #include "confdefs.h" + #include + int +@@ -19608,16 +19782,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:19611: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19785: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19614: \$? = $ac_status" >&5 ++ echo "$as_me:19788: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:19617: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19791: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19620: \$? = $ac_status" >&5 ++ echo "$as_me:19794: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -19634,7 +19808,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:19637: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:19811: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -19651,7 +19825,7 @@ + + } + +-echo "$as_me:19654: checking for $cf_ncuhdr_root header in include-path" >&5 ++echo "$as_me:19828: 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 +@@ -19663,7 +19837,7 @@ + do + + cat >conftest.$ac_ext <<_ACEOF +-#line 19666 "configure" ++#line 19840 "configure" + #include "confdefs.h" + + #define _XOPEN_SOURCE_EXTENDED +@@ -19695,16 +19869,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:19698: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:19872: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19701: \$? = $ac_status" >&5 ++ echo "$as_me:19875: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:19704: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:19878: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19707: \$? = $ac_status" >&5 ++ echo "$as_me:19881: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_h=$cf_header + +@@ -19719,14 +19893,14 @@ + done + + fi +-echo "$as_me:19722: result: $cf_cv_ncurses_h" >&5 ++echo "$as_me:19896: 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:19729: checking for $cf_ncuhdr_root include-path" >&5 ++echo "$as_me:19903: 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 +@@ -19744,7 +19918,19 @@ + case $cf_header_path in #(vi + -I*) + cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` +- cf_header_path_list="$cf_header_path_list $cf_header_path" ++ ++test "$cf_header_path" != "NONE" && \ ++test -d "$cf_header_path" && \ ++ { ++ test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" ++ test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" ++ test -d $cf_header_path/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root" ++ test -d $cf_header_path/include/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root/include" ++ test -d $cf_header_path/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include" ++ test -d $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root" ++} ++ ++ cf_header_path_list="$cf_header_path_list $cf_search" + ;; + esac + done +@@ -19854,7 +20040,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 19857 "configure" ++#line 20043 "configure" + #include "confdefs.h" + #include + int +@@ -19866,16 +20052,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:19869: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20055: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19872: \$? = $ac_status" >&5 ++ echo "$as_me:20058: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:19875: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20061: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19878: \$? = $ac_status" >&5 ++ echo "$as_me:20064: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -19892,7 +20078,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:19895: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:20081: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -19913,7 +20099,7 @@ + do + + cat >conftest.$ac_ext <<_ACEOF +-#line 19916 "configure" ++#line 20102 "configure" + #include "confdefs.h" + + #include <$cf_header> +@@ -19937,16 +20123,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:19940: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20126: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:19943: \$? = $ac_status" >&5 ++ echo "$as_me:20129: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:19946: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20132: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:19949: \$? = $ac_status" >&5 ++ echo "$as_me:20135: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_h2=$cf_header + +@@ -19967,12 +20153,12 @@ + CPPFLAGS="$cf_save2_CPPFLAGS" + test "$cf_cv_ncurses_h2" != no && break + done +- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:19970: error: not found" >&5 ++ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:20156: error: not found" >&5 + echo "$as_me: error: not found" >&2;} + { (exit 1); exit 1; }; } + + fi +-echo "$as_me:19975: result: $cf_cv_ncurses_h2" >&5 ++echo "$as_me:20161: 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%/[^/]*$%%'` +@@ -20005,7 +20191,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 20008 "configure" ++#line 20194 "configure" + #include "confdefs.h" + #include + int +@@ -20017,16 +20203,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:20020: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20206: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20023: \$? = $ac_status" >&5 ++ echo "$as_me:20209: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:20026: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20212: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20029: \$? = $ac_status" >&5 ++ echo "$as_me:20215: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -20043,7 +20229,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:20046: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:20232: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -20086,7 +20272,7 @@ + ;; + esac + +-echo "$as_me:20089: checking for terminfo header" >&5 ++echo "$as_me:20275: 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 +@@ -20104,7 +20290,7 @@ + for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" + do + cat >conftest.$ac_ext <<_ACEOF +-#line 20107 "configure" ++#line 20293 "configure" + #include "confdefs.h" + #include + #include <${cf_cv_ncurses_header-curses.h}> +@@ -20119,16 +20305,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:20122: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20308: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20125: \$? = $ac_status" >&5 ++ echo "$as_me:20311: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:20128: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20314: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20131: \$? = $ac_status" >&5 ++ echo "$as_me:20317: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_term_header="$cf_test" +@@ -20144,7 +20330,7 @@ + done + + fi +-echo "$as_me:20147: result: $cf_cv_term_header" >&5 ++echo "$as_me:20333: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + # Set definitions to allow ifdef'ing to accommodate subdirectories +@@ -20178,7 +20364,7 @@ + #define NCURSES 1 + EOF + +-echo "$as_me:20181: checking for ncurses version" >&5 ++echo "$as_me:20367: 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 +@@ -20204,10 +20390,10 @@ + #endif + EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" +- { (eval echo "$as_me:20207: \"$cf_try\"") >&5 ++ { (eval echo "$as_me:20393: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? +- echo "$as_me:20210: \$? = $ac_status" >&5 ++ echo "$as_me:20396: \$? = $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%".*%%'` +@@ -20217,7 +20403,7 @@ + + else + cat >conftest.$ac_ext <<_ACEOF +-#line 20220 "configure" ++#line 20406 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header-curses.h}> +@@ -20242,15 +20428,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:20245: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20431: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20248: \$? = $ac_status" >&5 ++ echo "$as_me:20434: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:20250: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20436: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20253: \$? = $ac_status" >&5 ++ echo "$as_me:20439: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_ncurses_version=`cat $cf_tempfile` +@@ -20264,7 +20450,7 @@ + rm -f $cf_tempfile + + fi +-echo "$as_me:20267: result: $cf_cv_ncurses_version" >&5 ++echo "$as_me:20453: 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 +@@ -20276,7 +20462,7 @@ + # to link gpm. + cf_ncurses_LIBS="" + cf_ncurses_SAVE="$LIBS" +-echo "$as_me:20279: checking for Gpm_Open in -lgpm" >&5 ++echo "$as_me:20465: 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 +@@ -20284,7 +20470,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 20287 "configure" ++#line 20473 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -20303,16 +20489,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:20306: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20492: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20309: \$? = $ac_status" >&5 ++ echo "$as_me:20495: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:20312: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20498: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20315: \$? = $ac_status" >&5 ++ echo "$as_me:20501: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_Gpm_Open=yes + else +@@ -20323,10 +20509,10 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:20326: result: $ac_cv_lib_gpm_Gpm_Open" >&5 ++echo "$as_me:20512: 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:20329: checking for initscr in -lgpm" >&5 ++ echo "$as_me:20515: 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 +@@ -20334,7 +20520,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lgpm $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 20337 "configure" ++#line 20523 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -20353,16 +20539,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:20356: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20542: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20359: \$? = $ac_status" >&5 ++ echo "$as_me:20545: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:20362: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20548: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20365: \$? = $ac_status" >&5 ++ echo "$as_me:20551: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gpm_initscr=yes + else +@@ -20373,7 +20559,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:20376: result: $ac_cv_lib_gpm_initscr" >&5 ++echo "$as_me:20562: 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" +@@ -20388,7 +20574,7 @@ + # 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:20391: checking for tgoto in -lmytinfo" >&5 ++ echo "$as_me:20577: 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 +@@ -20396,7 +20582,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lmytinfo $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 20399 "configure" ++#line 20585 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -20415,16 +20601,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:20418: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20604: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20421: \$? = $ac_status" >&5 ++ echo "$as_me:20607: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:20424: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20610: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20427: \$? = $ac_status" >&5 ++ echo "$as_me:20613: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_mytinfo_tgoto=yes + else +@@ -20435,7 +20621,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:20438: result: $ac_cv_lib_mytinfo_tgoto" >&5 ++echo "$as_me:20624: 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" +@@ -20469,7 +20655,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me-configure}:20472: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me-configure}:20658: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -20482,13 +20668,13 @@ + + eval 'cf_cv_have_lib_'$cf_nculib_root'=no' + cf_libdir="" +- echo "$as_me:20485: checking for initscr" >&5 ++ echo "$as_me:20671: 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 20491 "configure" ++#line 20677 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char initscr (); below. */ +@@ -20519,16 +20705,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:20522: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20708: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20525: \$? = $ac_status" >&5 ++ echo "$as_me:20711: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:20528: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20714: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20531: \$? = $ac_status" >&5 ++ echo "$as_me:20717: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_initscr=yes + else +@@ -20538,18 +20724,18 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:20541: result: $ac_cv_func_initscr" >&5 ++echo "$as_me:20727: 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:20548: checking for initscr in -l$cf_nculib_root" >&5 ++ echo "$as_me:20734: 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 20552 "configure" ++#line 20738 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header-curses.h}> + int +@@ -20561,25 +20747,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:20564: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20750: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20567: \$? = $ac_status" >&5 ++ echo "$as_me:20753: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:20570: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20756: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20573: \$? = $ac_status" >&5 ++ echo "$as_me:20759: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:20575: result: yes" >&5 ++ echo "$as_me:20761: 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:20582: result: no" >&5 ++echo "$as_me:20768: result: no" >&5 + echo "${ECHO_T}no" >&6 + + cf_search= +@@ -20669,11 +20855,11 @@ + + for cf_libdir in $cf_search + do +- echo "$as_me:20672: checking for -l$cf_nculib_root in $cf_libdir" >&5 ++ echo "$as_me:20858: 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 20676 "configure" ++#line 20862 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header-curses.h}> + int +@@ -20685,25 +20871,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:20688: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20874: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20691: \$? = $ac_status" >&5 ++ echo "$as_me:20877: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:20694: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20880: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20697: \$? = $ac_status" >&5 ++ echo "$as_me:20883: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:20699: result: yes" >&5 ++ echo "$as_me:20885: 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:20706: result: no" >&5 ++echo "$as_me:20892: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" + fi +@@ -20718,7 +20904,7 @@ + eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root + + if test $cf_found_library = no ; then +- { { echo "$as_me:20721: error: Cannot link $cf_nculib_root library" >&5 ++ { { echo "$as_me:20907: error: Cannot link $cf_nculib_root library" >&5 + echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -20726,7 +20912,7 @@ + fi + + if test -n "$cf_ncurses_LIBS" ; then +- echo "$as_me:20729: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 ++ echo "$as_me:20915: 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 +@@ -20736,7 +20922,7 @@ + fi + done + cat >conftest.$ac_ext <<_ACEOF +-#line 20739 "configure" ++#line 20925 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header-curses.h}> + int +@@ -20748,23 +20934,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:20751: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:20937: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:20754: \$? = $ac_status" >&5 ++ echo "$as_me:20940: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:20757: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:20943: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20760: \$? = $ac_status" >&5 ++ echo "$as_me:20946: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:20762: result: yes" >&5 ++ echo "$as_me:20948: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-echo "$as_me:20767: result: no" >&5 ++echo "$as_me:20953: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_ncurses_SAVE" + fi +@@ -20787,7 +20973,7 @@ + ;; + slang) + +-echo "$as_me:20790: checking for slang header file" >&5 ++echo "$as_me:20976: 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 +@@ -20795,7 +20981,7 @@ + + cf_cv_slang_header=no + cat >conftest.$ac_ext <<_ACEOF +-#line 20798 "configure" ++#line 20984 "configure" + #include "confdefs.h" + #include + int +@@ -20807,16 +20993,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:20810: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:20996: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20813: \$? = $ac_status" >&5 ++ echo "$as_me:20999: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:20816: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21002: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20819: \$? = $ac_status" >&5 ++ echo "$as_me:21005: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_slang_header=predefined + else +@@ -20833,7 +21019,19 @@ + case $cf_header_path in #(vi + -I*) + cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` +- cf_header_path_list="$cf_header_path_list $cf_header_path" ++ ++test "$cf_header_path" != "NONE" && \ ++test -d "$cf_header_path" && \ ++ { ++ test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" ++ test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" ++ test -d $cf_header_path/include/slang && cf_search="$cf_search $cf_header_path/include/slang" ++ test -d $cf_header_path/include/slang/include && cf_search="$cf_search $cf_header_path/include/slang/include" ++ test -d $cf_header_path/slang/include && cf_search="$cf_search $cf_header_path/slang/include" ++ test -d $cf_header_path/slang/include/slang && cf_search="$cf_search $cf_header_path/slang/include/slang" ++} ++ ++ cf_header_path_list="$cf_header_path_list $cf_search" + ;; + esac + done +@@ -20931,7 +21129,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:20934: result: $cf_cv_slang_header" >&5 ++echo "$as_me:21132: result: $cf_cv_slang_header" >&5 + echo "${ECHO_T}$cf_cv_slang_header" >&6 + + if test "x$cf_cv_slang_header" != xno +@@ -20971,7 +21169,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 20974 "configure" ++#line 21172 "configure" + #include "confdefs.h" + #include + int +@@ -20983,16 +21181,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:20986: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:21184: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:20989: \$? = $ac_status" >&5 ++ echo "$as_me:21187: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:20992: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21190: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:20995: \$? = $ac_status" >&5 ++ echo "$as_me:21193: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -21009,7 +21207,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:21012: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:21210: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -21039,7 +21237,7 @@ + + cf_cv_termlib=none + cat >conftest.$ac_ext <<_ACEOF +-#line 21042 "configure" ++#line 21240 "configure" + #include "confdefs.h" + + int +@@ -21051,19 +21249,19 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:21054: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21252: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21057: \$? = $ac_status" >&5 ++ echo "$as_me:21255: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:21060: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21258: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21063: \$? = $ac_status" >&5 ++ echo "$as_me:21261: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cat >conftest.$ac_ext <<_ACEOF +-#line 21066 "configure" ++#line 21264 "configure" + #include "confdefs.h" + + int +@@ -21075,16 +21273,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:21078: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21276: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21081: \$? = $ac_status" >&5 ++ echo "$as_me:21279: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:21084: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21282: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21087: \$? = $ac_status" >&5 ++ echo "$as_me:21285: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_termlib=terminfo + else +@@ -21095,7 +21293,7 @@ + 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}:21098: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5 ++echo "${as_me-configure}:21296: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5 + + else + echo "$as_me: failed program was:" >&5 +@@ -21110,10 +21308,10 @@ + LIBS="-l$cf_lib $cf_save_LIBS" + for cf_func in tigetstr tgetstr + do +- echo "$as_me:21113: checking for $cf_func in -l$cf_lib" >&5 ++ echo "$as_me:21311: 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 21116 "configure" ++#line 21314 "configure" + #include "confdefs.h" + + int +@@ -21125,16 +21323,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:21128: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21326: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21131: \$? = $ac_status" >&5 ++ echo "$as_me:21329: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:21134: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21332: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21137: \$? = $ac_status" >&5 ++ echo "$as_me:21335: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -21143,7 +21341,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- echo "$as_me:21146: result: $cf_result" >&5 ++ echo "$as_me:21344: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test "$cf_result" = yes ; then + if test "$cf_func" = tigetstr ; then +@@ -21160,7 +21358,7 @@ + fi + if test "$cf_cv_termlib" = none; then + # allow curses library for broken AIX system. +- echo "$as_me:21163: checking for initscr in -lcurses" >&5 ++ echo "$as_me:21361: 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 +@@ -21168,7 +21366,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lcurses $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 21171 "configure" ++#line 21369 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -21187,16 +21385,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:21190: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21388: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21193: \$? = $ac_status" >&5 ++ echo "$as_me:21391: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:21196: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21394: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21199: \$? = $ac_status" >&5 ++ echo "$as_me:21397: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_curses_initscr=yes + else +@@ -21207,13 +21405,13 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:21210: result: $ac_cv_lib_curses_initscr" >&5 ++echo "$as_me:21408: 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 + LIBS="$LIBS -lcurses" cf_cv_termlib=termcap + fi + +- echo "$as_me:21216: checking for tgoto in -ltermcap" >&5 ++ echo "$as_me:21414: 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 +@@ -21221,7 +21419,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ltermcap $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 21224 "configure" ++#line 21422 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -21240,16 +21438,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:21243: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21441: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21246: \$? = $ac_status" >&5 ++ echo "$as_me:21444: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:21249: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21447: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21252: \$? = $ac_status" >&5 ++ echo "$as_me:21450: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_termcap_tgoto=yes + else +@@ -21260,7 +21458,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:21263: result: $ac_cv_lib_termcap_tgoto" >&5 ++echo "$as_me:21461: 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 + LIBS="$LIBS -ltermcap" cf_cv_termlib=termcap +@@ -21271,20 +21469,20 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + if test "$cf_cv_termlib" = none; then +- { echo "$as_me:21274: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5 ++ { echo "$as_me:21472: 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:21281: checking for acos" >&5 ++echo "$as_me:21479: 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 21287 "configure" ++#line 21485 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char acos (); below. */ +@@ -21315,16 +21513,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:21318: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21516: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21321: \$? = $ac_status" >&5 ++ echo "$as_me:21519: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:21324: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21522: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21327: \$? = $ac_status" >&5 ++ echo "$as_me:21525: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_acos=yes + else +@@ -21334,13 +21532,13 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:21337: result: $ac_cv_func_acos" >&5 ++echo "$as_me:21535: 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:21343: checking for acos in -lm" >&5 ++echo "$as_me:21541: 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 +@@ -21348,7 +21546,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lm $LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 21351 "configure" ++#line 21549 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -21367,16 +21565,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:21370: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21568: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21373: \$? = $ac_status" >&5 ++ echo "$as_me:21571: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:21376: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21574: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21379: \$? = $ac_status" >&5 ++ echo "$as_me:21577: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_m_acos=yes + else +@@ -21387,7 +21585,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:21390: result: $ac_cv_lib_m_acos" >&5 ++echo "$as_me:21588: 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 + +@@ -21413,13 +21611,13 @@ + + eval 'cf_cv_have_lib_'video'=no' + cf_libdir="" +- echo "$as_me:21416: checking for v_init" >&5 ++ echo "$as_me:21614: 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 21422 "configure" ++#line 21620 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char v_init (); below. */ +@@ -21450,16 +21648,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:21453: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21651: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21456: \$? = $ac_status" >&5 ++ echo "$as_me:21654: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:21459: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21657: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21462: \$? = $ac_status" >&5 ++ echo "$as_me:21660: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_v_init=yes + else +@@ -21469,18 +21667,18 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:21472: result: $ac_cv_func_v_init" >&5 ++echo "$as_me:21670: 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:21479: checking for v_init in -lvideo" >&5 ++ echo "$as_me:21677: 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 21483 "configure" ++#line 21681 "configure" + #include "confdefs.h" + #include + int +@@ -21492,25 +21690,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:21495: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21693: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21498: \$? = $ac_status" >&5 ++ echo "$as_me:21696: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:21501: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21699: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21504: \$? = $ac_status" >&5 ++ echo "$as_me:21702: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:21506: result: yes" >&5 ++ echo "$as_me:21704: 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:21513: result: no" >&5 ++echo "$as_me:21711: result: no" >&5 + echo "${ECHO_T}no" >&6 + + cf_search= +@@ -21600,11 +21798,11 @@ + + for cf_libdir in $cf_search + do +- echo "$as_me:21603: checking for -lvideo in $cf_libdir" >&5 ++ echo "$as_me:21801: 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 21607 "configure" ++#line 21805 "configure" + #include "confdefs.h" + #include + int +@@ -21616,25 +21814,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:21619: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21817: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21622: \$? = $ac_status" >&5 ++ echo "$as_me:21820: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:21625: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21823: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21628: \$? = $ac_status" >&5 ++ echo "$as_me:21826: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:21630: result: yes" >&5 ++ echo "$as_me:21828: 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:21637: result: no" >&5 ++echo "$as_me:21835: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" + fi +@@ -21649,7 +21847,7 @@ + eval 'cf_found_library=$cf_cv_have_lib_'video + + if test $cf_found_library = no ; then +- { { echo "$as_me:21652: error: Cannot link video library" >&5 ++ { { echo "$as_me:21850: error: Cannot link video library" >&5 + echo "$as_me: error: Cannot link video library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -21659,13 +21857,13 @@ + + eval 'cf_cv_have_lib_'slang'=no' + cf_libdir="" +- echo "$as_me:21662: checking for SLtt_get_screen_size" >&5 ++ echo "$as_me:21860: 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 21668 "configure" ++#line 21866 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char SLtt_get_screen_size (); below. */ +@@ -21696,16 +21894,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:21699: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21897: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21702: \$? = $ac_status" >&5 ++ echo "$as_me:21900: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:21705: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21903: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21708: \$? = $ac_status" >&5 ++ echo "$as_me:21906: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_SLtt_get_screen_size=yes + else +@@ -21715,18 +21913,18 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:21718: result: $ac_cv_func_SLtt_get_screen_size" >&5 ++echo "$as_me:21916: 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:21725: checking for SLtt_get_screen_size in -lslang" >&5 ++ echo "$as_me:21923: 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 21729 "configure" ++#line 21927 "configure" + #include "confdefs.h" + #include + int +@@ -21738,25 +21936,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:21741: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:21939: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21744: \$? = $ac_status" >&5 ++ echo "$as_me:21942: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:21747: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:21945: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21750: \$? = $ac_status" >&5 ++ echo "$as_me:21948: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:21752: result: yes" >&5 ++ echo "$as_me:21950: 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:21759: result: no" >&5 ++echo "$as_me:21957: result: no" >&5 + echo "${ECHO_T}no" >&6 + + cf_search= +@@ -21846,11 +22044,11 @@ + + for cf_libdir in $cf_search + do +- echo "$as_me:21849: checking for -lslang in $cf_libdir" >&5 ++ echo "$as_me:22047: 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 21853 "configure" ++#line 22051 "configure" + #include "confdefs.h" + #include + int +@@ -21862,25 +22060,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:21865: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22063: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21868: \$? = $ac_status" >&5 ++ echo "$as_me:22066: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:21871: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22069: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21874: \$? = $ac_status" >&5 ++ echo "$as_me:22072: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:21876: result: yes" >&5 ++ echo "$as_me:22074: 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:21883: result: no" >&5 ++echo "$as_me:22081: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" + fi +@@ -21895,13 +22093,13 @@ + eval 'cf_found_library=$cf_cv_have_lib_'slang + + if test $cf_found_library = no ; then +- { { echo "$as_me:21898: error: Cannot link slang library" >&5 ++ { { echo "$as_me:22096: 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:21904: checking if we can link slang without termcap" >&5 ++echo "$as_me:22102: 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%^.%%'` +@@ -21910,7 +22108,7 @@ + fi + LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'` + cat >conftest.$ac_ext <<_ACEOF +-#line 21913 "configure" ++#line 22111 "configure" + #include "confdefs.h" + #include + int +@@ -21922,16 +22120,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:21925: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22123: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:21928: \$? = $ac_status" >&5 ++ echo "$as_me:22126: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:21931: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22129: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21934: \$? = $ac_status" >&5 ++ echo "$as_me:22132: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -21940,13 +22138,13 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +-echo "$as_me:21943: result: $cf_result" >&5 ++echo "$as_me:22141: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + test $cf_result = no && LIBS="$cf_slang_LIBS3" + + else + +-echo "$as_me:21949: checking for slang2 header file" >&5 ++echo "$as_me:22147: 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 +@@ -21954,7 +22152,7 @@ + + cf_cv_slang2_header=no + cat >conftest.$ac_ext <<_ACEOF +-#line 21957 "configure" ++#line 22155 "configure" + #include "confdefs.h" + #include + int +@@ -21966,16 +22164,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:21969: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22167: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:21972: \$? = $ac_status" >&5 ++ echo "$as_me:22170: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:21975: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22173: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:21978: \$? = $ac_status" >&5 ++ echo "$as_me:22176: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_slang2_header=predefined + else +@@ -21992,7 +22190,19 @@ + case $cf_header_path in #(vi + -I*) + cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` +- cf_header_path_list="$cf_header_path_list $cf_header_path" ++ ++test "$cf_header_path" != "NONE" && \ ++test -d "$cf_header_path" && \ ++ { ++ test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" ++ test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" ++ test -d $cf_header_path/include/slang2 && cf_search="$cf_search $cf_header_path/include/slang2" ++ test -d $cf_header_path/include/slang2/include && cf_search="$cf_search $cf_header_path/include/slang2/include" ++ test -d $cf_header_path/slang2/include && cf_search="$cf_search $cf_header_path/slang2/include" ++ test -d $cf_header_path/slang2/include/slang2 && cf_search="$cf_search $cf_header_path/slang2/include/slang2" ++} ++ ++ cf_header_path_list="$cf_header_path_list $cf_search" + ;; + esac + done +@@ -22090,7 +22300,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:22093: result: $cf_cv_slang2_header" >&5 ++echo "$as_me:22303: result: $cf_cv_slang2_header" >&5 + echo "${ECHO_T}$cf_cv_slang2_header" >&6 + + if test "x$cf_cv_slang2_header" != xno +@@ -22130,7 +22340,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 22133 "configure" ++#line 22343 "configure" + #include "confdefs.h" + #include + int +@@ -22142,16 +22352,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:22145: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:22355: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:22148: \$? = $ac_status" >&5 ++ echo "$as_me:22358: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:22151: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22361: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22154: \$? = $ac_status" >&5 ++ echo "$as_me:22364: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -22168,7 +22378,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:22171: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:22381: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -22198,7 +22408,7 @@ + + cf_cv_termlib=none + cat >conftest.$ac_ext <<_ACEOF +-#line 22201 "configure" ++#line 22411 "configure" + #include "confdefs.h" + + int +@@ -22210,19 +22420,19 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:22213: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22423: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22216: \$? = $ac_status" >&5 ++ echo "$as_me:22426: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:22219: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22429: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22222: \$? = $ac_status" >&5 ++ echo "$as_me:22432: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cat >conftest.$ac_ext <<_ACEOF +-#line 22225 "configure" ++#line 22435 "configure" + #include "confdefs.h" + + int +@@ -22234,16 +22444,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:22237: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22447: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22240: \$? = $ac_status" >&5 ++ echo "$as_me:22450: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:22243: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22453: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22246: \$? = $ac_status" >&5 ++ echo "$as_me:22456: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_termlib=terminfo + else +@@ -22254,7 +22464,7 @@ + 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}:22257: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5 ++echo "${as_me-configure}:22467: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5 + + else + echo "$as_me: failed program was:" >&5 +@@ -22269,10 +22479,10 @@ + LIBS="-l$cf_lib $cf_save_LIBS" + for cf_func in tigetstr tgetstr + do +- echo "$as_me:22272: checking for $cf_func in -l$cf_lib" >&5 ++ echo "$as_me:22482: 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 22275 "configure" ++#line 22485 "configure" + #include "confdefs.h" + + int +@@ -22284,16 +22494,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:22287: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22497: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22290: \$? = $ac_status" >&5 ++ echo "$as_me:22500: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:22293: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22503: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22296: \$? = $ac_status" >&5 ++ echo "$as_me:22506: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -22302,7 +22512,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- echo "$as_me:22305: result: $cf_result" >&5 ++ echo "$as_me:22515: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test "$cf_result" = yes ; then + if test "$cf_func" = tigetstr ; then +@@ -22319,7 +22529,7 @@ + fi + if test "$cf_cv_termlib" = none; then + # allow curses library for broken AIX system. +- echo "$as_me:22322: checking for initscr in -lcurses" >&5 ++ echo "$as_me:22532: 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 +@@ -22327,7 +22537,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lcurses $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 22330 "configure" ++#line 22540 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -22346,16 +22556,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:22349: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22559: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22352: \$? = $ac_status" >&5 ++ echo "$as_me:22562: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:22355: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22565: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22358: \$? = $ac_status" >&5 ++ echo "$as_me:22568: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_curses_initscr=yes + else +@@ -22366,13 +22576,13 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:22369: result: $ac_cv_lib_curses_initscr" >&5 ++echo "$as_me:22579: 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 + LIBS="$LIBS -lcurses" cf_cv_termlib=termcap + fi + +- echo "$as_me:22375: checking for tgoto in -ltermcap" >&5 ++ echo "$as_me:22585: 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 +@@ -22380,7 +22590,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ltermcap $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 22383 "configure" ++#line 22593 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -22399,16 +22609,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:22402: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22612: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22405: \$? = $ac_status" >&5 ++ echo "$as_me:22615: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:22408: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22618: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22411: \$? = $ac_status" >&5 ++ echo "$as_me:22621: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_termcap_tgoto=yes + else +@@ -22419,7 +22629,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:22422: result: $ac_cv_lib_termcap_tgoto" >&5 ++echo "$as_me:22632: 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 + LIBS="$LIBS -ltermcap" cf_cv_termlib=termcap +@@ -22430,20 +22640,20 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + if test "$cf_cv_termlib" = none; then +- { echo "$as_me:22433: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5 ++ { echo "$as_me:22643: 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:22440: checking for acos" >&5 ++echo "$as_me:22650: 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 22446 "configure" ++#line 22656 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char acos (); below. */ +@@ -22474,16 +22684,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:22477: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22687: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22480: \$? = $ac_status" >&5 ++ echo "$as_me:22690: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:22483: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22693: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22486: \$? = $ac_status" >&5 ++ echo "$as_me:22696: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_acos=yes + else +@@ -22493,13 +22703,13 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:22496: result: $ac_cv_func_acos" >&5 ++echo "$as_me:22706: 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:22502: checking for acos in -lm" >&5 ++echo "$as_me:22712: 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 +@@ -22507,7 +22717,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lm $LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 22510 "configure" ++#line 22720 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -22526,16 +22736,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:22529: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22739: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22532: \$? = $ac_status" >&5 ++ echo "$as_me:22742: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:22535: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22745: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22538: \$? = $ac_status" >&5 ++ echo "$as_me:22748: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_m_acos=yes + else +@@ -22546,7 +22756,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:22549: result: $ac_cv_lib_m_acos" >&5 ++echo "$as_me:22759: 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 + +@@ -22572,13 +22782,13 @@ + + eval 'cf_cv_have_lib_'video'=no' + cf_libdir="" +- echo "$as_me:22575: checking for v_init" >&5 ++ echo "$as_me:22785: 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 22581 "configure" ++#line 22791 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char v_init (); below. */ +@@ -22609,16 +22819,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:22612: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22822: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22615: \$? = $ac_status" >&5 ++ echo "$as_me:22825: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:22618: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22828: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22621: \$? = $ac_status" >&5 ++ echo "$as_me:22831: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_v_init=yes + else +@@ -22628,18 +22838,18 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:22631: result: $ac_cv_func_v_init" >&5 ++echo "$as_me:22841: 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:22638: checking for v_init in -lvideo" >&5 ++ echo "$as_me:22848: 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 22642 "configure" ++#line 22852 "configure" + #include "confdefs.h" + #include + int +@@ -22651,25 +22861,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:22654: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22864: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22657: \$? = $ac_status" >&5 ++ echo "$as_me:22867: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:22660: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22870: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22663: \$? = $ac_status" >&5 ++ echo "$as_me:22873: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:22665: result: yes" >&5 ++ echo "$as_me:22875: 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:22672: result: no" >&5 ++echo "$as_me:22882: result: no" >&5 + echo "${ECHO_T}no" >&6 + + cf_search= +@@ -22759,11 +22969,11 @@ + + for cf_libdir in $cf_search + do +- echo "$as_me:22762: checking for -lvideo in $cf_libdir" >&5 ++ echo "$as_me:22972: 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 22766 "configure" ++#line 22976 "configure" + #include "confdefs.h" + #include + int +@@ -22775,25 +22985,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:22778: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:22988: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22781: \$? = $ac_status" >&5 ++ echo "$as_me:22991: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:22784: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:22994: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22787: \$? = $ac_status" >&5 ++ echo "$as_me:22997: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:22789: result: yes" >&5 ++ echo "$as_me:22999: 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:22796: result: no" >&5 ++echo "$as_me:23006: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" + fi +@@ -22808,7 +23018,7 @@ + eval 'cf_found_library=$cf_cv_have_lib_'video + + if test $cf_found_library = no ; then +- { { echo "$as_me:22811: error: Cannot link video library" >&5 ++ { { echo "$as_me:23021: error: Cannot link video library" >&5 + echo "$as_me: error: Cannot link video library" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -22818,13 +23028,13 @@ + + eval 'cf_cv_have_lib_'slang2'=no' + cf_libdir="" +- echo "$as_me:22821: checking for SLtt_get_screen_size" >&5 ++ echo "$as_me:23031: 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 22827 "configure" ++#line 23037 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char SLtt_get_screen_size (); below. */ +@@ -22855,16 +23065,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:22858: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23068: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22861: \$? = $ac_status" >&5 ++ echo "$as_me:23071: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:22864: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23074: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22867: \$? = $ac_status" >&5 ++ echo "$as_me:23077: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_SLtt_get_screen_size=yes + else +@@ -22874,18 +23084,18 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:22877: result: $ac_cv_func_SLtt_get_screen_size" >&5 ++echo "$as_me:23087: 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:22884: checking for SLtt_get_screen_size in -lslang2" >&5 ++ echo "$as_me:23094: 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 22888 "configure" ++#line 23098 "configure" + #include "confdefs.h" + #include + int +@@ -22897,25 +23107,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:22900: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23110: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:22903: \$? = $ac_status" >&5 ++ echo "$as_me:23113: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:22906: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23116: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:22909: \$? = $ac_status" >&5 ++ echo "$as_me:23119: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:22911: result: yes" >&5 ++ echo "$as_me:23121: 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:22918: result: no" >&5 ++echo "$as_me:23128: result: no" >&5 + echo "${ECHO_T}no" >&6 + + cf_search= +@@ -23005,11 +23215,11 @@ + + for cf_libdir in $cf_search + do +- echo "$as_me:23008: checking for -lslang2 in $cf_libdir" >&5 ++ echo "$as_me:23218: 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 23012 "configure" ++#line 23222 "configure" + #include "confdefs.h" + #include + int +@@ -23021,25 +23231,25 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:23024: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23234: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23027: \$? = $ac_status" >&5 ++ echo "$as_me:23237: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:23030: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23240: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23033: \$? = $ac_status" >&5 ++ echo "$as_me:23243: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- echo "$as_me:23035: result: yes" >&5 ++ echo "$as_me:23245: 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:23042: result: no" >&5 ++echo "$as_me:23252: result: no" >&5 + echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" + fi +@@ -23054,13 +23264,13 @@ + eval 'cf_found_library=$cf_cv_have_lib_'slang2 + + if test $cf_found_library = no ; then +- { { echo "$as_me:23057: error: Cannot link slang2 library" >&5 ++ { { echo "$as_me:23267: 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:23063: checking if we can link slang2 without termcap" >&5 ++echo "$as_me:23273: 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%^.%%'` +@@ -23069,7 +23279,7 @@ + fi + LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'` + cat >conftest.$ac_ext <<_ACEOF +-#line 23072 "configure" ++#line 23282 "configure" + #include "confdefs.h" + #include + int +@@ -23081,16 +23291,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:23084: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23294: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23087: \$? = $ac_status" >&5 ++ echo "$as_me:23297: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:23090: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23300: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23093: \$? = $ac_status" >&5 ++ echo "$as_me:23303: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -23099,12 +23309,12 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +-echo "$as_me:23102: result: $cf_result" >&5 ++echo "$as_me:23312: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + test $cf_result = no && LIBS="$cf_slang_LIBS3" + + else +- { { echo "$as_me:23107: error: cannot find slang headers" >&5 ++ { { echo "$as_me:23317: error: cannot find slang headers" >&5 + echo "$as_me: error: cannot find slang headers" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -23112,14 +23322,14 @@ + + # 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:23115: checking if we must define UTF8" >&5 ++echo "$as_me:23325: 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 23122 "configure" ++#line 23332 "configure" + #include "confdefs.h" + #include + int +@@ -23131,16 +23341,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:23134: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:23344: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:23137: \$? = $ac_status" >&5 ++ echo "$as_me:23347: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:23140: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23350: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23143: \$? = $ac_status" >&5 ++ echo "$as_me:23353: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_slang_utf8=no + else +@@ -23148,7 +23358,7 @@ + cat conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 23151 "configure" ++#line 23361 "configure" + #include "confdefs.h" + + #define UTF8 +@@ -23162,16 +23372,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:23165: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:23375: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:23168: \$? = $ac_status" >&5 ++ echo "$as_me:23378: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:23171: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23381: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23174: \$? = $ac_status" >&5 ++ echo "$as_me:23384: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_slang_utf8=yes + else +@@ -23184,7 +23394,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:23187: result: $cf_cv_slang_utf8" >&5 ++echo "$as_me:23397: result: $cf_cv_slang_utf8" >&5 + echo "${ECHO_T}$cf_cv_slang_utf8" >&6 + + if test "$cf_cv_slang_utf8" = yes ; then +@@ -23194,14 +23404,14 @@ + + fi + +-echo "$as_me:23197: checking if we must tell slang this is UNIX" >&5 ++echo "$as_me:23407: 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 23204 "configure" ++#line 23414 "configure" + #include "confdefs.h" + #include + int +@@ -23220,16 +23430,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:23223: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:23433: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23226: \$? = $ac_status" >&5 ++ echo "$as_me:23436: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:23229: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23439: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23232: \$? = $ac_status" >&5 ++ echo "$as_me:23442: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_slang_unix=yes + else +@@ -23240,7 +23450,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:23243: result: $cf_cv_slang_unix" >&5 ++echo "$as_me:23453: 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 +@@ -23250,14 +23460,14 @@ + ;; + esac + +-echo "$as_me:23253: checking for chtype typedef" >&5 ++echo "$as_me:23463: 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 23260 "configure" ++#line 23470 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header-curses.h}> + int +@@ -23269,16 +23479,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:23272: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:23482: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:23275: \$? = $ac_status" >&5 ++ echo "$as_me:23485: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:23278: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23488: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23281: \$? = $ac_status" >&5 ++ echo "$as_me:23491: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_chtype_decl=yes + else +@@ -23288,21 +23498,21 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:23291: result: $cf_cv_chtype_decl" >&5 ++echo "$as_me:23501: result: $cf_cv_chtype_decl" >&5 + echo "${ECHO_T}$cf_cv_chtype_decl" >&6 + if test $cf_cv_chtype_decl = yes ; then + cat >>confdefs.h <<\EOF + #define HAVE_TYPE_CHTYPE 1 + EOF + +- echo "$as_me:23298: checking if chtype is scalar or struct" >&5 ++ echo "$as_me:23508: 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 23305 "configure" ++#line 23515 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header-curses.h}> + int +@@ -23314,16 +23524,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:23317: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:23527: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:23320: \$? = $ac_status" >&5 ++ echo "$as_me:23530: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:23323: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:23533: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23326: \$? = $ac_status" >&5 ++ echo "$as_me:23536: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_chtype_type=scalar + else +@@ -23333,7 +23543,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:23336: result: $cf_cv_chtype_type" >&5 ++echo "$as_me:23546: result: $cf_cv_chtype_type" >&5 + echo "${ECHO_T}$cf_cv_chtype_type" >&6 + if test $cf_cv_chtype_type = scalar ; then + cat >>confdefs.h <<\EOF +@@ -23343,7 +23553,7 @@ + fi + fi + +-echo "$as_me:23346: checking if you want the wide-curses features" >&5 ++echo "$as_me:23556: 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. +@@ -23360,10 +23570,10 @@ + use_wide_curses=$cf_wide_curses + + fi; +-echo "$as_me:23363: result: $use_wide_curses" >&5 ++echo "$as_me:23573: result: $use_wide_curses" >&5 + echo "${ECHO_T}$use_wide_curses" >&6 + +-echo "$as_me:23366: checking if color-style code should be used" >&5 ++echo "$as_me:23576: 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. +@@ -23383,7 +23593,7 @@ + + case $use_color_style in + no) +- echo "$as_me:23386: result: no" >&5 ++ echo "$as_me:23596: result: no" >&5 + echo "${ECHO_T}no" >&6 + INSTALL_LSS= + ;; +@@ -23392,10 +23602,10 @@ + #define USE_COLOR_STYLE 1 + EOF + +- echo "$as_me:23395: result: yes" >&5 ++ echo "$as_me:23605: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + +- echo "$as_me:23398: checking for location of style-sheet file" >&5 ++ echo "$as_me:23608: 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. +@@ -23431,7 +23641,7 @@ + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + *) +- { { echo "$as_me:23434: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:23644: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -23440,7 +23650,7 @@ + fi + LYNX_LSS_FILE="$withval" + +- echo "$as_me:23443: result: $LYNX_LSS_FILE" >&5 ++ echo "$as_me:23653: result: $LYNX_LSS_FILE" >&5 + echo "${ECHO_T}$LYNX_LSS_FILE" >&6 + + test "$LYNX_LSS_FILE" = no && LYNX_LSS_FILE= +@@ -23452,7 +23662,7 @@ + ;; + esac + +-echo "$as_me:23455: checking for the default configuration-file" >&5 ++echo "$as_me:23665: 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. +@@ -23488,7 +23698,7 @@ + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + *) +- { { echo "$as_me:23491: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:23701: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -23497,7 +23707,7 @@ + fi + LYNX_CFG_FILE="$withval" + +-echo "$as_me:23500: result: $LYNX_CFG_FILE" >&5 ++echo "$as_me:23710: result: $LYNX_CFG_FILE" >&5 + echo "${ECHO_T}$LYNX_CFG_FILE" >&6 + + test "$LYNX_CFG_FILE" = no && LYNX_CFG_FILE= +@@ -23505,7 +23715,7 @@ + #define LYNX_CFG_FILE "$LYNX_CFG_FILE" + EOF + +-echo "$as_me:23508: checking if htmlized lynx.cfg should be built" >&5 ++echo "$as_me:23718: 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. +@@ -23522,7 +23732,7 @@ + use_htmlized_cfg=no + + fi; +-echo "$as_me:23525: result: $use_htmlized_cfg" >&5 ++echo "$as_me:23735: result: $use_htmlized_cfg" >&5 + echo "${ECHO_T}$use_htmlized_cfg" >&6 + + LYNXCFG_MAKE='' +@@ -23530,7 +23740,7 @@ + LYNXCFG_MAKE='#' + fi + +-echo "$as_me:23533: checking if local doc directory should be linked to help page" >&5 ++echo "$as_me:23743: 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. +@@ -23547,7 +23757,7 @@ + use_local_docs=no + + fi; +-echo "$as_me:23550: result: $use_local_docs" >&5 ++echo "$as_me:23760: result: $use_local_docs" >&5 + echo "${ECHO_T}$use_local_docs" >&6 + + LYNXDOC_MAKE='' +@@ -23555,7 +23765,7 @@ + LYNXDOC_MAKE='#' + fi + +-echo "$as_me:23558: checking for MIME library directory" >&5 ++echo "$as_me:23768: 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. +@@ -23591,7 +23801,7 @@ + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + *) +- { { echo "$as_me:23594: error: expected a pathname, not \"$withval\"" >&5 ++ { { echo "$as_me:23804: error: expected a pathname, not \"$withval\"" >&5 + echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +@@ -23600,14 +23810,14 @@ + fi + MIME_LIBDIR="$withval" + +-echo "$as_me:23603: result: $MIME_LIBDIR" >&5 ++echo "$as_me:23813: result: $MIME_LIBDIR" >&5 + echo "${ECHO_T}$MIME_LIBDIR" >&6 + MIME_LIBDIR=`echo "$MIME_LIBDIR" | sed -e 's,/$,,' -e 's,$,/,'` + cat >>confdefs.h <&5 ++echo "$as_me:23820: 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. +@@ -23624,7 +23834,7 @@ + use_locale_charset=yes + + fi; +-echo "$as_me:23627: result: $use_locale_charset" >&5 ++echo "$as_me:23837: result: $use_locale_charset" >&5 + echo "${ECHO_T}$use_locale_charset" >&6 + test $use_locale_charset != no && cat >>confdefs.h <<\EOF + #define USE_LOCALE_CHARSET 1 +@@ -23632,7 +23842,7 @@ + + CHARSET_DEFS= + +-echo "$as_me:23635: checking if you want only a few charsets" >&5 ++echo "$as_me:23845: 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. +@@ -23644,7 +23854,7 @@ + fi; + + if test -n "$cf_charsets" ; then +- echo "$as_me:23647: result: yes" >&5 ++ echo "$as_me:23857: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + cat >>confdefs.h <<\EOF + #define ALL_CHARSETS 0 +@@ -23657,7 +23867,7 @@ + if test "$cf_charsets" = "minimal" ; then + test -n "$verbose" && echo " using minimal list of charsets: $cf_min_charsets" 1>&6 + +-echo "${as_me-configure}:23660: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5 ++echo "${as_me-configure}:23870: 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'` +@@ -23684,28 +23894,28 @@ + then + test -n "$verbose" && echo " found $cf_charset" 1>&6 + +-echo "${as_me-configure}:23687: testing found $cf_charset ..." 1>&5 ++echo "${as_me-configure}:23897: 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}:23693: testing not found $cf_charset ..." 1>&5 ++echo "${as_me-configure}:23903: testing not found $cf_charset ..." 1>&5 + + fi + done + else +- echo "$as_me:23698: result: no" >&5 ++ echo "$as_me:23908: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:23702: checking for ANSI C header files" >&5 ++echo "$as_me:23912: 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 23708 "configure" ++#line 23918 "configure" + #include "confdefs.h" + #include + #include +@@ -23713,13 +23923,13 @@ + #include + + _ACEOF +-if { (eval echo "$as_me:23716: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:23926: \"$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:23722: \$? = $ac_status" >&5 ++ echo "$as_me:23932: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -23741,7 +23951,7 @@ + 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 23744 "configure" ++#line 23954 "configure" + #include "confdefs.h" + #include + +@@ -23759,7 +23969,7 @@ + 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 23762 "configure" ++#line 23972 "configure" + #include "confdefs.h" + #include + +@@ -23780,7 +23990,7 @@ + : + else + cat >conftest.$ac_ext <<_ACEOF +-#line 23783 "configure" ++#line 23993 "configure" + #include "confdefs.h" + #include + #if ((' ' & 0x0FF) == 0x020) +@@ -23806,15 +24016,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:23809: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24019: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23812: \$? = $ac_status" >&5 ++ echo "$as_me:24022: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:23814: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24024: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23817: \$? = $ac_status" >&5 ++ echo "$as_me:24027: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -23827,7 +24037,7 @@ + fi + fi + fi +-echo "$as_me:23830: result: $ac_cv_header_stdc" >&5 ++echo "$as_me:24040: result: $ac_cv_header_stdc" >&5 + echo "${ECHO_T}$ac_cv_header_stdc" >&6 + if test $ac_cv_header_stdc = yes; then + +@@ -23837,13 +24047,13 @@ + + fi + +-echo "$as_me:23840: checking whether time.h and sys/time.h may both be included" >&5 ++echo "$as_me:24050: 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 23846 "configure" ++#line 24056 "configure" + #include "confdefs.h" + #include + #include +@@ -23859,16 +24069,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:23862: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24072: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:23865: \$? = $ac_status" >&5 ++ echo "$as_me:24075: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:23868: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24078: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23871: \$? = $ac_status" >&5 ++ echo "$as_me:24081: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_header_time=yes + else +@@ -23878,7 +24088,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:23881: result: $ac_cv_header_time" >&5 ++echo "$as_me:24091: result: $ac_cv_header_time" >&5 + echo "${ECHO_T}$ac_cv_header_time" >&6 + if test $ac_cv_header_time = yes; then + +@@ -23891,13 +24101,13 @@ + 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:23894: checking for $ac_hdr that defines DIR" >&5 ++echo "$as_me:24104: 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 23900 "configure" ++#line 24110 "configure" + #include "confdefs.h" + #include + #include <$ac_hdr> +@@ -23912,16 +24122,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:23915: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24125: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:23918: \$? = $ac_status" >&5 ++ echo "$as_me:24128: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:23921: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24131: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23924: \$? = $ac_status" >&5 ++ echo "$as_me:24134: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" + else +@@ -23931,7 +24141,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:23934: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:24144: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 ++ echo "$as_me:24157: 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 +@@ -23952,7 +24162,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldir $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 23955 "configure" ++#line 24165 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -23971,16 +24181,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:23974: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24184: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:23977: \$? = $ac_status" >&5 ++ echo "$as_me:24187: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:23980: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24190: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:23983: \$? = $ac_status" >&5 ++ echo "$as_me:24193: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dir_opendir=yes + else +@@ -23991,14 +24201,14 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:23994: result: $ac_cv_lib_dir_opendir" >&5 ++echo "$as_me:24204: 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:24001: checking for opendir in -lx" >&5 ++ echo "$as_me:24211: 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 +@@ -24006,7 +24216,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lx $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 24009 "configure" ++#line 24219 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -24025,16 +24235,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:24028: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24238: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24031: \$? = $ac_status" >&5 ++ echo "$as_me:24241: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:24034: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24244: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24037: \$? = $ac_status" >&5 ++ echo "$as_me:24247: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_x_opendir=yes + else +@@ -24045,7 +24255,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:24048: result: $ac_cv_lib_x_opendir" >&5 ++echo "$as_me:24258: 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" +@@ -24073,23 +24283,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:24076: checking for $ac_header" >&5 ++echo "$as_me:24286: 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 24082 "configure" ++#line 24292 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:24086: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:24296: \"$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:24092: \$? = $ac_status" >&5 ++ echo "$as_me:24302: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -24108,7 +24318,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:24111: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:24321: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:24331: 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 24128 "configure" ++#line 24338 "configure" + #include "confdefs.h" + + #if HAVE_TERMIO_H +@@ -24143,16 +24353,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:24146: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24356: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24149: \$? = $ac_status" >&5 ++ echo "$as_me:24359: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:24152: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24362: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24155: \$? = $ac_status" >&5 ++ echo "$as_me:24365: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_termio_and_termios=yes + else +@@ -24163,20 +24373,20 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + fi + +-echo "$as_me:24166: result: $cf_cv_termio_and_termios" >&5 ++echo "$as_me:24376: 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:24172: checking for sigaction and structs" >&5 ++echo "$as_me:24382: 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 24179 "configure" ++#line 24389 "configure" + #include "confdefs.h" + + #include +@@ -24196,16 +24406,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:24199: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24409: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24202: \$? = $ac_status" >&5 ++ echo "$as_me:24412: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:24205: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24415: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24208: \$? = $ac_status" >&5 ++ echo "$as_me:24418: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_func_sigaction=yes + else +@@ -24216,7 +24426,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:24219: result: $cf_cv_func_sigaction" >&5 ++echo "$as_me:24429: result: $cf_cv_func_sigaction" >&5 + echo "${ECHO_T}$cf_cv_func_sigaction" >&6 + test "$cf_cv_func_sigaction" = yes && cat >>confdefs.h <<\EOF + #define HAVE_SIGACTION 1 +@@ -24225,23 +24435,23 @@ + for ac_header in sys/wait.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:24228: checking for $ac_header" >&5 ++echo "$as_me:24438: 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 24234 "configure" ++#line 24444 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:24238: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:24448: \"$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:24244: \$? = $ac_status" >&5 ++ echo "$as_me:24454: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -24260,7 +24470,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:24263: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:24473: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:24494: 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 24290 "configure" ++#line 24500 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:24294: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:24504: \"$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:24300: \$? = $ac_status" >&5 ++ echo "$as_me:24510: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -24316,7 +24526,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:24319: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:24529: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:24542: 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 24338 "configure" ++#line 24548 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:24342: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:24552: \"$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:24348: \$? = $ac_status" >&5 ++ echo "$as_me:24558: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -24364,7 +24574,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:24367: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:24577: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:24599: 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 24396 "configure" ++#line 24606 "configure" + #include "confdefs.h" + $cf_wait_headers + int +@@ -24409,16 +24619,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:24412: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24622: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24415: \$? = $ac_status" >&5 ++ echo "$as_me:24625: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:24418: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24628: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24421: \$? = $ac_status" >&5 ++ echo "$as_me:24631: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_type_unionwait=no + echo compiles ok w/o union wait 1>&5 +@@ -24428,7 +24638,7 @@ + cat conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 24431 "configure" ++#line 24641 "configure" + #include "confdefs.h" + $cf_wait_headers + int +@@ -24448,16 +24658,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:24451: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24661: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24454: \$? = $ac_status" >&5 ++ echo "$as_me:24664: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:24457: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24667: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24460: \$? = $ac_status" >&5 ++ echo "$as_me:24670: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_type_unionwait=yes + echo compiles ok with union wait and possibly macros too 1>&5 +@@ -24472,7 +24682,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi + +-echo "$as_me:24475: result: $cf_cv_type_unionwait" >&5 ++echo "$as_me:24685: result: $cf_cv_type_unionwait" >&5 + echo "${ECHO_T}$cf_cv_type_unionwait" >&6 + test $cf_cv_type_unionwait = yes && cat >>confdefs.h <<\EOF + #define HAVE_TYPE_UNIONWAIT 1 +@@ -24480,14 +24690,14 @@ + + if test $cf_cv_type_unionwait = yes; then + +- echo "$as_me:24483: checking if union wait can be used as wait-arg" >&5 ++ echo "$as_me:24693: 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 24490 "configure" ++#line 24700 "configure" + #include "confdefs.h" + $cf_wait_headers + int +@@ -24499,16 +24709,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:24502: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24712: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24505: \$? = $ac_status" >&5 ++ echo "$as_me:24715: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:24508: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24718: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24511: \$? = $ac_status" >&5 ++ echo "$as_me:24721: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_arg_union_wait=yes + else +@@ -24520,20 +24730,20 @@ + + fi + +- echo "$as_me:24523: result: $cf_cv_arg_union_wait" >&5 ++ echo "$as_me:24733: 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:24529: checking if union wait can be used as waitpid-arg" >&5 ++ echo "$as_me:24739: 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 24536 "configure" ++#line 24746 "configure" + #include "confdefs.h" + $cf_wait_headers + int +@@ -24545,16 +24755,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:24548: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24758: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24551: \$? = $ac_status" >&5 ++ echo "$as_me:24761: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:24554: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24764: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24557: \$? = $ac_status" >&5 ++ echo "$as_me:24767: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_arg_union_waitpid=yes + else +@@ -24566,7 +24776,7 @@ + + fi + +- echo "$as_me:24569: result: $cf_cv_arg_union_waitpid" >&5 ++ echo "$as_me:24779: 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 + #define WAITPID_USES_UNION 1 +@@ -24574,13 +24784,13 @@ + + fi + +-echo "$as_me:24577: checking for uid_t in sys/types.h" >&5 ++echo "$as_me:24787: 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 24583 "configure" ++#line 24793 "configure" + #include "confdefs.h" + #include + +@@ -24594,7 +24804,7 @@ + rm -f conftest* + + fi +-echo "$as_me:24597: result: $ac_cv_type_uid_t" >&5 ++echo "$as_me:24807: 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 + +@@ -24608,7 +24818,7 @@ + + fi + +-echo "$as_me:24611: checking type of array argument to getgroups" >&5 ++echo "$as_me:24821: 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 +@@ -24617,7 +24827,7 @@ + ac_cv_type_getgroups=cross + else + cat >conftest.$ac_ext <<_ACEOF +-#line 24620 "configure" ++#line 24830 "configure" + #include "confdefs.h" + /* Thanks to Mike Rendell for this test. */ + #include +@@ -24643,15 +24853,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:24646: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:24856: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:24649: \$? = $ac_status" >&5 ++ echo "$as_me:24859: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:24651: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24861: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24654: \$? = $ac_status" >&5 ++ echo "$as_me:24864: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_getgroups=gid_t + else +@@ -24664,7 +24874,7 @@ + fi + if test $ac_cv_type_getgroups = cross; then + cat >conftest.$ac_ext <<_ACEOF +-#line 24667 "configure" ++#line 24877 "configure" + #include "confdefs.h" + #include + +@@ -24679,20 +24889,20 @@ + + fi + fi +-echo "$as_me:24682: result: $ac_cv_type_getgroups" >&5 ++echo "$as_me:24892: result: $ac_cv_type_getgroups" >&5 + echo "${ECHO_T}$ac_cv_type_getgroups" >&6 + + cat >>confdefs.h <&5 ++echo "$as_me:24899: 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 24695 "configure" ++#line 24905 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -24707,16 +24917,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:24710: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24920: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24713: \$? = $ac_status" >&5 ++ echo "$as_me:24923: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:24716: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24926: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24719: \$? = $ac_status" >&5 ++ echo "$as_me:24929: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_off_t=yes + else +@@ -24726,7 +24936,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:24729: result: $ac_cv_type_off_t" >&5 ++echo "$as_me:24939: 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 + : +@@ -24738,13 +24948,13 @@ + + fi + +-echo "$as_me:24741: checking for pid_t" >&5 ++echo "$as_me:24951: 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 24747 "configure" ++#line 24957 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -24759,16 +24969,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:24762: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:24972: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24765: \$? = $ac_status" >&5 ++ echo "$as_me:24975: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:24768: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:24978: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24771: \$? = $ac_status" >&5 ++ echo "$as_me:24981: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_pid_t=yes + else +@@ -24778,7 +24988,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:24781: result: $ac_cv_type_pid_t" >&5 ++echo "$as_me:24991: 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 + : +@@ -24790,13 +25000,13 @@ + + fi + +-echo "$as_me:24793: checking for uid_t in sys/types.h" >&5 ++echo "$as_me:25003: 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 24799 "configure" ++#line 25009 "configure" + #include "confdefs.h" + #include + +@@ -24810,7 +25020,7 @@ + rm -f conftest* + + fi +-echo "$as_me:24813: result: $ac_cv_type_uid_t" >&5 ++echo "$as_me:25023: 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 + +@@ -24824,13 +25034,13 @@ + + fi + +-echo "$as_me:24827: checking for mode_t" >&5 ++echo "$as_me:25037: 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 24833 "configure" ++#line 25043 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -24845,16 +25055,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:24848: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25058: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24851: \$? = $ac_status" >&5 ++ echo "$as_me:25061: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:24854: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25064: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24857: \$? = $ac_status" >&5 ++ echo "$as_me:25067: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_mode_t=yes + else +@@ -24864,7 +25074,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:24867: result: $ac_cv_type_mode_t" >&5 ++echo "$as_me:25077: 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 + : +@@ -24876,13 +25086,13 @@ + + fi + +- echo "$as_me:24879: checking for socklen_t" >&5 ++ echo "$as_me:25089: 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 24885 "configure" ++#line 25095 "configure" + #include "confdefs.h" + + #include +@@ -24900,16 +25110,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:24903: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25113: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24906: \$? = $ac_status" >&5 ++ echo "$as_me:25116: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:24909: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25119: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24912: \$? = $ac_status" >&5 ++ echo "$as_me:25122: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_socklen_t=yes + else +@@ -24919,7 +25129,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:24922: result: $ac_cv_type_socklen_t" >&5 ++echo "$as_me:25132: 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 +@@ -24934,14 +25144,14 @@ + + fi + +-echo "$as_me:24937: checking for long long type" >&5 ++echo "$as_me:25147: 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 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 24944 "configure" ++#line 25154 "configure" + #include "confdefs.h" + + int +@@ -24953,16 +25163,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:24956: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25166: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:24959: \$? = $ac_status" >&5 ++ echo "$as_me:25169: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:24962: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25172: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:24965: \$? = $ac_status" >&5 ++ echo "$as_me:25175: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_type_long_long=yes + else +@@ -24973,7 +25183,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:24976: result: $cf_cv_type_long_long" >&5 ++echo "$as_me:25186: 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 +@@ -24983,14 +25193,14 @@ + + fi + +-echo "$as_me:24986: checking for tm.tm_gmtoff" >&5 ++echo "$as_me:25196: 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 24993 "configure" ++#line 25203 "configure" + #include "confdefs.h" + + #ifdef TIME_WITH_SYS_TIME +@@ -25015,16 +25225,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:25018: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25228: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25021: \$? = $ac_status" >&5 ++ echo "$as_me:25231: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:25024: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25234: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25027: \$? = $ac_status" >&5 ++ echo "$as_me:25237: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_tm_gmtoff=yes + else +@@ -25035,19 +25245,19 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + fi + +-echo "$as_me:25038: result: $cf_cv_tm_gmtoff" >&5 ++echo "$as_me:25248: 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:25044: checking for int" >&5 ++echo "$as_me:25254: 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 25050 "configure" ++#line 25260 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -25062,16 +25272,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:25065: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25275: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25068: \$? = $ac_status" >&5 ++ echo "$as_me:25278: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:25071: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25281: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25074: \$? = $ac_status" >&5 ++ echo "$as_me:25284: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_int=yes + else +@@ -25081,10 +25291,10 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:25084: result: $ac_cv_type_int" >&5 ++echo "$as_me:25294: result: $ac_cv_type_int" >&5 + echo "${ECHO_T}$ac_cv_type_int" >&6 + +-echo "$as_me:25087: checking size of int" >&5 ++echo "$as_me:25297: 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 +@@ -25093,7 +25303,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >conftest.$ac_ext <<_ACEOF +-#line 25096 "configure" ++#line 25306 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -25105,21 +25315,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:25108: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25318: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25111: \$? = $ac_status" >&5 ++ echo "$as_me:25321: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:25114: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25324: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25117: \$? = $ac_status" >&5 ++ echo "$as_me:25327: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +-#line 25122 "configure" ++#line 25332 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -25131,16 +25341,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:25134: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25344: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25137: \$? = $ac_status" >&5 ++ echo "$as_me:25347: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:25140: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25350: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25143: \$? = $ac_status" >&5 ++ echo "$as_me:25353: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid; break + else +@@ -25156,7 +25366,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +-#line 25159 "configure" ++#line 25369 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -25168,16 +25378,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:25171: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25381: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25174: \$? = $ac_status" >&5 ++ echo "$as_me:25384: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:25177: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25387: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25180: \$? = $ac_status" >&5 ++ echo "$as_me:25390: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=$ac_mid; break + else +@@ -25193,7 +25403,7 @@ + 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 25196 "configure" ++#line 25406 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -25205,16 +25415,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:25208: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25418: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25211: \$? = $ac_status" >&5 ++ echo "$as_me:25421: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:25214: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25424: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25217: \$? = $ac_status" >&5 ++ echo "$as_me:25427: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid + else +@@ -25227,12 +25437,12 @@ + ac_cv_sizeof_int=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:25230: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:25440: 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 25235 "configure" ++#line 25445 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -25248,15 +25458,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:25251: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:25461: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:25254: \$? = $ac_status" >&5 ++ echo "$as_me:25464: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:25256: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25466: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25259: \$? = $ac_status" >&5 ++ echo "$as_me:25469: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_int=`cat conftest.val` + else +@@ -25272,19 +25482,19 @@ + ac_cv_sizeof_int=0 + fi + fi +-echo "$as_me:25275: result: $ac_cv_sizeof_int" >&5 ++echo "$as_me:25485: result: $ac_cv_sizeof_int" >&5 + echo "${ECHO_T}$ac_cv_sizeof_int" >&6 + cat >>confdefs.h <&5 ++echo "$as_me:25491: 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 25287 "configure" ++#line 25497 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -25299,16 +25509,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:25302: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25512: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25305: \$? = $ac_status" >&5 ++ echo "$as_me:25515: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:25308: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25518: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25311: \$? = $ac_status" >&5 ++ echo "$as_me:25521: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_long=yes + else +@@ -25318,10 +25528,10 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:25321: result: $ac_cv_type_long" >&5 ++echo "$as_me:25531: result: $ac_cv_type_long" >&5 + echo "${ECHO_T}$ac_cv_type_long" >&6 + +-echo "$as_me:25324: checking size of long" >&5 ++echo "$as_me:25534: 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 +@@ -25330,7 +25540,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >conftest.$ac_ext <<_ACEOF +-#line 25333 "configure" ++#line 25543 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -25342,21 +25552,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:25345: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25555: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25348: \$? = $ac_status" >&5 ++ echo "$as_me:25558: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:25351: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25561: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25354: \$? = $ac_status" >&5 ++ echo "$as_me:25564: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +-#line 25359 "configure" ++#line 25569 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -25368,16 +25578,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:25371: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25581: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25374: \$? = $ac_status" >&5 ++ echo "$as_me:25584: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:25377: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25587: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25380: \$? = $ac_status" >&5 ++ echo "$as_me:25590: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid; break + else +@@ -25393,7 +25603,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +-#line 25396 "configure" ++#line 25606 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -25405,16 +25615,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:25408: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25618: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25411: \$? = $ac_status" >&5 ++ echo "$as_me:25621: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:25414: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25624: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25417: \$? = $ac_status" >&5 ++ echo "$as_me:25627: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=$ac_mid; break + else +@@ -25430,7 +25640,7 @@ + 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 25433 "configure" ++#line 25643 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -25442,16 +25652,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:25445: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25655: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25448: \$? = $ac_status" >&5 ++ echo "$as_me:25658: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:25451: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25661: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25454: \$? = $ac_status" >&5 ++ echo "$as_me:25664: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid + else +@@ -25464,12 +25674,12 @@ + ac_cv_sizeof_long=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:25467: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:25677: 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 25472 "configure" ++#line 25682 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -25485,15 +25695,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:25488: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:25698: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:25491: \$? = $ac_status" >&5 ++ echo "$as_me:25701: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:25493: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25703: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25496: \$? = $ac_status" >&5 ++ echo "$as_me:25706: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_long=`cat conftest.val` + else +@@ -25509,19 +25719,19 @@ + ac_cv_sizeof_long=0 + fi + fi +-echo "$as_me:25512: result: $ac_cv_sizeof_long" >&5 ++echo "$as_me:25722: result: $ac_cv_sizeof_long" >&5 + echo "${ECHO_T}$ac_cv_sizeof_long" >&6 + cat >>confdefs.h <&5 ++echo "$as_me:25728: 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 25524 "configure" ++#line 25734 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -25536,16 +25746,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:25539: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25749: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25542: \$? = $ac_status" >&5 ++ echo "$as_me:25752: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:25545: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25755: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25548: \$? = $ac_status" >&5 ++ echo "$as_me:25758: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_off_t=yes + else +@@ -25555,10 +25765,10 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:25558: result: $ac_cv_type_off_t" >&5 ++echo "$as_me:25768: result: $ac_cv_type_off_t" >&5 + echo "${ECHO_T}$ac_cv_type_off_t" >&6 + +-echo "$as_me:25561: checking size of off_t" >&5 ++echo "$as_me:25771: 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 +@@ -25567,7 +25777,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >conftest.$ac_ext <<_ACEOF +-#line 25570 "configure" ++#line 25780 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -25579,21 +25789,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:25582: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25792: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25585: \$? = $ac_status" >&5 ++ echo "$as_me:25795: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:25588: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25798: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25591: \$? = $ac_status" >&5 ++ echo "$as_me:25801: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +-#line 25596 "configure" ++#line 25806 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -25605,16 +25815,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:25608: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25818: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25611: \$? = $ac_status" >&5 ++ echo "$as_me:25821: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:25614: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25824: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25617: \$? = $ac_status" >&5 ++ echo "$as_me:25827: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid; break + else +@@ -25630,7 +25840,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +-#line 25633 "configure" ++#line 25843 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -25642,16 +25852,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:25645: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25855: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25648: \$? = $ac_status" >&5 ++ echo "$as_me:25858: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:25651: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25861: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25654: \$? = $ac_status" >&5 ++ echo "$as_me:25864: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=$ac_mid; break + else +@@ -25667,7 +25877,7 @@ + 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 25670 "configure" ++#line 25880 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -25679,16 +25889,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:25682: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25892: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25685: \$? = $ac_status" >&5 ++ echo "$as_me:25895: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:25688: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25898: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25691: \$? = $ac_status" >&5 ++ echo "$as_me:25901: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid + else +@@ -25701,12 +25911,12 @@ + ac_cv_sizeof_off_t=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:25704: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:25914: 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 25709 "configure" ++#line 25919 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -25722,15 +25932,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:25725: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:25935: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:25728: \$? = $ac_status" >&5 ++ echo "$as_me:25938: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:25730: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25940: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25733: \$? = $ac_status" >&5 ++ echo "$as_me:25943: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_off_t=`cat conftest.val` + else +@@ -25746,19 +25956,19 @@ + ac_cv_sizeof_off_t=0 + fi + fi +-echo "$as_me:25749: result: $ac_cv_sizeof_off_t" >&5 ++echo "$as_me:25959: result: $ac_cv_sizeof_off_t" >&5 + echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6 + cat >>confdefs.h <&5 ++echo "$as_me:25965: 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 25761 "configure" ++#line 25971 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -25773,16 +25983,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:25776: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:25986: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25779: \$? = $ac_status" >&5 ++ echo "$as_me:25989: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:25782: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:25992: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25785: \$? = $ac_status" >&5 ++ echo "$as_me:25995: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_time_t=yes + else +@@ -25792,10 +26002,10 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:25795: result: $ac_cv_type_time_t" >&5 ++echo "$as_me:26005: result: $ac_cv_type_time_t" >&5 + echo "${ECHO_T}$ac_cv_type_time_t" >&6 + +-echo "$as_me:25798: checking size of time_t" >&5 ++echo "$as_me:26008: 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 +@@ -25804,7 +26014,7 @@ + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. + cat >conftest.$ac_ext <<_ACEOF +-#line 25807 "configure" ++#line 26017 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -25816,21 +26026,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:25819: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26029: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25822: \$? = $ac_status" >&5 ++ echo "$as_me:26032: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:25825: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26035: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25828: \$? = $ac_status" >&5 ++ echo "$as_me:26038: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +-#line 25833 "configure" ++#line 26043 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -25842,16 +26052,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:25845: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26055: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25848: \$? = $ac_status" >&5 ++ echo "$as_me:26058: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:25851: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26061: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25854: \$? = $ac_status" >&5 ++ echo "$as_me:26064: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid; break + else +@@ -25867,7 +26077,7 @@ + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +-#line 25870 "configure" ++#line 26080 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -25879,16 +26089,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:25882: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26092: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25885: \$? = $ac_status" >&5 ++ echo "$as_me:26095: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:25888: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26098: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25891: \$? = $ac_status" >&5 ++ echo "$as_me:26101: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=$ac_mid; break + else +@@ -25904,7 +26114,7 @@ + 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 25907 "configure" ++#line 26117 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -25916,16 +26126,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:25919: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:26129: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:25922: \$? = $ac_status" >&5 ++ echo "$as_me:26132: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:25925: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26135: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25928: \$? = $ac_status" >&5 ++ echo "$as_me:26138: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid + else +@@ -25938,12 +26148,12 @@ + ac_cv_sizeof_time_t=$ac_lo + else + if test "$cross_compiling" = yes; then +- { { echo "$as_me:25941: error: cannot run test program while cross compiling" >&5 ++ { { echo "$as_me:26151: 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 25946 "configure" ++#line 26156 "configure" + #include "confdefs.h" + $ac_includes_default + int +@@ -25959,15 +26169,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:25962: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:26172: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:25965: \$? = $ac_status" >&5 ++ echo "$as_me:26175: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:25967: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26177: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:25970: \$? = $ac_status" >&5 ++ echo "$as_me:26180: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_time_t=`cat conftest.val` + else +@@ -25983,7 +26193,7 @@ + ac_cv_sizeof_time_t=0 + fi + fi +-echo "$as_me:25986: result: $ac_cv_sizeof_time_t" >&5 ++echo "$as_me:26196: result: $ac_cv_sizeof_time_t" >&5 + echo "${ECHO_T}$ac_cv_sizeof_time_t" >&6 + cat >>confdefs.h <&5 ++echo "$as_me:26204: 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 26000 "configure" ++#line 26210 "configure" + #include "confdefs.h" + #include + int +@@ -26009,16 +26219,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:26012: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:26222: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:26015: \$? = $ac_status" >&5 ++ echo "$as_me:26225: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:26018: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26228: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26021: \$? = $ac_status" >&5 ++ echo "$as_me:26231: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_working_alloca_h=yes + else +@@ -26028,7 +26238,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:26031: result: $ac_cv_working_alloca_h" >&5 ++echo "$as_me:26241: 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 + +@@ -26038,13 +26248,13 @@ + + fi + +-echo "$as_me:26041: checking for alloca" >&5 ++echo "$as_me:26251: 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 26047 "configure" ++#line 26257 "configure" + #include "confdefs.h" + #ifdef __GNUC__ + # define alloca __builtin_alloca +@@ -26076,16 +26286,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:26079: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:26289: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:26082: \$? = $ac_status" >&5 ++ echo "$as_me:26292: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:26085: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26295: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26088: \$? = $ac_status" >&5 ++ echo "$as_me:26298: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_alloca_works=yes + else +@@ -26095,7 +26305,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:26098: result: $ac_cv_func_alloca_works" >&5 ++echo "$as_me:26308: 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 +@@ -26116,13 +26326,13 @@ + #define C_ALLOCA 1 + EOF + +-echo "$as_me:26119: checking whether \`alloca.c' needs Cray hooks" >&5 ++echo "$as_me:26329: 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 26125 "configure" ++#line 26335 "configure" + #include "confdefs.h" + #if defined(CRAY) && ! defined(CRAY2) + webecray +@@ -26140,18 +26350,18 @@ + rm -f conftest* + + fi +-echo "$as_me:26143: result: $ac_cv_os_cray" >&5 ++echo "$as_me:26353: 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:26148: checking for $ac_func" >&5 ++echo "$as_me:26358: 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 26154 "configure" ++#line 26364 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. */ +@@ -26182,16 +26392,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:26185: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:26395: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:26188: \$? = $ac_status" >&5 ++ echo "$as_me:26398: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:26191: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26401: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26194: \$? = $ac_status" >&5 ++ echo "$as_me:26404: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -26201,7 +26411,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:26204: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:26414: 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 + +@@ -26215,7 +26425,7 @@ + done + fi + +-echo "$as_me:26218: checking stack direction for C alloca" >&5 ++echo "$as_me:26428: 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 +@@ -26224,7 +26434,7 @@ + ac_cv_c_stack_direction=0 + else + cat >conftest.$ac_ext <<_ACEOF +-#line 26227 "configure" ++#line 26437 "configure" + #include "confdefs.h" + int + find_stack_direction () +@@ -26247,15 +26457,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:26250: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:26460: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:26253: \$? = $ac_status" >&5 ++ echo "$as_me:26463: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:26255: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26465: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26258: \$? = $ac_status" >&5 ++ echo "$as_me:26468: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_c_stack_direction=1 + else +@@ -26267,7 +26477,7 @@ + rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + fi +-echo "$as_me:26270: result: $ac_cv_c_stack_direction" >&5 ++echo "$as_me:26480: result: $ac_cv_c_stack_direction" >&5 + echo "${ECHO_T}$ac_cv_c_stack_direction" >&6 + + cat >>confdefs.h <&5 ++echo "$as_me:26492: 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 26288 "configure" ++#line 26498 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:26292: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:26502: \"$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:26298: \$? = $ac_status" >&5 ++ echo "$as_me:26508: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -26314,7 +26524,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:26317: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:26527: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:26540: 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 26336 "configure" ++#line 26546 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. */ +@@ -26364,16 +26574,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:26367: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:26577: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:26370: \$? = $ac_status" >&5 ++ echo "$as_me:26580: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:26373: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26583: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26376: \$? = $ac_status" >&5 ++ echo "$as_me:26586: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -26383,7 +26593,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:26386: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:26596: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5 ++ echo "$as_me:26608: 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 +@@ -26418,15 +26628,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:26421: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:26631: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:26424: \$? = $ac_status" >&5 ++ echo "$as_me:26634: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:26426: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26636: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26429: \$? = $ac_status" >&5 ++ echo "$as_me:26639: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_fork_works=yes + else +@@ -26438,7 +26648,7 @@ + rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + fi +-echo "$as_me:26441: result: $ac_cv_func_fork_works" >&5 ++echo "$as_me:26651: result: $ac_cv_func_fork_works" >&5 + echo "${ECHO_T}$ac_cv_func_fork_works" >&6 + + fi +@@ -26452,12 +26662,12 @@ + ac_cv_func_fork_works=yes + ;; + esac +- { echo "$as_me:26455: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 ++ { echo "$as_me:26665: 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:26460: checking for working vfork" >&5 ++ echo "$as_me:26670: 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 +@@ -26466,7 +26676,7 @@ + ac_cv_func_vfork_works=cross + else + cat >conftest.$ac_ext <<_ACEOF +-#line 26469 "configure" ++#line 26679 "configure" + #include "confdefs.h" + /* Thanks to Paul Eggert for this test. */ + #include +@@ -26563,15 +26773,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:26566: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:26776: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:26569: \$? = $ac_status" >&5 ++ echo "$as_me:26779: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:26571: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26781: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26574: \$? = $ac_status" >&5 ++ echo "$as_me:26784: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_vfork_works=yes + else +@@ -26583,13 +26793,13 @@ + rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + fi +-echo "$as_me:26586: result: $ac_cv_func_vfork_works" >&5 ++echo "$as_me:26796: 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:26592: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 ++ { echo "$as_me:26802: 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 + +@@ -26614,14 +26824,14 @@ + + fi + +-echo "$as_me:26617: checking if we should use fcntl or ioctl" >&5 ++echo "$as_me:26827: 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 26624 "configure" ++#line 26834 "configure" + #include "confdefs.h" + + #include +@@ -26638,16 +26848,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:26641: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:26851: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:26644: \$? = $ac_status" >&5 ++ echo "$as_me:26854: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:26647: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26857: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26650: \$? = $ac_status" >&5 ++ echo "$as_me:26860: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_fionbio=ioctl + else +@@ -26655,7 +26865,7 @@ + cat conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 26658 "configure" ++#line 26868 "configure" + #include "confdefs.h" + + #include +@@ -26677,16 +26887,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:26680: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:26890: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:26683: \$? = $ac_status" >&5 ++ echo "$as_me:26893: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:26686: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26896: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26689: \$? = $ac_status" >&5 ++ echo "$as_me:26899: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_fionbio=fcntl + else +@@ -26699,20 +26909,20 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:26702: result: $cf_cv_fionbio" >&5 ++echo "$as_me:26912: 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:26708: checking for broken/missing definition of remove" >&5 ++echo "$as_me:26918: 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 26715 "configure" ++#line 26925 "configure" + #include "confdefs.h" + #include + int +@@ -26724,23 +26934,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:26727: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:26937: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:26730: \$? = $ac_status" >&5 ++ echo "$as_me:26940: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:26733: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26943: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26736: \$? = $ac_status" >&5 ++ echo "$as_me:26946: \$? = $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 26743 "configure" ++#line 26953 "configure" + #include "confdefs.h" + #include + int __unlink(name) { return unlink(name); } +@@ -26753,16 +26963,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:26756: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:26966: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:26759: \$? = $ac_status" >&5 ++ echo "$as_me:26969: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:26762: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:26972: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26765: \$? = $ac_status" >&5 ++ echo "$as_me:26975: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_baddef_remove=yes + else +@@ -26777,20 +26987,20 @@ + + fi + +-echo "$as_me:26780: result: $cf_cv_baddef_remove" >&5 ++echo "$as_me:26990: 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:26786: checking for lstat" >&5 ++echo "$as_me:26996: 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 26793 "configure" ++#line 27003 "configure" + #include "confdefs.h" + + #include +@@ -26804,16 +27014,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:26807: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:27017: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:26810: \$? = $ac_status" >&5 ++ echo "$as_me:27020: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:26813: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27023: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26816: \$? = $ac_status" >&5 ++ echo "$as_me:27026: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_lstat=yes + else +@@ -26825,7 +27035,7 @@ + + fi + +-echo "$as_me:26828: result: $ac_cv_func_lstat " >&5 ++echo "$as_me:27038: result: $ac_cv_func_lstat " >&5 + echo "${ECHO_T}$ac_cv_func_lstat " >&6 + if test $ac_cv_func_lstat = yes; then + cat >>confdefs.h <<\EOF +@@ -26859,13 +27069,13 @@ + + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +-echo "$as_me:26862: checking for $ac_func" >&5 ++echo "$as_me:27072: 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 26868 "configure" ++#line 27078 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. */ +@@ -26896,16 +27106,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:26899: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:27109: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:26902: \$? = $ac_status" >&5 ++ echo "$as_me:27112: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:26905: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27115: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26908: \$? = $ac_status" >&5 ++ echo "$as_me:27118: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -26915,7 +27125,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:26918: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:27128: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:27144: 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 26940 "configure" ++#line 27150 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. */ +@@ -26968,16 +27178,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:26971: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:27181: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:26974: \$? = $ac_status" >&5 ++ echo "$as_me:27184: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:26977: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27187: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:26980: \$? = $ac_status" >&5 ++ echo "$as_me:27190: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -26987,7 +27197,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:26990: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:27200: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:27212: 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 +@@ -27019,7 +27229,7 @@ + esac + + cat >conftest.$ac_ext <<_ACEOF +-#line 27022 "configure" ++#line 27232 "configure" + #include "confdefs.h" + + #ifdef HAVE_STDLIB_H +@@ -27038,16 +27248,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:27041: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:27251: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:27044: \$? = $ac_status" >&5 ++ echo "$as_me:27254: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:27047: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27257: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27050: \$? = $ac_status" >&5 ++ echo "$as_me:27260: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_srand_func=$cf_func + break +@@ -27059,10 +27269,10 @@ + done + + fi +-echo "$as_me:27062: result: $cf_cv_srand_func" >&5 ++echo "$as_me:27272: 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:27065: checking for range of random-integers" >&5 ++ echo "$as_me:27275: 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 +@@ -27083,7 +27293,7 @@ + ;; + esac + cat >conftest.$ac_ext <<_ACEOF +-#line 27086 "configure" ++#line 27296 "configure" + #include "confdefs.h" + + #ifdef HAVE_STDLIB_H +@@ -27102,16 +27312,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:27105: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27315: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27108: \$? = $ac_status" >&5 ++ echo "$as_me:27318: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:27111: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27321: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27114: \$? = $ac_status" >&5 ++ echo "$as_me:27324: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -27122,7 +27332,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:27125: result: $cf_cv_rand_max" >&5 ++echo "$as_me:27335: result: $cf_cv_rand_max" >&5 + echo "${ECHO_T}$cf_cv_rand_max" >&6 + + cf_srand_func=`echo $cf_func | sed -e 's%/.*%%'` +@@ -27153,13 +27363,13 @@ + for ac_func in strstr + do + +-echo "$as_me:27156: checking for $ac_func declaration" >&5 ++echo "$as_me:27366: 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 27162 "configure" ++#line 27372 "configure" + #include "confdefs.h" + #include + int +@@ -27173,20 +27383,20 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:27176: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27386: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27179: \$? = $ac_status" >&5 ++ echo "$as_me:27389: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:27182: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27392: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27185: \$? = $ac_status" >&5 ++ echo "$as_me:27395: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cat >conftest.$ac_ext <<_ACEOF +-#line 27189 "configure" ++#line 27399 "configure" + #include "confdefs.h" + #include + int +@@ -27200,16 +27410,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:27203: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27413: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27206: \$? = $ac_status" >&5 ++ echo "$as_me:27416: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:27209: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27419: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27212: \$? = $ac_status" >&5 ++ echo "$as_me:27422: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + eval "ac_cv_func_decl_$ac_func=yes" +@@ -27230,11 +27440,11 @@ + fi + + if eval "test \"`echo '$ac_cv_func_'decl_$ac_func`\" = yes"; then +- echo "$as_me:27233: result: yes" >&5 ++ echo "$as_me:27443: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + : + else +- echo "$as_me:27237: result: no" >&5 ++ echo "$as_me:27447: result: no" >&5 + echo "${ECHO_T}no" >&6 + + ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` +@@ -27249,13 +27459,13 @@ + for ac_func in getgrgid getgrnam + do + +-echo "$as_me:27252: checking for $ac_func declaration" >&5 ++echo "$as_me:27462: 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 27258 "configure" ++#line 27468 "configure" + #include "confdefs.h" + + #include +@@ -27271,20 +27481,20 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:27274: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27484: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27277: \$? = $ac_status" >&5 ++ echo "$as_me:27487: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:27280: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27490: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27283: \$? = $ac_status" >&5 ++ echo "$as_me:27493: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cat >conftest.$ac_ext <<_ACEOF +-#line 27287 "configure" ++#line 27497 "configure" + #include "confdefs.h" + + #include +@@ -27300,16 +27510,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:27303: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27513: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27306: \$? = $ac_status" >&5 ++ echo "$as_me:27516: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:27309: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27519: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27312: \$? = $ac_status" >&5 ++ echo "$as_me:27522: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + eval "ac_cv_func_decl_$ac_func=yes" +@@ -27330,11 +27540,11 @@ + fi + + if eval "test \"`echo '$ac_cv_func_'decl_$ac_func`\" = yes"; then +- echo "$as_me:27333: result: yes" >&5 ++ echo "$as_me:27543: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + : + else +- echo "$as_me:27337: result: no" >&5 ++ echo "$as_me:27547: result: no" >&5 + echo "${ECHO_T}no" >&6 + + ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` +@@ -27346,14 +27556,14 @@ + fi + done + +-echo "$as_me:27349: checking if TRUE/FALSE are defined" >&5 ++echo "$as_me:27559: 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 27356 "configure" ++#line 27566 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header-curses.h}> +@@ -27367,16 +27577,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:27370: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27580: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27373: \$? = $ac_status" >&5 ++ echo "$as_me:27583: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:27376: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27586: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27379: \$? = $ac_status" >&5 ++ echo "$as_me:27589: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_bool_defs=yes + else +@@ -27387,7 +27597,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + fi + +-echo "$as_me:27390: result: $cf_cv_bool_defs" >&5 ++echo "$as_me:27600: result: $cf_cv_bool_defs" >&5 + echo "${ECHO_T}$cf_cv_bool_defs" >&6 + if test "$cf_cv_bool_defs" = no ; then + cat >>confdefs.h <<\EOF +@@ -27400,14 +27610,14 @@ + + fi + +-echo "$as_me:27403: checking if external errno is declared" >&5 ++echo "$as_me:27613: 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 27410 "configure" ++#line 27620 "configure" + #include "confdefs.h" + + #ifdef HAVE_STDLIB_H +@@ -27425,16 +27635,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:27428: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27638: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27431: \$? = $ac_status" >&5 ++ echo "$as_me:27641: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:27434: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27644: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27437: \$? = $ac_status" >&5 ++ echo "$as_me:27647: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_dcl_errno=yes + else +@@ -27445,7 +27655,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:27448: result: $cf_cv_dcl_errno" >&5 ++echo "$as_me:27658: result: $cf_cv_dcl_errno" >&5 + echo "${ECHO_T}$cf_cv_dcl_errno" >&6 + + if test "$cf_cv_dcl_errno" = no ; then +@@ -27460,14 +27670,14 @@ + + # It's possible (for near-UNIX clones) that the data doesn't exist + +-echo "$as_me:27463: checking if external errno exists" >&5 ++echo "$as_me:27673: 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 27470 "configure" ++#line 27680 "configure" + #include "confdefs.h" + + #undef errno +@@ -27482,16 +27692,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:27485: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:27695: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:27488: \$? = $ac_status" >&5 ++ echo "$as_me:27698: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:27491: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27701: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27494: \$? = $ac_status" >&5 ++ echo "$as_me:27704: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_errno=yes + else +@@ -27502,7 +27712,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:27505: result: $cf_cv_have_errno" >&5 ++echo "$as_me:27715: result: $cf_cv_have_errno" >&5 + echo "${ECHO_T}$cf_cv_have_errno" >&6 + + if test "$cf_cv_have_errno" = yes ; then +@@ -27515,7 +27725,7 @@ + + fi + +-echo "$as_me:27518: checking if we can set errno" >&5 ++echo "$as_me:27728: 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 +@@ -27523,7 +27733,7 @@ + + if test "$cross_compiling" = yes; then + cat >conftest.$ac_ext <<_ACEOF +-#line 27526 "configure" ++#line 27736 "configure" + #include "confdefs.h" + #include + int +@@ -27535,16 +27745,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:27538: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:27748: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:27541: \$? = $ac_status" >&5 ++ echo "$as_me:27751: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:27544: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27754: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27547: \$? = $ac_status" >&5 ++ echo "$as_me:27757: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_set_errno=maybe + else +@@ -27555,7 +27765,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + else + cat >conftest.$ac_ext <<_ACEOF +-#line 27558 "configure" ++#line 27768 "configure" + #include "confdefs.h" + + #include +@@ -27566,15 +27776,15 @@ + } + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:27569: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:27779: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:27572: \$? = $ac_status" >&5 ++ echo "$as_me:27782: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:27574: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27784: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27577: \$? = $ac_status" >&5 ++ echo "$as_me:27787: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_set_errno=yes + else +@@ -27587,20 +27797,20 @@ + fi + + fi +-echo "$as_me:27590: result: $cf_cv_set_errno" >&5 ++echo "$as_me:27800: 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:27596: checking for setlocale()" >&5 ++echo "$as_me:27806: 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 27603 "configure" ++#line 27813 "configure" + #include "confdefs.h" + #include + int +@@ -27612,16 +27822,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:27615: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:27825: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:27618: \$? = $ac_status" >&5 ++ echo "$as_me:27828: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:27621: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27831: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27624: \$? = $ac_status" >&5 ++ echo "$as_me:27834: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_locale=yes + else +@@ -27633,21 +27843,21 @@ + + fi + +-echo "$as_me:27636: result: $cf_cv_locale" >&5 ++echo "$as_me:27846: result: $cf_cv_locale" >&5 + echo "${ECHO_T}$cf_cv_locale" >&6 + test $cf_cv_locale = yes && { cat >>confdefs.h <<\EOF + #define LOCALE 1 + EOF + } + +-echo "$as_me:27643: checking if NGROUPS is defined" >&5 ++echo "$as_me:27853: 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 27650 "configure" ++#line 27860 "configure" + #include "confdefs.h" + + #if HAVE_SYS_PARAM_H +@@ -27666,23 +27876,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:27669: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27879: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27672: \$? = $ac_status" >&5 ++ echo "$as_me:27882: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:27675: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27885: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27678: \$? = $ac_status" >&5 ++ echo "$as_me:27888: \$? = $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 27685 "configure" ++#line 27895 "configure" + #include "confdefs.h" + + #if HAVE_SYS_PARAM_H +@@ -27701,16 +27911,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:27704: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27914: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27707: \$? = $ac_status" >&5 ++ echo "$as_me:27917: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:27710: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27920: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27713: \$? = $ac_status" >&5 ++ echo "$as_me:27923: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ngroups=NGROUPS_MAX + else +@@ -27722,7 +27932,7 @@ + + fi + rm -f conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:27725: result: $cf_cv_ngroups" >&5 ++echo "$as_me:27935: result: $cf_cv_ngroups" >&5 + echo "${ECHO_T}$cf_cv_ngroups" >&6 + + fi +@@ -27739,14 +27949,14 @@ + + fi + +-echo "$as_me:27742: checking if external sys_nerr is declared" >&5 ++echo "$as_me:27952: 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 27749 "configure" ++#line 27959 "configure" + #include "confdefs.h" + + #ifdef HAVE_STDLIB_H +@@ -27764,16 +27974,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:27767: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:27977: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27770: \$? = $ac_status" >&5 ++ echo "$as_me:27980: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:27773: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:27983: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27776: \$? = $ac_status" >&5 ++ echo "$as_me:27986: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_dcl_sys_nerr=yes + else +@@ -27784,7 +27994,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:27787: result: $cf_cv_dcl_sys_nerr" >&5 ++echo "$as_me:27997: 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 +@@ -27799,14 +28009,14 @@ + + # It's possible (for near-UNIX clones) that the data doesn't exist + +-echo "$as_me:27802: checking if external sys_nerr exists" >&5 ++echo "$as_me:28012: 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 27809 "configure" ++#line 28019 "configure" + #include "confdefs.h" + + #undef sys_nerr +@@ -27821,16 +28031,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:27824: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:28034: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:27827: \$? = $ac_status" >&5 ++ echo "$as_me:28037: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:27830: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:28040: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27833: \$? = $ac_status" >&5 ++ echo "$as_me:28043: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_sys_nerr=yes + else +@@ -27841,7 +28051,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:27844: result: $cf_cv_have_sys_nerr" >&5 ++echo "$as_me:28054: 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 +@@ -27854,14 +28064,14 @@ + + fi + +-echo "$as_me:27857: checking if external sys_errlist is declared" >&5 ++echo "$as_me:28067: 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 27864 "configure" ++#line 28074 "configure" + #include "confdefs.h" + + #ifdef HAVE_STDLIB_H +@@ -27879,16 +28089,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:27882: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:28092: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:27885: \$? = $ac_status" >&5 ++ echo "$as_me:28095: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:27888: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:28098: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27891: \$? = $ac_status" >&5 ++ echo "$as_me:28101: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_dcl_sys_errlist=yes + else +@@ -27899,7 +28109,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:27902: result: $cf_cv_dcl_sys_errlist" >&5 ++echo "$as_me:28112: 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 +@@ -27914,14 +28124,14 @@ + + # It's possible (for near-UNIX clones) that the data doesn't exist + +-echo "$as_me:27917: checking if external sys_errlist exists" >&5 ++echo "$as_me:28127: 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 27924 "configure" ++#line 28134 "configure" + #include "confdefs.h" + + #undef sys_errlist +@@ -27936,16 +28146,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:27939: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:28149: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:27942: \$? = $ac_status" >&5 ++ echo "$as_me:28152: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:27945: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:28155: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:27948: \$? = $ac_status" >&5 ++ echo "$as_me:28158: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_sys_errlist=yes + else +@@ -27956,7 +28166,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:27959: result: $cf_cv_have_sys_errlist" >&5 ++echo "$as_me:28169: 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 +@@ -27972,23 +28182,23 @@ + for ac_header in lastlog.h paths.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:27975: checking for $ac_header" >&5 ++echo "$as_me:28185: 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 27981 "configure" ++#line 28191 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:27985: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:28195: \"$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:27991: \$? = $ac_status" >&5 ++ echo "$as_me:28201: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -28007,7 +28217,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:28010: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:28220: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:28230: 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 28027 "configure" ++#line 28237 "configure" + #include "confdefs.h" + + #include +@@ -28044,16 +28254,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:28047: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:28257: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:28050: \$? = $ac_status" >&5 ++ echo "$as_me:28260: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:28053: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:28263: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:28056: \$? = $ac_status" >&5 ++ echo "$as_me:28266: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_path_lastlog="_PATH_LASTLOG" + else +@@ -28068,13 +28278,13 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:28071: result: $cf_cv_path_lastlog" >&5 ++echo "$as_me:28281: 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:28077: checking for utmp implementation" >&5 ++echo "$as_me:28287: 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 +@@ -28091,7 +28301,7 @@ + #endif + " + cat >conftest.$ac_ext <<_ACEOF +-#line 28094 "configure" ++#line 28304 "configure" + #include "confdefs.h" + $cf_utmp_includes + int +@@ -28105,16 +28315,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:28108: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:28318: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:28111: \$? = $ac_status" >&5 ++ echo "$as_me:28321: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:28114: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:28324: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:28117: \$? = $ac_status" >&5 ++ echo "$as_me:28327: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_utmp=$cf_header + break +@@ -28123,7 +28333,7 @@ + cat conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 28126 "configure" ++#line 28336 "configure" + #include "confdefs.h" + $cf_utmp_includes + int +@@ -28137,16 +28347,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:28140: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:28350: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:28143: \$? = $ac_status" >&5 ++ echo "$as_me:28353: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:28146: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:28356: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:28149: \$? = $ac_status" >&5 ++ echo "$as_me:28359: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_utmp=$cf_header + break +@@ -28161,7 +28371,7 @@ + done + + fi +-echo "$as_me:28164: result: $cf_cv_have_utmp" >&5 ++echo "$as_me:28374: result: $cf_cv_have_utmp" >&5 + echo "${ECHO_T}$cf_cv_have_utmp" >&6 + + if test $cf_cv_have_utmp != no ; then +@@ -28174,14 +28384,14 @@ + EOF + + if test $cf_cv_have_utmp != no ; then +-echo "$as_me:28177: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5 ++echo "$as_me:28387: 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 28184 "configure" ++#line 28394 "configure" + #include "confdefs.h" + + #include +@@ -28195,16 +28405,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:28198: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:28408: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:28201: \$? = $ac_status" >&5 ++ echo "$as_me:28411: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:28204: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:28414: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:28207: \$? = $ac_status" >&5 ++ echo "$as_me:28417: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_utmp_ut_host=yes + else +@@ -28216,7 +28426,7 @@ + + fi + +-echo "$as_me:28219: result: $cf_cv_have_utmp_ut_host" >&5 ++echo "$as_me:28429: 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 + #define HAVE_UTMP_UT_HOST 1 +@@ -28225,14 +28435,14 @@ + fi + + if test $cf_cv_have_utmp != no ; then +-echo "$as_me:28228: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5 ++echo "$as_me:28438: 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 28235 "configure" ++#line 28445 "configure" + #include "confdefs.h" + + #include +@@ -28246,16 +28456,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:28249: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:28459: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:28252: \$? = $ac_status" >&5 ++ echo "$as_me:28462: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:28255: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:28465: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:28258: \$? = $ac_status" >&5 ++ echo "$as_me:28468: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_utmp_ut_syslen=yes + else +@@ -28267,7 +28477,7 @@ + + fi + +-echo "$as_me:28270: result: $cf_cv_have_utmp_ut_syslen" >&5 ++echo "$as_me:28480: 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 + #define HAVE_UTMP_UT_SYSLEN 1 +@@ -28276,7 +28486,7 @@ + fi + + if test $cf_cv_have_utmp != no ; then +-echo "$as_me:28279: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5 ++echo "$as_me:28489: 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 +@@ -28293,7 +28503,7 @@ + " + for cf_header in ut_name ut_user ; do + cat >conftest.$ac_ext <<_ACEOF +-#line 28296 "configure" ++#line 28506 "configure" + #include "confdefs.h" + $cf_utmp_includes + int +@@ -28307,16 +28517,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:28310: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:28520: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:28313: \$? = $ac_status" >&5 ++ echo "$as_me:28523: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:28316: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:28526: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:28319: \$? = $ac_status" >&5 ++ echo "$as_me:28529: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_utmp_ut_name=$cf_header + break +@@ -28328,12 +28538,12 @@ + done + + fi +-echo "$as_me:28331: result: $cf_cv_have_utmp_ut_name" >&5 ++echo "$as_me:28541: 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 #(vi + no) #(vi +- { { echo "$as_me:28336: error: Cannot find declaration for ut.ut_name" >&5 ++ { { echo "$as_me:28546: 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; }; } + ;; +@@ -28347,7 +28557,7 @@ + fi + + if test $cf_cv_have_utmp != no ; then +-echo "$as_me:28350: checking for exit-status in $cf_cv_have_utmp" >&5 ++echo "$as_me:28560: 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 +@@ -28360,7 +28570,7 @@ + ut_exit.ut_exit + do + cat >conftest.$ac_ext <<_ACEOF +-#line 28363 "configure" ++#line 28573 "configure" + #include "confdefs.h" + + #include +@@ -28374,16 +28584,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:28377: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:28587: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:28380: \$? = $ac_status" >&5 ++ echo "$as_me:28590: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:28383: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:28593: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:28386: \$? = $ac_status" >&5 ++ echo "$as_me:28596: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_utmp_ut_xstatus=$cf_result + break +@@ -28396,7 +28606,7 @@ + done + + fi +-echo "$as_me:28399: result: $cf_cv_have_utmp_ut_xstatus" >&5 ++echo "$as_me:28609: 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 + cat >>confdefs.h <<\EOF +@@ -28411,14 +28621,14 @@ + fi + + if test $cf_cv_have_utmp != no ; then +-echo "$as_me:28414: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5 ++echo "$as_me:28624: 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 28421 "configure" ++#line 28631 "configure" + #include "confdefs.h" + + #include +@@ -28432,23 +28642,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:28435: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:28645: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:28438: \$? = $ac_status" >&5 ++ echo "$as_me:28648: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:28441: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:28651: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:28444: \$? = $ac_status" >&5 ++ echo "$as_me:28654: \$? = $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 28451 "configure" ++#line 28661 "configure" + #include "confdefs.h" + + #include +@@ -28462,16 +28672,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:28465: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:28675: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:28468: \$? = $ac_status" >&5 ++ echo "$as_me:28678: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:28471: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:28681: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:28474: \$? = $ac_status" >&5 ++ echo "$as_me:28684: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_utmp_ut_xtime=define + else +@@ -28485,7 +28695,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:28488: result: $cf_cv_have_utmp_ut_xtime" >&5 ++echo "$as_me:28698: 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 + cat >>confdefs.h <<\EOF +@@ -28502,14 +28712,14 @@ + fi + + if test $cf_cv_have_utmp != no ; then +-echo "$as_me:28505: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5 ++echo "$as_me:28715: 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 28512 "configure" ++#line 28722 "configure" + #include "confdefs.h" + + #include +@@ -28523,16 +28733,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:28526: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:28736: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:28529: \$? = $ac_status" >&5 ++ echo "$as_me:28739: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:28532: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:28742: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:28535: \$? = $ac_status" >&5 ++ echo "$as_me:28745: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_utmp_ut_session=yes + else +@@ -28543,7 +28753,7 @@ + rm -f conftest.$ac_objext conftest.$ac_ext + + fi +-echo "$as_me:28546: result: $cf_cv_have_utmp_ut_session" >&5 ++echo "$as_me:28756: 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 + cat >>confdefs.h <<\EOF +@@ -28553,7 +28763,7 @@ + fi + fi + +-echo "$as_me:28556: checking if $cf_cv_have_utmp is SYSV flavor" >&5 ++echo "$as_me:28766: 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 +@@ -28561,7 +28771,7 @@ + + test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx" + cat >conftest.$ac_ext <<_ACEOF +-#line 28564 "configure" ++#line 28774 "configure" + #include "confdefs.h" + + #include +@@ -28580,16 +28790,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:28583: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:28793: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:28586: \$? = $ac_status" >&5 ++ echo "$as_me:28796: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:28589: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:28799: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:28592: \$? = $ac_status" >&5 ++ echo "$as_me:28802: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_sysv_utmp=yes + else +@@ -28600,7 +28810,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:28603: result: $cf_cv_sysv_utmp" >&5 ++echo "$as_me:28813: result: $cf_cv_sysv_utmp" >&5 + echo "${ECHO_T}$cf_cv_sysv_utmp" >&6 + test $cf_cv_sysv_utmp = yes && cat >>confdefs.h <<\EOF + #define USE_SYSV_UTMP 1 +@@ -28608,14 +28818,14 @@ + + fi + +-echo "$as_me:28611: checking if external h_errno exists" >&5 ++echo "$as_me:28821: 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 28618 "configure" ++#line 28828 "configure" + #include "confdefs.h" + + #undef h_errno +@@ -28630,16 +28840,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:28633: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:28843: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:28636: \$? = $ac_status" >&5 ++ echo "$as_me:28846: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:28639: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:28849: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:28642: \$? = $ac_status" >&5 ++ echo "$as_me:28852: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_h_errno=yes + else +@@ -28650,7 +28860,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:28653: result: $cf_cv_have_h_errno" >&5 ++echo "$as_me:28863: 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 +@@ -28663,7 +28873,7 @@ + + fi + +-echo "$as_me:28666: checking if bibp: URLs should be supported" >&5 ++echo "$as_me:28876: 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. +@@ -28680,13 +28890,13 @@ + use_bibp_urls=yes + + fi; +-echo "$as_me:28683: result: $use_bibp_urls" >&5 ++echo "$as_me:28893: 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:28689: checking if configuration info should be browsable" >&5 ++echo "$as_me:28899: 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. +@@ -28703,13 +28913,13 @@ + use_config_info=yes + + fi; +-echo "$as_me:28706: result: $use_config_info" >&5 ++echo "$as_me:28916: 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:28712: checking if new-style forms-based options screen should be used" >&5 ++echo "$as_me:28922: 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. +@@ -28726,13 +28936,13 @@ + use_forms_options=yes + + fi; +-echo "$as_me:28729: result: $use_forms_options" >&5 ++echo "$as_me:28939: 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:28735: checking if old-style options menu should be used" >&5 ++echo "$as_me:28945: 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. +@@ -28749,13 +28959,13 @@ + use_menu_options=yes + + fi; +-echo "$as_me:28752: result: $use_menu_options" >&5 ++echo "$as_me:28962: 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:28758: checking if sessions code should be used" >&5 ++echo "$as_me:28968: 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. +@@ -28772,7 +28982,7 @@ + use_sessions=yes + + fi; +-echo "$as_me:28775: result: $use_sessions" >&5 ++echo "$as_me:28985: result: $use_sessions" >&5 + echo "${ECHO_T}$use_sessions" >&6 + if test $use_sessions != no ; then + cat >>confdefs.h <<\EOF +@@ -28782,7 +28992,7 @@ + EXTRA_OBJS="$EXTRA_OBJS LYSession\$o" + fi + +-echo "$as_me:28785: checking if session-caching code should be used" >&5 ++echo "$as_me:28995: 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. +@@ -28799,7 +29009,7 @@ + use_session_cache=yes + + fi; +-echo "$as_me:28802: result: $use_session_cache" >&5 ++echo "$as_me:29012: result: $use_session_cache" >&5 + echo "${ECHO_T}$use_session_cache" >&6 + if test $use_session_cache != no ; then + cat >>confdefs.h <<\EOF +@@ -28808,7 +29018,7 @@ + + fi + +-echo "$as_me:28811: checking if experimental address-list page should be used" >&5 ++echo "$as_me:29021: checking if experimental address-list page should be used" >&5 + echo $ECHO_N "checking if experimental address-list page should be used... $ECHO_C" >&6 + + # Check whether --enable-addrlist-page or --disable-addrlist-page was given. +@@ -28825,13 +29035,13 @@ + use_addrlist_page=no + + fi; +-echo "$as_me:28828: result: $use_addrlist_page" >&5 ++echo "$as_me:29038: result: $use_addrlist_page" >&5 + echo "${ECHO_T}$use_addrlist_page" >&6 + test $use_addrlist_page != no && cat >>confdefs.h <<\EOF + #define EXP_ADDRLIST_PAGE 1 + EOF + +-echo "$as_me:28834: checking if experimental CJK logic should be used" >&5 ++echo "$as_me:29044: 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. +@@ -28848,13 +29058,13 @@ + use_cjk=no + + fi; +-echo "$as_me:28851: result: $use_cjk" >&5 ++echo "$as_me:29061: 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:28857: checking if experimental Japanese UTF-8 logic should be used" >&5 ++echo "$as_me:29067: 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. +@@ -28871,7 +29081,7 @@ + use_ja_utf8=no + + fi; +-echo "$as_me:28874: result: $use_ja_utf8" >&5 ++echo "$as_me:29084: result: $use_ja_utf8" >&5 + echo "${ECHO_T}$use_ja_utf8" >&6 + if test $use_ja_utf8 != no ; then + cat >>confdefs.h <<\EOF +@@ -28916,7 +29126,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 28919 "configure" ++#line 29129 "configure" + #include "confdefs.h" + #include + int +@@ -28928,16 +29138,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:28931: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:29141: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:28934: \$? = $ac_status" >&5 ++ echo "$as_me:29144: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:28937: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:29147: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:28940: \$? = $ac_status" >&5 ++ echo "$as_me:29150: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -28954,7 +29164,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:28957: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:29167: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -28995,7 +29205,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 28998 "configure" ++#line 29208 "configure" + #include "confdefs.h" + #include + int +@@ -29007,16 +29217,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:29010: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:29220: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:29013: \$? = $ac_status" >&5 ++ echo "$as_me:29223: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:29016: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:29226: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:29019: \$? = $ac_status" >&5 ++ echo "$as_me:29229: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -29033,7 +29243,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:29036: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:29246: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -29049,7 +29259,7 @@ + fi + + else +-{ { echo "$as_me:29052: error: cannot find libiconv under $withval" >&5 ++{ { echo "$as_me:29262: error: cannot find libiconv under $withval" >&5 + echo "$as_me: error: cannot find libiconv under $withval" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -29074,7 +29284,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me-configure}:29077: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me-configure}:29287: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -29103,7 +29313,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me-configure}:29106: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me-configure}:29316: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -29112,7 +29322,7 @@ + fi + + else +-{ { echo "$as_me:29115: error: cannot find libiconv under $withval" >&5 ++{ { echo "$as_me:29325: error: cannot find libiconv under $withval" >&5 + echo "$as_me: error: cannot find libiconv under $withval" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -29123,7 +29333,7 @@ + + fi; + +- echo "$as_me:29126: checking for iconv" >&5 ++ echo "$as_me:29336: 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 +@@ -29134,10 +29344,12 @@ + cf_cv_header_path_iconv= + cf_cv_library_path_iconv= + +-echo "${as_me-configure}:29137: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5 ++echo "${as_me-configure}:29347: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5 ++ ++cf_save_LIBS="$LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 29140 "configure" ++#line 29352 "configure" + #include "confdefs.h" + + #include +@@ -29156,29 +29368,30 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:29159: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:29371: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:29162: \$? = $ac_status" >&5 ++ echo "$as_me:29374: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:29165: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:29377: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:29168: \$? = $ac_status" >&5 ++ echo "$as_me:29380: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_iconv=yes ++ cf_cv_header_path_iconv=/usr/include ++ cf_cv_library_path_iconv=/usr/lib + + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + +-cf_save_LIBS="$LIBS" + LIBS="-liconv $cf_save_LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 29181 "configure" ++#line 29394 "configure" + #include "confdefs.h" + + #include +@@ -29197,33 +29410,35 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:29200: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:29413: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:29203: \$? = $ac_status" >&5 ++ echo "$as_me:29416: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:29206: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:29419: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:29209: \$? = $ac_status" >&5 ++ echo "$as_me:29422: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_iconv=yes ++ cf_cv_header_path_iconv=/usr/include ++ cf_cv_library_path_iconv=/usr/lib + cf_cv_library_file_iconv="-liconv" + + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + +- cf_cv_find_linkage_iconv=no ++ cf_cv_find_linkage_iconv=no + LIBS="$cf_save_LIBS" + + test -n "$verbose" && echo " find linkage for iconv library" 1>&6 + +-echo "${as_me-configure}:29224: testing find linkage for iconv library ..." 1>&5 ++echo "${as_me-configure}:29439: testing find linkage for iconv library ..." 1>&5 + +-echo "${as_me-configure}:29226: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5 ++echo "${as_me-configure}:29441: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5 + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -29238,7 +29453,19 @@ + case $cf_header_path in #(vi + -I*) + cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` +- cf_header_path_list="$cf_header_path_list $cf_header_path" ++ ++test "$cf_header_path" != "NONE" && \ ++test -d "$cf_header_path" && \ ++ { ++ test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" ++ test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" ++ test -d $cf_header_path/include/iconv && cf_search="$cf_search $cf_header_path/include/iconv" ++ test -d $cf_header_path/include/iconv/include && cf_search="$cf_search $cf_header_path/include/iconv/include" ++ test -d $cf_header_path/iconv/include && cf_search="$cf_search $cf_header_path/iconv/include" ++ test -d $cf_header_path/iconv/include/iconv && cf_search="$cf_search $cf_header_path/iconv/include/iconv" ++} ++ ++ cf_header_path_list="$cf_header_path_list $cf_search" + ;; + esac + done +@@ -29324,11 +29551,11 @@ + 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}:29327: testing ... testing $cf_cv_header_path_iconv ..." 1>&5 ++echo "${as_me-configure}:29554: 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 29331 "configure" ++#line 29558 "configure" + #include "confdefs.h" + + #include +@@ -29347,21 +29574,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:29350: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:29577: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:29353: \$? = $ac_status" >&5 ++ echo "$as_me:29580: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:29356: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:29583: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:29359: \$? = $ac_status" >&5 ++ echo "$as_me:29586: \$? = $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}:29364: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5 ++echo "${as_me-configure}:29591: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5 + + cf_cv_find_linkage_iconv=maybe + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -29379,7 +29606,7 @@ + + if test "$cf_cv_find_linkage_iconv" = maybe ; then + +-echo "${as_me-configure}:29382: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5 ++echo "${as_me-configure}:29609: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" +@@ -29476,13 +29703,13 @@ + 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}:29479: testing ... testing $cf_cv_library_path_iconv ..." 1>&5 ++echo "${as_me-configure}:29706: 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 29485 "configure" ++#line 29712 "configure" + #include "confdefs.h" + + #include +@@ -29501,21 +29728,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:29504: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:29731: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:29507: \$? = $ac_status" >&5 ++ echo "$as_me:29734: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:29510: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:29737: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:29513: \$? = $ac_status" >&5 ++ echo "$as_me:29740: \$? = $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}:29518: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5 ++echo "${as_me-configure}:29745: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5 + + cf_cv_find_linkage_iconv=yes + cf_cv_library_file_iconv="-liconv" +@@ -29532,7 +29759,6 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi + done +- LIBS="$cf_save_LIBS" + CPPFLAGS="$cf_save_CPPFLAGS" + LDFLAGS="$cf_save_LDFLAGS" + fi +@@ -29547,6 +29773,8 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + ++LIBS="$cf_save_LIBS" ++ + if test "$cf_cv_find_linkage_iconv" = yes ; then + am_cv_func_iconv=yes + else +@@ -29554,7 +29782,7 @@ + fi + + fi +-echo "$as_me:29557: result: $am_cv_func_iconv" >&5 ++echo "$as_me:29785: result: $am_cv_func_iconv" >&5 + echo "${ECHO_T}$am_cv_func_iconv" >&6 + + if test "$am_cv_func_iconv" = yes; then +@@ -29563,14 +29791,14 @@ + #define HAVE_ICONV 1 + EOF + +- echo "$as_me:29566: checking if the declaration of iconv() needs const." >&5 ++ echo "$as_me:29794: 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 29573 "configure" ++#line 29801 "configure" + #include "confdefs.h" + + #include +@@ -29595,16 +29823,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:29598: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:29826: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:29601: \$? = $ac_status" >&5 ++ echo "$as_me:29829: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:29604: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:29832: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:29607: \$? = $ac_status" >&5 ++ echo "$as_me:29835: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + am_cv_proto_iconv_const=no + else +@@ -29614,7 +29842,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:29617: result: $am_cv_proto_iconv_const" >&5 ++echo "$as_me:29845: 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 +@@ -29656,7 +29884,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 29659 "configure" ++#line 29887 "configure" + #include "confdefs.h" + #include + int +@@ -29668,16 +29896,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:29671: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:29899: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:29674: \$? = $ac_status" >&5 ++ echo "$as_me:29902: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:29677: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:29905: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:29680: \$? = $ac_status" >&5 ++ echo "$as_me:29908: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -29694,7 +29922,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:29697: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:29925: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -29731,7 +29959,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me-configure}:29734: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me-configure}:29962: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -29755,7 +29983,7 @@ + esac + + if test "$use_dft_colors" != no ; then +-echo "$as_me:29758: checking if you want to use default-colors" >&5 ++echo "$as_me:29986: 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. +@@ -29772,7 +30000,7 @@ + use_dft_colors=no + + fi; +-echo "$as_me:29775: result: $use_dft_colors" >&5 ++echo "$as_me:30003: result: $use_dft_colors" >&5 + echo "${ECHO_T}$use_dft_colors" >&6 + test $use_dft_colors = "yes" && cat >>confdefs.h <<\EOF + #define USE_DEFAULT_COLORS 1 +@@ -29780,7 +30008,7 @@ + + fi + +-echo "$as_me:29783: checking if experimental keyboard-layout logic should be used" >&5 ++echo "$as_me:30011: 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. +@@ -29797,13 +30025,13 @@ + use_kbd_layout=no + + fi; +-echo "$as_me:29800: result: $use_kbd_layout" >&5 ++echo "$as_me:30028: 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:29806: checking if experimental nested-table logic should be used" >&5 ++echo "$as_me:30034: 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. +@@ -29820,13 +30048,13 @@ + use_nested_tables=no + + fi; +-echo "$as_me:29823: result: $use_nested_tables" >&5 ++echo "$as_me:30051: 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:29829: checking if alternative line-edit bindings should be used" >&5 ++echo "$as_me:30057: 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. +@@ -29843,13 +30071,13 @@ + use_alt_bindings=yes + + fi; +-echo "$as_me:29846: result: $use_alt_bindings" >&5 ++echo "$as_me:30074: result: $use_alt_bindings" >&5 + echo "${ECHO_T}$use_alt_bindings" >&6 + test $use_alt_bindings != no && cat >>confdefs.h <<\EOF + #define EXP_ALT_BINDINGS 1 + EOF + +-echo "$as_me:29852: checking if ascii case-conversion should be used" >&5 ++echo "$as_me:30080: 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. +@@ -29866,13 +30094,13 @@ + use_ascii_ctypes=yes + + fi; +-echo "$as_me:29869: result: $use_ascii_ctypes" >&5 ++echo "$as_me:30097: 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:29875: checking if you want to use extended HTML DTD logic" >&5 ++echo "$as_me:30103: 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. +@@ -29889,13 +30117,13 @@ + use_ext_htmldtd=yes + + fi; +-echo "$as_me:29892: result: $use_ext_htmldtd" >&5 ++echo "$as_me:30120: 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:29898: checking if file-upload logic should be used" >&5 ++echo "$as_me:30126: 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. +@@ -29912,13 +30140,13 @@ + use_file_upload=yes + + fi; +-echo "$as_me:29915: result: $use_file_upload" >&5 ++echo "$as_me:30143: 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:29921: checking if IDNA support should be used" >&5 ++echo "$as_me:30149: 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. +@@ -29935,7 +30163,7 @@ + use_idna=yes + + fi; +-echo "$as_me:29938: result: $use_idna" >&5 ++echo "$as_me:30166: result: $use_idna" >&5 + echo "${ECHO_T}$use_idna" >&6 + + if test "$use_idna" = yes ; then +@@ -29974,7 +30202,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 29977 "configure" ++#line 30205 "configure" + #include "confdefs.h" + #include + int +@@ -29986,16 +30214,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:29989: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:30217: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:29992: \$? = $ac_status" >&5 ++ echo "$as_me:30220: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:29995: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:30223: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:29998: \$? = $ac_status" >&5 ++ echo "$as_me:30226: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -30012,7 +30240,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:30015: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:30243: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -30053,7 +30281,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 30056 "configure" ++#line 30284 "configure" + #include "confdefs.h" + #include + int +@@ -30065,16 +30293,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:30068: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:30296: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:30071: \$? = $ac_status" >&5 ++ echo "$as_me:30299: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:30074: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:30302: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:30077: \$? = $ac_status" >&5 ++ echo "$as_me:30305: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -30091,7 +30319,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:30094: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:30322: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -30107,7 +30335,7 @@ + fi + + else +-{ { echo "$as_me:30110: error: cannot find under $use_idna" >&5 ++{ { echo "$as_me:30338: error: cannot find under $use_idna" >&5 + echo "$as_me: error: cannot find under $use_idna" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -30132,7 +30360,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me-configure}:30135: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me-configure}:30363: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -30161,7 +30389,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me-configure}:30164: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me-configure}:30392: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -30170,7 +30398,7 @@ + fi + + else +-{ { echo "$as_me:30173: error: cannot find under $use_idna" >&5 ++{ { echo "$as_me:30401: error: cannot find under $use_idna" >&5 + echo "$as_me: error: cannot find under $use_idna" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -30184,10 +30412,12 @@ + cf_cv_header_path_idn= + cf_cv_library_path_idn= + +-echo "${as_me-configure}:30187: testing Starting FIND_LINKAGE(idn,) ..." 1>&5 ++echo "${as_me-configure}:30415: testing Starting FIND_LINKAGE(idn,) ..." 1>&5 ++ ++cf_save_LIBS="$LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 30190 "configure" ++#line 30420 "configure" + #include "confdefs.h" + + #include +@@ -30205,29 +30435,30 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:30208: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:30438: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:30211: \$? = $ac_status" >&5 ++ echo "$as_me:30441: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:30214: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:30444: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:30217: \$? = $ac_status" >&5 ++ echo "$as_me:30447: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_idn=yes ++ cf_cv_header_path_idn=/usr/include ++ cf_cv_library_path_idn=/usr/lib + + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + +-cf_save_LIBS="$LIBS" + LIBS="-lidn $cf_save_LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 30230 "configure" ++#line 30461 "configure" + #include "confdefs.h" + + #include +@@ -30245,33 +30476,35 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:30248: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:30479: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:30251: \$? = $ac_status" >&5 ++ echo "$as_me:30482: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:30254: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:30485: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:30257: \$? = $ac_status" >&5 ++ echo "$as_me:30488: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_idn=yes ++ cf_cv_header_path_idn=/usr/include ++ cf_cv_library_path_idn=/usr/lib + cf_cv_library_file_idn="-lidn" + + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + +- cf_cv_find_linkage_idn=no ++ cf_cv_find_linkage_idn=no + LIBS="$cf_save_LIBS" + + test -n "$verbose" && echo " find linkage for idn library" 1>&6 + +-echo "${as_me-configure}:30272: testing find linkage for idn library ..." 1>&5 ++echo "${as_me-configure}:30505: testing find linkage for idn library ..." 1>&5 + +-echo "${as_me-configure}:30274: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5 ++echo "${as_me-configure}:30507: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5 + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -30286,7 +30519,19 @@ + case $cf_header_path in #(vi + -I*) + cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` +- cf_header_path_list="$cf_header_path_list $cf_header_path" ++ ++test "$cf_header_path" != "NONE" && \ ++test -d "$cf_header_path" && \ ++ { ++ test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" ++ test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" ++ test -d $cf_header_path/include/idn && cf_search="$cf_search $cf_header_path/include/idn" ++ test -d $cf_header_path/include/idn/include && cf_search="$cf_search $cf_header_path/include/idn/include" ++ test -d $cf_header_path/idn/include && cf_search="$cf_search $cf_header_path/idn/include" ++ test -d $cf_header_path/idn/include/idn && cf_search="$cf_search $cf_header_path/idn/include/idn" ++} ++ ++ cf_header_path_list="$cf_header_path_list $cf_search" + ;; + esac + done +@@ -30372,11 +30617,11 @@ + 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}:30375: testing ... testing $cf_cv_header_path_idn ..." 1>&5 ++echo "${as_me-configure}:30620: 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 30379 "configure" ++#line 30624 "configure" + #include "confdefs.h" + + #include +@@ -30394,21 +30639,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:30397: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:30642: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:30400: \$? = $ac_status" >&5 ++ echo "$as_me:30645: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:30403: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:30648: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:30406: \$? = $ac_status" >&5 ++ echo "$as_me:30651: \$? = $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}:30411: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5 ++echo "${as_me-configure}:30656: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5 + + cf_cv_find_linkage_idn=maybe + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -30426,7 +30671,7 @@ + + if test "$cf_cv_find_linkage_idn" = maybe ; then + +-echo "${as_me-configure}:30429: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5 ++echo "${as_me-configure}:30674: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" +@@ -30523,13 +30768,13 @@ + 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}:30526: testing ... testing $cf_cv_library_path_idn ..." 1>&5 ++echo "${as_me-configure}:30771: testing ... testing $cf_cv_library_path_idn ..." 1>&5 + + CPPFLAGS="$cf_test_CPPFLAGS" + LIBS="-lidn $cf_save_LIBS" + LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_idn" + cat >conftest.$ac_ext <<_ACEOF +-#line 30532 "configure" ++#line 30777 "configure" + #include "confdefs.h" + + #include +@@ -30547,21 +30792,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:30550: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:30795: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:30553: \$? = $ac_status" >&5 ++ echo "$as_me:30798: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:30556: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:30801: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:30559: \$? = $ac_status" >&5 ++ echo "$as_me:30804: \$? = $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}:30564: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5 ++echo "${as_me-configure}:30809: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5 + + cf_cv_find_linkage_idn=yes + cf_cv_library_file_idn="-lidn" +@@ -30578,7 +30823,6 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi + done +- LIBS="$cf_save_LIBS" + CPPFLAGS="$cf_save_CPPFLAGS" + LDFLAGS="$cf_save_LDFLAGS" + fi +@@ -30593,11 +30837,9 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +-if test "$cf_cv_find_linkage_idn" = yes ; then ++LIBS="$cf_save_LIBS" + +- cat >>confdefs.h <<\EOF +-#define USE_IDNA 1 +-EOF ++if test "$cf_cv_find_linkage_idn" = yes ; then + + if test -n "$cf_cv_header_path_idn" ; then + for cf_add_incdir in $cf_cv_header_path_idn +@@ -30623,7 +30865,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 30626 "configure" ++#line 30868 "configure" + #include "confdefs.h" + #include + int +@@ -30635,16 +30877,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:30638: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:30880: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:30641: \$? = $ac_status" >&5 ++ echo "$as_me:30883: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:30644: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:30886: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:30647: \$? = $ac_status" >&5 ++ echo "$as_me:30889: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -30661,7 +30903,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:30664: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:30906: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -30695,7 +30937,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me-configure}:30698: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me-configure}:30940: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -30703,16 +30945,23 @@ + done + fi + +- LIBS="$cf_cv_library_file_idn $LIBS" ++ LIBS="-lidn $LIBS" + + else +-{ echo "$as_me:30709: WARNING: Cannot find idn library" >&5 ++{ echo "$as_me:30951: WARNING: Cannot find idn library" >&5 + echo "$as_me: WARNING: Cannot find idn library" >&2;} + fi + ++if test "x$cf_cv_find_linkage_idn" = xyes ; then ++ cat >>confdefs.h <<\EOF ++#define USE_IDNA 1 ++EOF ++ ++fi ++ + fi + +-echo "$as_me:30715: checking if element-justification logic should be used" >&5 ++echo "$as_me:30964: checking if element-justification logic should be used" >&5 + echo $ECHO_N "checking if element-justification logic should be used... $ECHO_C" >&6 + + # Check whether --enable-justify-elts or --disable-justify-elts was given. +@@ -30729,13 +30978,13 @@ + use_justify_elts=yes + + fi; +-echo "$as_me:30732: result: $use_justify_elts" >&5 ++echo "$as_me:30981: result: $use_justify_elts" >&5 + echo "${ECHO_T}$use_justify_elts" >&6 + test $use_justify_elts != no && cat >>confdefs.h <<\EOF + #define USE_JUSTIFY_ELTS 1 + EOF + +-echo "$as_me:30738: checking if partial-display should be used" >&5 ++echo "$as_me:30987: checking if partial-display should be used" >&5 + echo $ECHO_N "checking if partial-display should be used... $ECHO_C" >&6 + + # Check whether --enable-partial or --disable-partial was given. +@@ -30752,13 +31001,13 @@ + use_partial_display=yes + + fi; +-echo "$as_me:30755: result: $use_partial_display" >&5 ++echo "$as_me:31004: result: $use_partial_display" >&5 + echo "${ECHO_T}$use_partial_display" >&6 + test $use_partial_display != no && cat >>confdefs.h <<\EOF + #define DISP_PARTIAL 1 + EOF + +-echo "$as_me:30761: checking if persistent-cookie logic should be used" >&5 ++echo "$as_me:31010: checking if persistent-cookie logic should be used" >&5 + echo $ECHO_N "checking if persistent-cookie logic should be used... $ECHO_C" >&6 + + # Check whether --enable-persistent-cookies or --disable-persistent-cookies was given. +@@ -30775,13 +31024,13 @@ + use_filed_cookies=yes + + fi; +-echo "$as_me:30778: result: $use_filed_cookies" >&5 ++echo "$as_me:31027: result: $use_filed_cookies" >&5 + echo "${ECHO_T}$use_filed_cookies" >&6 + test $use_filed_cookies != no && cat >>confdefs.h <<\EOF + #define USE_PERSISTENT_COOKIES 1 + EOF + +-echo "$as_me:30784: checking if html source should be colorized" >&5 ++echo "$as_me:31033: checking if html source should be colorized" >&5 + echo $ECHO_N "checking if html source should be colorized... $ECHO_C" >&6 + + # Check whether --enable-prettysrc or --disable-prettysrc was given. +@@ -30798,13 +31047,13 @@ + use_prettysrc=yes + + fi; +-echo "$as_me:30801: result: $use_prettysrc" >&5 ++echo "$as_me:31050: result: $use_prettysrc" >&5 + echo "${ECHO_T}$use_prettysrc" >&6 + test $use_prettysrc != no && cat >>confdefs.h <<\EOF + #define USE_PRETTYSRC 1 + EOF + +-echo "$as_me:30807: checking if progress-bar code should be used" >&5 ++echo "$as_me:31056: checking if progress-bar code should be used" >&5 + echo $ECHO_N "checking if progress-bar code should be used... $ECHO_C" >&6 + + # Check whether --enable-progressbar or --disable-progressbar was given. +@@ -30821,13 +31070,13 @@ + use_progressbar=yes + + fi; +-echo "$as_me:30824: result: $use_progressbar" >&5 ++echo "$as_me:31073: result: $use_progressbar" >&5 + echo "${ECHO_T}$use_progressbar" >&6 + test $use_progressbar != no && cat >>confdefs.h <<\EOF + #define USE_PROGRESSBAR 1 + EOF + +-echo "$as_me:30830: checking if read-progress message should show ETA" >&5 ++echo "$as_me:31079: checking if read-progress message should show ETA" >&5 + echo $ECHO_N "checking if read-progress message should show ETA... $ECHO_C" >&6 + + # Check whether --enable-read-eta or --disable-read-eta was given. +@@ -30844,13 +31093,13 @@ + use_read_eta=yes + + fi; +-echo "$as_me:30847: result: $use_read_eta" >&5 ++echo "$as_me:31096: result: $use_read_eta" >&5 + echo "${ECHO_T}$use_read_eta" >&6 + test $use_read_eta != no && cat >>confdefs.h <<\EOF + #define USE_READPROGRESS 1 + EOF + +-echo "$as_me:30853: checking if source caching should be used" >&5 ++echo "$as_me:31102: checking if source caching should be used" >&5 + echo $ECHO_N "checking if source caching should be used... $ECHO_C" >&6 + + # Check whether --enable-source-cache or --disable-source-cache was given. +@@ -30867,13 +31116,13 @@ + use_source_cache=yes + + fi; +-echo "$as_me:30870: result: $use_source_cache" >&5 ++echo "$as_me:31119: result: $use_source_cache" >&5 + echo "${ECHO_T}$use_source_cache" >&6 + test $use_source_cache != no && cat >>confdefs.h <<\EOF + #define USE_SOURCE_CACHE 1 + EOF + +-echo "$as_me:30876: checking if scrollbar code should be used" >&5 ++echo "$as_me:31125: checking if scrollbar code should be used" >&5 + echo $ECHO_N "checking if scrollbar code should be used... $ECHO_C" >&6 + + # Check whether --enable-scrollbar or --disable-scrollbar was given. +@@ -30890,10 +31139,10 @@ + use_scrollbar=yes + + fi; +-echo "$as_me:30893: result: $use_scrollbar" >&5 ++echo "$as_me:31142: result: $use_scrollbar" >&5 + echo "${ECHO_T}$use_scrollbar" >&6 + +-echo "$as_me:30896: checking if charset-selection logic should be used" >&5 ++echo "$as_me:31145: checking if charset-selection logic should be used" >&5 + echo $ECHO_N "checking if charset-selection logic should be used... $ECHO_C" >&6 + + # Check whether --enable-charset-choice or --disable-charset-choice was given. +@@ -30910,13 +31159,13 @@ + use_charset_choice=no + + fi; +-echo "$as_me:30913: result: $use_charset_choice" >&5 ++echo "$as_me:31162: result: $use_charset_choice" >&5 + echo "${ECHO_T}$use_charset_choice" >&6 + test $use_charset_choice != no && cat >>confdefs.h <<\EOF + #define USE_CHARSET_CHOICE 1 + EOF + +-echo "$as_me:30919: checking if you want to use external commands" >&5 ++echo "$as_me:31168: checking if you want to use external commands" >&5 + echo $ECHO_N "checking if you want to use external commands... $ECHO_C" >&6 + + # Check whether --enable-externs or --disable-externs was given. +@@ -30933,7 +31182,7 @@ + use_externs=no + + fi; +-echo "$as_me:30936: result: $use_externs" >&5 ++echo "$as_me:31185: result: $use_externs" >&5 + echo "${ECHO_T}$use_externs" >&6 + if test $use_externs != "no" ; then + cat >>confdefs.h <<\EOF +@@ -30943,7 +31192,7 @@ + EXTRA_OBJS="$EXTRA_OBJS LYExtern\$o" + fi + +-echo "$as_me:30946: checking if you want to use setfont support" >&5 ++echo "$as_me:31195: checking if you want to use setfont support" >&5 + echo $ECHO_N "checking if you want to use setfont support... $ECHO_C" >&6 + + # Check whether --enable-font-switch or --disable-font-switch was given. +@@ -30960,7 +31209,7 @@ + use_setfont=no + + fi; +-echo "$as_me:30963: result: $use_setfont" >&5 ++echo "$as_me:31212: result: $use_setfont" >&5 + echo "${ECHO_T}$use_setfont" >&6 + if test $use_setfont = yes ; then + case $host_os in +@@ -30971,7 +31220,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:30974: checking for $ac_word" >&5 ++echo "$as_me:31223: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_SETFONT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -30988,7 +31237,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_SETFONT="$ac_dir/$ac_word" +- echo "$as_me:30991: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:31240: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -30999,10 +31248,10 @@ + SETFONT=$ac_cv_path_SETFONT + + if test -n "$SETFONT"; then +- echo "$as_me:31002: result: $SETFONT" >&5 ++ echo "$as_me:31251: result: $SETFONT" >&5 + echo "${ECHO_T}$SETFONT" >&6 + else +- echo "$as_me:31005: result: no" >&5 ++ echo "$as_me:31254: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -31061,7 +31310,7 @@ + + if test -n "$cf_path_prog" ; then + +-echo "${as_me-configure}:31064: testing defining path for ${cf_path_prog} ..." 1>&5 ++echo "${as_me-configure}:31313: testing defining path for ${cf_path_prog} ..." 1>&5 + + cat >>confdefs.h <&6 + +-echo "${as_me-configure}:31081: testing Assume $host_os has font-switching ..." 1>&5 ++echo "${as_me-configure}:31330: testing Assume $host_os has font-switching ..." 1>&5 + + ;; + *) + SETFONT=unknown + test -n "$verbose" && echo " Assume $host_os has no font-switching" 1>&6 + +-echo "${as_me-configure}:31088: testing Assume $host_os has no font-switching ..." 1>&5 ++echo "${as_me-configure}:31337: testing Assume $host_os has no font-switching ..." 1>&5 + + ;; + esac + if test -z "$SETFONT" ; then +- { echo "$as_me:31093: WARNING: Cannot find a font-setting program" >&5 ++ { echo "$as_me:31342: WARNING: Cannot find a font-setting program" >&5 + echo "$as_me: WARNING: Cannot find a font-setting program" >&2;} + elif test "$SETFONT" != unknown ; then + cat >>confdefs.h <<\EOF +@@ -31100,7 +31349,7 @@ + fi + fi + +-echo "$as_me:31103: checking if you want cgi-link support" >&5 ++echo "$as_me:31352: checking if you want cgi-link support" >&5 + echo $ECHO_N "checking if you want cgi-link support... $ECHO_C" >&6 + + # Check whether --enable-cgi-links or --disable-cgi-links was given. +@@ -31116,10 +31365,10 @@ + else + enableval=no + fi; +-echo "$as_me:31119: result: $enableval" >&5 ++echo "$as_me:31368: result: $enableval" >&5 + echo "${ECHO_T}$enableval" >&6 + +-echo "$as_me:31122: checking if you want change-exec support" >&5 ++echo "$as_me:31371: checking if you want change-exec support" >&5 + echo $ECHO_N "checking if you want change-exec support... $ECHO_C" >&6 + + # Check whether --enable-change-exec or --disable-change-exec was given. +@@ -31136,13 +31385,13 @@ + use_change_exec=no + + fi; +-echo "$as_me:31139: result: $use_change_exec" >&5 ++echo "$as_me:31388: result: $use_change_exec" >&5 + echo "${ECHO_T}$use_change_exec" >&6 + test $use_change_exec = yes && cat >>confdefs.h <<\EOF + #define ENABLE_OPTS_CHANGE_EXEC 1 + EOF + +-echo "$as_me:31145: checking if you want exec-links support" >&5 ++echo "$as_me:31394: checking if you want exec-links support" >&5 + echo $ECHO_N "checking if you want exec-links support... $ECHO_C" >&6 + + # Check whether --enable-exec-links or --disable-exec-links was given. +@@ -31159,13 +31408,13 @@ + use_exec_links=$enableval + + fi; +-echo "$as_me:31162: result: $use_exec_links" >&5 ++echo "$as_me:31411: result: $use_exec_links" >&5 + echo "${ECHO_T}$use_exec_links" >&6 + test $use_exec_links = yes && cat >>confdefs.h <<\EOF + #define EXEC_LINKS 1 + EOF + +-echo "$as_me:31168: checking if you want exec-scripts support" >&5 ++echo "$as_me:31417: checking if you want exec-scripts support" >&5 + echo $ECHO_N "checking if you want exec-scripts support... $ECHO_C" >&6 + + # Check whether --enable-exec-scripts or --disable-exec-scripts was given. +@@ -31182,13 +31431,13 @@ + use_exec_scripts=$enableval + + fi; +-echo "$as_me:31185: result: $use_exec_scripts" >&5 ++echo "$as_me:31434: result: $use_exec_scripts" >&5 + echo "${ECHO_T}$use_exec_scripts" >&6 + test $use_exec_scripts = yes && cat >>confdefs.h <<\EOF + #define EXEC_SCRIPTS 1 + EOF + +-echo "$as_me:31191: checking if you want internal-links feature" >&5 ++echo "$as_me:31440: checking if you want internal-links feature" >&5 + echo $ECHO_N "checking if you want internal-links feature... $ECHO_C" >&6 + + # Check whether --enable-internal-links or --disable-internal-links was given. +@@ -31205,13 +31454,13 @@ + use_internal_links=no + + fi; +-echo "$as_me:31208: result: $use_internal_links" >&5 ++echo "$as_me:31457: result: $use_internal_links" >&5 + echo "${ECHO_T}$use_internal_links" >&6 + test $use_internal_links = no && cat >>confdefs.h <<\EOF + #define DONT_TRACK_INTERNAL_LINKS 1 + EOF + +-echo "$as_me:31214: checking if you want to fork NSL requests" >&5 ++echo "$as_me:31463: checking if you want to fork NSL requests" >&5 + echo $ECHO_N "checking if you want to fork NSL requests... $ECHO_C" >&6 + + # Check whether --enable-nsl-fork or --disable-nsl-fork was given. +@@ -31228,7 +31477,7 @@ + use_nsl_fork=no + + fi; +-echo "$as_me:31231: result: $use_nsl_fork" >&5 ++echo "$as_me:31480: result: $use_nsl_fork" >&5 + echo "${ECHO_T}$use_nsl_fork" >&6 + if test $use_nsl_fork = yes ; then + case $host_os in +@@ -31247,7 +31496,7 @@ + esac + fi + +-echo "$as_me:31250: checking if you want to log URL requests via syslog" >&5 ++echo "$as_me:31499: checking if you want to log URL requests via syslog" >&5 + echo $ECHO_N "checking if you want to log URL requests via syslog... $ECHO_C" >&6 + + # Check whether --enable-syslog or --disable-syslog was given. +@@ -31264,13 +31513,13 @@ + use_syslog=no + + fi; +-echo "$as_me:31267: result: $use_syslog" >&5 ++echo "$as_me:31516: result: $use_syslog" >&5 + echo "${ECHO_T}$use_syslog" >&6 + test $use_syslog = yes && cat >>confdefs.h <<\EOF + #define SYSLOG_REQUESTED_URLS 1 + EOF + +-echo "$as_me:31273: checking if you want to underline links" >&5 ++echo "$as_me:31522: checking if you want to underline links" >&5 + echo $ECHO_N "checking if you want to underline links... $ECHO_C" >&6 + + # Check whether --enable-underlines or --disable-underlines was given. +@@ -31287,7 +31536,7 @@ + use_underline=no + + fi; +-echo "$as_me:31290: result: $use_underline" >&5 ++echo "$as_me:31539: result: $use_underline" >&5 + echo "${ECHO_T}$use_underline" >&6 + test $use_underline = yes && cat >>confdefs.h <<\EOF + #define UNDERLINE_LINKS 1 +@@ -31297,7 +31546,7 @@ + #define UNDERLINE_LINKS 0 + EOF + +-echo "$as_me:31300: checking if help files should be gzip'ed" >&5 ++echo "$as_me:31549: checking if help files should be gzip'ed" >&5 + echo $ECHO_N "checking if help files should be gzip'ed... $ECHO_C" >&6 + + # Check whether --enable-gzip-help or --disable-gzip-help was given. +@@ -31314,10 +31563,10 @@ + use_gzip_help=no + + fi; +-echo "$as_me:31317: result: $use_gzip_help" >&5 ++echo "$as_me:31566: result: $use_gzip_help" >&5 + echo "${ECHO_T}$use_gzip_help" >&6 + +-echo "$as_me:31320: checking if you want to use libbz2 for decompression of some bzip2 files" >&5 ++echo "$as_me:31569: checking if you want to use libbz2 for decompression of some bzip2 files" >&5 + echo $ECHO_N "checking if you want to use libbz2 for decompression of some bzip2 files... $ECHO_C" >&6 + + # Check whether --with-bzlib or --without-bzlib was given. +@@ -31327,7 +31576,7 @@ + else + use_bzlib=no + fi; +-echo "$as_me:31330: result: $use_bzlib" >&5 ++echo "$as_me:31579: result: $use_bzlib" >&5 + echo "${ECHO_T}$use_bzlib" >&6 + + if test ".$use_bzlib" != ".no" ; then +@@ -31366,7 +31615,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 31369 "configure" ++#line 31618 "configure" + #include "confdefs.h" + #include + int +@@ -31378,16 +31627,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:31381: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:31630: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:31384: \$? = $ac_status" >&5 ++ echo "$as_me:31633: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:31387: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:31636: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:31390: \$? = $ac_status" >&5 ++ echo "$as_me:31639: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -31404,7 +31653,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:31407: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:31656: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -31445,7 +31694,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 31448 "configure" ++#line 31697 "configure" + #include "confdefs.h" + #include + int +@@ -31457,16 +31706,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:31460: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:31709: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:31463: \$? = $ac_status" >&5 ++ echo "$as_me:31712: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:31466: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:31715: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:31469: \$? = $ac_status" >&5 ++ echo "$as_me:31718: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -31483,7 +31732,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:31486: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:31735: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -31499,7 +31748,7 @@ + fi + + else +-{ { echo "$as_me:31502: error: cannot find under $use_bzlib" >&5 ++{ { echo "$as_me:31751: error: cannot find under $use_bzlib" >&5 + echo "$as_me: error: cannot find under $use_bzlib" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -31524,7 +31773,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me-configure}:31527: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me-configure}:31776: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -31553,7 +31802,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me-configure}:31556: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me-configure}:31805: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -31562,7 +31811,7 @@ + fi + + else +-{ { echo "$as_me:31565: error: cannot find under $use_bzlib" >&5 ++{ { echo "$as_me:31814: error: cannot find under $use_bzlib" >&5 + echo "$as_me: error: cannot find under $use_bzlib" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -31576,10 +31825,12 @@ + cf_cv_header_path_bz2= + cf_cv_library_path_bz2= + +-echo "${as_me-configure}:31579: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5 ++echo "${as_me-configure}:31828: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5 ++ ++cf_save_LIBS="$LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 31582 "configure" ++#line 31833 "configure" + #include "confdefs.h" + + #include +@@ -31596,29 +31847,30 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:31599: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:31850: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:31602: \$? = $ac_status" >&5 ++ echo "$as_me:31853: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:31605: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:31856: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:31608: \$? = $ac_status" >&5 ++ echo "$as_me:31859: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_bz2=yes ++ cf_cv_header_path_bz2=/usr/include ++ cf_cv_library_path_bz2=/usr/lib + + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + +-cf_save_LIBS="$LIBS" + LIBS="-lbz2 $cf_save_LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 31621 "configure" ++#line 31873 "configure" + #include "confdefs.h" + + #include +@@ -31635,33 +31887,35 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:31638: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:31890: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:31641: \$? = $ac_status" >&5 ++ echo "$as_me:31893: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:31644: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:31896: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:31647: \$? = $ac_status" >&5 ++ echo "$as_me:31899: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_bz2=yes ++ cf_cv_header_path_bz2=/usr/include ++ cf_cv_library_path_bz2=/usr/lib + cf_cv_library_file_bz2="-lbz2" + + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + +- cf_cv_find_linkage_bz2=no ++ cf_cv_find_linkage_bz2=no + LIBS="$cf_save_LIBS" + + test -n "$verbose" && echo " find linkage for bz2 library" 1>&6 + +-echo "${as_me-configure}:31662: testing find linkage for bz2 library ..." 1>&5 ++echo "${as_me-configure}:31916: testing find linkage for bz2 library ..." 1>&5 + +-echo "${as_me-configure}:31664: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5 ++echo "${as_me-configure}:31918: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5 + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -31676,7 +31930,19 @@ + case $cf_header_path in #(vi + -I*) + cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` +- cf_header_path_list="$cf_header_path_list $cf_header_path" ++ ++test "$cf_header_path" != "NONE" && \ ++test -d "$cf_header_path" && \ ++ { ++ test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" ++ test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" ++ test -d $cf_header_path/include/bzlib && cf_search="$cf_search $cf_header_path/include/bzlib" ++ test -d $cf_header_path/include/bzlib/include && cf_search="$cf_search $cf_header_path/include/bzlib/include" ++ test -d $cf_header_path/bzlib/include && cf_search="$cf_search $cf_header_path/bzlib/include" ++ test -d $cf_header_path/bzlib/include/bzlib && cf_search="$cf_search $cf_header_path/bzlib/include/bzlib" ++} ++ ++ cf_header_path_list="$cf_header_path_list $cf_search" + ;; + esac + done +@@ -31762,11 +32028,11 @@ + 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}:31765: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5 ++echo "${as_me-configure}:32031: 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 31769 "configure" ++#line 32035 "configure" + #include "confdefs.h" + + #include +@@ -31783,21 +32049,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:31786: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:32052: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:31789: \$? = $ac_status" >&5 ++ echo "$as_me:32055: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:31792: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:32058: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:31795: \$? = $ac_status" >&5 ++ echo "$as_me:32061: \$? = $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}:31800: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5 ++echo "${as_me-configure}:32066: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5 + + cf_cv_find_linkage_bz2=maybe + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -31815,7 +32081,7 @@ + + if test "$cf_cv_find_linkage_bz2" = maybe ; then + +-echo "${as_me-configure}:31818: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5 ++echo "${as_me-configure}:32084: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5 + + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" +@@ -31823,7 +32089,7 @@ + CPPFLAGS="$cf_test_CPPFLAGS" + LIBS="-lbz2 $cf_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 31826 "configure" ++#line 32092 "configure" + #include "confdefs.h" + + #include +@@ -31840,21 +32106,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:31843: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:32109: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:31846: \$? = $ac_status" >&5 ++ echo "$as_me:32112: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:31849: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:32115: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:31852: \$? = $ac_status" >&5 ++ echo "$as_me:32118: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + test -n "$verbose" && echo " ... found bz2 library in system" 1>&6 + +-echo "${as_me-configure}:31857: testing ... found bz2 library in system ..." 1>&5 ++echo "${as_me-configure}:32123: testing ... found bz2 library in system ..." 1>&5 + + cf_cv_find_linkage_bz2=yes + else +@@ -31957,13 +32223,13 @@ + 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}:31960: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5 ++echo "${as_me-configure}:32226: 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 31966 "configure" ++#line 32232 "configure" + #include "confdefs.h" + + #include +@@ -31980,21 +32246,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:31983: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:32249: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:31986: \$? = $ac_status" >&5 ++ echo "$as_me:32252: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:31989: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:32255: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:31992: \$? = $ac_status" >&5 ++ echo "$as_me:32258: \$? = $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}:31997: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5 ++echo "${as_me-configure}:32263: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5 + + cf_cv_find_linkage_bz2=yes + cf_cv_library_file_bz2="-lbz2" +@@ -32011,7 +32277,6 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi + done +- LIBS="$cf_save_LIBS" + CPPFLAGS="$cf_save_CPPFLAGS" + LDFLAGS="$cf_save_LDFLAGS" + fi +@@ -32026,6 +32291,8 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + ++LIBS="$cf_save_LIBS" ++ + if test "$cf_cv_find_linkage_bz2" = yes ; then + + if test -n "$cf_cv_header_path_bz2" ; then +@@ -32052,7 +32319,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 32055 "configure" ++#line 32322 "configure" + #include "confdefs.h" + #include + int +@@ -32064,16 +32331,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:32067: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:32334: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:32070: \$? = $ac_status" >&5 ++ echo "$as_me:32337: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:32073: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:32340: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:32076: \$? = $ac_status" >&5 ++ echo "$as_me:32343: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -32090,7 +32357,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:32093: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:32360: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -32124,7 +32391,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me-configure}:32127: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me-configure}:32394: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -32135,7 +32402,7 @@ + LIBS="-lbz2 $LIBS" + + else +-{ echo "$as_me:32138: WARNING: Cannot find bz2 library" >&5 ++{ echo "$as_me:32405: WARNING: Cannot find bz2 library" >&5 + echo "$as_me: WARNING: Cannot find bz2 library" >&2;} + fi + +@@ -32145,7 +32412,7 @@ + + fi + +-echo "$as_me:32148: checking if you want to use zlib for decompression of some gzip files" >&5 ++echo "$as_me:32415: 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. +@@ -32155,7 +32422,7 @@ + else + use_zlib=no + fi; +-echo "$as_me:32158: result: $use_zlib" >&5 ++echo "$as_me:32425: result: $use_zlib" >&5 + echo "${ECHO_T}$use_zlib" >&6 + + if test ".$use_zlib" != ".no" ; then +@@ -32194,7 +32461,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 32197 "configure" ++#line 32464 "configure" + #include "confdefs.h" + #include + int +@@ -32206,16 +32473,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:32209: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:32476: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:32212: \$? = $ac_status" >&5 ++ echo "$as_me:32479: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:32215: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:32482: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:32218: \$? = $ac_status" >&5 ++ echo "$as_me:32485: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -32232,7 +32499,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:32235: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:32502: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -32273,7 +32540,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 32276 "configure" ++#line 32543 "configure" + #include "confdefs.h" + #include + int +@@ -32285,16 +32552,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:32288: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:32555: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:32291: \$? = $ac_status" >&5 ++ echo "$as_me:32558: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:32294: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:32561: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:32297: \$? = $ac_status" >&5 ++ echo "$as_me:32564: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -32311,7 +32578,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:32314: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:32581: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -32327,7 +32594,7 @@ + fi + + else +-{ { echo "$as_me:32330: error: cannot find under $use_zlib" >&5 ++{ { echo "$as_me:32597: error: cannot find under $use_zlib" >&5 + echo "$as_me: error: cannot find under $use_zlib" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -32352,7 +32619,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me-configure}:32355: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me-configure}:32622: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -32381,7 +32648,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me-configure}:32384: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me-configure}:32651: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -32390,7 +32657,7 @@ + fi + + else +-{ { echo "$as_me:32393: error: cannot find under $use_zlib" >&5 ++{ { echo "$as_me:32660: error: cannot find under $use_zlib" >&5 + echo "$as_me: error: cannot find under $use_zlib" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -32404,10 +32671,12 @@ + cf_cv_header_path_z= + cf_cv_library_path_z= + +-echo "${as_me-configure}:32407: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5 ++echo "${as_me-configure}:32674: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5 ++ ++cf_save_LIBS="$LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 32410 "configure" ++#line 32679 "configure" + #include "confdefs.h" + + #include +@@ -32423,29 +32692,30 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:32426: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:32695: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:32429: \$? = $ac_status" >&5 ++ echo "$as_me:32698: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:32432: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:32701: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:32435: \$? = $ac_status" >&5 ++ echo "$as_me:32704: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_z=yes ++ cf_cv_header_path_z=/usr/include ++ cf_cv_library_path_z=/usr/lib + + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + +-cf_save_LIBS="$LIBS" + LIBS="-lz $cf_save_LIBS" + + cat >conftest.$ac_ext <<_ACEOF +-#line 32448 "configure" ++#line 32718 "configure" + #include "confdefs.h" + + #include +@@ -32461,33 +32731,35 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:32464: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:32734: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:32467: \$? = $ac_status" >&5 ++ echo "$as_me:32737: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:32470: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:32740: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:32473: \$? = $ac_status" >&5 ++ echo "$as_me:32743: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_find_linkage_z=yes ++ cf_cv_header_path_z=/usr/include ++ cf_cv_library_path_z=/usr/lib + cf_cv_library_file_z="-lz" + + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + +- cf_cv_find_linkage_z=no ++ cf_cv_find_linkage_z=no + LIBS="$cf_save_LIBS" + + test -n "$verbose" && echo " find linkage for z library" 1>&6 + +-echo "${as_me-configure}:32488: testing find linkage for z library ..." 1>&5 ++echo "${as_me-configure}:32760: testing find linkage for z library ..." 1>&5 + +-echo "${as_me-configure}:32490: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5 ++echo "${as_me-configure}:32762: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5 + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -32502,7 +32774,19 @@ + case $cf_header_path in #(vi + -I*) + cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` +- cf_header_path_list="$cf_header_path_list $cf_header_path" ++ ++test "$cf_header_path" != "NONE" && \ ++test -d "$cf_header_path" && \ ++ { ++ test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" ++ test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" ++ test -d $cf_header_path/include/zlib && cf_search="$cf_search $cf_header_path/include/zlib" ++ test -d $cf_header_path/include/zlib/include && cf_search="$cf_search $cf_header_path/include/zlib/include" ++ test -d $cf_header_path/zlib/include && cf_search="$cf_search $cf_header_path/zlib/include" ++ test -d $cf_header_path/zlib/include/zlib && cf_search="$cf_search $cf_header_path/zlib/include/zlib" ++} ++ ++ cf_header_path_list="$cf_header_path_list $cf_search" + ;; + esac + done +@@ -32588,11 +32872,11 @@ + 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}:32591: testing ... testing $cf_cv_header_path_z ..." 1>&5 ++echo "${as_me-configure}:32875: 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 32595 "configure" ++#line 32879 "configure" + #include "confdefs.h" + + #include +@@ -32608,21 +32892,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:32611: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:32895: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:32614: \$? = $ac_status" >&5 ++ echo "$as_me:32898: \$? = $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:32901: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:32620: \$? = $ac_status" >&5 ++ echo "$as_me:32904: \$? = $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}:32625: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5 ++echo "${as_me-configure}:32909: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5 + + cf_cv_find_linkage_z=maybe + cf_test_CPPFLAGS="$CPPFLAGS" +@@ -32640,7 +32924,7 @@ + + if test "$cf_cv_find_linkage_z" = maybe ; then + +-echo "${as_me-configure}:32643: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5 ++echo "${as_me-configure}:32927: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5 + + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" +@@ -32648,7 +32932,7 @@ + CPPFLAGS="$cf_test_CPPFLAGS" + LIBS="-lz $cf_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 32651 "configure" ++#line 32935 "configure" + #include "confdefs.h" + + #include +@@ -32664,21 +32948,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:32667: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:32951: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:32670: \$? = $ac_status" >&5 ++ echo "$as_me:32954: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:32673: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:32957: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:32676: \$? = $ac_status" >&5 ++ echo "$as_me:32960: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + test -n "$verbose" && echo " ... found z library in system" 1>&6 + +-echo "${as_me-configure}:32681: testing ... found z library in system ..." 1>&5 ++echo "${as_me-configure}:32965: testing ... found z library in system ..." 1>&5 + + cf_cv_find_linkage_z=yes + else +@@ -32781,13 +33065,13 @@ + 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}:32784: testing ... testing $cf_cv_library_path_z ..." 1>&5 ++echo "${as_me-configure}:33068: 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 32790 "configure" ++#line 33074 "configure" + #include "confdefs.h" + + #include +@@ -32803,21 +33087,21 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:32806: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:33090: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:32809: \$? = $ac_status" >&5 ++ echo "$as_me:33093: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:32812: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:33096: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:32815: \$? = $ac_status" >&5 ++ echo "$as_me:33099: \$? = $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}:32820: testing ... found z library in $cf_cv_library_path_z ..." 1>&5 ++echo "${as_me-configure}:33104: testing ... found z library in $cf_cv_library_path_z ..." 1>&5 + + cf_cv_find_linkage_z=yes + cf_cv_library_file_z="-lz" +@@ -32834,7 +33118,6 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi + done +- LIBS="$cf_save_LIBS" + CPPFLAGS="$cf_save_CPPFLAGS" + LDFLAGS="$cf_save_LDFLAGS" + fi +@@ -32849,6 +33132,8 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + ++LIBS="$cf_save_LIBS" ++ + if test "$cf_cv_find_linkage_z" = yes ; then + + if test -n "$cf_cv_header_path_z" ; then +@@ -32875,7 +33160,7 @@ + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +-#line 32878 "configure" ++#line 33163 "configure" + #include "confdefs.h" + #include + int +@@ -32887,16 +33172,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:32890: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:33175: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:32893: \$? = $ac_status" >&5 ++ echo "$as_me:33178: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:32896: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:33181: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:32899: \$? = $ac_status" >&5 ++ echo "$as_me:33184: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -32913,7 +33198,7 @@ + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +-echo "${as_me-configure}:32916: testing adding $cf_add_incdir to include-path ..." 1>&5 ++echo "${as_me-configure}:33201: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + +@@ -32947,7 +33232,7 @@ + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +-echo "${as_me-configure}:32950: testing adding $cf_add_libdir to library-path ..." 1>&5 ++echo "${as_me-configure}:33235: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi +@@ -32958,7 +33243,7 @@ + LIBS="-lz $LIBS" + + else +-{ echo "$as_me:32961: WARNING: Cannot find z library" >&5 ++{ echo "$as_me:33246: WARNING: Cannot find z library" >&5 + echo "$as_me: WARNING: Cannot find z library" >&2;} + fi + +@@ -32968,7 +33253,7 @@ + + fi + +-echo "$as_me:32971: checking if you want to exclude FINGER code" >&5 ++echo "$as_me:33256: 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. +@@ -32985,13 +33270,13 @@ + use_finger=no + + fi; +-echo "$as_me:32988: result: $use_finger" >&5 ++echo "$as_me:33273: 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:32994: checking if you want to exclude GOPHER code" >&5 ++echo "$as_me:33279: 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. +@@ -33008,13 +33293,13 @@ + use_gopher=no + + fi; +-echo "$as_me:33011: result: $use_gopher" >&5 ++echo "$as_me:33296: 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:33017: checking if you want to exclude NEWS code" >&5 ++echo "$as_me:33302: 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. +@@ -33031,13 +33316,13 @@ + use_news=no + + fi; +-echo "$as_me:33034: result: $use_news" >&5 ++echo "$as_me:33319: 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:33040: checking if you want to exclude FTP code" >&5 ++echo "$as_me:33325: 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. +@@ -33054,7 +33339,7 @@ + use_ftp=no + + fi; +-echo "$as_me:33057: result: $use_ftp" >&5 ++echo "$as_me:33342: result: $use_ftp" >&5 + echo "${ECHO_T}$use_ftp" >&6 + test $use_ftp != "no" && cat >>confdefs.h <<\EOF + #define DISABLE_FTP 1 +@@ -33062,7 +33347,7 @@ + + # 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:33065: checking if directory-editor code should be used" >&5 ++echo "$as_me:33350: 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. +@@ -33079,7 +33364,7 @@ + use_dired=yes + + fi; +-echo "$as_me:33082: result: $use_dired" >&5 ++echo "$as_me:33367: result: $use_dired" >&5 + echo "${ECHO_T}$use_dired" >&6 + + if test ".$use_dired" != ".no" ; then +@@ -33088,7 +33373,7 @@ + #define DIRED_SUPPORT 1 + EOF + +- echo "$as_me:33091: checking if you wish to allow extracting from archives via DirEd" >&5 ++ echo "$as_me:33376: 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. +@@ -33104,10 +33389,10 @@ + else + enableval=yes + fi; +- echo "$as_me:33107: result: $enableval" >&5 ++ echo "$as_me:33392: result: $enableval" >&5 + echo "${ECHO_T}$enableval" >&6 + +- echo "$as_me:33110: checking if DirEd mode should override keys" >&5 ++ echo "$as_me:33395: 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. +@@ -33129,10 +33414,10 @@ + EOF + + fi; +- echo "$as_me:33132: result: $enableval" >&5 ++ echo "$as_me:33417: result: $enableval" >&5 + echo "${ECHO_T}$enableval" >&6 + +- echo "$as_me:33135: checking if you wish to allow permissions commands via DirEd" >&5 ++ echo "$as_me:33420: 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. +@@ -33154,10 +33439,10 @@ + EOF + + fi; +- echo "$as_me:33157: result: $enableval" >&5 ++ echo "$as_me:33442: result: $enableval" >&5 + echo "${ECHO_T}$enableval" >&6 + +- echo "$as_me:33160: checking if you wish to allow executable-permission commands via DirEd" >&5 ++ echo "$as_me:33445: 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. +@@ -33173,10 +33458,10 @@ + else + enableval=yes + fi; +- echo "$as_me:33176: result: $enableval" >&5 ++ echo "$as_me:33461: result: $enableval" >&5 + echo "${ECHO_T}$enableval" >&6 + +- echo "$as_me:33179: checking if you wish to allow \"tar\" commands from DirEd" >&5 ++ echo "$as_me:33464: 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. +@@ -33198,10 +33483,10 @@ + EOF + + fi; +- echo "$as_me:33201: result: $enableval" >&5 ++ echo "$as_me:33486: result: $enableval" >&5 + echo "${ECHO_T}$enableval" >&6 + +- echo "$as_me:33204: checking if you wish to allow \"uudecode\" commands from DirEd" >&5 ++ echo "$as_me:33489: 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. +@@ -33223,10 +33508,10 @@ + EOF + + fi; +- echo "$as_me:33226: result: $enableval" >&5 ++ echo "$as_me:33511: result: $enableval" >&5 + echo "${ECHO_T}$enableval" >&6 + +- echo "$as_me:33229: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5 ++ echo "$as_me:33514: 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. +@@ -33248,10 +33533,10 @@ + EOF + + fi; +- echo "$as_me:33251: result: $enableval" >&5 ++ echo "$as_me:33536: result: $enableval" >&5 + echo "${ECHO_T}$enableval" >&6 + +- echo "$as_me:33254: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5 ++ echo "$as_me:33539: 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. +@@ -33273,11 +33558,11 @@ + EOF + + fi; +- echo "$as_me:33276: result: $enableval" >&5 ++ echo "$as_me:33561: result: $enableval" >&5 + echo "${ECHO_T}$enableval" >&6 + fi + +-echo "$as_me:33280: checking if you want long-directory listings" >&5 ++echo "$as_me:33565: 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. +@@ -33299,10 +33584,10 @@ + EOF + + fi; +-echo "$as_me:33302: result: $enableval" >&5 ++echo "$as_me:33587: result: $enableval" >&5 + echo "${ECHO_T}$enableval" >&6 + +-echo "$as_me:33305: checking if parent-directory references are permitted" >&5 ++echo "$as_me:33590: 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. +@@ -33318,7 +33603,7 @@ + else + enableval=yes + fi; +-echo "$as_me:33321: result: $enableval" >&5 ++echo "$as_me:33606: result: $enableval" >&5 + echo "${ECHO_T}$enableval" >&6 + + test -z "$TELNET" && TELNET=telnet +@@ -33326,7 +33611,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:33329: checking for $ac_word" >&5 ++echo "$as_me:33614: 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 +@@ -33343,7 +33628,7 @@ + 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:33346: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:33631: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -33354,10 +33639,10 @@ + TELNET=$ac_cv_path_TELNET + + if test -n "$TELNET"; then +- echo "$as_me:33357: result: $TELNET" >&5 ++ echo "$as_me:33642: result: $TELNET" >&5 + echo "${ECHO_T}$TELNET" >&6 + else +- echo "$as_me:33360: result: no" >&5 ++ echo "$as_me:33645: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -33416,7 +33701,7 @@ + + if test -n "$cf_path_prog" ; then + +-echo "${as_me-configure}:33419: testing defining path for ${cf_path_prog} ..." 1>&5 ++echo "${as_me-configure}:33704: testing defining path for ${cf_path_prog} ..." 1>&5 + + cat >>confdefs.h <&5 ++echo "$as_me:33721: 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 +@@ -33450,7 +33735,7 @@ + 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:33453: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:33738: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -33461,10 +33746,10 @@ + TN3270=$ac_cv_path_TN3270 + + if test -n "$TN3270"; then +- echo "$as_me:33464: result: $TN3270" >&5 ++ echo "$as_me:33749: result: $TN3270" >&5 + echo "${ECHO_T}$TN3270" >&6 + else +- echo "$as_me:33467: result: no" >&5 ++ echo "$as_me:33752: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -33523,7 +33808,7 @@ + + if test -n "$cf_path_prog" ; then + +-echo "${as_me-configure}:33526: testing defining path for ${cf_path_prog} ..." 1>&5 ++echo "${as_me-configure}:33811: testing defining path for ${cf_path_prog} ..." 1>&5 + + cat >>confdefs.h <&5 ++echo "$as_me:33828: 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 +@@ -33557,7 +33842,7 @@ + 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:33560: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:33845: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -33568,10 +33853,10 @@ + RLOGIN=$ac_cv_path_RLOGIN + + if test -n "$RLOGIN"; then +- echo "$as_me:33571: result: $RLOGIN" >&5 ++ echo "$as_me:33856: result: $RLOGIN" >&5 + echo "${ECHO_T}$RLOGIN" >&6 + else +- echo "$as_me:33574: result: no" >&5 ++ echo "$as_me:33859: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -33630,7 +33915,7 @@ + + if test -n "$cf_path_prog" ; then + +-echo "${as_me-configure}:33633: testing defining path for ${cf_path_prog} ..." 1>&5 ++echo "${as_me-configure}:33918: testing defining path for ${cf_path_prog} ..." 1>&5 + + cat >>confdefs.h <&5 ++echo "$as_me:33935: 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 +@@ -33664,7 +33949,7 @@ + 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:33667: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:33952: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -33675,10 +33960,10 @@ + MV=$ac_cv_path_MV + + if test -n "$MV"; then +- echo "$as_me:33678: result: $MV" >&5 ++ echo "$as_me:33963: result: $MV" >&5 + echo "${ECHO_T}$MV" >&6 + else +- echo "$as_me:33681: result: no" >&5 ++ echo "$as_me:33966: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -33737,7 +34022,7 @@ + + if test -n "$cf_path_prog" ; then + +-echo "${as_me-configure}:33740: testing defining path for ${cf_path_prog} ..." 1>&5 ++echo "${as_me-configure}:34025: testing defining path for ${cf_path_prog} ..." 1>&5 + + cat >>confdefs.h <&5 ++echo "$as_me:34042: 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 +@@ -33771,7 +34056,7 @@ + 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:33774: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:34059: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -33782,10 +34067,10 @@ + GZIP=$ac_cv_path_GZIP + + if test -n "$GZIP"; then +- echo "$as_me:33785: result: $GZIP" >&5 ++ echo "$as_me:34070: result: $GZIP" >&5 + echo "${ECHO_T}$GZIP" >&6 + else +- echo "$as_me:33788: result: no" >&5 ++ echo "$as_me:34073: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -33844,7 +34129,7 @@ + + if test -n "$cf_path_prog" ; then + +-echo "${as_me-configure}:33847: testing defining path for ${cf_path_prog} ..." 1>&5 ++echo "${as_me-configure}:34132: testing defining path for ${cf_path_prog} ..." 1>&5 + + cat >>confdefs.h <&5 ++echo "$as_me:34149: 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 +@@ -33878,7 +34163,7 @@ + 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:33881: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:34166: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -33889,10 +34174,10 @@ + UNCOMPRESS=$ac_cv_path_UNCOMPRESS + + if test -n "$UNCOMPRESS"; then +- echo "$as_me:33892: result: $UNCOMPRESS" >&5 ++ echo "$as_me:34177: result: $UNCOMPRESS" >&5 + echo "${ECHO_T}$UNCOMPRESS" >&6 + else +- echo "$as_me:33895: result: no" >&5 ++ echo "$as_me:34180: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -33951,7 +34236,7 @@ + + if test -n "$cf_path_prog" ; then + +-echo "${as_me-configure}:33954: testing defining path for ${cf_path_prog} ..." 1>&5 ++echo "${as_me-configure}:34239: testing defining path for ${cf_path_prog} ..." 1>&5 + + cat >>confdefs.h <&5 ++echo "$as_me:34256: 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 +@@ -33985,7 +34270,7 @@ + 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:33988: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:34273: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -33996,10 +34281,10 @@ + UNZIP=$ac_cv_path_UNZIP + + if test -n "$UNZIP"; then +- echo "$as_me:33999: result: $UNZIP" >&5 ++ echo "$as_me:34284: result: $UNZIP" >&5 + echo "${ECHO_T}$UNZIP" >&6 + else +- echo "$as_me:34002: result: no" >&5 ++ echo "$as_me:34287: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -34058,7 +34343,7 @@ + + if test -n "$cf_path_prog" ; then + +-echo "${as_me-configure}:34061: testing defining path for ${cf_path_prog} ..." 1>&5 ++echo "${as_me-configure}:34346: testing defining path for ${cf_path_prog} ..." 1>&5 + + cat >>confdefs.h <&5 ++echo "$as_me:34363: 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 +@@ -34092,7 +34377,7 @@ + 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:34095: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:34380: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -34103,10 +34388,10 @@ + BZIP2=$ac_cv_path_BZIP2 + + if test -n "$BZIP2"; then +- echo "$as_me:34106: result: $BZIP2" >&5 ++ echo "$as_me:34391: result: $BZIP2" >&5 + echo "${ECHO_T}$BZIP2" >&6 + else +- echo "$as_me:34109: result: no" >&5 ++ echo "$as_me:34394: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -34165,7 +34450,7 @@ + + if test -n "$cf_path_prog" ; then + +-echo "${as_me-configure}:34168: testing defining path for ${cf_path_prog} ..." 1>&5 ++echo "${as_me-configure}:34453: testing defining path for ${cf_path_prog} ..." 1>&5 + + cat >>confdefs.h <&5 ++echo "$as_me:34470: 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 +@@ -34199,7 +34484,7 @@ + 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:34202: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:34487: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -34210,10 +34495,10 @@ + TAR=$ac_cv_path_TAR + + if test -n "$TAR"; then +- echo "$as_me:34213: result: $TAR" >&5 ++ echo "$as_me:34498: result: $TAR" >&5 + echo "${ECHO_T}$TAR" >&6 + else +- echo "$as_me:34216: result: no" >&5 ++ echo "$as_me:34501: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -34272,7 +34557,7 @@ + + if test -n "$cf_path_prog" ; then + +-echo "${as_me-configure}:34275: testing defining path for ${cf_path_prog} ..." 1>&5 ++echo "${as_me-configure}:34560: testing defining path for ${cf_path_prog} ..." 1>&5 + + cat >>confdefs.h <&5 ++echo "$as_me:34617: 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 +@@ -34346,7 +34631,7 @@ + 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:34349: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:34634: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -34357,10 +34642,10 @@ + COMPRESS=$ac_cv_path_COMPRESS + + if test -n "$COMPRESS"; then +- echo "$as_me:34360: result: $COMPRESS" >&5 ++ echo "$as_me:34645: result: $COMPRESS" >&5 + echo "${ECHO_T}$COMPRESS" >&6 + else +- echo "$as_me:34363: result: no" >&5 ++ echo "$as_me:34648: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -34419,7 +34704,7 @@ + + if test -n "$cf_path_prog" ; then + +-echo "${as_me-configure}:34422: testing defining path for ${cf_path_prog} ..." 1>&5 ++echo "${as_me-configure}:34707: testing defining path for ${cf_path_prog} ..." 1>&5 + + cat >>confdefs.h <&5 ++echo "$as_me:34724: 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 +@@ -34453,7 +34738,7 @@ + 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:34456: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:34741: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -34464,10 +34749,10 @@ + RM=$ac_cv_path_RM + + if test -n "$RM"; then +- echo "$as_me:34467: result: $RM" >&5 ++ echo "$as_me:34752: result: $RM" >&5 + echo "${ECHO_T}$RM" >&6 + else +- echo "$as_me:34470: result: no" >&5 ++ echo "$as_me:34755: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -34526,7 +34811,7 @@ + + if test -n "$cf_path_prog" ; then + +-echo "${as_me-configure}:34529: testing defining path for ${cf_path_prog} ..." 1>&5 ++echo "${as_me-configure}:34814: testing defining path for ${cf_path_prog} ..." 1>&5 + + cat >>confdefs.h <&5 ++echo "$as_me:34831: 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 +@@ -34560,7 +34845,7 @@ + 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:34563: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:34848: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -34571,10 +34856,10 @@ + UUDECODE=$ac_cv_path_UUDECODE + + if test -n "$UUDECODE"; then +- echo "$as_me:34574: result: $UUDECODE" >&5 ++ echo "$as_me:34859: result: $UUDECODE" >&5 + echo "${ECHO_T}$UUDECODE" >&6 + else +- echo "$as_me:34577: result: no" >&5 ++ echo "$as_me:34862: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -34633,7 +34918,7 @@ + + if test -n "$cf_path_prog" ; then + +-echo "${as_me-configure}:34636: testing defining path for ${cf_path_prog} ..." 1>&5 ++echo "${as_me-configure}:34921: testing defining path for ${cf_path_prog} ..." 1>&5 + + cat >>confdefs.h <&5 ++echo "$as_me:34938: 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 +@@ -34667,7 +34952,7 @@ + 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:34670: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:34955: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -34678,10 +34963,10 @@ + ZCAT=$ac_cv_path_ZCAT + + if test -n "$ZCAT"; then +- echo "$as_me:34681: result: $ZCAT" >&5 ++ echo "$as_me:34966: result: $ZCAT" >&5 + echo "${ECHO_T}$ZCAT" >&6 + else +- echo "$as_me:34684: result: no" >&5 ++ echo "$as_me:34969: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -34740,7 +35025,7 @@ + + if test -n "$cf_path_prog" ; then + +-echo "${as_me-configure}:34743: testing defining path for ${cf_path_prog} ..." 1>&5 ++echo "${as_me-configure}:35028: testing defining path for ${cf_path_prog} ..." 1>&5 + + cat >>confdefs.h <&5 ++echo "$as_me:35045: 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 +@@ -34774,7 +35059,7 @@ + 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:34777: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:35062: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -34785,10 +35070,10 @@ + ZIP=$ac_cv_path_ZIP + + if test -n "$ZIP"; then +- echo "$as_me:34788: result: $ZIP" >&5 ++ echo "$as_me:35073: result: $ZIP" >&5 + echo "${ECHO_T}$ZIP" >&6 + else +- echo "$as_me:34791: result: no" >&5 ++ echo "$as_me:35076: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -34847,7 +35132,7 @@ + + if test -n "$cf_path_prog" ; then + +-echo "${as_me-configure}:34850: testing defining path for ${cf_path_prog} ..." 1>&5 ++echo "${as_me-configure}:35135: testing defining path for ${cf_path_prog} ..." 1>&5 + + cat >>confdefs.h <&5 ++echo "$as_me:35162: 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 +@@ -34891,7 +35176,7 @@ + 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:34894: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:35179: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -34902,10 +35187,10 @@ + INSTALL=$ac_cv_path_INSTALL + + if test -n "$INSTALL"; then +- echo "$as_me:34905: result: $INSTALL" >&5 ++ echo "$as_me:35190: result: $INSTALL" >&5 + echo "${ECHO_T}$INSTALL" >&6 + else +- echo "$as_me:34908: result: no" >&5 ++ echo "$as_me:35193: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -34964,7 +35249,7 @@ + + if test -n "$cf_path_prog" ; then + +-echo "${as_me-configure}:34967: testing defining path for ${cf_path_prog} ..." 1>&5 ++echo "${as_me-configure}:35252: testing defining path for ${cf_path_prog} ..." 1>&5 + + cat >>confdefs.h <&5 ++ echo "$as_me:35278: checking for X" >&5 + echo $ECHO_N "checking for X... $ECHO_C" >&6 + + # Check whether --with-x or --without-x was given. +@@ -35087,17 +35372,17 @@ + # 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 35090 "configure" ++#line 35375 "configure" + #include "confdefs.h" + #include + _ACEOF +-if { (eval echo "$as_me:35094: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:35379: \"$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:35100: \$? = $ac_status" >&5 ++ echo "$as_me:35385: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -35130,7 +35415,7 @@ + ac_save_LIBS=$LIBS + LIBS="-lXt $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 35133 "configure" ++#line 35418 "configure" + #include "confdefs.h" + #include + int +@@ -35142,16 +35427,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:35145: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:35430: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:35148: \$? = $ac_status" >&5 ++ echo "$as_me:35433: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:35151: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:35436: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:35154: \$? = $ac_status" >&5 ++ echo "$as_me:35439: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + LIBS=$ac_save_LIBS + # We can link X programs with no special library path. +@@ -35189,7 +35474,7 @@ + fi # $with_x != no + + if test "$have_x" != yes; then +- echo "$as_me:35192: result: $have_x" >&5 ++ echo "$as_me:35477: result: $have_x" >&5 + echo "${ECHO_T}$have_x" >&6 + no_x=yes + else +@@ -35199,7 +35484,7 @@ + # 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:35202: result: libraries $x_libraries, headers $x_includes" >&5 ++ echo "$as_me:35487: result: libraries $x_libraries, headers $x_includes" >&5 + echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 + fi + +@@ -35223,11 +35508,11 @@ + # others require no space. Words are not sufficient . . . . + case `(uname -sr) 2>/dev/null` in + "SunOS 5"*) +- echo "$as_me:35226: checking whether -R must be followed by a space" >&5 ++ echo "$as_me:35511: 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 35230 "configure" ++#line 35515 "configure" + #include "confdefs.h" + + int +@@ -35239,16 +35524,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:35242: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:35527: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:35245: \$? = $ac_status" >&5 ++ echo "$as_me:35530: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:35248: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:35533: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:35251: \$? = $ac_status" >&5 ++ echo "$as_me:35536: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_R_nospace=yes + else +@@ -35258,13 +35543,13 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + if test $ac_R_nospace = yes; then +- echo "$as_me:35261: result: no" >&5 ++ echo "$as_me:35546: 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 35267 "configure" ++#line 35552 "configure" + #include "confdefs.h" + + int +@@ -35276,16 +35561,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:35279: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:35564: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:35282: \$? = $ac_status" >&5 ++ echo "$as_me:35567: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:35285: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:35570: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:35288: \$? = $ac_status" >&5 ++ echo "$as_me:35573: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_R_space=yes + else +@@ -35295,11 +35580,11 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + if test $ac_R_space = yes; then +- echo "$as_me:35298: result: yes" >&5 ++ echo "$as_me:35583: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + X_LIBS="$X_LIBS -R $x_libraries" + else +- echo "$as_me:35302: result: neither works" >&5 ++ echo "$as_me:35587: result: neither works" >&5 + echo "${ECHO_T}neither works" >&6 + fi + fi +@@ -35319,7 +35604,7 @@ + # the Alpha needs dnet_stub (dnet does not exist). + ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" + cat >conftest.$ac_ext <<_ACEOF +-#line 35322 "configure" ++#line 35607 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -35338,22 +35623,22 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:35341: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:35626: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:35344: \$? = $ac_status" >&5 ++ echo "$as_me:35629: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:35347: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:35632: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:35350: \$? = $ac_status" >&5 ++ echo "$as_me:35635: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +-echo "$as_me:35356: checking for dnet_ntoa in -ldnet" >&5 ++echo "$as_me:35641: 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 +@@ -35361,7 +35646,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldnet $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 35364 "configure" ++#line 35649 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -35380,16 +35665,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:35383: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:35668: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:35386: \$? = $ac_status" >&5 ++ echo "$as_me:35671: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:35389: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:35674: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:35392: \$? = $ac_status" >&5 ++ echo "$as_me:35677: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dnet_dnet_ntoa=yes + else +@@ -35400,14 +35685,14 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:35403: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 ++echo "$as_me:35688: 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:35410: checking for dnet_ntoa in -ldnet_stub" >&5 ++ echo "$as_me:35695: 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 +@@ -35415,7 +35700,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldnet_stub $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 35418 "configure" ++#line 35703 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -35434,16 +35719,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:35437: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:35722: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:35440: \$? = $ac_status" >&5 ++ echo "$as_me:35725: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:35443: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:35728: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:35446: \$? = $ac_status" >&5 ++ echo "$as_me:35731: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dnet_stub_dnet_ntoa=yes + else +@@ -35454,7 +35739,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:35457: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 ++echo "$as_me:35742: 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" +@@ -35473,13 +35758,13 @@ + # 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:35476: checking for gethostbyname" >&5 ++ echo "$as_me:35761: 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 35482 "configure" ++#line 35767 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char gethostbyname (); below. */ +@@ -35510,16 +35795,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:35513: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:35798: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:35516: \$? = $ac_status" >&5 ++ echo "$as_me:35801: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:35519: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:35804: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:35522: \$? = $ac_status" >&5 ++ echo "$as_me:35807: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_gethostbyname=yes + else +@@ -35529,11 +35814,11 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:35532: result: $ac_cv_func_gethostbyname" >&5 ++echo "$as_me:35817: 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:35536: checking for gethostbyname in -lnsl" >&5 ++ echo "$as_me:35821: 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 +@@ -35541,7 +35826,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lnsl $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 35544 "configure" ++#line 35829 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -35560,16 +35845,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:35563: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:35848: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:35566: \$? = $ac_status" >&5 ++ echo "$as_me:35851: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:35569: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:35854: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:35572: \$? = $ac_status" >&5 ++ echo "$as_me:35857: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_nsl_gethostbyname=yes + else +@@ -35580,14 +35865,14 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:35583: result: $ac_cv_lib_nsl_gethostbyname" >&5 ++echo "$as_me:35868: 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:35590: checking for gethostbyname in -lbsd" >&5 ++ echo "$as_me:35875: 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 +@@ -35595,7 +35880,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lbsd $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 35598 "configure" ++#line 35883 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -35614,16 +35899,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:35617: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:35902: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:35620: \$? = $ac_status" >&5 ++ echo "$as_me:35905: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:35623: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:35908: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:35626: \$? = $ac_status" >&5 ++ echo "$as_me:35911: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_bsd_gethostbyname=yes + else +@@ -35634,7 +35919,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:35637: result: $ac_cv_lib_bsd_gethostbyname" >&5 ++echo "$as_me:35922: 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" +@@ -35650,13 +35935,13 @@ + # 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:35653: checking for connect" >&5 ++ echo "$as_me:35938: 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 35659 "configure" ++#line 35944 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char connect (); below. */ +@@ -35687,16 +35972,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:35690: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:35975: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:35693: \$? = $ac_status" >&5 ++ echo "$as_me:35978: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:35696: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:35981: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:35699: \$? = $ac_status" >&5 ++ echo "$as_me:35984: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_connect=yes + else +@@ -35706,11 +35991,11 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:35709: result: $ac_cv_func_connect" >&5 ++echo "$as_me:35994: 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:35713: checking for connect in -lsocket" >&5 ++ echo "$as_me:35998: 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 +@@ -35718,7 +36003,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsocket $X_EXTRA_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 35721 "configure" ++#line 36006 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -35737,16 +36022,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:35740: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:36025: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:35743: \$? = $ac_status" >&5 ++ echo "$as_me:36028: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:35746: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:36031: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:35749: \$? = $ac_status" >&5 ++ echo "$as_me:36034: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_socket_connect=yes + else +@@ -35757,7 +36042,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:35760: result: $ac_cv_lib_socket_connect" >&5 ++echo "$as_me:36045: 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" +@@ -35766,13 +36051,13 @@ + fi + + # Guillermo Gomez says -lposix is necessary on A/UX. +- echo "$as_me:35769: checking for remove" >&5 ++ echo "$as_me:36054: 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 35775 "configure" ++#line 36060 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char remove (); below. */ +@@ -35803,16 +36088,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:35806: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:36091: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:35809: \$? = $ac_status" >&5 ++ echo "$as_me:36094: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:35812: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:36097: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:35815: \$? = $ac_status" >&5 ++ echo "$as_me:36100: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_remove=yes + else +@@ -35822,11 +36107,11 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:35825: result: $ac_cv_func_remove" >&5 ++echo "$as_me:36110: 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:35829: checking for remove in -lposix" >&5 ++ echo "$as_me:36114: 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 +@@ -35834,7 +36119,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lposix $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 35837 "configure" ++#line 36122 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -35853,16 +36138,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:35856: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:36141: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:35859: \$? = $ac_status" >&5 ++ echo "$as_me:36144: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:35862: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:36147: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:35865: \$? = $ac_status" >&5 ++ echo "$as_me:36150: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_posix_remove=yes + else +@@ -35873,7 +36158,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:35876: result: $ac_cv_lib_posix_remove" >&5 ++echo "$as_me:36161: 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" +@@ -35882,13 +36167,13 @@ + fi + + # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. +- echo "$as_me:35885: checking for shmat" >&5 ++ echo "$as_me:36170: 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 35891 "configure" ++#line 36176 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char shmat (); below. */ +@@ -35919,16 +36204,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:35922: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:36207: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:35925: \$? = $ac_status" >&5 ++ echo "$as_me:36210: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:35928: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:36213: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:35931: \$? = $ac_status" >&5 ++ echo "$as_me:36216: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_shmat=yes + else +@@ -35938,11 +36223,11 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:35941: result: $ac_cv_func_shmat" >&5 ++echo "$as_me:36226: 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:35945: checking for shmat in -lipc" >&5 ++ echo "$as_me:36230: 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 +@@ -35950,7 +36235,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lipc $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 35953 "configure" ++#line 36238 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -35969,16 +36254,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:35972: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:36257: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:35975: \$? = $ac_status" >&5 ++ echo "$as_me:36260: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:35978: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:36263: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:35981: \$? = $ac_status" >&5 ++ echo "$as_me:36266: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_ipc_shmat=yes + else +@@ -35989,7 +36274,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:35992: result: $ac_cv_lib_ipc_shmat" >&5 ++echo "$as_me:36277: 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" +@@ -36007,7 +36292,7 @@ + # 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:36010: checking for IceConnectionNumber in -lICE" >&5 ++ echo "$as_me:36295: 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 +@@ -36015,7 +36300,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lICE $X_EXTRA_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 36018 "configure" ++#line 36303 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -36034,16 +36319,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:36037: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:36322: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:36040: \$? = $ac_status" >&5 ++ echo "$as_me:36325: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:36043: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:36328: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:36046: \$? = $ac_status" >&5 ++ echo "$as_me:36331: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_ICE_IceConnectionNumber=yes + else +@@ -36054,7 +36339,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:36057: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 ++echo "$as_me:36342: 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" +@@ -36072,7 +36357,7 @@ + + test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 + +-echo "${as_me-configure}:36075: testing checking additions to CFLAGS ..." 1>&5 ++echo "${as_me-configure}:36360: testing checking additions to CFLAGS ..." 1>&5 + + cf_check_cflags="$CFLAGS" + cf_check_cppflags="$CPPFLAGS" +@@ -36143,7 +36428,7 @@ + if test -n "$cf_new_cflags" ; then + test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 + +-echo "${as_me-configure}:36146: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 ++echo "${as_me-configure}:36431: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 + + CFLAGS="$CFLAGS $cf_new_cflags" + fi +@@ -36151,7 +36436,7 @@ + if test -n "$cf_new_cppflags" ; then + test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 + +-echo "${as_me-configure}:36154: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 ++echo "${as_me-configure}:36439: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 + + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" + fi +@@ -36159,14 +36444,14 @@ + 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}:36162: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 ++echo "${as_me-configure}:36447: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" + fi + + if test "$cf_check_cflags" != "$CFLAGS" ; then + cat >conftest.$ac_ext <<_ACEOF +-#line 36169 "configure" ++#line 36454 "configure" + #include "confdefs.h" + #include + int +@@ -36178,16 +36463,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:36181: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:36466: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:36184: \$? = $ac_status" >&5 ++ echo "$as_me:36469: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:36187: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:36472: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:36190: \$? = $ac_status" >&5 ++ echo "$as_me:36475: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -36195,12 +36480,12 @@ + cat conftest.$ac_ext >&5 + test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 + +-echo "${as_me-configure}:36198: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 ++echo "${as_me-configure}:36483: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 + + if test "$cf_check_cppflags" != "$CPPFLAGS" ; then + test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 + +-echo "${as_me-configure}:36203: testing but keeping change to \$CPPFLAGS ..." 1>&5 ++echo "${as_me-configure}:36488: testing but keeping change to \$CPPFLAGS ..." 1>&5 + + fi + CFLAGS="$cf_check_flags" +@@ -36208,13 +36493,13 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi + +-echo "$as_me:36211: checking for XOpenDisplay" >&5 ++echo "$as_me:36496: 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 36217 "configure" ++#line 36502 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char XOpenDisplay (); below. */ +@@ -36245,16 +36530,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:36248: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:36533: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:36251: \$? = $ac_status" >&5 ++ echo "$as_me:36536: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:36254: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:36539: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:36257: \$? = $ac_status" >&5 ++ echo "$as_me:36542: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_XOpenDisplay=yes + else +@@ -36264,13 +36549,13 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:36267: result: $ac_cv_func_XOpenDisplay" >&5 ++echo "$as_me:36552: 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:36273: checking for XOpenDisplay in -lX11" >&5 ++echo "$as_me:36558: 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 +@@ -36278,7 +36563,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 36281 "configure" ++#line 36566 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -36297,16 +36582,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:36300: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:36585: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:36303: \$? = $ac_status" >&5 ++ echo "$as_me:36588: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:36306: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:36591: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:36309: \$? = $ac_status" >&5 ++ echo "$as_me:36594: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_X11_XOpenDisplay=yes + else +@@ -36317,7 +36602,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:36320: result: $ac_cv_lib_X11_XOpenDisplay" >&5 ++echo "$as_me:36605: 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 + LIBS="-lX11 $LIBS" +@@ -36325,13 +36610,13 @@ + + fi + +-echo "$as_me:36328: checking for XtAppInitialize" >&5 ++echo "$as_me:36613: 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 36334 "configure" ++#line 36619 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char XtAppInitialize (); below. */ +@@ -36362,16 +36647,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:36365: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:36650: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:36368: \$? = $ac_status" >&5 ++ echo "$as_me:36653: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:36371: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:36656: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:36374: \$? = $ac_status" >&5 ++ echo "$as_me:36659: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_XtAppInitialize=yes + else +@@ -36381,13 +36666,13 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:36384: result: $ac_cv_func_XtAppInitialize" >&5 ++echo "$as_me:36669: 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:36390: checking for XtAppInitialize in -lXt" >&5 ++echo "$as_me:36675: 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 +@@ -36395,7 +36680,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 36398 "configure" ++#line 36683 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -36414,16 +36699,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:36417: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:36702: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:36420: \$? = $ac_status" >&5 ++ echo "$as_me:36705: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:36423: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:36708: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:36426: \$? = $ac_status" >&5 ++ echo "$as_me:36711: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_Xt_XtAppInitialize=yes + else +@@ -36434,7 +36719,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:36437: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 ++echo "$as_me:36722: 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 + cat >>confdefs.h <<\EOF +@@ -36448,7 +36733,7 @@ + fi + + if test $cf_have_X_LIBS = no ; then +- { echo "$as_me:36451: WARNING: Unable to successfully link X Toolkit library (-lXt) with ++ { echo "$as_me:36736: 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 +@@ -36458,7 +36743,7 @@ + + cf_x_athena=${cf_x_athena-Xaw} + +-echo "$as_me:36461: checking if you want to link with Xaw 3d library" >&5 ++echo "$as_me:36746: 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= + +@@ -36469,14 +36754,14 @@ + fi; + if test "$withval" = yes ; then + cf_x_athena=Xaw3d +- echo "$as_me:36472: result: yes" >&5 ++ echo "$as_me:36757: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:36475: result: no" >&5 ++ echo "$as_me:36760: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:36479: checking if you want to link with neXT Athena library" >&5 ++echo "$as_me:36764: 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= + +@@ -36487,14 +36772,14 @@ + fi; + if test "$withval" = yes ; then + cf_x_athena=neXtaw +- echo "$as_me:36490: result: yes" >&5 ++ echo "$as_me:36775: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:36493: result: no" >&5 ++ echo "$as_me:36778: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:36497: checking if you want to link with Athena-Plus library" >&5 ++echo "$as_me:36782: 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= + +@@ -36505,14 +36790,14 @@ + fi; + if test "$withval" = yes ; then + cf_x_athena=XawPlus +- echo "$as_me:36508: result: yes" >&5 ++ echo "$as_me:36793: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +- echo "$as_me:36511: result: no" >&5 ++ echo "$as_me:36796: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +-echo "$as_me:36515: checking for XextCreateExtension in -lXext" >&5 ++echo "$as_me:36800: 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 +@@ -36520,7 +36805,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lXext $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 36523 "configure" ++#line 36808 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -36539,16 +36824,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:36542: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:36827: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:36545: \$? = $ac_status" >&5 ++ echo "$as_me:36830: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:36548: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:36833: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:36551: \$? = $ac_status" >&5 ++ echo "$as_me:36836: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_Xext_XextCreateExtension=yes + else +@@ -36559,7 +36844,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:36562: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 ++echo "$as_me:36847: 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 + LIBS="-lXext $LIBS" +@@ -36581,14 +36866,14 @@ + 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:36584: checking for $cf_test in $cf_path" >&5 ++ echo "$as_me:36869: 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:36587: checking for $cf_test" >&5 ++ echo "$as_me:36872: checking for $cf_test" >&5 + echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6 + fi + cat >conftest.$ac_ext <<_ACEOF +-#line 36591 "configure" ++#line 36876 "configure" + #include "confdefs.h" + + #include +@@ -36602,16 +36887,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:36605: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:36890: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:36608: \$? = $ac_status" >&5 ++ echo "$as_me:36893: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:36611: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:36896: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:36614: \$? = $ac_status" >&5 ++ echo "$as_me:36899: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -36620,7 +36905,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext +- echo "$as_me:36623: result: $cf_result" >&5 ++ echo "$as_me:36908: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test "$cf_result" = yes ; then + cf_x_athena_include=$cf_path +@@ -36632,7 +36917,7 @@ + done + + if test -z "$cf_x_athena_include" ; then +- { echo "$as_me:36635: WARNING: Unable to successfully find Athena header files with test program" >&5 ++ { echo "$as_me:36920: 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_include" != default ; then + CPPFLAGS="$CPPFLAGS -I$cf_x_athena_include" +@@ -36657,15 +36942,15 @@ + cf_test=XawSimpleMenuAddGlobalActions + if test $cf_path != default ; then + LIBS="-L$cf_path/lib $cf_lib $LIBS" +- echo "$as_me:36660: checking for $cf_lib in $cf_path" >&5 ++ echo "$as_me:36945: checking for $cf_lib in $cf_path" >&5 + echo $ECHO_N "checking for $cf_lib in $cf_path... $ECHO_C" >&6 + else + LIBS="$cf_lib $LIBS" +- echo "$as_me:36664: checking for $cf_test in $cf_lib" >&5 ++ echo "$as_me:36949: checking for $cf_test in $cf_lib" >&5 + echo $ECHO_N "checking for $cf_test in $cf_lib... $ECHO_C" >&6 + fi + cat >conftest.$ac_ext <<_ACEOF +-#line 36668 "configure" ++#line 36953 "configure" + #include "confdefs.h" + + int +@@ -36677,16 +36962,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:36680: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:36965: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:36683: \$? = $ac_status" >&5 ++ echo "$as_me:36968: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:36686: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:36971: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:36689: \$? = $ac_status" >&5 ++ echo "$as_me:36974: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -36695,7 +36980,7 @@ + cf_result=no + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +- echo "$as_me:36698: result: $cf_result" >&5 ++ echo "$as_me:36983: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test "$cf_result" = yes ; then + cf_x_athena_lib="$cf_lib" +@@ -36707,7 +36992,7 @@ + done + + if test -z "$cf_x_athena_lib" ; then +- { { echo "$as_me:36710: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 ++ { { echo "$as_me:36995: 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 +@@ -36722,7 +37007,7 @@ + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +-echo "$as_me:36725: checking for $ac_word" >&5 ++echo "$as_me:37010: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_XCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -36739,7 +37024,7 @@ + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_XCURSES_CONFIG="$ac_dir/$ac_word" +- echo "$as_me:36742: found $ac_dir/$ac_word" >&5 ++ echo "$as_me:37027: found $ac_dir/$ac_word" >&5 + break + fi + done +@@ -36750,10 +37035,10 @@ + XCURSES_CONFIG=$ac_cv_path_XCURSES_CONFIG + + if test -n "$XCURSES_CONFIG"; then +- echo "$as_me:36753: result: $XCURSES_CONFIG" >&5 ++ echo "$as_me:37038: result: $XCURSES_CONFIG" >&5 + echo "${ECHO_T}$XCURSES_CONFIG" >&6 + else +- echo "$as_me:36756: result: no" >&5 ++ echo "$as_me:37041: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -36774,7 +37059,7 @@ + + test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 + +-echo "${as_me-configure}:36777: testing checking additions to CFLAGS ..." 1>&5 ++echo "${as_me-configure}:37062: testing checking additions to CFLAGS ..." 1>&5 + + cf_check_cflags="$CFLAGS" + cf_check_cppflags="$CPPFLAGS" +@@ -36845,7 +37130,7 @@ + if test -n "$cf_new_cflags" ; then + test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 + +-echo "${as_me-configure}:36848: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 ++echo "${as_me-configure}:37133: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 + + CFLAGS="$CFLAGS $cf_new_cflags" + fi +@@ -36853,7 +37138,7 @@ + if test -n "$cf_new_cppflags" ; then + test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 + +-echo "${as_me-configure}:36856: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 ++echo "${as_me-configure}:37141: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 + + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" + fi +@@ -36861,14 +37146,14 @@ + 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}:36864: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 ++echo "${as_me-configure}:37149: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" + fi + + if test "$cf_check_cflags" != "$CFLAGS" ; then + cat >conftest.$ac_ext <<_ACEOF +-#line 36871 "configure" ++#line 37156 "configure" + #include "confdefs.h" + #include + int +@@ -36880,16 +37165,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:36883: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:37168: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:36886: \$? = $ac_status" >&5 ++ echo "$as_me:37171: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:36889: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:37174: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:36892: \$? = $ac_status" >&5 ++ echo "$as_me:37177: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : + else +@@ -36897,12 +37182,12 @@ + cat conftest.$ac_ext >&5 + test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 + +-echo "${as_me-configure}:36900: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 ++echo "${as_me-configure}:37185: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 + + if test "$cf_check_cppflags" != "$CPPFLAGS" ; then + test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 + +-echo "${as_me-configure}:36905: testing but keeping change to \$CPPFLAGS ..." 1>&5 ++echo "${as_me-configure}:37190: testing but keeping change to \$CPPFLAGS ..." 1>&5 + + fi + CFLAGS="$cf_check_flags" +@@ -36910,7 +37195,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi + +-echo "$as_me:36913: checking for XOpenDisplay in -lX11" >&5 ++echo "$as_me:37198: 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 +@@ -36918,7 +37203,7 @@ + ac_check_lib_save_LIBS=$LIBS + LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 36921 "configure" ++#line 37206 "configure" + #include "confdefs.h" + + /* Override any gcc2 internal prototype to avoid an error. */ +@@ -36937,16 +37222,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:36940: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:37225: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:36943: \$? = $ac_status" >&5 ++ echo "$as_me:37228: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:36946: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:37231: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:36949: \$? = $ac_status" >&5 ++ echo "$as_me:37234: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_X11_XOpenDisplay=yes + else +@@ -36957,13 +37242,13 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:36960: result: $ac_cv_lib_X11_XOpenDisplay" >&5 ++echo "$as_me:37245: 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 + LIBS="-lX11 $LIBS" + fi + +-echo "$as_me:36966: checking for XCurses library" >&5 ++echo "$as_me:37251: 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 +@@ -36971,7 +37256,7 @@ + + LIBS="-lXCurses $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 36974 "configure" ++#line 37259 "configure" + #include "confdefs.h" + + #include +@@ -36986,16 +37271,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:36989: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:37274: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:36992: \$? = $ac_status" >&5 ++ echo "$as_me:37277: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:36995: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:37280: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:36998: \$? = $ac_status" >&5 ++ echo "$as_me:37283: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_lib_XCurses=yes + else +@@ -37006,7 +37291,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:37009: result: $cf_cv_lib_XCurses" >&5 ++echo "$as_me:37294: result: $cf_cv_lib_XCurses" >&5 + echo "${ECHO_T}$cf_cv_lib_XCurses" >&6 + + fi +@@ -37025,14 +37310,14 @@ + EOF + + else +- { { echo "$as_me:37028: error: Cannot link with XCurses" >&5 ++ { { echo "$as_me:37313: error: Cannot link with XCurses" >&5 + echo "$as_me: error: Cannot link with XCurses" >&2;} + { (exit 1); exit 1; }; } + fi + + else + +-echo "$as_me:37035: checking if we can include termio.h with curses" >&5 ++echo "$as_me:37320: 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 +@@ -37042,7 +37327,7 @@ + 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 37045 "configure" ++#line 37330 "configure" + #include "confdefs.h" + + #include +@@ -37056,16 +37341,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:37059: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:37344: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:37062: \$? = $ac_status" >&5 ++ echo "$as_me:37347: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:37065: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:37350: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:37068: \$? = $ac_status" >&5 ++ echo "$as_me:37353: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_termio_and_curses=yes + else +@@ -37078,7 +37363,7 @@ + rm -f lynx_cfg.h + + fi +-echo "$as_me:37081: result: $cf_cv_termio_and_curses" >&5 ++echo "$as_me:37366: result: $cf_cv_termio_and_curses" >&5 + echo "${ECHO_T}$cf_cv_termio_and_curses" >&6 + + test $cf_cv_termio_and_curses = yes && cat >>confdefs.h <<\EOF +@@ -37093,23 +37378,23 @@ + 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:37096: checking for $ac_header" >&5 ++echo "$as_me:37381: 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 37102 "configure" ++#line 37387 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:37106: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:37391: \"$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:37112: \$? = $ac_status" >&5 ++ echo "$as_me:37397: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -37128,7 +37413,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:37131: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:37416: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:37426: 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 +@@ -37147,7 +37432,7 @@ + for mapname in acs_map _acs_map + do + cat >conftest.$ac_ext <<_ACEOF +-#line 37150 "configure" ++#line 37435 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header-curses.h}> +@@ -37161,16 +37446,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:37164: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:37449: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:37167: \$? = $ac_status" >&5 ++ echo "$as_me:37452: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:37170: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:37455: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:37173: \$? = $ac_status" >&5 ++ echo "$as_me:37458: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_alt_char_set=$mapname + break +@@ -37184,20 +37469,20 @@ + + fi + +-echo "$as_me:37187: result: $cf_cv_alt_char_set" >&5 ++echo "$as_me:37472: 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 <&5 ++echo "$as_me:37478: 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 37200 "configure" ++#line 37485 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header-curses.h}> +@@ -37215,16 +37500,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:37218: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:37503: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:37221: \$? = $ac_status" >&5 ++ echo "$as_me:37506: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:37224: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:37509: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:37227: \$? = $ac_status" >&5 ++ echo "$as_me:37512: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_fancy_curses=yes + else +@@ -37236,13 +37521,13 @@ + + fi + +-echo "$as_me:37239: result: $cf_cv_fancy_curses" >&5 ++echo "$as_me:37524: 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:37245: checking for function curses_version" >&5 ++echo "$as_me:37530: 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 +@@ -37252,7 +37537,7 @@ + cf_cv_func_curses_version=unknown + else + cat >conftest.$ac_ext <<_ACEOF +-#line 37255 "configure" ++#line 37540 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header-curses.h}> +@@ -37265,15 +37550,15 @@ + + _ACEOF + rm -f conftest$ac_exeext +-if { (eval echo "$as_me:37268: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:37553: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:37271: \$? = $ac_status" >&5 ++ echo "$as_me:37556: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (eval echo "$as_me:37273: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:37558: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:37276: \$? = $ac_status" >&5 ++ echo "$as_me:37561: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_func_curses_version=yes + +@@ -37288,21 +37573,21 @@ + fi + rm -f core + fi +-echo "$as_me:37291: result: $cf_cv_func_curses_version" >&5 ++echo "$as_me:37576: 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 + #define HAVE_CURSES_VERSION 1 + EOF + + if test "$cf_cv_ncurses_version" != no ; then +-echo "$as_me:37298: checking for obsolete/broken version of ncurses" >&5 ++echo "$as_me:37583: 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 37305 "configure" ++#line 37590 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header-curses.h}> +@@ -37321,16 +37606,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:37324: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:37609: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:37327: \$? = $ac_status" >&5 ++ echo "$as_me:37612: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:37330: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:37615: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:37333: \$? = $ac_status" >&5 ++ echo "$as_me:37618: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_broken=no + else +@@ -37342,10 +37627,10 @@ + + fi + +-echo "$as_me:37345: result: $cf_cv_ncurses_broken" >&5 ++echo "$as_me:37630: 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:37348: WARNING: hmm... you should get an up-to-date version of ncurses" >&5 ++ { echo "$as_me:37633: WARNING: hmm... you should get an up-to-date version of ncurses" >&5 + echo "$as_me: WARNING: hmm... you should get an up-to-date version of ncurses" >&2;} + cat >>confdefs.h <<\EOF + #define NCURSES_BROKEN 1 +@@ -37354,14 +37639,14 @@ + fi + fi + +-echo "$as_me:37357: checking if curses supports color attributes" >&5 ++echo "$as_me:37642: 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 37364 "configure" ++#line 37649 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header-curses.h}> +@@ -37381,16 +37666,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:37384: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:37669: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:37387: \$? = $ac_status" >&5 ++ echo "$as_me:37672: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:37390: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:37675: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:37393: \$? = $ac_status" >&5 ++ echo "$as_me:37678: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_color_curses=yes + else +@@ -37402,7 +37687,7 @@ + + fi + +-echo "$as_me:37405: result: $cf_cv_color_curses" >&5 ++echo "$as_me:37690: result: $cf_cv_color_curses" >&5 + echo "${ECHO_T}$cf_cv_color_curses" >&6 + if test $cf_cv_color_curses = yes ; then + cat >>confdefs.h <<\EOF +@@ -37422,23 +37707,23 @@ + + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +-echo "$as_me:37425: checking for $ac_header" >&5 ++echo "$as_me:37710: 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 37431 "configure" ++#line 37716 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:37435: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:37720: \"$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:37441: \$? = $ac_status" >&5 ++ echo "$as_me:37726: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -37457,7 +37742,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:37460: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:37745: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 ++echo "$as_me:37760: 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 37481 "configure" ++#line 37766 "configure" + #include "confdefs.h" + #include <$ac_header> + _ACEOF +-if { (eval echo "$as_me:37485: \"$ac_cpp conftest.$ac_ext\"") >&5 ++if { (eval echo "$as_me:37770: \"$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:37491: \$? = $ac_status" >&5 ++ echo "$as_me:37776: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag +@@ -37507,7 +37792,7 @@ + fi + rm -f conftest.err conftest.$ac_ext + fi +-echo "$as_me:37510: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "$as_me:37795: result: `eval echo '${'$as_ac_Header'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 ++ echo "$as_me:37813: 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 37531 "configure" ++#line 37816 "configure" + #include "confdefs.h" + #include + int +@@ -37540,16 +37825,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:37543: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:37828: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:37546: \$? = $ac_status" >&5 ++ echo "$as_me:37831: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:37549: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:37834: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:37552: \$? = $ac_status" >&5 ++ echo "$as_me:37837: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + termios_bad=no + else +@@ -37557,7 +37842,7 @@ + cat conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +-#line 37560 "configure" ++#line 37845 "configure" + #include "confdefs.h" + + #define _POSIX_SOURCE +@@ -37571,16 +37856,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:37574: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:37859: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:37577: \$? = $ac_status" >&5 ++ echo "$as_me:37862: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:37580: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:37865: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:37583: \$? = $ac_status" >&5 ++ echo "$as_me:37868: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + termios_bad=unknown + else +@@ -37595,12 +37880,12 @@ + + fi + rm -f conftest.$ac_objext conftest.$ac_ext +- echo "$as_me:37598: result: $termios_bad" >&5 ++ echo "$as_me:37883: result: $termios_bad" >&5 + echo "${ECHO_T}$termios_bad" >&6 + fi + fi + +-echo "$as_me:37603: checking declaration of size-change" >&5 ++echo "$as_me:37888: 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 +@@ -37615,7 +37900,7 @@ + CPPFLAGS="$cf_save_CPPFLAGS" + test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" + cat >conftest.$ac_ext <<_ACEOF +-#line 37618 "configure" ++#line 37903 "configure" + #include "confdefs.h" + #include + #ifdef HAVE_TERMIOS_H +@@ -37659,16 +37944,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:37662: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:37947: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:37665: \$? = $ac_status" >&5 ++ echo "$as_me:37950: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:37668: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:37953: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:37671: \$? = $ac_status" >&5 ++ echo "$as_me:37956: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_sizechange=yes + else +@@ -37687,7 +37972,7 @@ + done + + fi +-echo "$as_me:37690: result: $cf_cv_sizechange" >&5 ++echo "$as_me:37975: result: $cf_cv_sizechange" >&5 + echo "${ECHO_T}$cf_cv_sizechange" >&6 + if test "$cf_cv_sizechange" != no ; then + cat >>confdefs.h <<\EOF +@@ -37704,14 +37989,14 @@ + esac + fi + +-echo "$as_me:37707: checking if ttytype is declared in curses library" >&5 ++echo "$as_me:37992: 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 37714 "configure" ++#line 37999 "configure" + #include "confdefs.h" + #include <${cf_cv_ncurses_header-curses.h}> + int +@@ -37723,16 +38008,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:37726: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:38011: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:37729: \$? = $ac_status" >&5 ++ echo "$as_me:38014: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:37732: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:38017: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:37735: \$? = $ac_status" >&5 ++ echo "$as_me:38020: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_ttytype=yes + else +@@ -37744,7 +38029,7 @@ + + fi + +-echo "$as_me:37747: result: $cf_cv_have_ttytype" >&5 ++echo "$as_me:38032: result: $cf_cv_have_ttytype" >&5 + echo "${ECHO_T}$cf_cv_have_ttytype" >&6 + test $cf_cv_have_ttytype = yes && cat >>confdefs.h <<\EOF + #define HAVE_TTYTYPE 1 +@@ -37752,14 +38037,14 @@ + + if test "$use_wide_curses" = yes ; then + +-echo "$as_me:37755: checking if curses supports wide characters" >&5 ++echo "$as_me:38040: 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 37762 "configure" ++#line 38047 "configure" + #include "confdefs.h" + + #include +@@ -37778,16 +38063,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:37781: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:38066: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:37784: \$? = $ac_status" >&5 ++ echo "$as_me:38069: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:37787: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:38072: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:37790: \$? = $ac_status" >&5 ++ echo "$as_me:38075: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_widec_curses=yes + else +@@ -37798,7 +38083,7 @@ + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + fi +-echo "$as_me:37801: result: $cf_cv_widec_curses" >&5 ++echo "$as_me:38086: result: $cf_cv_widec_curses" >&5 + echo "${ECHO_T}$cf_cv_widec_curses" >&6 + + if test "$cf_cv_widec_curses" = yes ; then +@@ -37807,14 +38092,14 @@ + EOF + + # This is needed on Tru64 5.0 to declare mbstate_t +- echo "$as_me:37810: checking if we must include wchar.h to declare mbstate_t" >&5 ++ echo "$as_me:38095: 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 37817 "configure" ++#line 38102 "configure" + #include "confdefs.h" + + #include +@@ -37828,23 +38113,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:37831: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:38116: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:37834: \$? = $ac_status" >&5 ++ echo "$as_me:38119: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:37837: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:38122: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:37840: \$? = $ac_status" >&5 ++ echo "$as_me:38125: \$? = $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 37847 "configure" ++#line 38132 "configure" + #include "confdefs.h" + + #include +@@ -37859,16 +38144,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:37862: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:38147: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:37865: \$? = $ac_status" >&5 ++ echo "$as_me:38150: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:37868: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:38153: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:37871: \$? = $ac_status" >&5 ++ echo "$as_me:38156: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_widec_mbstate=yes + else +@@ -37880,7 +38165,7 @@ + fi + rm -f conftest.$ac_objext conftest.$ac_ext + fi +-echo "$as_me:37883: result: $cf_cv_widec_mbstate" >&5 ++echo "$as_me:38168: result: $cf_cv_widec_mbstate" >&5 + echo "${ECHO_T}$cf_cv_widec_mbstate" >&6 + + if test "$cf_cv_widec_mbstate" = yes ; then +@@ -37901,14 +38186,14 @@ + + fi + +-echo "$as_me:37904: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 ++echo "$as_me:38189: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 + echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6 + if test "${cf_cv_need_xopen_extension+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + + cat >conftest.$ac_ext <<_ACEOF +-#line 37911 "configure" ++#line 38196 "configure" + #include "confdefs.h" + + #include +@@ -37925,23 +38210,23 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:37928: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:38213: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:37931: \$? = $ac_status" >&5 ++ echo "$as_me:38216: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:37934: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:38219: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:37937: \$? = $ac_status" >&5 ++ echo "$as_me:38222: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_need_xopen_extension=no + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + cat >conftest.$ac_ext <<_ACEOF +-#line 37944 "configure" ++#line 38229 "configure" + #include "confdefs.h" + + #define _XOPEN_SOURCE_EXTENDED +@@ -37959,16 +38244,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:37962: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:38247: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:37965: \$? = $ac_status" >&5 ++ echo "$as_me:38250: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:37968: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:38253: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:37971: \$? = $ac_status" >&5 ++ echo "$as_me:38256: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_need_xopen_extension=yes + else +@@ -37980,11 +38265,11 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:37983: result: $cf_cv_need_xopen_extension" >&5 ++echo "$as_me:38268: 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:37987: checking for term.h" >&5 ++echo "$as_me:38272: 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 +@@ -37997,7 +38282,7 @@ + term.h + do + cat >conftest.$ac_ext <<_ACEOF +-#line 38000 "configure" ++#line 38285 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header-curses.h}> +@@ -38011,16 +38296,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:38014: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:38299: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:38017: \$? = $ac_status" >&5 ++ echo "$as_me:38302: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:38020: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:38305: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:38023: \$? = $ac_status" >&5 ++ echo "$as_me:38308: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_term_header=$cf_header + break +@@ -38039,7 +38324,7 @@ + for cf_header in ncurses/term.h ncursesw/term.h + do + cat >conftest.$ac_ext <<_ACEOF +-#line 38042 "configure" ++#line 38327 "configure" + #include "confdefs.h" + + #include <${cf_cv_ncurses_header-curses.h}> +@@ -38057,16 +38342,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext +-if { (eval echo "$as_me:38060: \"$ac_compile\"") >&5 ++if { (eval echo "$as_me:38345: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +- echo "$as_me:38063: \$? = $ac_status" >&5 ++ echo "$as_me:38348: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:38066: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:38351: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:38069: \$? = $ac_status" >&5 ++ echo "$as_me:38354: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_term_header=$cf_header + break +@@ -38081,7 +38366,7 @@ + esac + + fi +-echo "$as_me:38084: result: $cf_cv_term_header" >&5 ++echo "$as_me:38369: result: $cf_cv_term_header" >&5 + echo "${ECHO_T}$cf_cv_term_header" >&6 + + case $cf_cv_term_header in #(vi +@@ -38132,10 +38417,10 @@ + + cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + +- echo "$as_me:38135: checking for ${cf_func}" >&5 ++ echo "$as_me:38420: checking for ${cf_func}" >&5 + echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 + +-echo "${as_me-configure}:38138: testing ${cf_func} ..." 1>&5 ++echo "${as_me-configure}:38423: testing ${cf_func} ..." 1>&5 + + if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -38144,7 +38429,7 @@ + eval cf_result='$ac_cv_func_'$cf_func + if test ".$cf_result" != ".no"; then + cat >conftest.$ac_ext <<_ACEOF +-#line 38147 "configure" ++#line 38432 "configure" + #include "confdefs.h" + + #ifdef HAVE_XCURSES +@@ -38175,16 +38460,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:38178: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:38463: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:38181: \$? = $ac_status" >&5 ++ echo "$as_me:38466: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:38184: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:38469: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:38187: \$? = $ac_status" >&5 ++ echo "$as_me:38472: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_result=yes + else +@@ -38200,7 +38485,7 @@ + + # use the computed/retrieved cache-value: + eval 'cf_result=$cf_cv_func_'$cf_func +- echo "$as_me:38203: result: $cf_result" >&5 ++ echo "$as_me:38488: result: $cf_result" >&5 + echo "${ECHO_T}$cf_result" >&6 + if test $cf_result != no; then + cat >>confdefs.h <&5 ++echo "$as_me:38504: 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 38225 "configure" ++#line 38510 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. */ +@@ -38253,16 +38538,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:38256: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:38541: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:38259: \$? = $ac_status" >&5 ++ echo "$as_me:38544: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:38262: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:38547: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:38265: \$? = $ac_status" >&5 ++ echo "$as_me:38550: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" + else +@@ -38272,7 +38557,7 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-echo "$as_me:38275: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "$as_me:38560: result: `eval echo '${'$as_ac_var'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 + if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5 ++ { { echo "$as_me:38574: 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:38294: error: Configuration does not support color-styles" >&5 ++ { { echo "$as_me:38579: error: Configuration does not support color-styles" >&5 + echo "$as_me: error: Configuration does not support color-styles" >&2;} + { (exit 1); exit 1; }; } + fi +@@ -38299,7 +38584,7 @@ + + if test $use_scrollbar != no ; then + if test .$cf_cv_fancy_curses != .yes ; then +- { echo "$as_me:38302: WARNING: Configuration does not support ACS_xxx definitions" >&5 ++ { echo "$as_me:38587: WARNING: Configuration does not support ACS_xxx definitions" >&5 + echo "$as_me: WARNING: Configuration does not support ACS_xxx definitions" >&2;} + else + cat >>confdefs.h <<\EOF +@@ -38312,7 +38597,7 @@ + # use rpath for libraries in unusual places + + LD_RPATH_OPT= +-echo "$as_me:38315: checking for an rpath option" >&5 ++echo "$as_me:38600: checking for an rpath option" >&5 + echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 + case $cf_cv_system_name in #(vi + irix*) #(vi +@@ -38343,17 +38628,17 @@ + *) + ;; + esac +-echo "$as_me:38346: result: $LD_RPATH_OPT" >&5 ++echo "$as_me:38631: result: $LD_RPATH_OPT" >&5 + echo "${ECHO_T}$LD_RPATH_OPT" >&6 + + case "x$LD_RPATH_OPT" in #(vi + x-R*) +- echo "$as_me:38351: checking if we need a space after rpath option" >&5 ++ echo "$as_me:38636: 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" + LIBS="${LD_RPATH_OPT}$libdir $LIBS" + cat >conftest.$ac_ext <<_ACEOF +-#line 38356 "configure" ++#line 38641 "configure" + #include "confdefs.h" + + int +@@ -38365,16 +38650,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:38368: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:38653: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:38371: \$? = $ac_status" >&5 ++ echo "$as_me:38656: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:38374: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:38659: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:38377: \$? = $ac_status" >&5 ++ echo "$as_me:38662: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_rpath_space=no + else +@@ -38384,13 +38669,13 @@ + fi + rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS="$cf_save_LIBS" +- echo "$as_me:38387: result: $cf_rpath_space" >&5 ++ echo "$as_me:38672: 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:38393: checking if rpath should be not be set" >&5 ++echo "$as_me:38678: checking if rpath should be not be set" >&5 + echo $ECHO_N "checking if rpath should be not be set... $ECHO_C" >&6 + + # Check whether --enable-rpath-hack or --disable-rpath-hack was given. +@@ -38407,21 +38692,21 @@ + cf_disable_rpath_hack=no + + fi; +-echo "$as_me:38410: result: $cf_disable_rpath_hack" >&5 ++echo "$as_me:38695: 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:38414: checking for updated LDFLAGS" >&5 ++echo "$as_me:38699: 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:38417: result: maybe" >&5 ++ echo "$as_me:38702: 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:38424: checking for $ac_word" >&5 ++echo "$as_me:38709: 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 +@@ -38436,7 +38721,7 @@ + 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:38439: found $ac_dir/$ac_word" >&5 ++echo "$as_me:38724: found $ac_dir/$ac_word" >&5 + break + done + +@@ -38444,10 +38729,10 @@ + fi + cf_ldd_prog=$ac_cv_prog_cf_ldd_prog + if test -n "$cf_ldd_prog"; then +- echo "$as_me:38447: result: $cf_ldd_prog" >&5 ++ echo "$as_me:38732: result: $cf_ldd_prog" >&5 + echo "${ECHO_T}$cf_ldd_prog" >&6 + else +- echo "$as_me:38450: result: no" >&5 ++ echo "$as_me:38735: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + +@@ -38459,7 +38744,7 @@ + if test "$cf_ldd_prog" != no + then + cat >conftest.$ac_ext <<_ACEOF +-#line 38462 "configure" ++#line 38747 "configure" + #include "confdefs.h" + #include + int +@@ -38471,16 +38756,16 @@ + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:38474: \"$ac_link\"") >&5 ++if { (eval echo "$as_me:38759: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? +- echo "$as_me:38477: \$? = $ac_status" >&5 ++ echo "$as_me:38762: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:38480: \"$ac_try\"") >&5 ++ { (eval echo "$as_me:38765: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- echo "$as_me:38483: \$? = $ac_status" >&5 ++ echo "$as_me:38768: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort -u` + else +@@ -38492,11 +38777,11 @@ + + test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 + +-echo "${as_me-configure}:38495: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 ++echo "${as_me-configure}:38780: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 + +-echo "${as_me-configure}:38499: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 ++echo "${as_me-configure}:38784: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 + + cf_rpath_dst= + for cf_rpath_src in $LDFLAGS +@@ -38533,7 +38818,7 @@ + then + test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 + +-echo "${as_me-configure}:38536: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 ++echo "${as_me-configure}:38821: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 + + EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" + fi +@@ -38546,11 +38831,11 @@ + + test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 + +-echo "${as_me-configure}:38549: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 ++echo "${as_me-configure}:38834: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 + +-echo "${as_me-configure}:38553: testing ...checking LIBS $LIBS ..." 1>&5 ++echo "${as_me-configure}:38838: testing ...checking LIBS $LIBS ..." 1>&5 + + cf_rpath_dst= + for cf_rpath_src in $LIBS +@@ -38587,7 +38872,7 @@ + then + test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 + +-echo "${as_me-configure}:38590: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 ++echo "${as_me-configure}:38875: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 + + EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" + fi +@@ -38600,11 +38885,11 @@ + + test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 + +-echo "${as_me-configure}:38603: testing ...checked LIBS $LIBS ..." 1>&5 ++echo "${as_me-configure}:38888: testing ...checked LIBS $LIBS ..." 1>&5 + + test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 + +-echo "${as_me-configure}:38607: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 ++echo "${as_me-configure}:38892: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 + + fi + +@@ -38705,7 +38990,7 @@ + : ${CONFIG_STATUS=./config.status} + ac_clean_files_save=$ac_clean_files + ac_clean_files="$ac_clean_files $CONFIG_STATUS" +-{ echo "$as_me:38708: creating $CONFIG_STATUS" >&5 ++{ echo "$as_me:38993: creating $CONFIG_STATUS" >&5 + echo "$as_me: creating $CONFIG_STATUS" >&6;} + cat >$CONFIG_STATUS <<_ACEOF + #! $SHELL +@@ -38881,7 +39166,7 @@ + echo "$ac_cs_version"; exit 0 ;; + --he | --h) + # Conflict between --help and --header +- { { echo "$as_me:38884: error: ambiguous option: $1 ++ { { echo "$as_me:39169: 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;} +@@ -38900,7 +39185,7 @@ + ac_need_defaults=false;; + + # This is an error. +- -*) { { echo "$as_me:38903: error: unrecognized option: $1 ++ -*) { { echo "$as_me:39188: 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;} +@@ -38953,7 +39238,7 @@ + "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:38956: error: invalid argument: $ac_config_target" >&5 ++ *) { { echo "$as_me:39241: error: invalid argument: $ac_config_target" >&5 + echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +@@ -39274,7 +39559,7 @@ + esac + + if test x"$ac_file" != x-; then +- { echo "$as_me:39277: creating $ac_file" >&5 ++ { echo "$as_me:39562: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi +@@ -39292,7 +39577,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:39295: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:39580: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -39305,7 +39590,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:39308: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:39593: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -39371,7 +39656,7 @@ + * ) ac_file_in=$ac_file.in ;; + esac + +- test x"$ac_file" != x- && { echo "$as_me:39374: creating $ac_file" >&5 ++ test x"$ac_file" != x- && { echo "$as_me:39659: creating $ac_file" >&5 + echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the +@@ -39382,7 +39667,7 @@ + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) +- test -f "$f" || { { echo "$as_me:39385: error: cannot find input file: $f" >&5 ++ test -f "$f" || { { echo "$as_me:39670: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; +@@ -39395,7 +39680,7 @@ + echo $srcdir/$f + else + # /dev/null tree +- { { echo "$as_me:39398: error: cannot find input file: $f" >&5 ++ { { echo "$as_me:39683: error: cannot find input file: $f" >&5 + echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; +@@ -39513,7 +39798,7 @@ + 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:39516: $ac_file is unchanged" >&5 ++ { echo "$as_me:39801: $ac_file is unchanged" >&5 + echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ --- lynx-cur-2.8.8dev.3.orig/debian/lynx-cur-wrapper-conffiles/lynx-cs.cfg +++ lynx-cur-2.8.8dev.3/debian/lynx-cur-wrapper-conffiles/lynx-cs.cfg @@ -0,0 +1,5 @@ +# Include all the common options: +INCLUDE:/etc/lynx-cur/lynx.cfg +# Now override a couple: +CHARACTER_SET:iso-8859-1 +PREFERRED_LANGUAGE:cs,en;q=0.9,*;q=0.5 --- lynx-cur-2.8.8dev.3.orig/debian/lynx-cur-wrapper-conffiles/lynx-da.cfg +++ lynx-cur-2.8.8dev.3/debian/lynx-cur-wrapper-conffiles/lynx-da.cfg @@ -0,0 +1,5 @@ +# Include all the common options: +INCLUDE:/etc/lynx-cur/lynx.cfg +# Now override a couple: +CHARACTER_SET:iso-8859-1 +PREFERRED_LANGUAGE:da,en;q=0.9,*;q=0.5 --- lynx-cur-2.8.8dev.3.orig/debian/lynx-cur-wrapper-conffiles/lynx-de.cfg +++ lynx-cur-2.8.8dev.3/debian/lynx-cur-wrapper-conffiles/lynx-de.cfg @@ -0,0 +1,5 @@ +# Include all the common options: +INCLUDE:/etc/lynx-cur/lynx.cfg +# Now override a couple: +CHARACTER_SET:iso-8859-1 +PREFERRED_LANGUAGE:de,en;q=0.9,*;q=0.5 --- lynx-cur-2.8.8dev.3.orig/debian/lynx-cur-wrapper-conffiles/lynx-es.cfg +++ lynx-cur-2.8.8dev.3/debian/lynx-cur-wrapper-conffiles/lynx-es.cfg @@ -0,0 +1,5 @@ +# Include all the common options: +INCLUDE:/etc/lynx-cur/lynx.cfg +# Now override a couple: +CHARACTER_SET:iso-8859-1 +PREFERRED_LANGUAGE:es,en;q=0.9,*;q=0.5 --- lynx-cur-2.8.8dev.3.orig/debian/lynx-cur-wrapper-conffiles/lynx-fr.cfg +++ lynx-cur-2.8.8dev.3/debian/lynx-cur-wrapper-conffiles/lynx-fr.cfg @@ -0,0 +1,5 @@ +# Include all the common options: +INCLUDE:/etc/lynx-cur/lynx.cfg +# Now override a couple: +CHARACTER_SET:iso-8859-1 +PREFERRED_LANGUAGE:fr,en;q=0.9,*;q=0.5 --- lynx-cur-2.8.8dev.3.orig/debian/lynx-cur-wrapper-conffiles/lynx-it.cfg +++ lynx-cur-2.8.8dev.3/debian/lynx-cur-wrapper-conffiles/lynx-it.cfg @@ -0,0 +1,5 @@ +# Include all the common options: +INCLUDE:/etc/lynx-cur/lynx.cfg +# Now override a couple: +CHARACTER_SET:iso-8859-1 +PREFERRED_LANGUAGE:it,en;q=0.9,*;q=0.5 --- lynx-cur-2.8.8dev.3.orig/debian/lynx-cur-wrapper-conffiles/lynx-ja.cfg +++ lynx-cur-2.8.8dev.3/debian/lynx-cur-wrapper-conffiles/lynx-ja.cfg @@ -0,0 +1,5 @@ +# Include all the common options: +INCLUDE:/etc/lynx-cur/lynx.cfg +# Now override a couple: +CHARACTER_SET:euc-jp +PREFERRED_LANGUAGE:ja,en;q=0.9,*;q=0.5 --- lynx-cur-2.8.8dev.3.orig/debian/lynx-cur-wrapper-conffiles/lynx-ko.cfg +++ lynx-cur-2.8.8dev.3/debian/lynx-cur-wrapper-conffiles/lynx-ko.cfg @@ -0,0 +1,5 @@ +# Include all the common options: +INCLUDE:/etc/lynx-cur/lynx.cfg +# Now override a couple: +CHARACTER_SET:euc-kr +PREFERRED_LANGUAGE:ko,en;q=0.9,*;q=0.5 --- lynx-cur-2.8.8dev.3.orig/debian/lynx-cur-wrapper-conffiles/lynx-nl.cfg +++ lynx-cur-2.8.8dev.3/debian/lynx-cur-wrapper-conffiles/lynx-nl.cfg @@ -0,0 +1,5 @@ +# Include all the common options: +INCLUDE:/etc/lynx-cur/lynx.cfg +# Now override a couple: +CHARACTER_SET:iso-8859-1 +PREFERRED_LANGUAGE:nl,en;q=0.9,*;q=0.5 --- lynx-cur-2.8.8dev.3.orig/debian/lynx-cur-wrapper-conffiles/lynx-no.cfg +++ lynx-cur-2.8.8dev.3/debian/lynx-cur-wrapper-conffiles/lynx-no.cfg @@ -0,0 +1,5 @@ +# Include all the common options: +INCLUDE:/etc/lynx-cur/lynx.cfg +# Now override a couple: +CHARACTER_SET:iso-8859-1 +PREFERRED_LANGUAGE:no,en;q=0.9,*;q=0.5 --- lynx-cur-2.8.8dev.3.orig/debian/lynx-cur-wrapper-conffiles/lynx-pl.cfg +++ lynx-cur-2.8.8dev.3/debian/lynx-cur-wrapper-conffiles/lynx-pl.cfg @@ -0,0 +1,5 @@ +# Include all the common options: +INCLUDE:/etc/lynx-cur/lynx.cfg +# Now override a couple: +CHARACTER_SET:iso-8859-1 +PREFERRED_LANGUAGE:pl,en;q=0.9,*;q=0.5 --- lynx-cur-2.8.8dev.3.orig/debian/lynx-cur-wrapper-conffiles/lynx-pt.cfg +++ lynx-cur-2.8.8dev.3/debian/lynx-cur-wrapper-conffiles/lynx-pt.cfg @@ -0,0 +1,5 @@ +# Include all the common options: +INCLUDE:/etc/lynx-cur/lynx.cfg +# Now override a couple: +CHARACTER_SET:iso-8859-1 +PREFERRED_LANGUAGE:pt,en;q=0.9,*;q=0.5 --- lynx-cur-2.8.8dev.3.orig/debian/lynx-cur-wrapper-conffiles/lynx-ru.cfg +++ lynx-cur-2.8.8dev.3/debian/lynx-cur-wrapper-conffiles/lynx-ru.cfg @@ -0,0 +1,5 @@ +# Include all the common options: +INCLUDE:/etc/lynx-cur/lynx.cfg +# Now override a couple: +CHARACTER_SET:iso-8859-1 +PREFERRED_LANGUAGE:ru,en;q=0.9,*;q=0.5 --- lynx-cur-2.8.8dev.3.orig/debian/lynx-cur-wrapper-conffiles/lynx-sl.cfg +++ lynx-cur-2.8.8dev.3/debian/lynx-cur-wrapper-conffiles/lynx-sl.cfg @@ -0,0 +1,5 @@ +# Include all the common options: +INCLUDE:/etc/lynx-cur/lynx.cfg +# Now override a couple: +CHARACTER_SET:iso-8859-1 +PREFERRED_LANGUAGE:sl,en;q=0.9,*;q=0.5 --- lynx-cur-2.8.8dev.3.orig/debian/lynx-cur-wrapper-conffiles/lynx-sv.cfg +++ lynx-cur-2.8.8dev.3/debian/lynx-cur-wrapper-conffiles/lynx-sv.cfg @@ -0,0 +1,5 @@ +# Include all the common options: +INCLUDE:/etc/lynx-cur/lynx.cfg +# Now override a couple: +CHARACTER_SET:iso-8859-1 +PREFERRED_LANGUAGE:sv,en;q=0.9,*;q=0.5 --- lynx-cur-2.8.8dev.3.orig/debian/lynx-cur-wrapper-conffiles/lynx-utf.cfg +++ lynx-cur-2.8.8dev.3/debian/lynx-cur-wrapper-conffiles/lynx-utf.cfg @@ -0,0 +1,5 @@ +# Include all the common options: +INCLUDE:/etc/lynx-cur/lynx.cfg +# Now override a couple: +CHARACTER_SET:utf-8 +PREFERRED_LANGUAGE:utf-8,en;q=0.9,*;q=0.5 --- lynx-cur-2.8.8dev.3.orig/debian/lynx-cur-wrapper-conffiles/lynx-zh.cfg +++ lynx-cur-2.8.8dev.3/debian/lynx-cur-wrapper-conffiles/lynx-zh.cfg @@ -0,0 +1,5 @@ +# Include all the common options: +INCLUDE:/etc/lynx-cur/lynx.cfg +# Now override a couple: +CHARACTER_SET:big5 +PREFERRED_LANGUAGE:zh,en;q=0.9,*;q=0.5 --- lynx-cur-2.8.8dev.3.orig/debian/lynx-cur-wrapper-conffiles/lynx.cfg.blck +++ lynx-cur-2.8.8dev.3/debian/lynx-cur-wrapper-conffiles/lynx.cfg.blck @@ -0,0 +1,13 @@ +# Include all the common options: +INCLUDE:/etc/lynx-cur/lynx.cfg +# Now override a couple: +CHARACTER_SET:euc-jp +PREFERRED_LANGUAGE:ja,en;q=0.9,*;q=0.5 +COLOR:0:lightgray:black +COLOR:1:blue:black +COLOR:2:yellow:blue +COLOR:3:green:black +COLOR:4:magenta:black +COLOR:5:blue:black +COLOR:6:red:black +COLOR:7:magenta:cyan --- lynx-cur-2.8.8dev.3.orig/debian/lynx-cur-wrapper-conffiles/lynx.cfg.dflt +++ lynx-cur-2.8.8dev.3/debian/lynx-cur-wrapper-conffiles/lynx.cfg.dflt @@ -0,0 +1,13 @@ +# Include all the common options: +INCLUDE:/etc/lynx-cur/lynx.cfg +# Now override a couple: +CHARACTER_SET:euc-jp +PREFERRED_LANGUAGE:ja,en;q=0.9,*;q=0.5 +COLOR:0:default:default +COLOR:1:blue:default +COLOR:2:yellow:blue +COLOR:3:green:default +COLOR:4:magenta:default +COLOR:5:blue:default +COLOR:6:red:default +COLOR:7:magenta:cyan