From b799a1275c8e4bb4f1f07ce3e237708902cb8922 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 27 Apr 2024 21:36:22 +0200 Subject: Merging upstream version 2.9.1. Signed-off-by: Daniel Baumann --- CHANGES | 28 +- INSTALLATION | 11 +- PACKAGE/debian/changelog | 6 +- PACKAGE/debian/compat | 2 +- PACKAGE/debian/lynx-dev.lintian-overrides | 26 +- PACKAGE/debian/postinst | 27 - PACKAGE/debian/prerm | 12 - PACKAGE/debian/rules | 16 +- PACKAGE/lynx-curssl.iss | 14 - PACKAGE/lynx.iss | 20 +- PACKAGE/lynx.nsi | 8 +- PACKAGE/lynx.spec | 30 +- PACKAGE/version.iss | 2 +- WWW/Library/Implementation/HTFTP.c | 7 +- WWW/Library/Implementation/HTFile.c | 4 +- WWW/Library/Implementation/HTFormat.c | 4 +- WWW/Library/Implementation/HTMLGen.c | 8 +- WWW/Library/Implementation/HTUtils.h | 5 +- WWW/Library/Implementation/SGML.c | 7 +- WWW/Library/Implementation/makefile.in | 6 +- WWW/Library/Implementation/www_tcp.h | 8 +- aclocal.m4 | 485 +- config.guess | 7 +- config.hin | 28 +- config.sub | 27 +- configure | 16447 +++++++++++++--------------- configure.in | 22 +- lynx.cfg | 6 +- lynx.man | 6 +- samples/mhtml-tool | 568 + src/GridText.c | 20 +- src/HTFWriter.c | 4 +- src/LYBookmark.c | 268 +- src/LYCharSets.c | 35 +- src/LYIcon.rc | 10 +- src/LYMain.c | 5 +- src/LYMainLoop.c | 42 +- src/LYReadCFG.c | 6 +- src/TRSTable.c | 5 +- src/chrtrans/README.tables | 2 +- src/makefile.in | 11 +- userdefs.h | 6 +- 42 files changed, 9027 insertions(+), 9234 deletions(-) delete mode 100644 PACKAGE/debian/postinst delete mode 100644 PACKAGE/debian/prerm delete mode 100644 PACKAGE/lynx-curssl.iss create mode 100755 samples/mhtml-tool diff --git a/CHANGES b/CHANGES index 6b8e03f..e805dca 100644 --- a/CHANGES +++ b/CHANGES @@ -1,8 +1,34 @@ --- $LynxId: CHANGES,v 1.1159 2024/01/15 21:41:51 tom Exp $ +-- $LynxId: CHANGES,v 1.1185 2024/04/15 20:54:26 tom Exp $ =============================================================================== Changes since Lynx 2.8 release =============================================================================== +2024-04-15 (2.9.1) +* add samples/mhtml-tool, from + https://github.com/ThomasDickey/mhtml-tool + which can use Lynx to display an "mhtml" file, e.g., foo.mht by + mhtml-tool -e lynx foo.mht +* add --with-libintl-prefix configure option (from patch for tin by Urs + JanBen) -TD +* improve bookmark file-updates, allowing for users to add HTML markup + (report by TG) -TD +* remove obsolete option --with-included-gettext -TD +* override $BUILD_CPPFLAGS and $BUILD_LIBS when not cross-compiling, to help + build Lynx with PDCurses -TD +* re-order configure check for _XOPEN_SOURCE, etc., to reduce compiler warnings + with gcc 14 -TD +* add configure check for ssp library, needed in some MinGW configurations -TD +* fixes for saving a UTF-8 bookmark title -KH + + correct comparison of Windows codepage values when setting + DisplayCharsetMatchLocale, to handle UTF-8 + + reset the internal state of UCTransToUni() before using it for bookmark + title check. +* update/cleanup test-packages -TD +* correct logic in HTMLGen.c where XMP was not treated as a preformatted + style, causing NNTP headers to be formatted (report by Marco Moock) -TD +* fix special case of main status line on a page without links, broken by fix + for UBSAN/ASAN issue -TG + 2024-01-15 (2.9.0) * change version of OpenSSL used in Windows installers to 3.x and 1.1.1x, for new/old respectively -TD diff --git a/INSTALLATION b/INSTALLATION index b51d8f8..5c89839 100644 --- a/INSTALLATION +++ b/INSTALLATION @@ -665,15 +665,12 @@ II. Compile instructions -- UNIX See the "--enable-gnutls-compat" option. - --with-included-gettext - not supported in this package. The configure script uses macros which - are bundled together with more useful features. - - See the "--enable-nls" option. - --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib + --with-libintl-prefix=DIR + search for libintl in DIR/include and DIR/lib + --with-lss-file{=path} (define LYNX_LSS_FILE) Specify the default style-sheet file's name. Use --without-lss-file to make the default behavior match the non-color-style (if no --lss @@ -1506,4 +1503,4 @@ VIII. Acknowledgment -- 1999/04/24 - H. Nelson -- vile:txtmode --- $LynxId: INSTALLATION,v 1.137 2022/12/28 13:40:56 tom Exp $ +-- $LynxId: INSTALLATION,v 1.139 2024/04/09 23:18:16 tom Exp $ diff --git a/PACKAGE/debian/changelog b/PACKAGE/debian/changelog index 048e3cf..69e763e 100644 --- a/PACKAGE/debian/changelog +++ b/PACKAGE/debian/changelog @@ -1,8 +1,8 @@ -lynx-dev (2.9.0) unstable; urgency=high +lynx-dev (2.9.1) unstable; urgency=low - * new release + * maintenance updates - -- Thomas E. Dickey Sun, 14 Jan 2024 17:15:53 -0500 + -- Thomas E. Dickey Wed, 13 Mar 2024 12:45:26 -0400 lynx-dev (2.8.8dev.16) unstable; urgency=high diff --git a/PACKAGE/debian/compat b/PACKAGE/debian/compat index f599e28..48082f7 100644 --- a/PACKAGE/debian/compat +++ b/PACKAGE/debian/compat @@ -1 +1 @@ -10 +12 diff --git a/PACKAGE/debian/lynx-dev.lintian-overrides b/PACKAGE/debian/lynx-dev.lintian-overrides index 9b0aa40..00712a9 100644 --- a/PACKAGE/debian/lynx-dev.lintian-overrides +++ b/PACKAGE/debian/lynx-dev.lintian-overrides @@ -1,15 +1,17 @@ -# This is intentional because it is referenced from the documentation. -lynx-dev: extra-license-file usr/share/doc/lynx-dev/COPYING - -lynx-dev: national-encoding usr/share/doc/lynx-dev/test/ALT88592.html -lynx-dev: national-encoding usr/share/doc/lynx-dev/test/iso-8859-1.html -lynx-dev: national-encoding usr/share/doc/lynx-dev/test/iso-8859-2.html +# These are sample/test-files: +lynx-dev: national-encoding [usr/share/doc/lynx-dev/test/ALT88592.html] +lynx-dev: national-encoding [usr/share/doc/lynx-dev/test/iso-8859-1.html] +lynx-dev: national-encoding [usr/share/doc/lynx-dev/test/iso-8859-2.html] # These are a known problem with lintian: # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=891301 -lynx-dev: privacy-breach-generic usr/share/doc/lynx-dev/test/ALT88592.html [] (http://mail.gnu.org/mailman/listinfo/lynx-dev/) -lynx-dev: privacy-breach-generic usr/share/doc/lynx-dev/test/bad-html.html [] (http://mail.gnu.org/mailman/listinfo/lynx-dev/) -lynx-dev: privacy-breach-generic usr/share/doc/lynx-dev/test/cp-1252.html [] (http://mail.gnu.org/mailman/listinfo/lynx-dev/) -lynx-dev: privacy-breach-generic usr/share/doc/lynx-dev/test/cp-1252a.html [] (http://mail.gnu.org/mailman/listinfo/lynx-dev/) -lynx-dev: privacy-breach-generic usr/share/doc/lynx-dev/test/iso-8859-2.html [] (http://mail.gnu.org/mailman/listinfo/lynx-dev/) -lynx-dev: privacy-breach-generic usr/share/doc/lynx-dev/test/iso-8859-2a.html [] (http://mail.gnu.org/mailman/listinfo/lynx-dev/) +lynx-dev: privacy-breach-generic [] (http://mail.gnu.org/mailman/listinfo/lynx-dev/) [usr/share/doc/lynx-dev/test/ALT88592.html] +lynx-dev: privacy-breach-generic [] (http://mail.gnu.org/mailman/listinfo/lynx-dev/) [usr/share/doc/lynx-dev/test/bad-html.html] +lynx-dev: privacy-breach-generic [] (http://mail.gnu.org/mailman/listinfo/lynx-dev/) [usr/share/doc/lynx-dev/test/cp-1252.html] +lynx-dev: privacy-breach-generic [] (http://mail.gnu.org/mailman/listinfo/lynx-dev/) [usr/share/doc/lynx-dev/test/cp-1252a.html] +lynx-dev: privacy-breach-generic [] (http://mail.gnu.org/mailman/listinfo/lynx-dev/) [usr/share/doc/lynx-dev/test/iso-8859-2.html] +lynx-dev: privacy-breach-generic [] (http://mail.gnu.org/mailman/listinfo/lynx-dev/) [usr/share/doc/lynx-dev/test/iso-8859-2a.html] + +# These are intentional: +lynx-dev: extra-license-file [usr/share/doc/lynx-dev/COPYING] +lynx-dev: spelling-error-in-binary XWINDOWS X [usr/bin/lynx-dev] diff --git a/PACKAGE/debian/postinst b/PACKAGE/debian/postinst deleted file mode 100644 index 89955d4..0000000 --- a/PACKAGE/debian/postinst +++ /dev/null @@ -1,27 +0,0 @@ -#! /bin/sh -# postinst script for lynx - -set -e - -PRI=50 -ALT=lynx -PKG=lynx-dev - -BINDIR=/usr/bin -MANDIR=/usr/share/man/man1 - -if [ $1 != "upgrade" ] -then - - update-alternatives \ - --install \ - $BINDIR/$ALT $ALT \ - $BINDIR/$PKG $PRI \ - --slave $MANDIR/$ALT.1.gz $ALT.1.gz \ - $MANDIR/$PKG.1.gz - -fi - -#DEBHELPER# - -exit 0 diff --git a/PACKAGE/debian/prerm b/PACKAGE/debian/prerm deleted file mode 100644 index a79bf38..0000000 --- a/PACKAGE/debian/prerm +++ /dev/null @@ -1,12 +0,0 @@ -#! /bin/sh -# prerm script for lynx - -set -e - -if [ $1 != "upgrade" ]; then - update-alternatives --remove lynx /usr/bin/lynx-dev -fi - -#DEBHELPER# - -exit 0 diff --git a/PACKAGE/debian/rules b/PACKAGE/debian/rules index 908ed5e..08cabf6 100755 --- a/PACKAGE/debian/rules +++ b/PACKAGE/debian/rules @@ -1,5 +1,9 @@ #!/usr/bin/make -f -# $LynxId: rules,v 1.19 2024/01/15 01:16:07 tom Exp $ +# $LynxId: rules,v 1.24 2024/03/14 13:48:36 tom Exp $ + +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -20,10 +24,6 @@ helpdir := $(docdir)/help_dir DSTDIR := $(CURDIR)/debian/$(PACKAGE) DOCDIR := $(DSTDIR)$(docdir) -CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS) -CFLAGS := $(shell dpkg-buildflags --get CFLAGS) -LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) - ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) DEBOP=--enable-debug else @@ -155,15 +155,15 @@ install-indep: install-arch: dh_testdir dh_testroot - dh_prep -s - dh_installdirs -s + dh_prep -a + dh_installdirs -a $(MAKE) install-full \ DESTDIR=$(DSTDIR) \ docdir=$(docdir) \ helpdir=$(helpdir) - cd $(DOCDIR) && rm -f COPY*.asc CHANGES + cd $(DOCDIR) && rm -f COPY*.asc CHANGES # Build architecture-independent files here. binary-indep: build install diff --git a/PACKAGE/lynx-curssl.iss b/PACKAGE/lynx-curssl.iss deleted file mode 100644 index 3182257..0000000 --- a/PACKAGE/lynx-curssl.iss +++ /dev/null @@ -1,14 +0,0 @@ -; $LynxId: lynx-curssl.iss,v 1.1 2022/12/29 00:38:46 tom Exp $ -; -; This is an installer for Lynx built with "current" OpenSSL (3.0.x). -; -; The script assumes environment variables have been set, e.g., to point to -; data which is used by the installer (see "lynx.lss" for details). - -#define NoScreenDll -#define SslGlob1 "'libssl-3*.dll'" -#define SslGlob2 "'libcrypto-3*.dll'" -#define SetupBaseName "lynx-curssl" -#define SourceExeName "lynx-curssl.exe" - -#include "lynx.iss" diff --git a/PACKAGE/lynx.iss b/PACKAGE/lynx.iss index 2353067..385b51c 100644 --- a/PACKAGE/lynx.iss +++ b/PACKAGE/lynx.iss @@ -1,4 +1,4 @@ -; $LynxId: lynx.iss,v 1.41 2024/01/15 23:28:41 tom Exp $ +; $LynxId: lynx.iss,v 1.42 2024/04/14 23:28:50 tom Exp $ ; vile:ts=4 sw=4 notabinsert fk=8bit ; ; This is the BASE script for different flavors of the installer for Lynx. @@ -95,7 +95,7 @@ AppCopyright= AppPublisherURL={#MyAppURL} AppSupportURL={#MyAppURL} AppUpdatesURL={#MyAppURL} -DefaultDirName={pf}\{#MyAppName} +DefaultDirName={commonpf}\{#MyAppName} DefaultGroupName={#MyAppName} AllowNoIcons=yes LicenseFile=..\COPYHEADER @@ -176,7 +176,7 @@ Type: dirifempty; Name: {app} function isGuru(): Boolean; begin - Result := isAdminLoggedOn(); + Result := isAdmin(); end; function environRootKey(): Integer; @@ -232,7 +232,7 @@ end; function selectedVarsRootKey(): Integer; begin - if isTaskSelected('for_all_users') then + if WizardisTaskSelected('for_all_users') then Result := HKEY_LOCAL_MACHINE else Result := HKEY_CURRENT_USER; @@ -240,15 +240,15 @@ end; function selectedVarsSubKey(): String; begin - if isTaskSelected('for_all_users') then + if WizardisTaskSelected('for_all_users') then begin - if isTaskSelected('register_vars') then + if WizardisTaskSelected('register_vars') then Result := appSubKey() else Result := envSysKey(); end else begin - if isTaskSelected('register_vars') then + if WizardisTaskSelected('register_vars') then Result := appSubKey() else Result := envSubKey(); @@ -308,13 +308,13 @@ begin if not RegWriteStringValue(selectedVarsRootKey(), Keypath, '', AppDir) then Log('Failed to set key'); - if isTaskSelected('use_sendto') then + if WizardisTaskSelected('use_sendto') then begin AddSendTo(); Log('** added Send-To link'); end; - if isTaskSelected('quicklaunchicon') then + if WizardisTaskSelected('quicklaunchicon') then begin AddQuickLaunch(); Log('** added Quick-launch link'); @@ -346,7 +346,7 @@ begin Log('** customized ' + CfgFile); - if isTaskSelected('use_sendto') then + if WizardisTaskSelected('use_sendto') then begin AddSendTo(); Log('** added Send-To link'); diff --git a/PACKAGE/lynx.nsi b/PACKAGE/lynx.nsi index 7071db2..90817f6 100644 --- a/PACKAGE/lynx.nsi +++ b/PACKAGE/lynx.nsi @@ -1,4 +1,4 @@ -; $LynxId: lynx.nsi,v 1.63 2024/01/07 11:13:00 tom Exp $ +; $LynxId: lynx.nsi,v 1.72 2024/04/15 20:53:51 tom Exp $ ; Script originally generated with the Venis Install Wizard, but customized. ; The Inno Setup script is preferred; but this can be built via cross-compiling. @@ -8,9 +8,9 @@ !define VERSION_EPOCH "2" !define VERSION_MAJOR "9" -!define VERSION_MINOR "0" -!define VERSION_LEVEL "1013" -!define VERSION_PATCH "dev.13" +!define VERSION_MINOR "1" +!define VERSION_LEVEL "0" +!define VERSION_PATCH "" !define SUBKEY "Lynx" diff --git a/PACKAGE/lynx.spec b/PACKAGE/lynx.spec index a11a9a0..7f23f19 100644 --- a/PACKAGE/lynx.spec +++ b/PACKAGE/lynx.spec @@ -1,25 +1,28 @@ -# $LynxId: lynx.spec,v 1.72 2024/01/15 11:47:26 tom Exp $ +# $LynxId: lynx.spec,v 1.83 2024/04/15 20:53:51 tom Exp $ Summary: A text-based Web browser Name: lynx-dev -Version: 2.9.0 -Release: 1 +Version: 2.9.1 +Release: 0 License: GPLv2 Group: Applications/Internet -Source: lynx%{version}.tgz +Source: https://invisible-island.net/archives/lynx/lynx%{version}.tgz URL: https://lynx.invisible-island.net Provides: webclient >= 0.0 Provides: text-www-browser >= 0.0 # Fedora: -BuildRequires: openssl-devel, pkgconfig, ncurses-devel >= 5.3-5, +BuildRequires: pkgconfig, ncurses-devel >= 5.3-5, BuildRequires: zlib-devel, gettext BuildRequires: libidn-devel +# BuildRequires: openssl-devel # BuildRequires: bzip2-devel # SuSE: # BuildRequires: libbz2-devel +# BuildRequires: libopenssl-1_1-devel, or +# BuildRequires: libopenssl-3-devel -Requires: gzip, bzip2, tar, zip, unzip +Requires: brotli, gzip, bzip2, tar, zip, unzip %description Lynx is a fully-featured World Wide Web (WWW) client for users running @@ -48,35 +51,23 @@ HTTP, FTP, WAIS, and NNTP servers. --sysconfdir=%{lynx_etc} \ --with-cfg-path=%{lynx_etc}:%{lynx_doc}/samples \ --with-textdomain=%{name} \ - --enable-8bit-toupper \ --enable-cgi-links \ --enable-change-exec \ --enable-charset-choice \ - --enable-cjk \ --enable-default-colors \ --enable-exec-links \ --enable-exec-scripts \ --enable-externs \ --enable-font-switch \ - --enable-forms-options \ --enable-gzip-help \ --enable-htmlized-cfg \ --enable-internal-links \ --enable-ipv6 \ - --enable-chinese-utf8 \ - --enable-japanese-utf8 \ - --enable-justify-elts \ --enable-kbd-layout \ --enable-local-docs \ --enable-nested-tables \ --enable-nls \ --enable-nsl-fork \ - --enable-partial \ - --enable-persistent-cookies \ - --enable-prettysrc \ - --enable-read-eta \ - --enable-scrollbar \ - --enable-source-cache \ --enable-syslog \ --enable-warnings \ --with-screen=ncursesw6dev \ @@ -111,6 +102,9 @@ strip $RPM_BUILD_ROOT%{_bindir}/%{name} %changelog +* Thu Mar 14 2024 Thomas E. Dickey +- trim redundant options + * Mon Jan 15 2024 Thomas E. Dickey - simplified tarball name diff --git a/PACKAGE/version.iss b/PACKAGE/version.iss index e3fe613..92b4e90 100644 --- a/PACKAGE/version.iss +++ b/PACKAGE/version.iss @@ -1,6 +1,6 @@ ; version used for Inno Setup files. -#define LYNX_VERSION "2.9.0" +#define LYNX_VERSION "2.9.1" #define MyAppProg "Lynx" #define MyAppName "Lynx - web browser" diff --git a/WWW/Library/Implementation/HTFTP.c b/WWW/Library/Implementation/HTFTP.c index decf559..a08701c 100644 --- a/WWW/Library/Implementation/HTFTP.c +++ b/WWW/Library/Implementation/HTFTP.c @@ -1,5 +1,5 @@ /* - * $LynxId: HTFTP.c,v 1.148 2023/01/05 09:17:15 tom Exp $ + * $LynxId: HTFTP.c,v 1.149 2024/03/21 07:51:10 tom Exp $ * * File Transfer Protocol (FTP) Client * for a WorldWideWeb browser @@ -2189,7 +2189,10 @@ static void parse_cms_dir_entry(char *line, set_years_and_date(); } - /* Track down the date. */ + /* Track down the date using the ":" separating hours/minutes: + * mm/dd/yy hh:mm + * 01234567890123 + */ cpd = cps; if (((cps < end) && (cps = StrChr(cpd, ':')) != NULL) && diff --git a/WWW/Library/Implementation/HTFile.c b/WWW/Library/Implementation/HTFile.c index 8fdaa2c..e9a225d 100644 --- a/WWW/Library/Implementation/HTFile.c +++ b/WWW/Library/Implementation/HTFile.c @@ -1,5 +1,5 @@ /* - * $LynxId: HTFile.c,v 1.158 2022/07/25 23:52:05 tom Exp $ + * $LynxId: HTFile.c,v 1.159 2024/04/11 20:19:06 tom Exp $ * * File Access HTFile.c * =========== @@ -1313,7 +1313,7 @@ CompressFileType HTCompressFileType(const char *filename, */ const char *HTCompressTypeToSuffix(CompressFileType method) { - const char *result = ""; + const char *result; switch (method) { default: diff --git a/WWW/Library/Implementation/HTFormat.c b/WWW/Library/Implementation/HTFormat.c index a830387..198ea51 100644 --- a/WWW/Library/Implementation/HTFormat.c +++ b/WWW/Library/Implementation/HTFormat.c @@ -1,5 +1,5 @@ /* - * $LynxId: HTFormat.c,v 1.96 2022/03/31 23:39:38 tom Exp $ + * $LynxId: HTFormat.c,v 1.97 2024/04/11 20:19:35 tom Exp $ * * Manage different file formats HTFormat.c * ============================= @@ -1378,7 +1378,7 @@ static int HTBrFileCopy(FILE *brfp, HTStream *sink) char *normal_buffer = NULL; size_t brotli_size; size_t brotli_limit = 0; - size_t brotli_offset = brotli_limit; + size_t brotli_offset; size_t normal_size; size_t normal_limit = 0; diff --git a/WWW/Library/Implementation/HTMLGen.c b/WWW/Library/Implementation/HTMLGen.c index c63723c..7cf7bb9 100644 --- a/WWW/Library/Implementation/HTMLGen.c +++ b/WWW/Library/Implementation/HTMLGen.c @@ -1,5 +1,5 @@ /* - * $LynxId: HTMLGen.c,v 1.46 2020/01/21 22:02:35 tom Exp $ + * $LynxId: HTMLGen.c,v 1.47 2024/03/13 23:48:59 tom Exp $ * * HTML Generator * ============== @@ -160,7 +160,7 @@ static void allow_break(HTStructured * me, int new_cleanness, int dlbc) * ------------------ * * The tricky bits are the line break handling. This attempts - * to synchrononise line breaks on sentence or phrase ends. This + * to synchronize line breaks on sentence or phrase ends. This * is important if one stores SGML files in a line-oriented code * repository, so that if a small change is made, line ends don't * shift in a ripple-through to apparently change a large part of the @@ -466,7 +466,7 @@ static int HTMLGen_start_element(HTStructured * me, int element_number, /* * Make very specific HTML assumption that PRE can't be nested! */ - me->preformatted = (BOOL) ((element_number == HTML_PRE) + me->preformatted = (BOOL) ((element_number == HTML_PRE || element_number == HTML_XMP) ? YES : was_preformatted); @@ -538,7 +538,7 @@ static int HTMLGen_end_element(HTStructured * me, int element_number, HTMLGen_put_string(me, "'); - if (element_number == HTML_PRE) { + if (element_number == HTML_PRE || element_number == HTML_XMP) { me->preformatted = NO; } #ifdef USE_COLOR_STYLE diff --git a/WWW/Library/Implementation/HTUtils.h b/WWW/Library/Implementation/HTUtils.h index 3d66cab..5a14027 100644 --- a/WWW/Library/Implementation/HTUtils.h +++ b/WWW/Library/Implementation/HTUtils.h @@ -1,5 +1,5 @@ /* - * $LynxId: HTUtils.h,v 1.135 2023/11/05 23:09:43 tom Exp $ + * $LynxId: HTUtils.h,v 1.137 2024/03/17 23:04:27 tom Exp $ * * Utility macros for the W3 code library * MACROS FOR GENERAL USE @@ -140,7 +140,6 @@ char *alloca(); /* suppress inadvertent use of gettext in makeuctb when cross-compiling */ #ifdef DONT_USE_GETTEXT #undef HAVE_GETTEXT -#undef HAVE_LIBGETTEXT_H #undef HAVE_LIBINTL_H #endif @@ -618,7 +617,7 @@ extern int WWW_TraceMask; #ifndef PRI_off_t #define GUESS_PRI_off_t -#if (SIZEOF_OFF_T == SIZEOF_LONG) +#if defined(SIZEOF_OFF_T) && defined(SIZEOF_LONG) && (SIZEOF_OFF_T == SIZEOF_LONG) #define PRI_off_t "ld" #define SCN_off_t "ld" #define CAST_off_t(n) (long)(n) diff --git a/WWW/Library/Implementation/SGML.c b/WWW/Library/Implementation/SGML.c index c256685..d689bbd 100644 --- a/WWW/Library/Implementation/SGML.c +++ b/WWW/Library/Implementation/SGML.c @@ -1,5 +1,5 @@ /* - * $LynxId: SGML.c,v 1.186 2023/10/25 22:35:29 tom Exp $ + * $LynxId: SGML.c,v 1.188 2024/04/11 20:22:19 tom Exp $ * * General SGML Parser code SGML.c * ======================== @@ -242,9 +242,10 @@ struct _HTStream { #else static const char *state_name(sgml_state n) { - const char *result = "?"; + const char *result; /* *INDENT-OFF* */ switch (n) { + default: case S_attr: result = "S_attr"; break; case S_attr_gap: result = "S_attr_gap"; break; case S_comment: result = "S_comment"; break; @@ -5023,11 +5024,9 @@ unsigned char *TO_EUC(const unsigned char *jis, unsigned char *d; int to1B, to2B; int in_sjis = 0; - static int nje; int n8bits; int is_JIS; - nje++; n8bits = 0; s = jis; d = euc; diff --git a/WWW/Library/Implementation/makefile.in b/WWW/Library/Implementation/makefile.in index 0b467d7..44de1c7 100644 --- a/WWW/Library/Implementation/makefile.in +++ b/WWW/Library/Implementation/makefile.in @@ -1,4 +1,4 @@ -# $LynxId: makefile.in,v 1.35 2021/07/16 20:01:00 tom Exp $ +# $LynxId: makefile.in,v 1.36 2024/03/17 22:13:00 tom Exp $ # Make WWW under unix for a.n.other unix system (bsd) # Use this as a template @@ -31,15 +31,13 @@ RANLIB = @RANLIB@ o = .@OBJEXT@ x = @EXEEXT@ -INTLDIR_CPPFLAGS= @INTLDIR_CPPFLAGS@ -I$(top_srcdir)/intl - CPP = @CPP@ CPPOPTS = $(DEFS) $(LYFLAGS) \ -I../../.. \ -I../../../src \ -I$(top_srcdir) \ -I$(top_srcdir)/src \ - $(INTLDIR_CPPFLAGS) -I$(WWWINC) $(EXTRA_CPPFLAGS) $(CPPFLAGS) + -I$(WWWINC) $(EXTRA_CPPFLAGS) $(CPPFLAGS) LY_CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@ CFLAGS = $(CPPOPTS) $(LY_CFLAGS) diff --git a/WWW/Library/Implementation/www_tcp.h b/WWW/Library/Implementation/www_tcp.h index ef754c8..1bc20e0 100644 --- a/WWW/Library/Implementation/www_tcp.h +++ b/WWW/Library/Implementation/www_tcp.h @@ -1,5 +1,5 @@ /* System dependencies in the W3 library - * $LynxId: www_tcp.h,v 1.61 2018/12/26 12:30:14 tom Exp $ + * $LynxId: www_tcp.h,v 1.63 2024/03/17 23:04:27 tom Exp $ * SYSTEM DEPENDENCIES @@ -804,7 +804,7 @@ typedef unsigned short mode_t; #if defined(VMS) #define socklen_t unsigned -#else +#elif defined(_WINDOWS) #define socklen_t int /* used for default LY_SOCKLEN definition */ #endif @@ -814,10 +814,6 @@ typedef unsigned short mode_t; #include #endif -#ifdef HAVE_LIBGETTEXT_H -#include -#endif - #define N_(s) s #ifndef HAVE_GETTEXT diff --git a/aclocal.m4 b/aclocal.m4 index 9f561cc..ae08a12 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -dnl $LynxId: aclocal.m4,v 1.328 2024/01/07 15:29:15 tom Exp $ +dnl $LynxId: aclocal.m4,v 1.341 2024/04/09 22:40:58 tom Exp $ dnl Macros for auto-configure script. dnl by Thomas E. Dickey dnl and Jim Spath @@ -41,68 +41,49 @@ dnl https://invisible-island.net/autoconf/autoconf.html dnl https://invisible-island.net/autoconf/my-autoconf.html dnl --------------------------------------------------------------------------- dnl --------------------------------------------------------------------------- -dnl AM_GNU_GETTEXT version: 15 updated: 2021/01/02 09:31:20 +dnl AM_GNU_GETTEXT version: 16 updated: 2024/03/17 19:34:20 dnl -------------- dnl Usage: Just like AM_WITH_NLS, which see. AC_DEFUN([AM_GNU_GETTEXT], - [AC_REQUIRE([AC_PROG_MAKE_SET])dnl - AC_REQUIRE([AC_CANONICAL_HOST])dnl - AC_REQUIRE([AC_PROG_RANLIB])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - AC_REQUIRE([AC_C_INLINE])dnl - AC_REQUIRE([AC_TYPE_OFF_T])dnl - AC_REQUIRE([AC_TYPE_SIZE_T])dnl - AC_REQUIRE([AC_FUNC_ALLOCA])dnl - AC_REQUIRE([AC_FUNC_MMAP])dnl - AC_REQUIRE([jm_GLIBC21])dnl - AC_REQUIRE([CF_PROG_CC])dnl - - AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ -stdlib.h string.h unistd.h sys/param.h]) - AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getcwd getegid geteuid \ -getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \ -strdup strtoul tsearch __argz_count __argz_stringify __argz_next]) - + [ AM_ICONV AM_LANGINFO_CODESET AM_LC_MESSAGES AM_WITH_NLS([$1],[$2],[$3],[$4]) - if test "x$CATOBJEXT" != "x"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - AC_MSG_CHECKING(for catalogs to be installed) - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - ("$presentlang"*) useit=yes;; - esac - done - if test "$useit" = yes; then - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi - done - LINGUAS=$NEW_LINGUAS - AC_MSG_RESULT($LINGUAS) - fi - - dnl Construct list of names of catalog files to be constructed. - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi + if test "$USE_NLS" = "yes"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + AC_MSG_CHECKING(for catalogs to be installed) + NEW_LINGUAS= + for presentlang in $ALL_LINGUAS; do + useit=no + for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + ("$presentlang"*) useit=yes;; + esac + done + if test "$useit" = yes; then + NEW_LINGUAS="$NEW_LINGUAS $presentlang" + fi + done + LINGUAS=$NEW_LINGUAS + AC_MSG_RESULT($LINGUAS) + fi - dnl Enable libtool support if the surrounding package wishes it. - INTL_LIBTOOL_SUFFIX_PREFIX=ifelse([$1], use-libtool, [l], []) - AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) + dnl Construct list of names of catalog files to be constructed. + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done + fi + else + CATALOGS= + fi ])dnl dnl --------------------------------------------------------------------------- dnl AM_ICONV version: 12 updated: 2007/07/30 19:12:03 @@ -292,7 +273,7 @@ fi AC_SUBST($1)dnl ])dnl dnl --------------------------------------------------------------------------- -dnl AM_WITH_NLS version: 33 updated: 2022/01/28 08:32:11 +dnl AM_WITH_NLS version: 39 updated: 2024/04/09 18:37:41 dnl ----------- dnl Inserted as requested by gettext 0.10.40 dnl File from /usr/share/aclocal @@ -318,35 +299,6 @@ dnl dnl serial 10 dnl dnl Usage: AM_WITH_NLS([TOOLSYMBOL], [NEEDSYMBOL], [LIBDIR], [ENABLED]). -dnl If TOOLSYMBOL is specified and is 'use-libtool', then a libtool library -dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, -dnl depending on --{enable,disable}-{shared,static} and on the presence of -dnl AM-DISABLE-SHARED). Otherwise, a static library -dnl $(top_builddir)/intl/libintl.a will be created. -dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext -dnl implementations (in libc or libintl) without the ngettext() function -dnl will be ignored. -dnl LIBDIR is used to find the intl libraries. If empty, -dnl the value `$(top_builddir)/intl/' is used. -dnl ENABLED is used to control the default for the related --enable-nls, since -dnl not all application developers want this feature by default, e.g., lynx. -dnl -dnl The result of the configuration is one of three cases: -dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled -dnl and used. -dnl Catalog format: GNU --> install in $(datadir) -dnl Catalog extension: .mo after installation, .gmo in source tree -dnl 2) GNU gettext has been found in the system's C library. -dnl Catalog format: GNU --> install in $(datadir) -dnl Catalog extension: .mo after installation, .gmo in source tree -dnl 3) No internationalization, always use English msgid. -dnl Catalog format: none -dnl Catalog extension: none -dnl The use of .gmo is historical (it was needed to avoid overwriting the -dnl GNU format catalogs when building on a platform with an X/Open gettext), -dnl but we keep it in order not to force irrelevant filename changes on the -dnl maintainers. -dnl AC_DEFUN([AM_WITH_NLS], [AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS @@ -360,23 +312,9 @@ AC_DEFUN([AM_WITH_NLS], AC_MSG_RESULT($USE_NLS) AC_SUBST(USE_NLS) - BUILD_INCLUDED_LIBINTL=no - USE_INCLUDED_LIBINTL=no - INTLLIBS= - dnl If we use NLS figure out what method if test "$USE_NLS" = "yes"; then dnl We need to process the po/ directory. - POSUB=po - AC_DEFINE(ENABLE_NLS, 1, - [Define to 1 if translation of program messages to the user's native language - is requested.]) - AC_MSG_CHECKING([whether included gettext is requested]) - AC_ARG_WITH(included-gettext, - [ --with-included-gettext use the GNU gettext library included here], - nls_cv_force_use_gnu_gettext=$withval, - nls_cv_force_use_gnu_gettext=no) - AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) dnl Search for GNU msgfmt in the PATH. AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, @@ -388,108 +326,68 @@ AC_DEFUN([AM_WITH_NLS], AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, ["$ac_dir/$ac_word" --omit-header /dev/null >/dev/null 2>&1], :) - nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" - if test "$nls_cv_force_use_gnu_gettext" != "yes"; then - dnl User does not insist on using GNU NLS library. Figure out what - dnl to use. If GNU gettext is available we use this. Else we may have - dnl to fall back to GNU NLS library. - CATOBJEXT=NONE - - dnl Save these (possibly-set) variables for reference. If the user - dnl overrode these to provide full pathnames, then warn if not actually - dnl GNU gettext, but do not override their values. Also, if they were - dnl overridden, suppress the part of the library test which prevents it - dnl from finding anything other than GNU gettext. Doing this also - dnl suppresses a bogus search for the intl library. - cf_save_msgfmt_path="$MSGFMT" - cf_save_xgettext_path="$XGETTEXT" - - cf_save_LIBS_1="$LIBS" - CF_ADD_LIBS($LIBICONV) - - cf_save_OPTS_1="$CPPFLAGS" - if test "x$cf_save_msgfmt_path" = "x$MSGFMT" && \ - test "x$cf_save_xgettext_path" = "x$XGETTEXT" ; then - CF_ADD_CFLAGS(-DIGNORE_MSGFMT_HACK) - fi + CATOBJEXT=NONE - CF_FIND_LINKAGE(CF__INTL_HEAD, - CF__INTL_BODY($2), - intl, - cf_cv_func_gettext=yes, - cf_cv_func_gettext=no) - - AC_MSG_CHECKING([for libintl.h and gettext()]) - AC_MSG_RESULT($cf_cv_func_gettext) - - LIBS="$cf_save_LIBS_1" - CPPFLAGS="$cf_save_OPTS_1" - - if test "$cf_cv_func_gettext" = yes ; then - AC_DEFINE(HAVE_LIBINTL_H,1,[Define to 1 if we have libintl.h]) - - dnl If an already present or preinstalled GNU gettext() is found, - dnl use it. But if this macro is used in GNU gettext, and GNU - dnl gettext is already preinstalled in libintl, we update this - dnl libintl. (Cf. the install rule in intl/Makefile.in.) - if test "$PACKAGE" != gettext; then - AC_DEFINE(HAVE_GETTEXT, 1, - [Define if the GNU gettext() function is already present or preinstalled.]) - - CF_ADD_INCDIR($cf_cv_header_path_intl) - - if test -n "$cf_cv_library_file_intl" ; then - dnl If iconv() is in a separate libiconv library, then anyone - dnl linking with libintl{.a,.so} also needs to link with - dnl libiconv. - INTLLIBS="$cf_cv_library_file_intl $LIBICONV" - CF_ADD_LIBDIR($cf_cv_library_path_intl,INTLLIBS) - fi + dnl Save these (possibly-set) variables for reference. If the user + dnl overrode these to provide full pathnames, then warn if not actually + dnl GNU gettext, but do not override their values. Also, if they were + dnl overridden, suppress the part of the library test which prevents it + dnl from finding anything other than GNU gettext. Doing this also + dnl suppresses a bogus search for the intl library. + cf_save_msgfmt_path="$MSGFMT" + cf_save_xgettext_path="$XGETTEXT" - gt_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - AC_CHECK_FUNCS(dcgettext) - LIBS="$gt_save_LIBS" - - CATOBJEXT=.gmo - fi - elif test -z "$MSGFMT" || test -z "$XGETTEXT" ; then - AC_MSG_WARN(disabling NLS feature) - sed -e /ENABLE_NLS/d confdefs.h >confdefs.tmp - mv confdefs.tmp confdefs.h - ALL_LINGUAS= - CATOBJEXT=.ignored - MSGFMT=":" - GMSGFMT=":" - XGETTEXT=":" - POSUB= - BUILD_INCLUDED_LIBINTL=no - USE_INCLUDED_LIBINTL=no - USE_NLS=no - nls_cv_use_gnu_gettext=no - fi + CF_ADD_LIBS($LIBICONV) + cf_save_LIBS_1="$LIBS" - if test "$CATOBJEXT" = "NONE"; then - dnl GNU gettext is not found in the C library. - dnl Fall back on GNU gettext library. - nls_cv_use_gnu_gettext=maybe - fi - fi + cf_save_OPTS_1="$CPPFLAGS" + if test "x$cf_save_msgfmt_path" = "x$MSGFMT" && \ + test "x$cf_save_xgettext_path" = "x$XGETTEXT" ; then + CF_ADD_CFLAGS(-DIGNORE_MSGFMT_HACK) + fi - if test "$nls_cv_use_gnu_gettext" != "no"; then - CATOBJEXT=.gmo - if test -f "$srcdir/intl/libintl.h" || test -f "$srcdir/intl/libgnuintl.h" ; then - dnl Mark actions used to generate GNU NLS library. - AC_DEFINE(HAVE_LIBINTL_H,1,[Define to 1 for included intl header]) - INTLOBJS="\$(GETTOBJS)" - BUILD_INCLUDED_LIBINTL=yes - USE_INCLUDED_LIBINTL=yes - INTLLIBS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV" - LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` - elif test "$nls_cv_use_gnu_gettext" = "yes"; then - nls_cv_use_gnu_gettext=no - AC_MSG_WARN(no NLS library is packaged with this application) - fi + AC_ARG_WITH([libintl-prefix], + [ --with-libintl-prefix=DIR + search for libintl in DIR/include and DIR/lib], + [CF_ADD_OPTIONAL_PATH($withval, libintl)]) + + CF_FIND_LINKAGE(CF__INTL_HEAD, + CF__INTL_BODY($2), + intl, + cf_cv_func_gettext=yes, + cf_cv_func_gettext=no) + + AC_MSG_CHECKING([for libintl.h and gettext()]) + AC_MSG_RESULT($cf_cv_func_gettext) + + if test "$cf_cv_func_gettext" = yes ; then + AC_DEFINE(HAVE_LIBINTL_H,1,[Define to 1 if we have libintl.h]) + + AC_DEFINE(HAVE_GETTEXT, 1, + [Define if the GNU gettext() function is already present or preinstalled.]) + + CF_ADD_INCDIR($cf_cv_header_path_intl) + + if test -n "$cf_cv_library_file_intl" ; then + INTLLIBS="$cf_cv_library_file_intl" + CF_ADD_LIBDIR($cf_cv_library_path_intl,INTLLIBS) + fi + + LIBS="$LIBS $INTLLIBS" + AC_CHECK_FUNCS(dcgettext) + CATOBJEXT=.gmo + AC_DEFINE(ENABLE_NLS, 1, + [Define to 1 if translation of program messages is enabled.]) + elif test -z "$MSGFMT" || test -z "$XGETTEXT" ; then + AC_MSG_WARN(disabling NLS feature) + ALL_LINGUAS= + CATOBJEXT=.ignored + MSGFMT=":" + GMSGFMT=":" + XGETTEXT=":" + USE_NLS=no + LIBS="$cf_save_LIBS_1" + CPPFLAGS="$cf_save_OPTS_1" fi dnl Test whether we really found GNU msgfmt. @@ -549,50 +447,6 @@ AC_DEFUN([AM_WITH_NLS], esac done]) - dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL - dnl to 'yes' because some of the testsuite requires it. - if test "$PACKAGE" = gettext; then - BUILD_INCLUDED_LIBINTL=yes - fi - - dnl intl/plural.c is generated from intl/plural.y. It requires an old - dnl version of bison, or byacc, because plural.y uses the bison - dnl "%pure-parser" feature. That requires at least bison-1.26 because - dnl earlier versions generate a plural.c that doesn't compile. However, - dnl while byacc (2010) supports this feature, bison dropped compatibility - dnl beginning with version 2.3 (2008). - dnl - dnl bison or byacc are only needed for the maintainer (who touches - dnl plural.y). To avoid separate Makefiles or --enable-maintainer-mode, we - dnl put the rule in general Makefile. Now, some people carelessly touch - dnl the files or have a broken "make" program, hence the plural.c rule will - dnl sometimes fire. To avoid an error, define INTL_YACC to ":" if it is - dnl not present or too old. - if test "$nls_cv_use_gnu_gettext" = "yes"; then - AC_CHECK_PROGS([INTL_YACC], [byacc bison]) - if test -z "$INTL_YACC"; then - ac_verc_fail=yes - else - dnl Found it, now check the version. - AC_MSG_CHECKING([version of $INTL_YACC]) -changequote(<<,>>)dnl - ac_prog_version=`$INTL_YACC -V 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p;s/^\(byacc\) - \([0-9][0-9.]*\) \([0-9]*\).*$/\1-\2.\3/p'` - case "$ac_prog_version" in - (byacc-[0-9].[0-9].20[1-9]*) - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - ('') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; - (1.2[6-9]*|1.[3-9][0-9]*|2.[0-3]*) -changequote([,])dnl - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - (*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - esac - AC_MSG_RESULT([$ac_prog_version]) - fi - if test "$ac_verc_fail" = yes; then - INTL_YACC=: - fi - fi - dnl These rules are solely for the distribution goal. While doing this dnl we only have to keep exactly one list of the available catalogs dnl in configure.in. @@ -603,15 +457,10 @@ changequote([,])dnl fi dnl Make all variables we use known to autoconf. - AC_SUBST(BUILD_INCLUDED_LIBINTL) - AC_SUBST(USE_INCLUDED_LIBINTL) AC_SUBST(CATALOGS) AC_SUBST(CATOBJEXT) AC_SUBST(GMOFILES) - AC_SUBST(INTLLIBS) - AC_SUBST(INTLOBJS) AC_SUBST(POFILES) - AC_SUBST(POSUB) dnl For backward compatibility. Some configure.ins may be using this. nls_cv_header_intl= @@ -887,7 +736,7 @@ LIBS=`echo "$LIBS" | sed -e "s/[[ ]][[ ]]*/ /g" -e "s%$1 %$1 $2 %" -e 's% % % CF_VERBOSE(...after $LIBS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ADD_OPTIONAL_PATH version: 3 updated: 2015/05/10 19:52:14 +dnl CF_ADD_OPTIONAL_PATH version: 5 updated: 2024/04/09 18:37:41 dnl -------------------- dnl Add an optional search-path to the compile/link variables. dnl See CF_WITH_PATH @@ -896,12 +745,11 @@ dnl $1 = shell variable containing the result of --with-XXX=[DIR] dnl $2 = module to look for. AC_DEFUN([CF_ADD_OPTIONAL_PATH],[ case "$1" in -(no) - ;; -(yes) +(no|yes) ;; (*) CF_ADD_SEARCHPATH([$1], [AC_MSG_ERROR(cannot find $2 under $1)]) + CF_VERBOSE(setting path value for ifelse([$2],,variable,[$2]) to $1) ;; esac ])dnl @@ -1209,7 +1057,7 @@ if test "$cf_cv_bool_defs" = no ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_BUILD_CC version: 11 updated: 2022/12/04 15:40:08 +dnl CF_BUILD_CC version: 12 updated: 2024/03/17 09:17:26 dnl ----------- dnl If we're cross-compiling, allow the user to override the tools and their dnl options. The configure script is oriented toward identifying the host @@ -1309,9 +1157,9 @@ else : ${BUILD_CC:='${CC}'} : ${BUILD_CPP:='${CPP}'} : ${BUILD_CFLAGS:='${CFLAGS}'} - : ${BUILD_CPPFLAGS:='${CPPFLAGS}'} + : ${BUILD_CPPFLAGS:='ifelse([$1],,'${CPPFLAGS}',[$1])'} : ${BUILD_LDFLAGS:='${LDFLAGS}'} - : ${BUILD_LIBS:='${LIBS}'} + : ${BUILD_LIBS:='ifelse([$2],,'${LIBS}',[$2])'} : ${BUILD_EXEEXT:='$x'} : ${BUILD_OBJEXT:='o'} fi @@ -1326,23 +1174,19 @@ AC_SUBST(BUILD_EXEEXT) AC_SUBST(BUILD_OBJEXT) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_BUNDLED_INTL version: 21 updated: 2023/01/10 19:35:04 +dnl CF_BUNDLED_INTL version: 22 updated: 2024/03/17 19:34:20 dnl --------------- dnl Top-level macro for configuring an application with a bundled copy of -dnl the intl and po directories for gettext. +dnl the po directory for gettext. dnl dnl $1 specifies either Makefile or makefile, defaulting to the former. dnl $2 if nonempty sets the option to --enable-nls rather than to --disable-nls dnl dnl Sets variables which can be used to substitute in makefiles: -dnl GT_YES - "#" comment unless building intl library, otherwise empty -dnl GT_NO - "#" comment if building intl library, otherwise empty -dnl INTLDIR_MAKE - to make ./intl directory -dnl MSG_DIR_MAKE - to make ./po directory -dnl SUB_MAKEFILE - list of makefiles in ./intl, ./po directories +dnl MSG_DIR_MAKE - empty to make ./po directory +dnl SUB_MAKEFILE - makefile in ./po directory dnl dnl Defines: -dnl HAVE_LIBGETTEXT_H if we're using ./intl dnl NLS_TEXTDOMAIN dnl dnl Environment: @@ -1387,73 +1231,17 @@ if test "$USE_NLS" = yes ; then AC_SUBST(NLS_TEXTDOMAIN) fi -INTLDIR_MAKE= MSG_DIR_MAKE= SUB_MAKEFILE= dnl this updates SUB_MAKEFILE and MSG_DIR_MAKE: CF_OUR_MESSAGES($1) -if test "$USE_INCLUDED_LIBINTL" = yes ; then - if test "$nls_cv_force_use_gnu_gettext" = yes ; then - : - elif test "$nls_cv_use_gnu_gettext" != no ; then - : - else - INTLDIR_MAKE="#" - fi - if test -z "$INTLDIR_MAKE"; then - AC_DEFINE(HAVE_LIBGETTEXT_H,1,[Define to 1 if we have libgettext.h]) - for cf_makefile in \ - $srcdir/intl/Makefile.in \ - $srcdir/intl/makefile.in - do - if test -f "$cf_makefile" ; then - SUB_MAKEFILE="$SUB_MAKEFILE `echo \"${cf_makefile}\"|sed -e 's,^'$srcdir/',,' -e 's/\.in$//'`:${cf_makefile}" - break - fi - done - fi -else - INTLDIR_MAKE="#" - if test "$USE_NLS" = yes ; then - AC_CHECK_HEADERS(libintl.h) - fi -fi - -if test -z "$INTLDIR_MAKE" ; then - CF_APPEND_TEXT(CPPFLAGS,-I../intl) -fi - -dnl FIXME: we use this in lynx (the alternative is a spurious dependency upon -dnl GNU make) -if test "$BUILD_INCLUDED_LIBINTL" = yes ; then - GT_YES="#" - GT_NO= -else - GT_YES= - GT_NO="#" +if test "$USE_NLS" = yes ; then + AC_CHECK_HEADERS(libintl.h) fi -AC_SUBST(INTLDIR_MAKE) AC_SUBST(MSG_DIR_MAKE) -AC_SUBST(GT_YES) -AC_SUBST(GT_NO) - -dnl FIXME: the underlying AM_GNU_GETTEXT macro either needs some fixes or a -dnl little documentation. It doesn't define anything so that we can ifdef our -dnl own code, except ENABLE_NLS, which is too vague to be of any use. - -if test "$USE_INCLUDED_LIBINTL" = yes ; then - if test "$nls_cv_force_use_gnu_gettext" = yes ; then - AC_DEFINE(HAVE_GETTEXT,1,[Define to 1 if we have gettext function]) - elif test "$nls_cv_use_gnu_gettext" = yes ; then - AC_DEFINE(HAVE_GETTEXT,1,[Define to 1 if we have gettext function]) - fi - if test -n "$nls_cv_header_intl" ; then - AC_DEFINE(HAVE_LIBINTL_H,1,[Define to 1 if we have header-file for libintl]) - fi -fi ])dnl dnl --------------------------------------------------------------------------- dnl CF_C11_NORETURN version: 4 updated: 2023/02/18 17:41:25 @@ -4840,11 +4628,12 @@ CF_ADD_LIBS($cf_cv_netlibs) test "$cf_test_netlibs" = no && echo "$cf_cv_netlibs" >&AC_FD_MSG ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NGROUPS version: 5 updated: 2024/01/07 06:34:16 +dnl CF_NGROUPS version: 6 updated: 2024/03/17 19:34:20 dnl ---------- dnl Check for the symbol NGROUPS AC_DEFUN([CF_NGROUPS], [ +AC_CHECK_HEADERS( sys/param.h limits.h ) AC_MSG_CHECKING(if NGROUPS is defined) AC_CACHE_VAL(cf_cv_ngroups,[ AC_TRY_COMPILE([ @@ -5006,7 +4795,7 @@ else fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_OUR_MESSAGES version: 8 updated: 2021/01/02 09:31:20 +dnl CF_OUR_MESSAGES version: 9 updated: 2024/04/08 18:39:25 dnl --------------- dnl Check if we use the messages included with this program dnl @@ -5025,7 +4814,7 @@ if test "$USE_NLS" = yes ; then if test -d "$srcdir/po" ; then AC_MSG_CHECKING(if we should use included message-library) AC_ARG_ENABLE(included-msgs, - [ --disable-included-msgs use included messages, for i18n support], + [ --disable-included-msgs do not use included messages for i18n support], [use_our_messages=$enableval], [use_our_messages=yes]) fi @@ -6106,24 +5895,21 @@ AC_MSG_RESULT($cf_use_socks5p_h) test "$cf_use_socks5p_h" = yes && AC_DEFINE(INCLUDE_PROTOTYPES,1,[Define to 1 if needed to declare prototypes in socks headers]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SRAND version: 20 updated: 2024/01/07 06:54:12 +dnl CF_SRAND version: 22 updated: 2024/01/22 19:30:53 dnl -------- dnl Check for functions similar to srand() and rand(). lrand48() and random() dnl return a 31-bit value, while rand() returns a value less than RAND_MAX dnl which usually is only 16-bits. dnl -dnl On MirOS, use arc4random_push() and arc4random(). -dnl Some systems support an asymmetric variation of this interface. -dnl dnl $1 = optional prefix for resulting shell variables. The default "my_" dnl gives $my_srand and $my_rand to the caller, as well as MY_RAND_MAX. dnl These are all AC_SUBST'd and AC_DEFINE'd. AC_DEFUN([CF_SRAND],[ AC_CHECK_HEADERS(limits.h) -AC_CHECK_FUNC(arc2random,,[AC_CHECK_LIB(bsd,arc4random,CF_ADD_LIB(bsd))]) +AC_CHECK_FUNC(arc4random,,[AC_CHECK_LIB(bsd,arc4random,CF_ADD_LIB(bsd))]) AC_CACHE_CHECK(for random-integer functions, cf_cv_srand_func,[ cf_cv_srand_func=unknown -for cf_func in arc4random_push/arc4random arc4random_stir/arc4random srandom/random srand48/lrand48 srand/rand +for cf_func in arc4random_stir/arc4random srandom/random srand48/lrand48 srand/rand do CF_SRAND_PARSE($cf_func,cf_srand_func,cf_rand_func) @@ -7326,13 +7112,13 @@ fi fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_BROTLI version: 1 updated: 2022/03/17 15:59:12 +dnl CF_WITH_BROTLI version: 2 updated: 2024/04/09 18:37:41 dnl -------------- dnl Check for Brotli decoder library dnl dnl $1 = optional path for headers/library AC_DEFUN([CF_WITH_BROTLI],[ - CF_ADD_OPTIONAL_PATH($1) + CF_ADD_OPTIONAL_PATH($1, [brotli library]) CF_FIND_LINKAGE([ #include @@ -7348,13 +7134,13 @@ AC_DEFUN([CF_WITH_BROTLI],[ ],brotlidec,,,brotlilib) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_BZLIB version: 4 updated: 2007/07/29 13:19:54 +dnl CF_WITH_BZLIB version: 5 updated: 2024/04/09 18:37:41 dnl ------------- dnl Check for libbz2 aka "bzlib" dnl dnl $1 = optional path for headers/library AC_DEFUN([CF_WITH_BZLIB],[ - CF_ADD_OPTIONAL_PATH($1) + CF_ADD_OPTIONAL_PATH($1, [bzip2 library]) CF_FIND_LINKAGE([ #include @@ -7418,13 +7204,13 @@ if test "$with_dmalloc" = yes ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_IDNA version: 11 updated: 2021/07/05 09:09:42 +dnl CF_WITH_IDNA version: 12 updated: 2024/04/09 18:37:41 dnl ------------ dnl Check for libidn2, use it if found. Otherwise, check for libidn, use that. dnl dnl $1 = optional path for headers/library AC_DEFUN([CF_WITH_IDNA],[ -CF_ADD_OPTIONAL_PATH($1) +CF_ADD_OPTIONAL_PATH($1, [idna library]) CF_FIND_LINKAGE([ #include @@ -7493,11 +7279,11 @@ then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_ZLIB version: 4 updated: 2011/05/28 12:10:58 +dnl CF_WITH_ZLIB version: 5 updated: 2024/04/09 18:37:41 dnl ------------ dnl check for libz aka "zlib" AC_DEFUN([CF_WITH_ZLIB],[ - CF_ADD_OPTIONAL_PATH($1) + CF_ADD_OPTIONAL_PATH($1, [zlib]) CF_FIND_LINKAGE([ #include @@ -8217,32 +8003,3 @@ define([CF__XOPEN_SOURCE_HEAD], [ $ac_includes_default ]) -dnl --------------------------------------------------------------------------- -dnl jm_GLIBC21 version: 4 updated: 2015/05/10 19:52:14 -dnl ---------- -dnl Inserted as requested by gettext 0.10.40 -dnl File from /usr/share/aclocal -dnl glibc21.m4 -dnl ==================== -dnl serial 2 -dnl -dnl Test for the GNU C Library, version 2.1 or newer. -dnl From Bruno Haible. -AC_DEFUN([jm_GLIBC21], -[ -AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, - ac_cv_gnu_library_2_1, - [AC_EGREP_CPP([Lucky GNU user], - [ -#include -#ifdef __GNU_LIBRARY__ - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) - Lucky GNU user - #endif -#endif - ], - ac_cv_gnu_library_2_1=yes, - ac_cv_gnu_library_2_1=no)]) - AC_SUBST(GLIBC21) - GLIBC21="$ac_cv_gnu_library_2_1" -]) diff --git a/config.guess b/config.guess index cdfc439..f47d666 100755 --- a/config.guess +++ b/config.guess @@ -4,7 +4,7 @@ # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2023-08-22' +timestamp='2023-10-19' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -165,6 +165,8 @@ Linux|GNU|GNU/*) LIBC=dietlibc #elif defined(__GLIBC__) LIBC=gnu + #elif defined(__LLVM_LIBC__) + LIBC=llvm #else #include /* First heuristic to detect musl libc. */ @@ -1593,6 +1595,9 @@ EOF *:Unleashed:*:*) GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE ;; + *:Ironclad:*:*) + GUESS=$UNAME_MACHINE-unknown-ironclad + ;; esac # Do we have a guess based on uname results? diff --git a/config.hin b/config.hin index bc07aa2..7646361 100644 --- a/config.hin +++ b/config.hin @@ -1,5 +1,5 @@ /* - * $LynxId: config.hin,v 1.154 2024/01/07 15:13:24 tom Exp $ + * $LynxId: config.hin,v 1.155 2024/03/17 23:09:41 tom Exp $ * vile:cmode * * The configure script translates "config.hin" into "lynx_cfg.h" @@ -53,9 +53,8 @@ #undef GCC_UNUSED /* CF_GCC_ATTRIBUTES */ #undef GETGROUPS_T /* AC_TYPE_GETGROUPS */ #undef GZIP_PATH /* CF_PATH_PROG(gzip) */ -#undef HAVE_ALLOCA /* AM_GNU_GETTEXT/AC_FUNC_ALLOCA */ -#undef HAVE_ALLOCA_H /* AM_GNU_GETTEXT/AC_FUNC_ALLOCA */ -#undef HAVE_ARGZ_H /* AM_GNU_GETTEXT */ +#undef HAVE_ALLOCA /* AC_FUNC_ALLOCA */ +#undef HAVE_ALLOCA_H /* AC_FUNC_ALLOCA */ #undef HAVE_ARPA_INET_H #undef HAVE_ASSUME_DEFAULT_COLORS /* ncurses extension */ #undef HAVE_ATOLL @@ -69,7 +68,6 @@ #undef HAVE_CURSES_EXIT /* ncurses debugging extension */ #undef HAVE_CURSES_VERSION /* CF_FUNC_CURSES_VERSION */ #undef HAVE_CUSERID -#undef HAVE_DCGETTEXT /* AM_GNU_GETTEXT */ #undef HAVE_DEFINE_KEY #undef HAVE_DELSCREEN /* CF_CURSES_FUNCS */ #undef HAVE_DIRENT_H /* AC_HEADER_DIRENT */ @@ -84,7 +82,7 @@ #undef HAVE_GETCWD #undef HAVE_GETGROUPS #undef HAVE_GETPWUID /* CF_FUNC_GETPWUID */ -#undef HAVE_GETTEXT /* defined if you want to use non-GNU gettext */ +#undef HAVE_GETTEXT /* AM_WITH_NLS */ #undef HAVE_GETTIMEOFDAY #undef HAVE_GETUID #undef HAVE_GNUTLS_PROTOCOL_SET_PRIORITY @@ -99,21 +97,17 @@ #undef HAVE_LC_MESSAGES /* locale messages */ #undef HAVE_LIBDBMALLOC /* --with-dbmalloc */ #undef HAVE_LIBDMALLOC /* --with-dmalloc */ -#undef HAVE_LIBGETTEXT_H /* defined if you want to use bundled gettext */ #undef HAVE_LIBINTL_H /* AM_GNU_GETTEXT, or cleanup from that */ #undef HAVE_LIBUTF8_H /* may be needed for libncursesw */ -#undef HAVE_LIMITS_H +#undef HAVE_LIMITS_H /* CF_NGROUP */ #undef HAVE_LOCALE_H #undef HAVE_LONG_LONG /* CF_TYPE_LONG_LONG */ #undef HAVE_LSTAT /* CF_FUNC_LSTAT */ -#undef HAVE_MALLOC_H /* AM_GNU_GETTEXT */ #undef HAVE_MBSTATE_T /* CF_WIDEC_CURSES */ #undef HAVE_MEMORY_H /* AC_CHECK_DECL(exit) */ #undef HAVE_MKDTEMP #undef HAVE_MKTEMP #undef HAVE_MKTIME /* AC_REPLACE_FUNCS(mktime) */ -#undef HAVE_MMAP /* AM_GNU_GETTEXT */ -#undef HAVE_MUNMAP /* AM_GNU_GETTEXT */ #undef HAVE_NAPMS #undef HAVE_NCURSESW_NCURSES_H /* defined if we include */ #undef HAVE_NCURSESW_TERM_H /* have */ @@ -122,7 +116,6 @@ #undef HAVE_NCURSES_TERM_H /* have */ #undef HAVE_NEWPAD #undef HAVE_NEWTERM -#undef HAVE_NL_TYPES_H /* AM_GNU_GETTEXT */ #undef HAVE_PNOUTREFRESH #undef HAVE_POPEN #undef HAVE_PUTENV @@ -130,7 +123,6 @@ #undef HAVE_READDIR #undef HAVE_RESIZETERM #undef HAVE_RESOLV_H -#undef HAVE_SETENV /* AM_GNU_GETTEXT */ #undef HAVE_SETLOCALE #undef HAVE_SETUID #undef HAVE_SIGACTION /* CF_FUNC_SIGACTION */ @@ -140,9 +132,6 @@ #undef HAVE_STDINT_H /* AC_CHECK_DECL(exit) */ #undef HAVE_STDLIB_H /* AC_CHECK_DECL(exit) */ #undef HAVE_STDNORETURN_H /* CF_C11_NORETURN */ -#undef HAVE_STPCPY /* AM_GNU_GETTEXT */ -#undef HAVE_STRCASECMP /* AM_GNU_GETTEXT */ -#undef HAVE_STRCHR /* AM_GNU_GETTEXT */ #undef HAVE_STRERROR #undef HAVE_STRINGS_H /* AC_CHECK_DECL(exit) */ #undef HAVE_STRING_H /* AC_CHECK_DECL(exit) */ @@ -154,7 +143,7 @@ #undef HAVE_SYS_FILIO_H /* have */ #undef HAVE_SYS_IOCTL_H /* have */ #undef HAVE_SYS_NDIR_H /* AC_HEADER_DIRENT */ -#undef HAVE_SYS_PARAM_H /* AM_GNU_GETTEXT */ +#undef HAVE_SYS_PARAM_H /* CF_NGROUP */ #undef HAVE_SYS_STAT_H /* AC_CHECK_DECL(exit) */ #undef HAVE_SYS_TIMEB_H /* have */ #undef HAVE_SYS_TIME_H /* have */ @@ -180,8 +169,6 @@ #undef HAVE_UTMP_UT_SESSION /* CF_UTMP_UT_SESSION */ #undef HAVE_UTMP_UT_XSTATUS /* CF_UTMP_UT_XSTATUS */ #undef HAVE_UTMP_UT_XTIME /* CF_UTMP_UT_XTIME */ -#undef HAVE_VALUES_H /* AM_GNU_GETTEXT */ -#undef HAVE_VARARGS_H /* CF_VARARGS */ #undef HAVE_VASPRINTF /* CF_FUNC_VASPRINTF */ #undef HAVE_VFORK_H /* have */ #undef HAVE_WAIS_H @@ -199,9 +186,6 @@ #undef HAVE_ZERROR #undef HAVE__NC_FREEALL /* ncurses debugging extension */ #undef HAVE__NC_FREE_AND_EXIT /* ncurses debugging extension */ -#undef HAVE___ARGZ_COUNT /* AM_GNU_GETTEXT */ -#undef HAVE___ARGZ_NEXT /* AM_GNU_GETTEXT */ -#undef HAVE___ARGZ_STRINGIFY /* AM_GNU_GETTEXT */ #undef ICONV_CONST #undef IGNORE_CTRL_C /* FIXME: make tests? */ #undef INCLUDE_PROTOTYPES /* CF_SOCKS5 */ diff --git a/config.sub b/config.sub index 51394d3..e4c4e09 100755 --- a/config.sub +++ b/config.sub @@ -4,7 +4,7 @@ # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2023-09-15' +timestamp='2023-12-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -1222,6 +1222,7 @@ case $cpu-$vendor in | moxie \ | mt \ | msp430 \ + | nanomips* \ | nds32 | nds32le | nds32be \ | nfp \ | nios | nios2 | nios2eb | nios2el \ @@ -1253,6 +1254,7 @@ case $cpu-$vendor in | ubicom32 \ | v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \ | vax \ + | vc4 \ | visium \ | w65 \ | wasm32 | wasm64 \ @@ -1597,7 +1599,7 @@ case $cpu-$vendor in os= obj=elf ;; - mips*-*) + mips*-*|nanomips*-*) os= obj=elf ;; @@ -1721,7 +1723,7 @@ fi case $os in # Sometimes we do "kernel-libc", so those need to count as OSes. - musl* | newlib* | relibc* | uclibc*) + llvm* | musl* | newlib* | relibc* | uclibc*) ;; # Likewise for "kernel-abi" eabi* | gnueabi*) @@ -1766,12 +1768,19 @@ case $os in | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \ - | fiwix* | mlibc* | cos* | mbr* ) + | fiwix* | mlibc* | cos* | mbr* | ironclad* ) ;; # This one is extra strict with allowed versions sco3.2v2 | sco3.2v[4-9]* | sco5v6*) # Don't forget version if it is 3.2v4 or newer. ;; + # This refers to builds using the UEFI calling convention + # (which depends on the architecture) and PE file format. + # Note that this is both a different calling convention and + # different file format than that of GNU-EFI + # (x86_64-w64-mingw32). + uefi) + ;; none) ;; kernel* | msvc* ) @@ -1818,16 +1827,18 @@ esac # As a final step for OS-related things, validate the OS-kernel combination # (given a valid OS), if there is a kernel. case $kernel-$os-$obj in - linux-gnu*- | linux-dietlibc*- | linux-android*- | linux-newlib*- \ - | linux-musl*- | linux-relibc*- | linux-uclibc*- | linux-mlibc*- ) + linux-gnu*- | linux-android*- | linux-dietlibc*- | linux-llvm*- \ + | linux-mlibc*- | linux-musl*- | linux-newlib*- \ + | linux-relibc*- | linux-uclibc*- ) ;; uclinux-uclibc*- ) ;; managarm-mlibc*- | managarm-kernel*- ) ;; - windows*-gnu*- | windows*-msvc*-) + windows*-msvc*-) ;; - -dietlibc*- | -newlib*- | -musl*- | -relibc*- | -uclibc*- | -mlibc*- ) + -dietlibc*- | -llvm*- | -mlibc*- | -musl*- | -newlib*- | -relibc*- \ + | -uclibc*- ) # These are just libc implementations, not actual OSes, and thus # require a kernel. echo "Invalid configuration '$1': libc '$os' needs explicit kernel." 1>&2 diff --git a/configure b/configure index 3de5c35..54ee528 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.in Revision: 1.355 . +# From configure.in Revision: 1.366 . # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52.20231210 for lynx 2.9.0. +# Generated by Autoconf 2.52.20231210 for lynx 2.9.0g. # # Report bugs to . # @@ -191,8 +191,8 @@ mandir='${datarootdir}/man' # Identity of this package. PACKAGE_NAME='lynx' PACKAGE_TARNAME='lynx' -PACKAGE_VERSION='2.9.0' -PACKAGE_STRING='lynx 2.9.0' +PACKAGE_VERSION='2.9.1' +PACKAGE_STRING='lynx 2.9.1' PACKAGE_BUGREPORT='lynx-dev@nongnu.org' ac_prev= @@ -625,7 +625,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <&5 <&5 + { echo "$as_me:1033: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} cat "$ac_site_file" >&5 . "$ac_site_file" @@ -1040,7 +1041,7 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:1043: loading cache $cache_file" >&5 + { echo "$as_me:1044: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -1048,7 +1049,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:1051: creating cache $cache_file" >&5 + { echo "$as_me:1052: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1064,21 +1065,21 @@ for ac_var in `(set) 2>&1 | eval ac_new_val="\$ac_env_${ac_var}_value" case "$ac_old_set,$ac_new_set" in set,) - { echo "$as_me:1067: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:1068: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:1071: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:1072: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:1077: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:1078: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:1079: former value: $ac_old_val" >&5 + { echo "$as_me:1080: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:1081: current value: $ac_new_val" >&5 + { echo "$as_me:1082: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; @@ -1097,9 +1098,9 @@ echo "$as_me: current value: $ac_new_val" >&2;} fi done if "$ac_cache_corrupted"; then - { echo "$as_me:1100: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:1101: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:1102: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:1103: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -1128,10 +1129,10 @@ esac echo "#! $SHELL" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh -if { (echo "$as_me:1131: PATH=\".;.\"; conftest.sh") >&5 +if { (echo "$as_me:1132: PATH=\".;.\"; conftest.sh") >&5 (PATH=".;."; conftest.sh) 2>&5 ac_status=$? - echo "$as_me:1134: \$? = $ac_status" >&5 + echo "$as_me:1135: \$? = $ac_status" >&5 (exit "$ac_status"); }; then ac_path_separator=';' else @@ -1177,7 +1178,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1180: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:1181: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} { (exit 1); exit 1; }; } fi @@ -1187,11 +1188,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:1190: error: cannot run $ac_config_sub" >&5 + { { echo "$as_me:1191: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:1194: checking build system type" >&5 +echo "$as_me:1195: checking build system type" >&5 echo $ECHO_N "checking build system type... $ECHO_C" >&6 if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1200,23 +1201,23 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:1203: error: cannot guess build type; you must specify one" >&5 + { { echo "$as_me:1204: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } ac_cv_build=`$ac_config_sub "$ac_cv_build_alias"` || - { { echo "$as_me:1207: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + { { echo "$as_me:1208: error: $ac_config_sub $ac_cv_build_alias failed." >&5 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1212: result: $ac_cv_build" >&5 +echo "$as_me:1213: result: $ac_cv_build" >&5 echo "${ECHO_T}$ac_cv_build" >&6 build=$ac_cv_build build_cpu=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` build_vendor=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` build_os=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$as_me:1219: checking host system type" >&5 +echo "$as_me:1220: checking host system type" >&5 echo $ECHO_N "checking host system type... $ECHO_C" >&6 if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1225,12 +1226,12 @@ else test -z "$ac_cv_host_alias" && ac_cv_host_alias=$ac_cv_build_alias ac_cv_host=`$ac_config_sub "$ac_cv_host_alias"` || - { { echo "$as_me:1228: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { echo "$as_me:1229: error: $ac_config_sub $ac_cv_host_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1233: result: $ac_cv_host" >&5 +echo "$as_me:1234: result: $ac_cv_host" >&5 echo "${ECHO_T}$ac_cv_host" >&6 host=$ac_cv_host host_cpu=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` @@ -1238,7 +1239,7 @@ host_vendor=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then - echo "$as_me:1241: checking target system type" >&5 + echo "$as_me:1242: checking target system type" >&5 echo $ECHO_N "checking target system type... $ECHO_C" >&6 if test "${ac_cv_target+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1247,12 +1248,12 @@ else test "x$ac_cv_target_alias" = "x" && ac_cv_target_alias=$ac_cv_host_alias ac_cv_target=`$ac_config_sub "$ac_cv_target_alias"` || - { { echo "$as_me:1250: error: $ac_config_sub $ac_cv_target_alias failed" >&5 + { { echo "$as_me:1251: error: $ac_config_sub $ac_cv_target_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1255: result: $ac_cv_target" >&5 +echo "$as_me:1256: result: $ac_cv_target" >&5 echo "${ECHO_T}$ac_cv_target" >&6 target=$ac_cv_target target_cpu=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` @@ -1284,13 +1285,13 @@ else fi test -z "$system_name" && system_name="$cf_cv_system_name" -test -n "$cf_cv_system_name" && echo "$as_me:1287: result: Configuring for $cf_cv_system_name" >&5 +test -n "$cf_cv_system_name" && echo "$as_me:1288: result: Configuring for $cf_cv_system_name" >&5 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6 if test ".$system_name" != ".$cf_cv_system_name" ; then - echo "$as_me:1291: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "$as_me:1292: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6 - { { echo "$as_me:1293: error: \"Please remove config.cache and try again.\"" >&5 + { { echo "$as_me:1294: error: \"Please remove config.cache and try again.\"" >&5 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;} { (exit 1); exit 1; }; } fi @@ -1298,7 +1299,7 @@ fi # Check whether --with-system-type or --without-system-type was given. if test "${with_system_type+set}" = set; then withval="$with_system_type" - { echo "$as_me:1301: WARNING: overriding system type $host_os to $withval" >&5 + { echo "$as_me:1302: WARNING: overriding system type $host_os to $withval" >&5 echo "$as_me: WARNING: overriding system type $host_os to $withval" >&2;} host_os=$withval fi; @@ -1321,7 +1322,7 @@ VERSION=$PACKAGE_VERSION NO_DOTS_VERSION=`echo "$PACKAGE_VERSION" | sed -e 's,\.,-,g'` -echo "$as_me:1324: checking for DESTDIR" >&5 +echo "$as_me:1325: checking for DESTDIR" >&5 echo $ECHO_N "checking for DESTDIR... $ECHO_C" >&6 # Check whether --with-destdir or --without-destdir was given. @@ -1357,7 +1358,7 @@ case ".$withval" in withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:1360: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:1361: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -1366,7 +1367,7 @@ esac fi eval DESTDIR="$withval" -echo "$as_me:1369: result: $DESTDIR" >&5 +echo "$as_me:1370: result: $DESTDIR" >&5 echo "${ECHO_T}$DESTDIR" >&6 case "$host_os" in @@ -1385,7 +1386,7 @@ ac_main_return="return" if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1388: checking for $ac_word" >&5 +echo "$as_me:1389: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1400,7 +1401,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:1403: found $ac_dir/$ac_word" >&5 +echo "$as_me:1404: found $ac_dir/$ac_word" >&5 break done @@ -1408,10 +1409,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1411: result: $CC" >&5 + echo "$as_me:1412: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1414: result: no" >&5 + echo "$as_me:1415: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1420,7 +1421,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1423: checking for $ac_word" >&5 +echo "$as_me:1424: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1435,7 +1436,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1438: found $ac_dir/$ac_word" >&5 +echo "$as_me:1439: found $ac_dir/$ac_word" >&5 break done @@ -1443,10 +1444,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1446: result: $ac_ct_CC" >&5 + echo "$as_me:1447: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1449: result: no" >&5 + echo "$as_me:1450: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1459,7 +1460,7 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1462: checking for $ac_word" >&5 +echo "$as_me:1463: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1474,7 +1475,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:1477: found $ac_dir/$ac_word" >&5 +echo "$as_me:1478: found $ac_dir/$ac_word" >&5 break done @@ -1482,10 +1483,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1485: result: $CC" >&5 + echo "$as_me:1486: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1488: result: no" >&5 + echo "$as_me:1489: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1494,7 +1495,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1497: checking for $ac_word" >&5 +echo "$as_me:1498: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1509,7 +1510,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1512: found $ac_dir/$ac_word" >&5 +echo "$as_me:1513: found $ac_dir/$ac_word" >&5 break done @@ -1517,10 +1518,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1520: result: $ac_ct_CC" >&5 + echo "$as_me:1521: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1523: result: no" >&5 + echo "$as_me:1524: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1533,7 +1534,7 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1536: checking for $ac_word" >&5 +echo "$as_me:1537: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1553,7 +1554,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then continue fi ac_cv_prog_CC="cc" -echo "$as_me:1556: found $ac_dir/$ac_word" >&5 +echo "$as_me:1557: found $ac_dir/$ac_word" >&5 break done @@ -1575,10 +1576,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1578: result: $CC" >&5 + echo "$as_me:1579: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1581: result: no" >&5 + echo "$as_me:1582: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1589,7 +1590,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1592: checking for $ac_word" >&5 +echo "$as_me:1593: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1604,7 +1605,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1607: found $ac_dir/$ac_word" >&5 +echo "$as_me:1608: found $ac_dir/$ac_word" >&5 break done @@ -1612,10 +1613,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1615: result: $CC" >&5 + echo "$as_me:1616: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1618: result: no" >&5 + echo "$as_me:1619: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1628,7 +1629,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1631: checking for $ac_word" >&5 +echo "$as_me:1632: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1643,7 +1644,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1646: found $ac_dir/$ac_word" >&5 +echo "$as_me:1647: found $ac_dir/$ac_word" >&5 break done @@ -1651,10 +1652,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1654: result: $ac_ct_CC" >&5 + echo "$as_me:1655: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1657: result: no" >&5 + echo "$as_me:1658: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1666,32 +1667,32 @@ fi fi -test -z "$CC" && { { echo "$as_me:1669: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:1670: error: no acceptable cc found in \$PATH" >&5 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:1674:" \ +echo "$as_me:1675:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo "$2"` -{ (eval echo "$as_me:1677: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:1678: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1680: \$? = $ac_status" >&5 + echo "$as_me:1681: \$? = $ac_status" >&5 (exit "$ac_status"); } -{ (eval echo "$as_me:1682: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:1683: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1685: \$? = $ac_status" >&5 + echo "$as_me:1686: \$? = $ac_status" >&5 (exit "$ac_status"); } -{ (eval echo "$as_me:1687: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:1688: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1690: \$? = $ac_status" >&5 + echo "$as_me:1691: \$? = $ac_status" >&5 (exit "$ac_status"); } cat >"conftest.$ac_ext" <<_ACEOF -#line 1694 "configure" +#line 1695 "configure" #include "confdefs.h" int @@ -1707,13 +1708,13 @@ ac_clean_files="$ac_clean_files a.out a.exe" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:1710: checking for C compiler default output" >&5 +echo "$as_me:1711: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *"conftest[^"]*"//'` -if { (eval echo "$as_me:1713: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:1714: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1716: \$? = $ac_status" >&5 + echo "$as_me:1717: \$? = $ac_status" >&5 (exit "$ac_status"); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last @@ -1736,34 +1737,34 @@ done else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -{ { echo "$as_me:1739: error: C compiler cannot create executables" >&5 +{ { echo "$as_me:1740: error: C compiler cannot create executables" >&5 echo "$as_me: error: C compiler cannot create executables" >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:1745: result: $ac_file" >&5 +echo "$as_me:1746: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1750: checking whether the C compiler works" >&5 +echo "$as_me:1751: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:1756: \"$ac_try\"") >&5 + { (eval echo "$as_me:1757: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1759: \$? = $ac_status" >&5 + echo "$as_me:1760: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1766: error: cannot run C compiled programs. + { { echo "$as_me:1767: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&5 echo "$as_me: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&2;} @@ -1771,24 +1772,24 @@ If you meant to cross compile, use \`--host'." >&2;} fi fi fi -echo "$as_me:1774: result: yes" >&5 +echo "$as_me:1775: result: yes" >&5 echo "${ECHO_T}yes" >&6 rm -f a.out a.exe "conftest$ac_cv_exeext" ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1781: checking whether we are cross compiling" >&5 +echo "$as_me:1782: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1783: result: $cross_compiling" >&5 +echo "$as_me:1784: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1786: checking for executable suffix" >&5 +echo "$as_me:1787: checking for executable suffix" >&5 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1788: \"$ac_link\"") >&5 +if { (eval echo "$as_me:1789: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1791: \$? = $ac_status" >&5 + echo "$as_me:1792: \$? = $ac_status" >&5 (exit "$ac_status"); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will @@ -1804,25 +1805,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1807: error: cannot compute EXEEXT: cannot compile and link" >&5 + { { echo "$as_me:1808: error: cannot compute EXEEXT: cannot compile and link" >&5 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} { (exit 1); exit 1; }; } fi rm -f "conftest$ac_cv_exeext" -echo "$as_me:1813: result: $ac_cv_exeext" >&5 +echo "$as_me:1814: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f "conftest.$ac_ext" EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1819: checking for object suffix" >&5 +echo "$as_me:1820: checking for object suffix" >&5 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 1825 "configure" +#line 1826 "configure" #include "confdefs.h" int @@ -1834,10 +1835,10 @@ main (void) } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1837: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1838: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1840: \$? = $ac_status" >&5 + echo "$as_me:1841: \$? = $ac_status" >&5 (exit "$ac_status"); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in @@ -1849,24 +1850,24 @@ done else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -{ { echo "$as_me:1852: error: cannot compute OBJEXT: cannot compile" >&5 +{ { echo "$as_me:1853: error: cannot compute OBJEXT: cannot compile" >&5 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} { (exit 1); exit 1; }; } fi rm -f "conftest.$ac_cv_objext" "conftest.$ac_ext" fi -echo "$as_me:1859: result: $ac_cv_objext" >&5 +echo "$as_me:1860: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1863: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:1864: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 1869 "configure" +#line 1870 "configure" #include "confdefs.h" int @@ -1881,16 +1882,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1884: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1885: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1887: \$? = $ac_status" >&5 + echo "$as_me:1888: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1890: \"$ac_try\"") >&5 + { (eval echo "$as_me:1891: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1893: \$? = $ac_status" >&5 + echo "$as_me:1894: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_compiler_gnu=yes else @@ -1902,19 +1903,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1905: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:1906: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" -echo "$as_me:1911: checking whether $CC accepts -g" >&5 +echo "$as_me:1912: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 1917 "configure" +#line 1918 "configure" #include "confdefs.h" int @@ -1926,16 +1927,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1929: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1930: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1932: \$? = $ac_status" >&5 + echo "$as_me:1933: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1935: \"$ac_try\"") >&5 + { (eval echo "$as_me:1936: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1938: \$? = $ac_status" >&5 + echo "$as_me:1939: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_prog_cc_g=yes else @@ -1945,7 +1946,7 @@ ac_cv_prog_cc_g=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:1948: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:1949: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -1972,16 +1973,16 @@ cat >"conftest.$ac_ext" <<_ACEOF #endif _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1975: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1976: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1978: \$? = $ac_status" >&5 + echo "$as_me:1979: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1981: \"$ac_try\"") >&5 + { (eval echo "$as_me:1982: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1984: \$? = $ac_status" >&5 + echo "$as_me:1985: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then for ac_declaration in \ ''\ @@ -1993,7 +1994,7 @@ if { (eval echo "$as_me:1975: \"$ac_compile\"") >&5 'void exit (int);' do cat >"conftest.$ac_ext" <<_ACEOF -#line 1996 "configure" +#line 1997 "configure" #include "confdefs.h" #include $ac_declaration @@ -2006,16 +2007,16 @@ exit (42); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:2009: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2010: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2012: \$? = $ac_status" >&5 + echo "$as_me:2013: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:2015: \"$ac_try\"") >&5 + { (eval echo "$as_me:2016: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2018: \$? = $ac_status" >&5 + echo "$as_me:2019: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -2025,7 +2026,7 @@ continue fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF -#line 2028 "configure" +#line 2029 "configure" #include "confdefs.h" $ac_declaration int @@ -2037,16 +2038,16 @@ exit (42); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:2040: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2041: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2043: \$? = $ac_status" >&5 + echo "$as_me:2044: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:2046: \"$ac_try\"") >&5 + { (eval echo "$as_me:2047: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2049: \$? = $ac_status" >&5 + echo "$as_me:2050: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -2076,11 +2077,11 @@ ac_main_return="return" GCC_VERSION=none if test "$GCC" = yes ; then - echo "$as_me:2079: checking version of $CC" >&5 + echo "$as_me:2080: checking version of $CC" >&5 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown - echo "$as_me:2083: result: $GCC_VERSION" >&5 + echo "$as_me:2084: result: $GCC_VERSION" >&5 echo "${ECHO_T}$GCC_VERSION" >&6 fi @@ -2089,12 +2090,12 @@ INTEL_COMPILER=no if test "$GCC" = yes ; then case "$host_os" in (linux*|gnu*) - echo "$as_me:2092: checking if this is really Intel C compiler" >&5 + echo "$as_me:2093: checking if this is really Intel C compiler" >&5 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -no-gcc" cat >"conftest.$ac_ext" <<_ACEOF -#line 2097 "configure" +#line 2098 "configure" #include "confdefs.h" int @@ -2111,16 +2112,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:2114: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2115: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2117: \$? = $ac_status" >&5 + echo "$as_me:2118: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:2120: \"$ac_try\"") >&5 + { (eval echo "$as_me:2121: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2123: \$? = $ac_status" >&5 + echo "$as_me:2124: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147" @@ -2131,7 +2132,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" CFLAGS="$cf_save_CFLAGS" - echo "$as_me:2134: result: $INTEL_COMPILER" >&5 + echo "$as_me:2135: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac @@ -2140,11 +2141,11 @@ fi CLANG_COMPILER=no if test "$GCC" = yes ; then - echo "$as_me:2143: checking if this is really Clang C compiler" >&5 + echo "$as_me:2144: checking if this is really Clang C compiler" >&5 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" cat >"conftest.$ac_ext" <<_ACEOF -#line 2147 "configure" +#line 2148 "configure" #include "confdefs.h" int @@ -2161,16 +2162,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:2164: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2165: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2167: \$? = $ac_status" >&5 + echo "$as_me:2168: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:2170: \"$ac_try\"") >&5 + { (eval echo "$as_me:2171: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2173: \$? = $ac_status" >&5 + echo "$as_me:2174: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then CLANG_COMPILER=yes @@ -2180,7 +2181,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" CFLAGS="$cf_save_CFLAGS" - echo "$as_me:2183: result: $CLANG_COMPILER" >&5 + echo "$as_me:2184: result: $CLANG_COMPILER" >&5 echo "${ECHO_T}$CLANG_COMPILER" >&6 fi @@ -2189,30 +2190,30 @@ CLANG_VERSION=none if test "x$CLANG_COMPILER" = "xyes" ; then case "$CC" in (c[1-9][0-9]|*/c[1-9][0-9]) - { echo "$as_me:2192: WARNING: replacing broken compiler alias $CC" >&5 + { echo "$as_me:2193: WARNING: replacing broken compiler alias $CC" >&5 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;} CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`" CC=clang ;; esac - echo "$as_me:2199: checking version of $CC" >&5 + echo "$as_me:2200: checking version of $CC" >&5 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$CLANG_VERSION" && CLANG_VERSION=unknown - echo "$as_me:2203: result: $CLANG_VERSION" >&5 + echo "$as_me:2204: result: $CLANG_VERSION" >&5 echo "${ECHO_T}$CLANG_VERSION" >&6 for cf_clang_opt in \ -Qunused-arguments \ -Wno-error=implicit-function-declaration do - echo "$as_me:2210: checking if option $cf_clang_opt works" >&5 + echo "$as_me:2211: checking if option $cf_clang_opt works" >&5 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $cf_clang_opt" cat >"conftest.$ac_ext" <<_ACEOF -#line 2215 "configure" +#line 2216 "configure" #include "confdefs.h" #include @@ -2226,16 +2227,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:2229: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2230: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2232: \$? = $ac_status" >&5 + echo "$as_me:2233: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:2235: \"$ac_try\"") >&5 + { (eval echo "$as_me:2236: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2238: \$? = $ac_status" >&5 + echo "$as_me:2239: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_clang_optok=yes @@ -2246,13 +2247,13 @@ cat "conftest.$ac_ext" >&5 cf_clang_optok=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:2249: result: $cf_clang_optok" >&5 + echo "$as_me:2250: result: $cf_clang_optok" >&5 echo "${ECHO_T}$cf_clang_optok" >&6 CFLAGS="$cf_save_CFLAGS" if test "$cf_clang_optok" = yes; then test -n "$verbose" && echo " adding option $cf_clang_opt" 1>&6 -echo "${as_me:-configure}:2255: testing adding option $cf_clang_opt ..." 1>&5 +echo "${as_me:-configure}:2256: testing adding option $cf_clang_opt ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_clang_opt" @@ -2261,7 +2262,7 @@ echo "${as_me:-configure}:2255: testing adding option $cf_clang_opt ..." 1>&5 done fi -echo "$as_me:2264: checking for $CC option to accept ANSI C" >&5 +echo "$as_me:2265: checking for $CC option to accept ANSI C" >&5 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 if test "${ac_cv_prog_cc_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2269,7 +2270,7 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >"conftest.$ac_ext" <<_ACEOF -#line 2272 "configure" +#line 2273 "configure" #include "confdefs.h" #include #include @@ -2316,16 +2317,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO do CC="$ac_save_CC $ac_arg" rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:2319: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2320: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2322: \$? = $ac_status" >&5 + echo "$as_me:2323: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:2325: \"$ac_try\"") >&5 + { (eval echo "$as_me:2326: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2328: \$? = $ac_status" >&5 + echo "$as_me:2329: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -2342,10 +2343,10 @@ fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:2345: result: none needed" >&5 + echo "$as_me:2346: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:2348: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:2349: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac @@ -2353,13 +2354,13 @@ esac # This should have been defined by AC_PROG_CC : "${CC:=cc}" -echo "$as_me:2356: checking \$CFLAGS variable" >&5 +echo "$as_me:2357: checking \$CFLAGS variable" >&5 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6 case "x$CFLAGS" in (*-[IUD]*) - echo "$as_me:2360: result: broken" >&5 + echo "$as_me:2361: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:2362: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 + { echo "$as_me:2363: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;} cf_flags="$CFLAGS" CFLAGS= @@ -2467,18 +2468,18 @@ fi done ;; (*) - echo "$as_me:2470: result: ok" >&5 + echo "$as_me:2471: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac -echo "$as_me:2475: checking \$CC variable" >&5 +echo "$as_me:2476: checking \$CC variable" >&5 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 case "$CC" in (*[\ \ ]-*) - echo "$as_me:2479: result: broken" >&5 + echo "$as_me:2480: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:2481: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 + { echo "$as_me:2482: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} # humor him... cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'` @@ -2595,487 +2596,86 @@ fi done test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 -echo "${as_me:-configure}:2598: testing resulting CC: '$CC' ..." 1>&5 +echo "${as_me:-configure}:2599: testing resulting CC: '$CC' ..." 1>&5 test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 -echo "${as_me:-configure}:2602: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 +echo "${as_me:-configure}:2603: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 -echo "${as_me:-configure}:2606: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 +echo "${as_me:-configure}:2607: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 ;; (*) - echo "$as_me:2610: result: ok" >&5 + echo "$as_me:2611: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac -for ac_prog in ggrep grep -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:2619: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$GREP"; then - ac_cv_prog_GREP="$GREP" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_GREP="$ac_prog" -echo "$as_me:2634: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -GREP=$ac_cv_prog_GREP -if test -n "$GREP"; then - echo "$as_me:2642: result: $GREP" >&5 -echo "${ECHO_T}$GREP" >&6 -else - echo "$as_me:2645: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$GREP" && break -done -test -n "$GREP" || GREP=": " - -echo "$as_me:2653: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6 -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - for ac_prog in gegrep egrep -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:2665: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $EGREP in - [\\/]* | ?:[\\/]*) - ac_cv_path_EGREP="$EGREP" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_EGREP="$ac_dir/$ac_word" - echo "$as_me:2682: found $ac_dir/$ac_word" >&5 - break -fi -done - - ;; -esac -fi -EGREP=$ac_cv_path_EGREP - -if test -n "$EGREP"; then - echo "$as_me:2693: result: $EGREP" >&5 -echo "${ECHO_T}$EGREP" >&6 -else - echo "$as_me:2696: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$EGREP" && break -done -test -n "$EGREP" || EGREP=": " - - test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2704: error: cannot find workable egrep" >&5 -echo "$as_me: error: cannot find workable egrep" >&2;} - { (exit 1); exit 1; }; } - fi -fi -echo "$as_me:2709: result: $ac_cv_path_EGREP" >&5 -echo "${ECHO_T}$ac_cv_path_EGREP" >&6 - EGREP="$ac_cv_path_EGREP" - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' -ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_main_return="return" -echo "$as_me:2719: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then +echo "$as_me:2616: checking for inline" >&5 +echo $ECHO_N "checking for inline... $ECHO_C" >&6 +if test "${ac_cv_c_inline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >"conftest.$ac_ext" <<_ACEOF -#line 2740 "configure" -#include "confdefs.h" -#include - Syntax error -_ACEOF -if { (eval echo "$as_me:2745: \"$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:2751: \$? = $ac_status" >&5 - (exit "$ac_status"); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : -else - echo "$as_me: failed program was:" >&5 - cat "conftest.$ac_ext" >&5 - # Broken: fails on valid input. -continue -fi -rm -f conftest.err "conftest.$ac_ext" - - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. + ac_cv_c_inline=no +for ac_kw in inline __inline__ __inline; do cat >"conftest.$ac_ext" <<_ACEOF -#line 2774 "configure" +#line 2624 "configure" #include "confdefs.h" -#include -_ACEOF -if { (eval echo "$as_me:2778: \"$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:2784: \$? = $ac_status" >&5 - (exit "$ac_status"); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 - cat "conftest.$ac_ext" >&5 - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err "conftest.$ac_ext" - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err "conftest.$ac_ext" -if $ac_preproc_ok; then - break -fi - - done - ac_cv_prog_CPP=$CPP +#ifndef __cplusplus +static $ac_kw int static_foo (void) {return 0; } +$ac_kw int foo (void) {return 0; } +#endif -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -echo "$as_me:2821: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6 -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >"conftest.$ac_ext" <<_ACEOF -#line 2831 "configure" -#include "confdefs.h" -#include - Syntax error _ACEOF -if { (eval echo "$as_me:2836: \"$ac_cpp "conftest.$ac_ext"\"") >&5 - (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:2633: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - $EGREP -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:2842: \$? = $ac_status" >&5 - (exit "$ac_status"); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : -else - echo "$as_me: failed program was:" >&5 - cat "conftest.$ac_ext" >&5 - # Broken: fails on valid input. -continue -fi -rm -f conftest.err "conftest.$ac_ext" - - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >"conftest.$ac_ext" <<_ACEOF -#line 2865 "configure" -#include "confdefs.h" -#include -_ACEOF -if { (eval echo "$as_me:2869: \"$ac_cpp "conftest.$ac_ext"\"") >&5 - (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 + echo "$as_me:2636: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:2639: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 ac_status=$? - $EGREP -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:2875: \$? = $ac_status" >&5 - (exit "$ac_status"); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue + echo "$as_me:2642: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_c_inline=$ac_kw; break else echo "$as_me: failed program was:" >&5 - cat "conftest.$ac_ext" >&5 - # Passes both tests. -ac_preproc_ok=: -break +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.err "conftest.$ac_ext" - +rm -f "conftest.$ac_objext" "conftest.$ac_ext" done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err "conftest.$ac_ext" -if $ac_preproc_ok; then - : -else - { { echo "$as_me:2903: error: C preprocessor \"$CPP\" fails sanity check" >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} - { (exit 1); exit 1; }; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' -ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_main_return="return" -echo "$as_me:2915: checking if preprocessor -C option works" >&5 -echo $ECHO_N "checking if preprocessor -C option works... $ECHO_C" >&6 -if test "${cf_cv_prog_cpp_comments+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -cf_cv_prog_cpp_comments=no -cat >conftest.c <conftest.i 2>/dev/null ) -then - if ( grep COMMENT conftest.i >/dev/null 2>/dev/null ) - then - cf_cv_prog_cpp_comments=yes - fi -fi -rm -f conftest.[ci] - -fi - -echo "$as_me:2940: result: $cf_cv_prog_cpp_comments" >&5 -echo "${ECHO_T}$cf_cv_prog_cpp_comments" >&6 -if test x$cf_cv_prog_cpp_comments = xyes -then - CPP="$CPP -C" -fi - -echo "$as_me:2947: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - echo "$as_me:2951: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else - echo "$as_me:2954: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6 fi - -case "$host_os" in -(mingw*) -LN_S="cp -p" -echo "$as_me:2961: result: Override: No symbolic links in mingw." >&5 -echo "${ECHO_T}Override: No symbolic links in mingw." >&6 - ;; -(*) - ;; -esac -echo "$as_me:2967: checking whether ${MAKE-make} sets \${MAKE}" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.make <<\EOF -all: - @echo 'ac_maketemp="${MAKE}"' +echo "$as_me:2653: result: $ac_cv_c_inline" >&5 +echo "${ECHO_T}$ac_cv_c_inline" >&6 +case $ac_cv_c_inline in + inline | yes) ;; + no) +cat >>confdefs.h <<\EOF +#define inline EOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` -if test -n "$ac_maketemp"; then - eval ac_cv_prog_make_${ac_make}_set=yes -else - eval ac_cv_prog_make_${ac_make}_set=no -fi -rm -f conftest.make -fi -if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:2987: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - SET_MAKE= -else - echo "$as_me:2991: result: no" >&5 -echo "${ECHO_T}no" >&6 - SET_MAKE="MAKE=${MAKE-make}" -fi - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:3008: checking for a BSD compatible install" >&5 -echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_save_IFS=$IFS; IFS=$ac_path_separator - for ac_dir in $PATH; do - IFS=$ac_save_IFS - # Account for people who put trailing slashes in PATH elements. - case $ac_dir/ in - / | ./ | .// | /cC/* \ - | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ - | /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if $as_executable_p "$ac_dir/$ac_prog"; then - if test $ac_prog = install && - grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi - done - ;; - esac - done - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the path is relative. - INSTALL=$ac_install_sh - fi -fi -echo "$as_me:3057: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6 - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + ;; + *) cat >>confdefs.h <&5 +echo "$as_me:2672: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_YACC+set}" = set; then +if test "${ac_cv_prog_GREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$YACC"; then - ac_cv_prog_YACC="$YACC" # Let the user override the test. + if test -n "$GREP"; then + ac_cv_prog_GREP="$GREP" # Let the user override the test. else ac_save_IFS=$IFS; IFS=$ac_path_separator ac_dummy="$PATH" @@ -3083,27 +2683,27 @@ for ac_dir in $ac_dummy; do IFS=$ac_save_IFS test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_YACC="$ac_prog" -echo "$as_me:3087: found $ac_dir/$ac_word" >&5 +ac_cv_prog_GREP="$ac_prog" +echo "$as_me:2687: found $ac_dir/$ac_word" >&5 break done fi fi -YACC=$ac_cv_prog_YACC -if test -n "$YACC"; then - echo "$as_me:3095: result: $YACC" >&5 -echo "${ECHO_T}$YACC" >&6 +GREP=$ac_cv_prog_GREP +if test -n "$GREP"; then + echo "$as_me:2695: result: $GREP" >&5 +echo "${ECHO_T}$GREP" >&6 else - echo "$as_me:3098: result: no" >&5 + echo "$as_me:2698: result: no" >&5 echo "${ECHO_T}no" >&6 fi - test -n "$YACC" && break + test -n "$GREP" && break done -test -n "$YACC" || YACC="yacc" +test -n "$GREP" || GREP=": " -echo "$as_me:3106: checking for egrep" >&5 +echo "$as_me:2706: checking for egrep" >&5 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 if test "${ac_cv_path_EGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3115,7 +2715,7 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:3118: checking for $ac_word" >&5 +echo "$as_me:2718: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_EGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3132,7 +2732,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_EGREP="$ac_dir/$ac_word" - echo "$as_me:3135: found $ac_dir/$ac_word" >&5 + echo "$as_me:2735: found $ac_dir/$ac_word" >&5 break fi done @@ -3143,10 +2743,10 @@ fi EGREP=$ac_cv_path_EGREP if test -n "$EGREP"; then - echo "$as_me:3146: result: $EGREP" >&5 + echo "$as_me:2746: result: $EGREP" >&5 echo "${ECHO_T}$EGREP" >&6 else - echo "$as_me:3149: result: no" >&5 + echo "$as_me:2749: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3154,12 +2754,465 @@ fi done test -n "$EGREP" || EGREP=": " - test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:3157: error: cannot find workable egrep" >&5 + test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2757: error: cannot find workable egrep" >&5 echo "$as_me: error: cannot find workable egrep" >&2;} { (exit 1); exit 1; }; } fi fi -echo "$as_me:3162: result: $ac_cv_path_EGREP" >&5 +echo "$as_me:2762: result: $ac_cv_path_EGREP" >&5 +echo "${ECHO_T}$ac_cv_path_EGREP" >&6 + EGREP="$ac_cv_path_EGREP" + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' +ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_main_return="return" +echo "$as_me:2772: checking how to run the C preprocessor" >&5 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if test "${ac_cv_prog_CPP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >"conftest.$ac_ext" <<_ACEOF +#line 2793 "configure" +#include "confdefs.h" +#include + Syntax error +_ACEOF +if { (eval echo "$as_me:2798: \"$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:2804: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + : +else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + # Broken: fails on valid input. +continue +fi +rm -f conftest.err "conftest.$ac_ext" + + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >"conftest.$ac_ext" <<_ACEOF +#line 2827 "configure" +#include "confdefs.h" +#include +_ACEOF +if { (eval echo "$as_me:2831: \"$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:2837: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err "conftest.$ac_ext" + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err "conftest.$ac_ext" +if $ac_preproc_ok; then + break +fi + + done + ac_cv_prog_CPP=$CPP + +fi + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +echo "$as_me:2874: result: $CPP" >&5 +echo "${ECHO_T}$CPP" >&6 +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >"conftest.$ac_ext" <<_ACEOF +#line 2884 "configure" +#include "confdefs.h" +#include + Syntax error +_ACEOF +if { (eval echo "$as_me:2889: \"$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:2895: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + : +else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + # Broken: fails on valid input. +continue +fi +rm -f conftest.err "conftest.$ac_ext" + + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >"conftest.$ac_ext" <<_ACEOF +#line 2918 "configure" +#include "confdefs.h" +#include +_ACEOF +if { (eval echo "$as_me:2922: \"$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:2928: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err "conftest.$ac_ext" + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err "conftest.$ac_ext" +if $ac_preproc_ok; then + : +else + { { echo "$as_me:2956: error: C preprocessor \"$CPP\" fails sanity check" >&5 +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} + { (exit 1); exit 1; }; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5' +ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_main_return="return" + +echo "$as_me:2968: checking if preprocessor -C option works" >&5 +echo $ECHO_N "checking if preprocessor -C option works... $ECHO_C" >&6 +if test "${cf_cv_prog_cpp_comments+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cf_cv_prog_cpp_comments=no +cat >conftest.c <conftest.i 2>/dev/null ) +then + if ( grep COMMENT conftest.i >/dev/null 2>/dev/null ) + then + cf_cv_prog_cpp_comments=yes + fi +fi +rm -f conftest.[ci] + +fi + +echo "$as_me:2993: result: $cf_cv_prog_cpp_comments" >&5 +echo "${ECHO_T}$cf_cv_prog_cpp_comments" >&6 +if test x$cf_cv_prog_cpp_comments = xyes +then + CPP="$CPP -C" +fi + +echo "$as_me:3000: checking whether ln -s works" >&5 +echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 +LN_S=$as_ln_s +if test "$LN_S" = "ln -s"; then + echo "$as_me:3004: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else + echo "$as_me:3007: result: no, using $LN_S" >&5 +echo "${ECHO_T}no, using $LN_S" >&6 +fi + +case "$host_os" in +(mingw*) +LN_S="cp -p" +echo "$as_me:3014: result: Override: No symbolic links in mingw." >&5 +echo "${ECHO_T}Override: No symbolic links in mingw." >&6 + ;; +(*) + ;; +esac +echo "$as_me:3020: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 +set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.make <<\EOF +all: + @echo 'ac_maketemp="${MAKE}"' +EOF +# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` +if test -n "$ac_maketemp"; then + eval ac_cv_prog_make_${ac_make}_set=yes +else + eval ac_cv_prog_make_${ac_make}_set=no +fi +rm -f conftest.make +fi +if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then + echo "$as_me:3040: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + SET_MAKE= +else + echo "$as_me:3044: result: no" >&5 +echo "${ECHO_T}no" >&6 + SET_MAKE="MAKE=${MAKE-make}" +fi + +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# ./install, which can be erroneously created by make from ./install.sh. +echo "$as_me:3061: checking for a BSD compatible install" >&5 +echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 +if test -z "$INSTALL"; then +if test "${ac_cv_path_install+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_save_IFS=$IFS; IFS=$ac_path_separator + for ac_dir in $PATH; do + IFS=$ac_save_IFS + # Account for people who put trailing slashes in PATH elements. + case $ac_dir/ in + / | ./ | .// | /cC/* \ + | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ + | /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + if $as_executable_p "$ac_dir/$ac_prog"; then + if test $ac_prog = install && + grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + ac_cv_path_install="$ac_dir/$ac_prog -c" + break 2 + fi + fi + done + ;; + esac + done + +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. We don't cache a + # path for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the path is relative. + INSTALL=$ac_install_sh + fi +fi +echo "$as_me:3110: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6 + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +for ac_prog in byacc 'bison -y' +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:3125: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_YACC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$YACC"; then + ac_cv_prog_YACC="$YACC" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_YACC="$ac_prog" +echo "$as_me:3140: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +YACC=$ac_cv_prog_YACC +if test -n "$YACC"; then + echo "$as_me:3148: result: $YACC" >&5 +echo "${ECHO_T}$YACC" >&6 +else + echo "$as_me:3151: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$YACC" && break +done +test -n "$YACC" || YACC="yacc" + +echo "$as_me:3159: checking for egrep" >&5 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6 +if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + for ac_prog in gegrep egrep +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:3171: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $EGREP in + [\\/]* | ?:[\\/]*) + ac_cv_path_EGREP="$EGREP" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_EGREP="$ac_dir/$ac_word" + echo "$as_me:3188: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +EGREP=$ac_cv_path_EGREP + +if test -n "$EGREP"; then + echo "$as_me:3199: result: $EGREP" >&5 +echo "${ECHO_T}$EGREP" >&6 +else + echo "$as_me:3202: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$EGREP" && break +done +test -n "$EGREP" || EGREP=": " + + test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:3210: error: cannot find workable egrep" >&5 +echo "$as_me: error: cannot find workable egrep" >&2;} + { (exit 1); exit 1; }; } + fi +fi +echo "$as_me:3215: result: $ac_cv_path_EGREP" >&5 echo "${ECHO_T}$ac_cv_path_EGREP" >&6 EGREP="$ac_cv_path_EGREP" @@ -3167,7 +3220,7 @@ for ac_prog in lint cppcheck splint 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:3170: checking for $ac_word" >&5 +echo "$as_me:3223: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LINT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3182,7 +3235,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_LINT="$ac_prog" -echo "$as_me:3185: found $ac_dir/$ac_word" >&5 +echo "$as_me:3238: found $ac_dir/$ac_word" >&5 break done @@ -3190,10 +3243,10 @@ fi fi LINT=$ac_cv_prog_LINT if test -n "$LINT"; then - echo "$as_me:3193: result: $LINT" >&5 + echo "$as_me:3246: result: $LINT" >&5 echo "${ECHO_T}$LINT" >&6 else - echo "$as_me:3196: result: no" >&5 + echo "$as_me:3249: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3206,7 +3259,7 @@ case "x$LINT" in ;; esac -echo "$as_me:3209: checking for fgrep" >&5 +echo "$as_me:3262: checking for fgrep" >&5 echo $ECHO_N "checking for fgrep... $ECHO_C" >&6 if test "${ac_cv_path_FGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3218,7 +3271,7 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:3221: checking for $ac_word" >&5 +echo "$as_me:3274: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_FGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3235,7 +3288,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_FGREP="$ac_dir/$ac_word" - echo "$as_me:3238: found $ac_dir/$ac_word" >&5 + echo "$as_me:3291: found $ac_dir/$ac_word" >&5 break fi done @@ -3246,10 +3299,10 @@ fi FGREP=$ac_cv_path_FGREP if test -n "$FGREP"; then - echo "$as_me:3249: result: $FGREP" >&5 + echo "$as_me:3302: result: $FGREP" >&5 echo "${ECHO_T}$FGREP" >&6 else - echo "$as_me:3252: result: no" >&5 + echo "$as_me:3305: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3257,16 +3310,16 @@ fi done test -n "$FGREP" || FGREP=": " - test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3260: error: cannot find workable fgrep" >&5 + test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3313: error: cannot find workable fgrep" >&5 echo "$as_me: error: cannot find workable fgrep" >&2;} { (exit 1); exit 1; }; } fi fi -echo "$as_me:3265: result: $ac_cv_path_FGREP" >&5 +echo "$as_me:3318: result: $ac_cv_path_FGREP" >&5 echo "${ECHO_T}$ac_cv_path_FGREP" >&6 FGREP="$ac_cv_path_FGREP" -echo "$as_me:3269: checking for makeflags variable" >&5 +echo "$as_me:3322: checking for makeflags variable" >&5 echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6 if test "${cf_cv_makeflags+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3296,7 +3349,7 @@ CF_EOF ;; (*) -echo "${as_me:-configure}:3299: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 +echo "${as_me:-configure}:3352: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 ;; esac @@ -3304,10 +3357,10 @@ echo "${as_me:-configure}:3299: testing given option \"$cf_option\",no match \"$ rm -f cf_makeflags.tmp fi -echo "$as_me:3307: result: $cf_cv_makeflags" >&5 +echo "$as_me:3360: result: $cf_cv_makeflags" >&5 echo "${ECHO_T}$cf_cv_makeflags" >&6 -echo "$as_me:3310: checking for \".PHONY\" make-support" >&5 +echo "$as_me:3363: checking for \".PHONY\" make-support" >&5 echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6 if test "${cf_cv_make_PHONY+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3362,14 +3415,14 @@ CF_EOF rm -rf conftest* fi -echo "$as_me:3365: result: $cf_cv_make_PHONY" >&5 +echo "$as_me:3418: result: $cf_cv_make_PHONY" >&5 echo "${ECHO_T}$cf_cv_make_PHONY" >&6 MAKE_NO_PHONY="#" MAKE_PHONY="#" test "x$cf_cv_make_PHONY" = xyes && MAKE_PHONY= test "x$cf_cv_make_PHONY" != xyes && MAKE_NO_PHONY= -echo "$as_me:3372: checking if filesystem supports mixed-case filenames" >&5 +echo "$as_me:3425: checking if filesystem supports mixed-case filenames" >&5 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 if test "${cf_cv_mixedcase+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3396,7 +3449,7 @@ else fi fi -echo "$as_me:3399: result: $cf_cv_mixedcase" >&5 +echo "$as_me:3452: result: $cf_cv_mixedcase" >&5 echo "${ECHO_T}$cf_cv_mixedcase" >&6 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF @@ -3407,7 +3460,7 @@ for ac_prog in exctags ctags 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:3410: checking for $ac_word" >&5 +echo "$as_me:3463: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CTAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3422,7 +3475,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CTAGS="$ac_prog" -echo "$as_me:3425: found $ac_dir/$ac_word" >&5 +echo "$as_me:3478: found $ac_dir/$ac_word" >&5 break done @@ -3430,10 +3483,10 @@ fi fi CTAGS=$ac_cv_prog_CTAGS if test -n "$CTAGS"; then - echo "$as_me:3433: result: $CTAGS" >&5 + echo "$as_me:3486: result: $CTAGS" >&5 echo "${ECHO_T}$CTAGS" >&6 else - echo "$as_me:3436: result: no" >&5 + echo "$as_me:3489: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3444,7 +3497,7 @@ for ac_prog in exetags etags 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:3447: checking for $ac_word" >&5 +echo "$as_me:3500: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ETAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3459,7 +3512,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ETAGS="$ac_prog" -echo "$as_me:3462: found $ac_dir/$ac_word" >&5 +echo "$as_me:3515: found $ac_dir/$ac_word" >&5 break done @@ -3467,10 +3520,10 @@ fi fi ETAGS=$ac_cv_prog_ETAGS if test -n "$ETAGS"; then - echo "$as_me:3470: result: $ETAGS" >&5 + echo "$as_me:3523: result: $ETAGS" >&5 echo "${ECHO_T}$ETAGS" >&6 else - echo "$as_me:3473: result: no" >&5 + echo "$as_me:3526: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3479,7 +3532,7 @@ done # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args. set dummy ${CTAGS:-ctags}; ac_word=$2 -echo "$as_me:3482: checking for $ac_word" >&5 +echo "$as_me:3535: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3494,7 +3547,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_MAKE_LOWER_TAGS="yes" -echo "$as_me:3497: found $ac_dir/$ac_word" >&5 +echo "$as_me:3550: found $ac_dir/$ac_word" >&5 break done @@ -3503,17 +3556,17 @@ fi fi MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS if test -n "$MAKE_LOWER_TAGS"; then - echo "$as_me:3506: result: $MAKE_LOWER_TAGS" >&5 + echo "$as_me:3559: result: $MAKE_LOWER_TAGS" >&5 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 else - echo "$as_me:3509: result: no" >&5 + echo "$as_me:3562: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test "$cf_cv_mixedcase" = yes ; then # Extract the first word of "${ETAGS:-etags}", so it can be a program name with args. set dummy ${ETAGS:-etags}; ac_word=$2 -echo "$as_me:3516: checking for $ac_word" >&5 +echo "$as_me:3569: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3528,7 +3581,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_MAKE_UPPER_TAGS="yes" -echo "$as_me:3531: found $ac_dir/$ac_word" >&5 +echo "$as_me:3584: found $ac_dir/$ac_word" >&5 break done @@ -3537,10 +3590,10 @@ fi fi MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS if test -n "$MAKE_UPPER_TAGS"; then - echo "$as_me:3540: result: $MAKE_UPPER_TAGS" >&5 + echo "$as_me:3593: result: $MAKE_UPPER_TAGS" >&5 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 else - echo "$as_me:3543: result: no" >&5 + echo "$as_me:3596: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3563,7 +3616,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. set dummy ${ac_tool_prefix}windres; ac_word=$2 -echo "$as_me:3566: checking for $ac_word" >&5 +echo "$as_me:3619: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_WINDRES+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3580,7 +3633,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_WINDRES="$ac_dir/$ac_word" - echo "$as_me:3583: found $ac_dir/$ac_word" >&5 + echo "$as_me:3636: found $ac_dir/$ac_word" >&5 break fi done @@ -3591,10 +3644,10 @@ fi WINDRES=$ac_cv_path_WINDRES if test -n "$WINDRES"; then - echo "$as_me:3594: result: $WINDRES" >&5 + echo "$as_me:3647: result: $WINDRES" >&5 echo "${ECHO_T}$WINDRES" >&6 else - echo "$as_me:3597: result: no" >&5 + echo "$as_me:3650: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3603,7 +3656,7 @@ if test -z "$ac_cv_path_WINDRES"; then ac_pt_WINDRES=$WINDRES # Extract the first word of "windres", so it can be a program name with args. set dummy windres; ac_word=$2 -echo "$as_me:3606: checking for $ac_word" >&5 +echo "$as_me:3659: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_ac_pt_WINDRES+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3620,7 +3673,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_ac_pt_WINDRES="$ac_dir/$ac_word" - echo "$as_me:3623: found $ac_dir/$ac_word" >&5 + echo "$as_me:3676: found $ac_dir/$ac_word" >&5 break fi done @@ -3632,10 +3685,10 @@ fi ac_pt_WINDRES=$ac_cv_path_ac_pt_WINDRES if test -n "$ac_pt_WINDRES"; then - echo "$as_me:3635: result: $ac_pt_WINDRES" >&5 + echo "$as_me:3688: result: $ac_pt_WINDRES" >&5 echo "${ECHO_T}$ac_pt_WINDRES" >&6 else - echo "$as_me:3638: result: no" >&5 + echo "$as_me:3691: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3663,7 +3716,7 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:3666: checking for $ac_word" >&5 +echo "$as_me:3719: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_BUILD_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3678,7 +3731,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_BUILD_CC="$ac_prog" -echo "$as_me:3681: found $ac_dir/$ac_word" >&5 +echo "$as_me:3734: found $ac_dir/$ac_word" >&5 break done @@ -3686,10 +3739,10 @@ fi fi BUILD_CC=$ac_cv_prog_BUILD_CC if test -n "$BUILD_CC"; then - echo "$as_me:3689: result: $BUILD_CC" >&5 + echo "$as_me:3742: result: $BUILD_CC" >&5 echo "${ECHO_T}$BUILD_CC" >&6 else - echo "$as_me:3692: result: no" >&5 + echo "$as_me:3745: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3698,12 +3751,12 @@ done test -n "$BUILD_CC" || BUILD_CC="none" fi; - echo "$as_me:3701: checking for native build C compiler" >&5 + echo "$as_me:3754: checking for native build C compiler" >&5 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 - echo "$as_me:3703: result: $BUILD_CC" >&5 + echo "$as_me:3756: result: $BUILD_CC" >&5 echo "${ECHO_T}$BUILD_CC" >&6 - echo "$as_me:3706: checking for native build C preprocessor" >&5 + echo "$as_me:3759: checking for native build C preprocessor" >&5 echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6 # Check whether --with-build-cpp or --without-build-cpp was given. @@ -3713,10 +3766,10 @@ if test "${with_build_cpp+set}" = set; then else BUILD_CPP='${BUILD_CC} -E' fi; - echo "$as_me:3716: result: $BUILD_CPP" >&5 + echo "$as_me:3769: result: $BUILD_CPP" >&5 echo "${ECHO_T}$BUILD_CPP" >&6 - echo "$as_me:3719: checking for native build C flags" >&5 + echo "$as_me:3772: checking for native build C flags" >&5 echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6 # Check whether --with-build-cflags or --without-build-cflags was given. @@ -3724,10 +3777,10 @@ if test "${with_build_cflags+set}" = set; then withval="$with_build_cflags" BUILD_CFLAGS="$withval" fi; - echo "$as_me:3727: result: $BUILD_CFLAGS" >&5 + echo "$as_me:3780: result: $BUILD_CFLAGS" >&5 echo "${ECHO_T}$BUILD_CFLAGS" >&6 - echo "$as_me:3730: checking for native build C preprocessor-flags" >&5 + echo "$as_me:3783: checking for native build C preprocessor-flags" >&5 echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6 # Check whether --with-build-cppflags or --without-build-cppflags was given. @@ -3735,10 +3788,10 @@ if test "${with_build_cppflags+set}" = set; then withval="$with_build_cppflags" BUILD_CPPFLAGS="$withval" fi; - echo "$as_me:3738: result: $BUILD_CPPFLAGS" >&5 + echo "$as_me:3791: result: $BUILD_CPPFLAGS" >&5 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 - echo "$as_me:3741: checking for native build linker-flags" >&5 + echo "$as_me:3794: checking for native build linker-flags" >&5 echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6 # Check whether --with-build-ldflags or --without-build-ldflags was given. @@ -3746,10 +3799,10 @@ if test "${with_build_ldflags+set}" = set; then withval="$with_build_ldflags" BUILD_LDFLAGS="$withval" fi; - echo "$as_me:3749: result: $BUILD_LDFLAGS" >&5 + echo "$as_me:3802: result: $BUILD_LDFLAGS" >&5 echo "${ECHO_T}$BUILD_LDFLAGS" >&6 - echo "$as_me:3752: checking for native build linker-libraries" >&5 + echo "$as_me:3805: checking for native build linker-libraries" >&5 echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6 # Check whether --with-build-libs or --without-build-libs was given. @@ -3757,7 +3810,7 @@ if test "${with_build_libs+set}" = set; then withval="$with_build_libs" BUILD_LIBS="$withval" fi; - echo "$as_me:3760: result: $BUILD_LIBS" >&5 + echo "$as_me:3813: result: $BUILD_LIBS" >&5 echo "${ECHO_T}$BUILD_LIBS" >&6 # this assumes we're on Unix. @@ -3766,7 +3819,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6 : ${BUILD_CC:='${CC}'} - echo "$as_me:3769: checking if the build-compiler \"$BUILD_CC\" works" >&5 + echo "$as_me:3822: checking if the build-compiler \"$BUILD_CC\" works" >&5 echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6 cf_save_crossed=$cross_compiling @@ -3780,7 +3833,7 @@ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6 cf_ok_build_cc=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 3783 "configure" +#line 3836 "configure" #include "confdefs.h" #include int main(int argc, char *argv[]) @@ -3790,15 +3843,15 @@ else _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:3793: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3846: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3796: \$? = $ac_status" >&5 + echo "$as_me:3849: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:3798: \"$ac_try\"") >&5 + { (eval echo "$as_me:3851: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3801: \$? = $ac_status" >&5 + echo "$as_me:3854: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_ok_build_cc=yes else @@ -3813,12 +3866,12 @@ fi cross_compiling=$cf_save_crossed ac_link=$cf_save_ac_link - echo "$as_me:3816: result: $cf_ok_build_cc" >&5 + echo "$as_me:3869: result: $cf_ok_build_cc" >&5 echo "${ECHO_T}$cf_ok_build_cc" >&6 if test "$cf_ok_build_cc" != yes then - { { echo "$as_me:3821: error: Cross-build requires two compilers. + { { echo "$as_me:3874: error: Cross-build requires two compilers. Use --with-build-cc to specify the native compiler." >&5 echo "$as_me: error: Cross-build requires two compilers. Use --with-build-cc to specify the native compiler." >&2;} @@ -3829,9 +3882,9 @@ else : ${BUILD_CC:='${CC}'} : ${BUILD_CPP:='${CPP}'} : ${BUILD_CFLAGS:='${CFLAGS}'} - : ${BUILD_CPPFLAGS:='${CPPFLAGS}'} + : ${BUILD_CPPFLAGS:='#'} : ${BUILD_LDFLAGS:='${LDFLAGS}'} - : ${BUILD_LIBS:='${LIBS}'} + : ${BUILD_LIBS:=''${LIBS}''} : ${BUILD_EXEEXT:='$x'} : ${BUILD_OBJEXT:='o'} fi @@ -3839,7 +3892,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:3842: checking for $ac_word" >&5 +echo "$as_me:3895: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3854,7 +3907,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -echo "$as_me:3857: found $ac_dir/$ac_word" >&5 +echo "$as_me:3910: found $ac_dir/$ac_word" >&5 break done @@ -3862,10 +3915,10 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:3865: result: $RANLIB" >&5 + echo "$as_me:3918: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else - echo "$as_me:3868: result: no" >&5 + echo "$as_me:3921: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3874,7 +3927,7 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:3877: checking for $ac_word" >&5 +echo "$as_me:3930: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3889,7 +3942,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_RANLIB="ranlib" -echo "$as_me:3892: found $ac_dir/$ac_word" >&5 +echo "$as_me:3945: found $ac_dir/$ac_word" >&5 break done @@ -3898,10 +3951,10 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:3901: result: $ac_ct_RANLIB" >&5 + echo "$as_me:3954: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$as_me:3904: result: no" >&5 + echo "$as_me:3957: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3913,7 +3966,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -echo "$as_me:3916: checking for $ac_word" >&5 +echo "$as_me:3969: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3928,7 +3981,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_AR="${ac_tool_prefix}ar" -echo "$as_me:3931: found $ac_dir/$ac_word" >&5 +echo "$as_me:3984: found $ac_dir/$ac_word" >&5 break done @@ -3936,10 +3989,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:3939: result: $AR" >&5 + echo "$as_me:3992: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:3942: result: no" >&5 + echo "$as_me:3995: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3948,7 +4001,7 @@ if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo "$as_me:3951: checking for $ac_word" >&5 +echo "$as_me:4004: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3963,7 +4016,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_AR="ar" -echo "$as_me:3966: found $ac_dir/$ac_word" >&5 +echo "$as_me:4019: found $ac_dir/$ac_word" >&5 break done @@ -3972,10 +4025,10 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:3975: result: $ac_ct_AR" >&5 + echo "$as_me:4028: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:3978: result: no" >&5 + echo "$as_me:4031: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3984,7 +4037,7 @@ else AR="$ac_cv_prog_AR" fi -echo "$as_me:3987: checking for options to update archives" >&5 +echo "$as_me:4040: checking for options to update archives" >&5 echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6 if test "${cf_cv_ar_flags+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4021,13 +4074,13 @@ else rm -f conftest.a cat >"conftest.$ac_ext" <&5 + if { (eval echo "$as_me:4080: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4030: \$? = $ac_status" >&5 + echo "$as_me:4083: \$? = $ac_status" >&5 (exit "$ac_status"); } ; then echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5 $AR $ARFLAGS "$cf_ar_flags" conftest.a "conftest.$ac_cv_objext" 2>&5 1>/dev/null @@ -4038,7 +4091,7 @@ EOF else test -n "$verbose" && echo " cannot compile test-program" 1>&6 -echo "${as_me:-configure}:4041: testing cannot compile test-program ..." 1>&5 +echo "${as_me:-configure}:4094: testing cannot compile test-program ..." 1>&5 break fi @@ -4048,7 +4101,7 @@ echo "${as_me:-configure}:4041: testing cannot compile test-program ..." 1>&5 esac fi -echo "$as_me:4051: result: $cf_cv_ar_flags" >&5 +echo "$as_me:4104: result: $cf_cv_ar_flags" >&5 echo "${ECHO_T}$cf_cv_ar_flags" >&6 if test -n "$ARFLAGS" ; then @@ -4059,7 +4112,7 @@ else ARFLAGS=$cf_cv_ar_flags fi -echo "$as_me:4062: checking if you want to see long compiling messages" >&5 +echo "$as_me:4115: checking if you want to see long compiling messages" >&5 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 # Check whether --enable-echo or --disable-echo was given. @@ -4093,7 +4146,7 @@ else ECHO_CC='' fi; -echo "$as_me:4096: result: $enableval" >&5 +echo "$as_me:4149: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 # special case for WWW/* @@ -4103,7 +4156,7 @@ else DONT_ECHO_CC='' fi -echo "$as_me:4106: checking if you want to check memory-leaks" >&5 +echo "$as_me:4159: checking if you want to check memory-leaks" >&5 echo $ECHO_N "checking if you want to check memory-leaks... $ECHO_C" >&6 # Check whether --enable-find-leaks or --disable-find-leaks was given. @@ -4120,7 +4173,7 @@ else with_leak_checks=no fi; -echo "$as_me:4123: result: $with_leak_checks" >&5 +echo "$as_me:4176: result: $with_leak_checks" >&5 echo "${ECHO_T}$with_leak_checks" >&6 test "$with_leak_checks" = "yes" && cat >>confdefs.h <<\EOF @@ -4130,7 +4183,7 @@ EOF # The comment about adding -g to $CFLAGS is unclear. Autoconf tries to add # a -g flag; we remove it if the user's $CFLAGS was not set and debugging is # disabled. -echo "$as_me:4133: checking if you want to enable debug-code" >&5 +echo "$as_me:4186: checking if you want to enable debug-code" >&5 echo $ECHO_N "checking if you want to enable debug-code... $ECHO_C" >&6 # Check whether --enable-debug or --disable-debug was given. @@ -4147,7 +4200,7 @@ else with_debug=no fi; -echo "$as_me:4150: result: $with_debug" >&5 +echo "$as_me:4203: result: $with_debug" >&5 echo "${ECHO_T}$with_debug" >&6 if test "$with_debug" = "yes" ; then case "$host_os" in @@ -4172,7 +4225,7 @@ else esac fi -echo "$as_me:4175: checking if you want to enable lynx trace code *recommended* " >&5 +echo "$as_me:4228: checking if you want to enable lynx trace code *recommended* " >&5 echo $ECHO_N "checking if you want to enable lynx trace code *recommended* ... $ECHO_C" >&6 # Check whether --enable-trace or --disable-trace was given. @@ -4189,14 +4242,14 @@ else with_trace=yes fi; -echo "$as_me:4192: result: $with_trace" >&5 +echo "$as_me:4245: result: $with_trace" >&5 echo "${ECHO_T}$with_trace" >&6 test "$with_trace" = no && cat >>confdefs.h <<\EOF #define NO_LYNX_TRACE 1 EOF -echo "$as_me:4199: checking if you want verbose trace code" >&5 +echo "$as_me:4252: checking if you want verbose trace code" >&5 echo $ECHO_N "checking if you want verbose trace code... $ECHO_C" >&6 # Check whether --enable-vertrace or --disable-vertrace was given. @@ -4213,7 +4266,7 @@ else with_vertrace=no fi; -echo "$as_me:4216: result: $with_vertrace" >&5 +echo "$as_me:4269: result: $with_vertrace" >&5 echo "${ECHO_T}$with_vertrace" >&6 test "$with_vertrace" = yes && cat >>confdefs.h <<\EOF @@ -4222,7 +4275,7 @@ EOF if test -n "$with_screen" && test "x$with_screen" = "xpdcurses" then - echo "$as_me:4225: checking for X" >&5 + echo "$as_me:4278: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6 # Check whether --with-x or --without-x was given. @@ -4326,17 +4379,17 @@ if test "$ac_x_includes" = no; then # Guess where to find include files, by looking for Intrinsic.h. # First, try using that file with no special directory specified. cat >"conftest.$ac_ext" <<_ACEOF -#line 4329 "configure" +#line 4382 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:4333: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:4386: \"$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:4339: \$? = $ac_status" >&5 + echo "$as_me:4392: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4369,7 +4422,7 @@ if test "$ac_x_libraries" = no; then ac_save_LIBS=$LIBS LIBS="-lXt $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 4372 "configure" +#line 4425 "configure" #include "confdefs.h" #include int @@ -4381,16 +4434,16 @@ XtMalloc (0) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:4384: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4437: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4387: \$? = $ac_status" >&5 + echo "$as_me:4440: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:4390: \"$ac_try\"") >&5 + { (eval echo "$as_me:4443: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4393: \$? = $ac_status" >&5 + echo "$as_me:4446: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then LIBS=$ac_save_LIBS # We can link X programs with no special library path. @@ -4428,7 +4481,7 @@ fi fi # $with_x != no if test "$have_x" != yes; then - echo "$as_me:4431: result: $have_x" >&5 + echo "$as_me:4484: result: $have_x" >&5 echo "${ECHO_T}$have_x" >&6 no_x=yes else @@ -4438,7 +4491,7 @@ else # Update the cache value to reflect the command line values. ac_cv_have_x="have_x=yes \ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$as_me:4441: result: libraries $x_libraries, headers $x_includes" >&5 + echo "$as_me:4494: result: libraries $x_libraries, headers $x_includes" >&5 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi @@ -4465,11 +4518,11 @@ else # others require no space. Words are not sufficient . . . . case `(uname -sr) 2>/dev/null` in "SunOS 5"*) - echo "$as_me:4468: checking whether -R must be followed by a space" >&5 + echo "$as_me:4521: 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 4472 "configure" +#line 4525 "configure" #include "confdefs.h" int @@ -4481,16 +4534,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:4484: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4537: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4487: \$? = $ac_status" >&5 + echo "$as_me:4540: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:4490: \"$ac_try\"") >&5 + { (eval echo "$as_me:4543: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4493: \$? = $ac_status" >&5 + echo "$as_me:4546: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_R_nospace=yes else @@ -4500,13 +4553,13 @@ ac_R_nospace=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" if test $ac_R_nospace = yes; then - echo "$as_me:4503: result: no" >&5 + echo "$as_me:4556: 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 4509 "configure" +#line 4562 "configure" #include "confdefs.h" int @@ -4518,16 +4571,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:4521: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4574: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4524: \$? = $ac_status" >&5 + echo "$as_me:4577: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:4527: \"$ac_try\"") >&5 + { (eval echo "$as_me:4580: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4530: \$? = $ac_status" >&5 + echo "$as_me:4583: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_R_space=yes else @@ -4537,11 +4590,11 @@ ac_R_space=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" if test $ac_R_space = yes; then - echo "$as_me:4540: result: yes" >&5 + echo "$as_me:4593: result: yes" >&5 echo "${ECHO_T}yes" >&6 X_LIBS="$X_LIBS -R $x_libraries" else - echo "$as_me:4544: result: neither works" >&5 + echo "$as_me:4597: result: neither works" >&5 echo "${ECHO_T}neither works" >&6 fi fi @@ -4561,7 +4614,7 @@ echo "${ECHO_T}neither works" >&6 # the Alpha needs dnet_stub (dnet does not exist). ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" cat >"conftest.$ac_ext" <<_ACEOF -#line 4564 "configure" +#line 4617 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4580,22 +4633,22 @@ XOpenDisplay (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:4583: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4636: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4586: \$? = $ac_status" >&5 + echo "$as_me:4639: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:4589: \"$ac_try\"") >&5 + { (eval echo "$as_me:4642: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4592: \$? = $ac_status" >&5 + echo "$as_me:4645: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:4598: checking for dnet_ntoa in -ldnet" >&5 +echo "$as_me:4651: 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 @@ -4603,7 +4656,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 4606 "configure" +#line 4659 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4622,16 +4675,16 @@ dnet_ntoa (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:4625: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4678: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4628: \$? = $ac_status" >&5 + echo "$as_me:4681: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:4631: \"$ac_try\"") >&5 + { (eval echo "$as_me:4684: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4634: \$? = $ac_status" >&5 + echo "$as_me:4687: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dnet_dnet_ntoa=yes else @@ -4642,14 +4695,14 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:4645: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "$as_me:4698: 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:4652: checking for dnet_ntoa in -ldnet_stub" >&5 + echo "$as_me:4705: 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 @@ -4657,7 +4710,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 4660 "configure" +#line 4713 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4676,16 +4729,16 @@ dnet_ntoa (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:4679: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4732: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4682: \$? = $ac_status" >&5 + echo "$as_me:4735: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:4685: \"$ac_try\"") >&5 + { (eval echo "$as_me:4738: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4688: \$? = $ac_status" >&5 + echo "$as_me:4741: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dnet_stub_dnet_ntoa=yes else @@ -4696,7 +4749,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:4699: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "$as_me:4752: 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" @@ -4715,13 +4768,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" # on Irix 5.2, according to T.E. Dickey. # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - echo "$as_me:4718: checking for gethostbyname" >&5 + echo "$as_me:4771: 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 4724 "configure" +#line 4777 "configure" #include "confdefs.h" #define gethostbyname autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -4752,16 +4805,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:4755: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4808: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4758: \$? = $ac_status" >&5 + echo "$as_me:4811: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:4761: \"$ac_try\"") >&5 + { (eval echo "$as_me:4814: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4764: \$? = $ac_status" >&5 + echo "$as_me:4817: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_gethostbyname=yes else @@ -4771,11 +4824,11 @@ ac_cv_func_gethostbyname=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:4774: result: $ac_cv_func_gethostbyname" >&5 +echo "$as_me:4827: 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:4778: checking for gethostbyname in -lnsl" >&5 + echo "$as_me:4831: 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 @@ -4783,7 +4836,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 4786 "configure" +#line 4839 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4802,16 +4855,16 @@ gethostbyname (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:4805: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4858: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4808: \$? = $ac_status" >&5 + echo "$as_me:4861: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:4811: \"$ac_try\"") >&5 + { (eval echo "$as_me:4864: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4814: \$? = $ac_status" >&5 + echo "$as_me:4867: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_nsl_gethostbyname=yes else @@ -4822,14 +4875,14 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:4825: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "$as_me:4878: 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:4832: checking for gethostbyname in -lbsd" >&5 + echo "$as_me:4885: 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 @@ -4837,7 +4890,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 4840 "configure" +#line 4893 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4856,16 +4909,16 @@ gethostbyname (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:4859: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4912: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4862: \$? = $ac_status" >&5 + echo "$as_me:4915: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:4865: \"$ac_try\"") >&5 + { (eval echo "$as_me:4918: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4868: \$? = $ac_status" >&5 + echo "$as_me:4921: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_bsd_gethostbyname=yes else @@ -4876,7 +4929,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:4879: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "$as_me:4932: 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" @@ -4892,13 +4945,13 @@ fi # variants that don't use the nameserver (or something). -lsocket # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. - echo "$as_me:4895: checking for connect" >&5 + echo "$as_me:4948: 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 4901 "configure" +#line 4954 "configure" #include "confdefs.h" #define connect autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -4929,16 +4982,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:4932: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4985: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4935: \$? = $ac_status" >&5 + echo "$as_me:4988: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:4938: \"$ac_try\"") >&5 + { (eval echo "$as_me:4991: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4941: \$? = $ac_status" >&5 + echo "$as_me:4994: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_connect=yes else @@ -4948,11 +5001,11 @@ ac_cv_func_connect=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:4951: result: $ac_cv_func_connect" >&5 +echo "$as_me:5004: 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:4955: checking for connect in -lsocket" >&5 + echo "$as_me:5008: 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 @@ -4960,7 +5013,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 4963 "configure" +#line 5016 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4979,16 +5032,16 @@ connect (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:4982: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5035: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4985: \$? = $ac_status" >&5 + echo "$as_me:5038: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:4988: \"$ac_try\"") >&5 + { (eval echo "$as_me:5041: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4991: \$? = $ac_status" >&5 + echo "$as_me:5044: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_socket_connect=yes else @@ -4999,7 +5052,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5002: result: $ac_cv_lib_socket_connect" >&5 +echo "$as_me:5055: 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" @@ -5008,13 +5061,13 @@ fi fi # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:5011: checking for remove" >&5 + echo "$as_me:5064: 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 5017 "configure" +#line 5070 "configure" #include "confdefs.h" #define remove autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -5045,16 +5098,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:5048: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5101: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5051: \$? = $ac_status" >&5 + echo "$as_me:5104: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:5054: \"$ac_try\"") >&5 + { (eval echo "$as_me:5107: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5057: \$? = $ac_status" >&5 + echo "$as_me:5110: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_remove=yes else @@ -5064,11 +5117,11 @@ ac_cv_func_remove=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:5067: result: $ac_cv_func_remove" >&5 +echo "$as_me:5120: 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:5071: checking for remove in -lposix" >&5 + echo "$as_me:5124: 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 @@ -5076,7 +5129,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 5079 "configure" +#line 5132 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5095,16 +5148,16 @@ remove (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:5098: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5151: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5101: \$? = $ac_status" >&5 + echo "$as_me:5154: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:5104: \"$ac_try\"") >&5 + { (eval echo "$as_me:5157: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5107: \$? = $ac_status" >&5 + echo "$as_me:5160: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_posix_remove=yes else @@ -5115,7 +5168,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5118: result: $ac_cv_lib_posix_remove" >&5 +echo "$as_me:5171: 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" @@ -5124,13 +5177,13 @@ fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:5127: checking for shmat" >&5 + echo "$as_me:5180: 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 5133 "configure" +#line 5186 "configure" #include "confdefs.h" #define shmat autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -5161,16 +5214,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:5164: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5217: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5167: \$? = $ac_status" >&5 + echo "$as_me:5220: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:5170: \"$ac_try\"") >&5 + { (eval echo "$as_me:5223: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5173: \$? = $ac_status" >&5 + echo "$as_me:5226: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_shmat=yes else @@ -5180,11 +5233,11 @@ ac_cv_func_shmat=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:5183: result: $ac_cv_func_shmat" >&5 +echo "$as_me:5236: 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:5187: checking for shmat in -lipc" >&5 + echo "$as_me:5240: 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 @@ -5192,7 +5245,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 5195 "configure" +#line 5248 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5211,16 +5264,16 @@ shmat (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:5214: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5267: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5217: \$? = $ac_status" >&5 + echo "$as_me:5270: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:5220: \"$ac_try\"") >&5 + { (eval echo "$as_me:5273: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5223: \$? = $ac_status" >&5 + echo "$as_me:5276: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_ipc_shmat=yes else @@ -5231,7 +5284,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5234: result: $ac_cv_lib_ipc_shmat" >&5 +echo "$as_me:5287: 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" @@ -5249,7 +5302,7 @@ fi # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry - echo "$as_me:5252: checking for IceConnectionNumber in -lICE" >&5 + echo "$as_me:5305: 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 @@ -5257,7 +5310,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 5260 "configure" +#line 5313 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5276,16 +5329,16 @@ IceConnectionNumber (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:5279: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5332: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5282: \$? = $ac_status" >&5 + echo "$as_me:5335: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:5285: \"$ac_try\"") >&5 + { (eval echo "$as_me:5338: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5288: \$? = $ac_status" >&5 + echo "$as_me:5341: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_ICE_IceConnectionNumber=yes else @@ -5296,7 +5349,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5299: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "$as_me:5352: 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" @@ -5308,7 +5361,7 @@ fi fi -echo "$as_me:5311: checking if you want to use C11 _Noreturn feature" >&5 +echo "$as_me:5364: checking if you want to use C11 _Noreturn feature" >&5 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given. @@ -5325,17 +5378,17 @@ else enable_stdnoreturn=no fi; -echo "$as_me:5328: result: $enable_stdnoreturn" >&5 +echo "$as_me:5381: result: $enable_stdnoreturn" >&5 echo "${ECHO_T}$enable_stdnoreturn" >&6 if test $enable_stdnoreturn = yes; then -echo "$as_me:5332: checking for C11 _Noreturn feature" >&5 +echo "$as_me:5385: checking for C11 _Noreturn feature" >&5 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6 if test "${cf_cv_c11_noreturn+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 5338 "configure" +#line 5391 "configure" #include "confdefs.h" $ac_includes_default @@ -5351,16 +5404,16 @@ if (feof(stdin)) giveup() } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5354: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5407: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5357: \$? = $ac_status" >&5 + echo "$as_me:5410: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5360: \"$ac_try\"") >&5 + { (eval echo "$as_me:5413: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5363: \$? = $ac_status" >&5 + echo "$as_me:5416: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_c11_noreturn=yes else @@ -5371,7 +5424,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:5374: result: $cf_cv_c11_noreturn" >&5 +echo "$as_me:5427: result: $cf_cv_c11_noreturn" >&5 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6 else cf_cv_c11_noreturn=no, @@ -5427,16 +5480,16 @@ then then test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 -echo "${as_me:-configure}:5430: testing repairing CFLAGS: $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:5483: testing repairing CFLAGS: $CFLAGS ..." 1>&5 CFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 -echo "${as_me:-configure}:5435: testing ... fixed $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:5488: testing ... fixed $CFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:5439: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:5492: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; @@ -5475,16 +5528,16 @@ then then test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 -echo "${as_me:-configure}:5478: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:5531: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 CPPFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 -echo "${as_me:-configure}:5483: testing ... fixed $CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:5536: testing ... fixed $CPPFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:5487: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:5540: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; @@ -5523,23 +5576,23 @@ then then test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 -echo "${as_me:-configure}:5526: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:5579: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 LDFLAGS="$cf_temp_flags" test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 -echo "${as_me:-configure}:5531: testing ... fixed $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:5584: testing ... fixed $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:5535: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:5588: testing ... extra $EXTRA_CFLAGS ..." 1>&5 fi ;; esac fi -echo "$as_me:5542: checking if you want to turn on gcc warnings" >&5 +echo "$as_me:5595: checking if you want to turn on gcc warnings" >&5 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6 # Check whether --enable-warnings or --disable-warnings was given. @@ -5556,7 +5609,7 @@ else enable_warnings=no fi; -echo "$as_me:5559: result: $enable_warnings" >&5 +echo "$as_me:5612: result: $enable_warnings" >&5 echo "${ECHO_T}$enable_warnings" >&6 if test "$enable_warnings" = "yes" then @@ -5579,10 +5632,10 @@ cat > conftest.i <&5 + { echo "$as_me:5635: checking for $CC __attribute__ directives..." >&5 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} cat > "conftest.$ac_ext" < #include "confdefs.h" #include "conftest.h" @@ -5632,12 +5685,12 @@ EOF ;; esac - if { (eval echo "$as_me:5635: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:5688: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5638: \$? = $ac_status" >&5 + echo "$as_me:5691: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:5640: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:5693: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case "$cf_attribute" in @@ -5715,7 +5768,7 @@ do done cat >"conftest.$ac_ext" <<_ACEOF -#line 5718 "configure" +#line 5771 "configure" #include "confdefs.h" #include @@ -5730,26 +5783,26 @@ String foo = malloc(1); free((void*)foo) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5733: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5786: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5736: \$? = $ac_status" >&5 + echo "$as_me:5789: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5739: \"$ac_try\"") >&5 + { (eval echo "$as_me:5792: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5742: \$? = $ac_status" >&5 + echo "$as_me:5795: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then -echo "$as_me:5745: checking for X11/Xt const-feature" >&5 +echo "$as_me:5798: checking for X11/Xt const-feature" >&5 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6 if test "${cf_cv_const_x_string+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 5752 "configure" +#line 5805 "configure" #include "confdefs.h" #undef _CONST_X_STRING @@ -5767,16 +5820,16 @@ String foo = malloc(1); *foo = 0 } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5770: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5823: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5773: \$? = $ac_status" >&5 + echo "$as_me:5826: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5776: \"$ac_try\"") >&5 + { (eval echo "$as_me:5829: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5779: \$? = $ac_status" >&5 + echo "$as_me:5832: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_const_x_string=no @@ -5791,7 +5844,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:5794: result: $cf_cv_const_x_string" >&5 +echo "$as_me:5847: result: $cf_cv_const_x_string" >&5 echo "${ECHO_T}$cf_cv_const_x_string" >&6 LIBS="$cf_save_LIBS_CF_CONST_X_STRING" @@ -5820,7 +5873,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi cat > "conftest.$ac_ext" <&5 + { echo "$as_me:5892: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" @@ -5852,12 +5905,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} wd981 do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:5855: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:5908: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5858: \$? = $ac_status" >&5 + echo "$as_me:5911: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:5860: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:5913: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -5865,7 +5918,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 CFLAGS="$cf_save_CFLAGS" elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" then - { echo "$as_me:5868: checking for $CC warning options..." >&5 + { echo "$as_me:5921: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" cf_warn_CONST="" @@ -5888,12 +5941,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:5891: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:5944: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5894: \$? = $ac_status" >&5 + echo "$as_me:5947: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:5896: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:5949: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case "$cf_opt" in (Winline) @@ -5901,7 +5954,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 ([34].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:5904: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:5957: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -5911,7 +5964,7 @@ echo "${as_me:-configure}:5904: testing feature is broken in gcc $GCC_VERSION .. ([12].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:5914: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:5967: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -5928,7 +5981,7 @@ fi fi -echo "$as_me:5931: checking if you want to use dbmalloc for testing" >&5 +echo "$as_me:5984: checking if you want to use dbmalloc for testing" >&5 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6 # Check whether --with-dbmalloc or --without-dbmalloc was given. @@ -5950,7 +6003,7 @@ EOF else with_dbmalloc= fi; -echo "$as_me:5953: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:6006: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case ".$with_cflags" in @@ -6064,23 +6117,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:6067: checking for dbmalloc.h" >&5 + echo "$as_me:6120: checking for dbmalloc.h" >&5 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6 if test "${ac_cv_header_dbmalloc_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 6073 "configure" +#line 6126 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:6077: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:6130: \"$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:6083: \$? = $ac_status" >&5 + echo "$as_me:6136: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6099,11 +6152,11 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:6102: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:6155: result: $ac_cv_header_dbmalloc_h" >&5 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6 if test "$ac_cv_header_dbmalloc_h" = yes; then -echo "$as_me:6106: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:6159: checking for debug_malloc in -ldbmalloc" >&5 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6111,7 +6164,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6114 "configure" +#line 6167 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6130,16 +6183,16 @@ debug_malloc (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6133: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6186: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6136: \$? = $ac_status" >&5 + echo "$as_me:6189: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6139: \"$ac_try\"") >&5 + { (eval echo "$as_me:6192: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6142: \$? = $ac_status" >&5 + echo "$as_me:6195: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -6150,7 +6203,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6153: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:6206: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6 if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then cat >>confdefs.h <&5 +echo "$as_me:6221: checking if you want to use dmalloc for testing" >&5 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6 # Check whether --with-dmalloc or --without-dmalloc was given. @@ -6187,7 +6240,7 @@ EOF else with_dmalloc= fi; -echo "$as_me:6190: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:6243: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 case ".$with_cflags" in @@ -6301,23 +6354,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:6304: checking for dmalloc.h" >&5 + echo "$as_me:6357: checking for dmalloc.h" >&5 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6 if test "${ac_cv_header_dmalloc_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 6310 "configure" +#line 6363 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:6314: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:6367: \"$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:6320: \$? = $ac_status" >&5 + echo "$as_me:6373: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6336,11 +6389,11 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:6339: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:6392: result: $ac_cv_header_dmalloc_h" >&5 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6 if test "$ac_cv_header_dmalloc_h" = yes; then -echo "$as_me:6343: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:6396: checking for dmalloc_debug in -ldmalloc" >&5 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6348,7 +6401,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6351 "configure" +#line 6404 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6367,16 +6420,16 @@ dmalloc_debug (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6370: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6423: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6373: \$? = $ac_status" >&5 + echo "$as_me:6426: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6376: \"$ac_try\"") >&5 + { (eval echo "$as_me:6429: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6379: \$? = $ac_status" >&5 + echo "$as_me:6432: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -6387,7 +6440,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6390: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:6443: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6 if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then cat >>confdefs.h <&5 +echo "$as_me:6483: checking for strcmp in -lc_s" >&5 echo $ECHO_N "checking for strcmp in -lc_s... $ECHO_C" >&6 if test "${ac_cv_lib_c_s_strcmp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6435,7 +6488,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lc_s $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6438 "configure" +#line 6491 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6454,16 +6507,16 @@ strcmp (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6457: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6510: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6460: \$? = $ac_status" >&5 + echo "$as_me:6513: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6463: \"$ac_try\"") >&5 + { (eval echo "$as_me:6516: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6466: \$? = $ac_status" >&5 + echo "$as_me:6519: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_c_s_strcmp=yes else @@ -6474,7 +6527,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6477: result: $ac_cv_lib_c_s_strcmp" >&5 +echo "$as_me:6530: result: $ac_cv_lib_c_s_strcmp" >&5 echo "${ECHO_T}$ac_cv_lib_c_s_strcmp" >&6 if test "$ac_cv_lib_c_s_strcmp" = yes; then cat >>confdefs.h <&5 +echo $ECHO_N "checking for __chk_fail in -lssp... $ECHO_C" >&6 +if test "${ac_cv_lib_ssp___chk_fail+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lssp $LIBS" +cat >"conftest.$ac_ext" <<_ACEOF +#line 6692 "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char __chk_fail (void); +int +main (void) +{ +__chk_fail (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:6711: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6714: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:6717: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6720: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_ssp___chk_fail=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_lib_ssp___chk_fail=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:6731: result: $ac_cv_lib_ssp___chk_fail" >&5 +echo "${ECHO_T}$ac_cv_lib_ssp___chk_fail" >&6 +if test "$ac_cv_lib_ssp___chk_fail" = yes; then + cat >>confdefs.h <&5 + { echo "$as_me:6769: WARNING: You should consider using gcc or rcc if available" >&5 echo "$as_me: WARNING: You should consider using gcc or rcc if available" >&2;} unset ac_cv_prog_CC for ac_prog in gcc rcc 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:6664: checking for $ac_word" >&5 +echo "$as_me:6776: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6676,7 +6788,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="$ac_prog" -echo "$as_me:6679: found $ac_dir/$ac_word" >&5 +echo "$as_me:6791: found $ac_dir/$ac_word" >&5 break done @@ -6684,10 +6796,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:6687: result: $CC" >&5 + echo "$as_me:6799: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:6690: result: no" >&5 + echo "$as_me:6802: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6710,23 +6822,23 @@ test -n "$CC" || CC="$CC" for ac_header in jcurses.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:6713: checking for $ac_header" >&5 +echo "$as_me:6825: 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 6719 "configure" +#line 6831 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:6723: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:6835: \"$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:6729: \$? = $ac_status" >&5 + echo "$as_me:6841: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6745,7 +6857,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:6748: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:6860: 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:6888: 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 6782 "configure" +#line 6894 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:6786: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:6898: \"$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:6792: \$? = $ac_status" >&5 + echo "$as_me:6904: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6808,7 +6920,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:6811: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:6923: 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:6950: checking \$CFLAGS variable" >&5 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6 case "x$CFLAGS" in (*-[IUD]*) - echo "$as_me:6842: result: broken" >&5 + echo "$as_me:6954: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:6844: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 + { echo "$as_me:6956: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;} cf_flags="$CFLAGS" CFLAGS= @@ -6949,18 +7061,18 @@ fi done ;; (*) - echo "$as_me:6952: result: ok" >&5 + echo "$as_me:7064: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac -echo "$as_me:6957: checking \$CC variable" >&5 +echo "$as_me:7069: checking \$CC variable" >&5 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 case "$CC" in (*[\ \ ]-*) - echo "$as_me:6961: result: broken" >&5 + echo "$as_me:7073: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:6963: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 + { echo "$as_me:7075: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} # humor him... cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'` @@ -7077,24 +7189,24 @@ fi done test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 -echo "${as_me:-configure}:7080: testing resulting CC: '$CC' ..." 1>&5 +echo "${as_me:-configure}:7192: testing resulting CC: '$CC' ..." 1>&5 test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 -echo "${as_me:-configure}:7084: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 +echo "${as_me:-configure}:7196: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 -echo "${as_me:-configure}:7088: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 +echo "${as_me:-configure}:7200: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 ;; (*) - echo "$as_me:7092: result: ok" >&5 + echo "$as_me:7204: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac -echo "$as_me:7097: checking for ${CC:-cc} option to accept ANSI C" >&5 +echo "$as_me:7209: checking for ${CC:-cc} option to accept ANSI C" >&5 echo $ECHO_N "checking for ${CC:-cc} option to accept ANSI C... $ECHO_C" >&6 if test "${cf_cv_ansi_cc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7218,7 +7330,7 @@ if test -n "$cf_new_extra_cppflags" ; then fi cat >"conftest.$ac_ext" <<_ACEOF -#line 7221 "configure" +#line 7333 "configure" #include "confdefs.h" #ifndef CC_HAS_PROTOS @@ -7239,16 +7351,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7242: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7354: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7245: \$? = $ac_status" >&5 + echo "$as_me:7357: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7248: \"$ac_try\"") >&5 + { (eval echo "$as_me:7360: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7251: \$? = $ac_status" >&5 + echo "$as_me:7363: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ansi_cc="$cf_arg"; break else @@ -7261,7 +7373,7 @@ CFLAGS="$cf_save_CFLAGS" CPPFLAGS="$cf_save_CPPFLAGS" fi -echo "$as_me:7264: result: $cf_cv_ansi_cc" >&5 +echo "$as_me:7376: result: $cf_cv_ansi_cc" >&5 echo "${ECHO_T}$cf_cv_ansi_cc" >&6 if test "$cf_cv_ansi_cc" != "no"; then @@ -7375,7 +7487,7 @@ fi fi if test "$cf_cv_ansi_cc" = "no"; then - { { echo "$as_me:7378: error: Your compiler does not appear to recognize prototypes. + { { echo "$as_me:7490: error: Your compiler does not appear to recognize prototypes. You have the following choices: a. adjust your compiler options b. get an up-to-date compiler @@ -7388,2878 +7500,1821 @@ You have the following choices: { (exit 1); exit 1; }; } fi -# Check whether --enable-largefile or --disable-largefile was given. -if test "${enable_largefile+set}" = set; then - enableval="$enable_largefile" - -fi; -if test "$enable_largefile" != no; then - - echo "$as_me:7398: checking for special C compiler options needed for large files" >&5 -echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 -if test "${ac_cv_sys_largefile_CC+set}" = set; then +echo "$as_me:7503: checking if the POSIX test-macros are already defined" >&5 +echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6 +if test "${cf_cv_posix_visible+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_sys_largefile_CC=no - if test "$GCC" != yes; then - ac_save_CC=$CC - while :; do - # IRIX 6.2 and later do not support large files by default, - # so use the C compiler's -n32 option if that helps. - cat >"conftest.$ac_ext" <<_ACEOF -#line 7410 "configure" + +cat >"conftest.$ac_ext" <<_ACEOF +#line 7510 "configure" #include "confdefs.h" -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; +#include int main (void) { +#if defined(__POSIX_VISIBLE) && ((__POSIX_VISIBLE - 0L) > 0) \ + && defined(__XSI_VISIBLE) && ((__XSI_VISIBLE - 0L) > 0) \ + && defined(__BSD_VISIBLE) && ((__BSD_VISIBLE - 0L) > 0) \ + && defined(__ISO_C_VISIBLE) && ((__ISO_C_VISIBLE - 0L) > 0) +#error conflicting symbols found +#endif + ; return 0; } _ACEOF - rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7430: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:7529: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7433: \$? = $ac_status" >&5 + echo "$as_me:7532: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7436: \"$ac_try\"") >&5 + { (eval echo "$as_me:7535: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7439: \$? = $ac_status" >&5 + echo "$as_me:7538: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - break + cf_cv_posix_visible=no else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 +cf_cv_posix_visible=yes +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +echo "$as_me:7549: result: $cf_cv_posix_visible" >&5 +echo "${ECHO_T}$cf_cv_posix_visible" >&6 + +if test "$cf_cv_posix_visible" = no; then + +cf_XOPEN_SOURCE=500 +cf_POSIX_C_SOURCE=199506L +cf_xopen_source= + +case "$host_os" in +(aix[4-7]*) + cf_xopen_source="-D_ALL_SOURCE" + ;; +(darwin[0-8].*) + cf_xopen_source="-D_APPLE_C_SOURCE" + ;; +(darwin*) + cf_xopen_source="-D_DARWIN_C_SOURCE" + cf_XOPEN_SOURCE= + ;; +(freebsd*|dragonfly*|midnightbsd*) + # 5.x headers associate + # _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L + # _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L + cf_POSIX_C_SOURCE=200112L + cf_XOPEN_SOURCE=600 + cf_xopen_source="-D_BSD_TYPES -D__BSD_VISIBLE -D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + ;; +(hpux11*) + cf_xopen_source="-D_HPUX_SOURCE -D_XOPEN_SOURCE=500" + ;; +(hpux*) + cf_xopen_source="-D_HPUX_SOURCE" + ;; +(irix[56].*) + cf_xopen_source="-D_SGI_SOURCE" + cf_XOPEN_SOURCE= + ;; +(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) + +cf_gnu_xopen_source=$cf_XOPEN_SOURCE + +echo "$as_me:7591: checking if this is the GNU C library" >&5 +echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6 +if test "${cf_cv_gnu_library+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cat >"conftest.$ac_ext" <<_ACEOF +#line 7598 "configure" +#include "confdefs.h" +#include +int +main (void) +{ + + #if __GLIBC__ > 0 && __GLIBC_MINOR__ >= 0 + return 0; + #elif __NEWLIB__ > 0 && __NEWLIB_MINOR__ >= 0 + return 0; + #else + # error not GNU C library + #endif + ; + return 0; +} +_ACEOF rm -f "conftest.$ac_objext" - CC="$CC -n32" - rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7449: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7617: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7452: \$? = $ac_status" >&5 + echo "$as_me:7620: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7455: \"$ac_try\"") >&5 + { (eval echo "$as_me:7623: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7458: \$? = $ac_status" >&5 + echo "$as_me:7626: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - ac_cv_sys_largefile_CC=' -n32'; break + cf_cv_gnu_library=yes else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 +cf_cv_gnu_library=no fi -rm -f "conftest.$ac_objext" - break - done - CC=$ac_save_CC - rm -f "conftest.$ac_ext" - fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi -echo "$as_me:7472: result: $ac_cv_sys_largefile_CC" >&5 -echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 - if test "$ac_cv_sys_largefile_CC" != no; then - CC=$CC$ac_cv_sys_largefile_CC - fi +echo "$as_me:7637: result: $cf_cv_gnu_library" >&5 +echo "${ECHO_T}$cf_cv_gnu_library" >&6 - echo "$as_me:7478: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 -if test "${ac_cv_sys_file_offset_bits+set}" = set; then +if test x$cf_cv_gnu_library = xyes; then + + # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE + # was changed to help a little. newlib incorporated the change about 4 + # years later. + echo "$as_me:7645: checking if _DEFAULT_SOURCE can be used as a basis" >&5 +echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6 +if test "${cf_cv_gnu_library_219+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - while :; do - ac_cv_sys_file_offset_bits=no - cat >"conftest.$ac_ext" <<_ACEOF -#line 7486 "configure" + + cf_save="$CPPFLAGS" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +#line 7657 "configure" #include "confdefs.h" #include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; int main (void) { + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 19) || (__GLIBC__ > 2) + return 0; + #elif (__NEWLIB__ == 2 && __NEWLIB_MINOR__ >= 4) || (__GLIBC__ > 3) + return 0; + #else + # error GNU C library __GLIBC__.__GLIBC_MINOR__ is too old + #endif ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7506: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7676: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7509: \$? = $ac_status" >&5 + echo "$as_me:7679: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7512: \"$ac_try\"") >&5 + { (eval echo "$as_me:7682: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7515: \$? = $ac_status" >&5 + echo "$as_me:7685: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - break + cf_cv_gnu_library_219=yes else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 +cf_cv_gnu_library_219=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - cat >"conftest.$ac_ext" <<_ACEOF -#line 7524 "configure" + CPPFLAGS="$cf_save" + +fi +echo "$as_me:7697: result: $cf_cv_gnu_library_219" >&5 +echo "${ECHO_T}$cf_cv_gnu_library_219" >&6 + + if test "x$cf_cv_gnu_library_219" = xyes; then + cf_save="$CPPFLAGS" + echo "$as_me:7702: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 +echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6 +if test "${cf_cv_gnu_dftsrc_219+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=$cf_gnu_xopen_source +do +case "$cf_fix_cppflags" in +(no) + case "$cf_add_cflags" in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) + case "$cf_add_cflags" in + (-D*) + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test "$cf_fix_cppflags" = yes ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + fi + ;; + esac + case "$CPPFLAGS" in + (*$cf_add_cflags) + ;; + (*) + case "$cf_add_cflags" in + (-D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + + ;; + esac + ;; + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + + ;; + esac + ;; +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + +fi + +if test -n "$cf_new_cppflags" ; then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + +fi + +if test -n "$cf_new_extra_cppflags" ; then + + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + +fi + + cat >"conftest.$ac_ext" <<_ACEOF +#line 7807 "configure" #include "confdefs.h" -#define _FILE_OFFSET_BITS 64 -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; + + #include + #include + int main (void) { + #if (_XOPEN_SOURCE >= $cf_gnu_xopen_source) && (MB_LEN_MAX > 1) + return 0; + #else + # error GNU C library is too old + #endif ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7545: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7827: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7548: \$? = $ac_status" >&5 + echo "$as_me:7830: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7551: \"$ac_try\"") >&5 + { (eval echo "$as_me:7833: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7554: \$? = $ac_status" >&5 + echo "$as_me:7836: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - ac_cv_sys_file_offset_bits=64; break + cf_cv_gnu_dftsrc_219=yes else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 +cf_cv_gnu_dftsrc_219=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - break -done + fi -echo "$as_me:7565: result: $ac_cv_sys_file_offset_bits" >&5 -echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 -if test "$ac_cv_sys_file_offset_bits" != no; then +echo "$as_me:7847: result: $cf_cv_gnu_dftsrc_219" >&5 +echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 + test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save" + else + cf_cv_gnu_dftsrc_219=maybe + fi -cat >>confdefs.h <&5 -echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 -if test "${ac_cv_sys_large_files+set}" = set; then + echo "$as_me:7856: 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 - while :; do - ac_cv_sys_large_files=no - cat >"conftest.$ac_ext" <<_ACEOF -#line 7583 "configure" + + cat >"conftest.$ac_ext" <<_ACEOF +#line 7863 "configure" #include "confdefs.h" #include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; int main (void) { + #ifndef _XOPEN_SOURCE + #error expected _XOPEN_SOURCE to be defined + #endif ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7603: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7878: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7606: \$? = $ac_status" >&5 + echo "$as_me:7881: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7609: \"$ac_try\"") >&5 + { (eval echo "$as_me:7884: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7612: \$? = $ac_status" >&5 + echo "$as_me:7887: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - break + cf_cv_gnu_source=no else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 +cf_save="$CPPFLAGS" + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in -D_GNU_SOURCE +do +case "$cf_fix_cppflags" in +(no) + case "$cf_add_cflags" in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) + case "$cf_add_cflags" in + (-D*) + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test "$cf_fix_cppflags" = yes ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + fi + ;; + esac + case "$CPPFLAGS" in + (*$cf_add_cflags) + ;; + (*) + case "$cf_add_cflags" in + (-D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + + ;; + esac + ;; + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + + ;; + esac + ;; +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + fi -rm -f "conftest.$ac_objext" "conftest.$ac_ext" - cat >"conftest.$ac_ext" <<_ACEOF -#line 7621 "configure" + +if test -n "$cf_new_cppflags" ; then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + +fi + +if test -n "$cf_new_extra_cppflags" ; then + + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + +fi + + cat >"conftest.$ac_ext" <<_ACEOF +#line 7994 "configure" #include "confdefs.h" -#define _LARGE_FILES 1 #include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; int main (void) { + #ifdef _XOPEN_SOURCE + #error expected _XOPEN_SOURCE to be undefined + #endif ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7642: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8009: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7645: \$? = $ac_status" >&5 + echo "$as_me:8012: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7648: \"$ac_try\"") >&5 + { (eval echo "$as_me:8015: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7651: \$? = $ac_status" >&5 + echo "$as_me:8018: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - ac_cv_sys_large_files=1; break + cf_cv_gnu_source=no else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 +cf_cv_gnu_source=yes fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - break -done -fi -echo "$as_me:7662: result: $ac_cv_sys_large_files" >&5 -echo "${ECHO_T}$ac_cv_sys_large_files" >&6 -if test "$ac_cv_sys_large_files" != no; then - -cat >>confdefs.h <&5 +echo "${ECHO_T}$cf_cv_gnu_source" >&6 - if test "$enable_largefile" != no ; then - echo "$as_me:7675: checking for _LARGEFILE_SOURCE value needed for large files" >&5 -echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6 -if test "${ac_cv_sys_largefile_source+set}" = set; then + if test "$cf_cv_gnu_source" = yes + then + echo "$as_me:8038: checking if we should also define _DEFAULT_SOURCE" >&5 +echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6 +if test "${cf_cv_default_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - while :; do - ac_cv_sys_largefile_source=no - cat >"conftest.$ac_ext" <<_ACEOF -#line 7683 "configure" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +#line 8048 "configure" #include "confdefs.h" -#include - #include +#include int main (void) { - int (*my_fseeko)(FILE *, off_t, int) = fseeko; - return my_fseeko(stdin, 0, 0); + #ifdef _DEFAULT_SOURCE + #error expected _DEFAULT_SOURCE to be undefined + #endif ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7698: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8063: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7701: \$? = $ac_status" >&5 + echo "$as_me:8066: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7704: \"$ac_try\"") >&5 + { (eval echo "$as_me:8069: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7707: \$? = $ac_status" >&5 + echo "$as_me:8072: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - break + cf_cv_default_source=no else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 +cf_cv_default_source=yes fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - cat >"conftest.$ac_ext" <<_ACEOF -#line 7716 "configure" + +fi +echo "$as_me:8083: result: $cf_cv_default_source" >&5 +echo "${ECHO_T}$cf_cv_default_source" >&6 + if test "$cf_cv_default_source" = yes + then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" + + fi + fi + fi + +fi + + ;; +(minix*) + cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this... + ;; +(mirbsd*) + # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks and other headers which use u_int / u_short types + cf_XOPEN_SOURCE= + +if test "$cf_cv_posix_visible" = no; then + +cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE + +cf_save_CFLAGS="$CFLAGS" +cf_save_CPPFLAGS="$CPPFLAGS" + +cf_trim_CFLAGS=`echo "$cf_save_CFLAGS" | \ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` + +cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` + +echo "$as_me:8120: 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}:8126: testing if the symbol is already defined go no further ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +#line 8129 "configure" #include "confdefs.h" -#define _LARGEFILE_SOURCE 1 -#include - #include +#include int main (void) { - int (*my_fseeko)(FILE *, off_t, int) = fseeko; - return my_fseeko(stdin, 0, 0); +#ifndef _POSIX_C_SOURCE +#error _POSIX_C_SOURCE is not defined +#endif ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7732: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8144: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7735: \$? = $ac_status" >&5 + echo "$as_me:8147: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7738: \"$ac_try\"") >&5 + { (eval echo "$as_me:8150: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7741: \$? = $ac_status" >&5 + echo "$as_me:8153: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - ac_cv_sys_largefile_source=1; break + cf_cv_posix_c_source=no +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_want_posix_source=no + case .$cf_POSIX_C_SOURCE in + (.[12]??*) + cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" + ;; + (.2) + cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" + cf_want_posix_source=yes + ;; + (.*) + cf_want_posix_source=yes + ;; + esac + if test "$cf_want_posix_source" = yes ; then + cat >"conftest.$ac_ext" <<_ACEOF +#line 8174 "configure" +#include "confdefs.h" +#include +int +main (void) +{ + +#ifdef _POSIX_SOURCE +#error _POSIX_SOURCE is defined +#endif + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:8189: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:8192: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:8195: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8198: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 +cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - break -done -fi -echo "$as_me:7752: result: $ac_cv_sys_largefile_source" >&5 -echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 -if test "$ac_cv_sys_largefile_source" != no; then + fi -cat >>confdefs.h <&5 -fi -rm -rf conftest* + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS" -# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug -# in glibc 2.1.3, but that breaks too many other things. -# If you want fseeko and ftello with glibc, upgrade to a fixed glibc. -echo "$as_me:7766: checking for fseeko" >&5 -echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 -if test "${ac_cv_func_fseeko+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >"conftest.$ac_ext" <<_ACEOF -#line 7772 "configure" + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" + +echo "${as_me:-configure}:8217: testing if the second compile does not leave our definition intact error ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +#line 8220 "configure" #include "confdefs.h" -#include - #include +#include int main (void) { -int (*my_fseeko)(FILE *, off_t, int) = fseeko; - return my_fseeko && my_fseeko (stdin, 0, 0); + +#ifndef _POSIX_C_SOURCE +#error _POSIX_C_SOURCE is not defined +#endif ; return 0; } _ACEOF -rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7786: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:8235: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7789: \$? = $ac_status" >&5 + echo "$as_me:8238: \$? = $ac_status" >&5 (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7792: \"$ac_try\"") >&5 + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:8241: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7795: \$? = $ac_status" >&5 + echo "$as_me:8244: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - ac_cv_func_fseeko=yes + : else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -ac_cv_func_fseeko=no +cf_cv_posix_c_source=no fi -rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + CFLAGS="$cf_save_CFLAGS" + CPPFLAGS="$cf_save_CPPFLAGS" + fi -echo "$as_me:7805: result: $ac_cv_func_fseeko" >&5 -echo "${ECHO_T}$ac_cv_func_fseeko" >&6 -if test $ac_cv_func_fseeko = yes; then +rm -f "conftest.$ac_objext" "conftest.$ac_ext" -cat >>confdefs.h <<\EOF -#define HAVE_FSEEKO 1 -EOF +fi +echo "$as_me:8260: 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 + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS" + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in $cf_cv_posix_c_source +do +case "$cf_fix_cppflags" in +(no) + case "$cf_add_cflags" in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) + case "$cf_add_cflags" in + (-D*) + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test "$cf_fix_cppflags" = yes ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + fi + ;; + esac + case "$CPPFLAGS" in + (*$cf_add_cflags) + ;; + (*) + case "$cf_add_cflags" in + (-D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + + ;; + esac + ;; + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + + ;; + esac + ;; +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" fi - # Normally we would collect these definitions in the config.h, - # but (like _XOPEN_SOURCE), some environments rely on having these - # defined before any of the system headers are included. Another - # case comes up with C++, e.g., on AIX the compiler compiles the - # header files by themselves before looking at the body files it is - # told to compile. For ncurses, those header files do not include - # the config.h - if test "$ac_cv_sys_large_files" != no - then +if test -n "$cf_new_cppflags" ; then test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-D_LARGE_FILES" + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" - fi - if test "$ac_cv_sys_largefile_source" != no - then +fi - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-D_LARGEFILE_SOURCE" +if test -n "$cf_new_extra_cppflags" ; then - fi - if test "$ac_cv_sys_file_offset_bits" != no - then + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits" +fi - fi +fi - echo "$as_me:7844: checking whether to use struct dirent64" >&5 -echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6 -if test "${cf_cv_struct_dirent64+set}" = set; then +fi # cf_cv_posix_visible + + ;; +(netbsd*) + cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw + ;; +(openbsd[6-9]*) + # OpenBSD 6.x has broken locale support, both compile-time and runtime. + # see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html + # Abusing the conformance level is a workaround. + { echo "$as_me:8377: WARNING: this system does not provide usable locale support" >&5 +echo "$as_me: WARNING: this system does not provide usable locale support" >&2;} + cf_xopen_source="-D_BSD_SOURCE" + cf_XOPEN_SOURCE=700 + ;; +(openbsd[4-5]*) + # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw + cf_xopen_source="-D_BSD_SOURCE" + cf_XOPEN_SOURCE=600 + ;; +(openbsd*) + # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw + ;; +(osf[45]*) + cf_xopen_source="-D_OSF_SOURCE" + ;; +(nto-qnx*) + cf_xopen_source="-D_QNX_SOURCE" + ;; +(sco*) + # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer + ;; +(solaris2.*) + cf_xopen_source="-D__EXTENSIONS__" + cf_cv_xopen_source=broken + ;; +(sysv4.2uw2.*) # Novell/SCO UnixWare 2.x (tested on 2.1.2) + cf_XOPEN_SOURCE= + cf_POSIX_C_SOURCE= + ;; +(*) + +echo "$as_me:8409: 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 7851 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8416 "configure" #include "confdefs.h" -#pragma GCC diagnostic error "-Wincompatible-pointer-types" -#include -#include +$ac_includes_default -#ifndef __REDIRECT -/* if transitional largefile support is setup, this is true */ -extern struct dirent64 * readdir(DIR *); +int +main (void) +{ + +#ifndef _XOPEN_SOURCE +#error _XOPEN_SOURCE is not defined #endif + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:8434: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:8437: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:8440: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8443: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_xopen_source=no +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_save="$CPPFLAGS" + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + + cat >"conftest.$ac_ext" <<_ACEOF +#line 8455 "configure" +#include "confdefs.h" + +$ac_includes_default + int main (void) { - DIR *dp = opendir("."); - struct dirent64 *x = readdir(dp); - struct dirent *y = readdir(dp); - int z = x - y; - (void)z; +#ifndef _XOPEN_SOURCE +#error _XOPEN_SOURCE is not defined +#endif ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7878: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8473: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7881: \$? = $ac_status" >&5 + echo "$as_me:8476: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7884: \"$ac_try\"") >&5 + { (eval echo "$as_me:8479: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7887: \$? = $ac_status" >&5 + echo "$as_me:8482: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - cf_cv_struct_dirent64=yes + cf_cv_xopen_source=no else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -cf_cv_struct_dirent64=no +cf_cv_xopen_source=$cf_XOPEN_SOURCE fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" + CPPFLAGS="$cf_save" fi -echo "$as_me:7898: result: $cf_cv_struct_dirent64" >&5 -echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 - test "$cf_cv_struct_dirent64" = yes && -cat >>confdefs.h <<\EOF -#define HAVE_STRUCT_DIRENT64 1 -EOF +rm -f "conftest.$ac_objext" "conftest.$ac_ext" - fi +fi +echo "$as_me:8497: result: $cf_cv_xopen_source" >&5 +echo "${ECHO_T}$cf_cv_xopen_source" >&6 -if test -z "$ALL_LINGUAS" ; then - ALL_LINGUAS=`test -d "$srcdir/po" && cd "$srcdir/po" && echo *.po|sed -e 's/\.po//g' -e 's/*//'` +if test "$cf_cv_xopen_source" != no ; then - echo "$as_me:7910: checking for PATH separator" >&5 -echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6 - case "$cf_cv_system_name" in - (os2*) PATH_SEPARATOR=';' ;; - (*) ${PATH_SEPARATOR:=':'} ;; - esac +CFLAGS=`echo "$CFLAGS" | \ + sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` - echo "$as_me:7917: result: $PATH_SEPARATOR" >&5 -echo "${ECHO_T}$PATH_SEPARATOR" >&6 +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` -# Extract the first word of "msginit", so it can be a program name with args. + cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" -set dummy msginit; ac_word=$2 -echo "$as_me:7923: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_MSGINIT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case "$MSGINIT" in - ([\\/]*|?:[\\/]*) - ac_cv_path_MSGINIT="$MSGINIT" # Let the user override the test with a path. - ;; - (*) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_word$ac_exeext" ; then - if "$ac_dir/$ac_word" --no-translator --version /dev/null >/dev/null 2>&1; then - ac_cv_path_MSGINIT="$ac_dir/$ac_word$ac_exeext" - break - fi - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_MSGINIT" && ac_cv_path_MSGINIT=":" - ;; -esac -fi -MSGINIT="$ac_cv_path_MSGINIT" -if test "$MSGINIT" != ":"; then - echo "$as_me:7950: result: $MSGINIT" >&5 -echo "${ECHO_T}$MSGINIT" >&6 -else - echo "$as_me:7953: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi +for cf_add_cflags in $cf_temp_xopen_source +do + case "x$cf_add_cflags" in + (x-[DU]*) - if test "$MSGINIT" != ":" ; then - test -n "$verbose" && echo " adding en.po" 1>&6 +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break -echo "${as_me:-configure}:7960: testing adding en.po ..." 1>&5 + CFLAGS="$cf_old_cflag" +done - ALL_LINGUAS="$ALL_LINGUAS en" - fi -fi +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:7969: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -echo "$as_me:7984: found $ac_dir/$ac_word" >&5 -break + CPPFLAGS="$cf_old_cflag" done -fi -fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - echo "$as_me:7992: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6 -else - echo "$as_me:7995: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi + ;; + esac -fi -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -echo "$as_me:8004: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_RANLIB="ranlib" -echo "$as_me:8019: found $ac_dir/$ac_word" >&5 -break -done - - test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" -fi -fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - echo "$as_me:8028: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6 -else - echo "$as_me:8031: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - RANLIB=$ac_ct_RANLIB -else - RANLIB="$ac_cv_prog_RANLIB" -fi - -echo "$as_me:8040: 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 8046 "configure" -#include "confdefs.h" -#include -#include -#include -#include - -_ACEOF -if { (eval echo "$as_me:8054: \"$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:8060: \$? = $ac_status" >&5 - (exit "$ac_status"); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_cv_header_stdc=yes -else - echo "$as_me: failed program was:" >&5 - cat "conftest.$ac_ext" >&5 - ac_cv_header_stdc=no -fi -rm -f conftest.err "conftest.$ac_ext" - -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 8082 "configure" -#include "confdefs.h" -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -rf conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >"conftest.$ac_ext" <<_ACEOF -#line 8100 "configure" -#include "confdefs.h" -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -rf conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : -else - cat >"conftest.$ac_ext" <<_ACEOF -#line 8121 "configure" -#include "confdefs.h" -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main (void) -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - $ac_main_return(2); - $ac_main_return (0); -} -_ACEOF -rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:8147: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:8150: \$? = $ac_status" >&5 - (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:8152: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:8155: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -ac_cv_header_stdc=no -fi -rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" -fi -fi -fi -echo "$as_me:8168: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 -if test $ac_cv_header_stdc = yes; then - -cat >>confdefs.h <<\EOF -#define STDC_HEADERS 1 -EOF - -fi - -echo "$as_me:8178: checking for inline" >&5 -echo $ECHO_N "checking for inline... $ECHO_C" >&6 -if test "${ac_cv_c_inline+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_c_inline=no -for ac_kw in inline __inline__ __inline; do - cat >"conftest.$ac_ext" <<_ACEOF -#line 8186 "configure" -#include "confdefs.h" -#ifndef __cplusplus -static $ac_kw int static_foo (void) {return 0; } -$ac_kw int foo (void) {return 0; } -#endif - -_ACEOF -rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8195: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:8198: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8201: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:8204: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_c_inline=$ac_kw; break -else - echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -fi -rm -f "conftest.$ac_objext" "conftest.$ac_ext" -done - -fi -echo "$as_me:8215: result: $ac_cv_c_inline" >&5 -echo "${ECHO_T}$ac_cv_c_inline" >&6 -case $ac_cv_c_inline in - inline | yes) ;; - no) -cat >>confdefs.h <<\EOF -#define inline -EOF - ;; - *) cat >>confdefs.h <&5 -echo $ECHO_N "checking for $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 8242 "configure" -#include "confdefs.h" -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8248: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:8251: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8254: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:8257: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -eval "$as_ac_Header=no" -fi -rm -f "conftest.$ac_objext" "conftest.$ac_ext" -fi -echo "$as_me:8267: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 -echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 -if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then - cat >>confdefs.h <&5 -echo $ECHO_N "checking for 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 8283 "configure" -#include "confdefs.h" -$ac_includes_default -int -main (void) -{ -if ((off_t *) 0) - return 0; -if (sizeof (off_t)) - return 0; - ; - return 0; -} -_ACEOF -rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8298: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:8301: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8304: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:8307: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_type_off_t=yes -else - echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -ac_cv_type_off_t=no -fi -rm -f "conftest.$ac_objext" "conftest.$ac_ext" -fi -echo "$as_me:8317: result: $ac_cv_type_off_t" >&5 -echo "${ECHO_T}$ac_cv_type_off_t" >&6 -if test "$ac_cv_type_off_t" = yes; then - : -else - -cat >>confdefs.h <&5 -echo $ECHO_N "checking for size_t... $ECHO_C" >&6 -if test "${ac_cv_type_size_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >"conftest.$ac_ext" <<_ACEOF -#line 8335 "configure" -#include "confdefs.h" -$ac_includes_default -int -main (void) -{ -if ((size_t *) 0) - return 0; -if (sizeof (size_t)) - return 0; - ; - return 0; -} -_ACEOF -rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8350: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:8353: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8356: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:8359: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_type_size_t=yes -else - echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -ac_cv_type_size_t=no -fi -rm -f "conftest.$ac_objext" "conftest.$ac_ext" -fi -echo "$as_me:8369: result: $ac_cv_type_size_t" >&5 -echo "${ECHO_T}$ac_cv_type_size_t" >&6 -if test "$ac_cv_type_size_t" = yes; then - : -else - -cat >>confdefs.h <&5 -echo $ECHO_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 8389 "configure" -#include "confdefs.h" -#include -int -main (void) -{ -char *p = (char *) alloca (2 * sizeof (int)); - ; - return 0; -} -_ACEOF -rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8401: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:8404: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8407: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:8410: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_working_alloca_h=yes -else - echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -ac_cv_working_alloca_h=no -fi -rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" -fi -echo "$as_me:8420: result: $ac_cv_working_alloca_h" >&5 -echo "${ECHO_T}$ac_cv_working_alloca_h" >&6 -if test $ac_cv_working_alloca_h = yes; then - -cat >>confdefs.h <<\EOF -#define HAVE_ALLOCA_H 1 -EOF - -fi - -echo "$as_me:8430: 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 8436 "configure" -#include "confdefs.h" -#ifdef __GNUC__ -# define alloca __builtin_alloca -#else -# ifdef _MSC_VER -# include -# define alloca _alloca -# else -# if HAVE_ALLOCA_H -# include -# else -# ifdef _AIX - #pragma alloca -# else -# ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -# endif -# endif -# endif -# endif -#endif - -int -main (void) -{ -char *p = (char *) alloca (1); - ; - return 0; -} -_ACEOF -rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8468: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:8471: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8474: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:8477: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_func_alloca_works=yes -else - echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -ac_cv_func_alloca_works=no -fi -rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" -fi -echo "$as_me:8487: 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 - -cat >>confdefs.h <<\EOF -#define HAVE_ALLOCA 1 -EOF - -else - # The SVR3 libPW and SVR4 libucb both contain incompatible functions -# that cause trouble. Some versions do not even contain alloca or -# contain a buggy version. If you still want to use their alloca, -# use ar to extract alloca.o from them instead of compiling alloca.c. - -ALLOCA="alloca.$ac_objext" - -cat >>confdefs.h <<\EOF -#define C_ALLOCA 1 -EOF - -echo "$as_me:8508: 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 8514 "configure" -#include "confdefs.h" -#if defined(CRAY) && ! defined(CRAY2) -webecray -#else -wenotbecray -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "webecray" >/dev/null 2>&1; then - ac_cv_os_cray=yes -else - ac_cv_os_cray=no -fi -rm -rf conftest* - -fi -echo "$as_me:8532: 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:8537: 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 8543 "configure" -#include "confdefs.h" -#define $ac_func autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef $ac_func - -#ifdef __cplusplus -extern "C" -#endif - -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (void); - -int -main (void) -{ - -/* The GNU C library defines stubs for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -#error found stub for $ac_func -#endif - - return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8574: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:8577: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8580: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:8583: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -eval "$as_ac_var=no" -fi -rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" -fi -echo "$as_me:8593: result: `eval echo '${'"$as_ac_var"'}'`" >&5 -echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 -if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then - -cat >>confdefs.h <&5 -echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6 -if test "${ac_cv_c_stack_direction+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - ac_cv_c_stack_direction=0 -else - cat >"conftest.$ac_ext" <<_ACEOF -#line 8616 "configure" -#include "confdefs.h" -int -find_stack_direction (void) -{ - static char *addr = 0; - auto char dummy; - if (addr == 0) - { - addr = &dummy; - return find_stack_direction (); - } - else - return (&dummy > addr) ? 1 : -1; -} + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" -int -main (void) -{ - $ac_main_return (find_stack_direction () < 0); -} -_ACEOF -rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:8639: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:8642: \$? = $ac_status" >&5 - (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:8644: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:8647: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_c_stack_direction=1 -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -ac_cv_c_stack_direction=-1 -fi -rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" -fi -fi -echo "$as_me:8659: result: $ac_cv_c_stack_direction" >&5 -echo "${ECHO_T}$ac_cv_c_stack_direction" >&6 + continue + elif test "${cf_tst_cflags}" = "\"'" ; then -cat >>confdefs.h <&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >"conftest.$ac_ext" <<_ACEOF -#line 8677 "configure" -#include "confdefs.h" -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:8681: \"$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:8687: \$? = $ac_status" >&5 - (exit "$ac_status"); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 - cat "conftest.$ac_ext" >&5 - eval "$as_ac_Header=no" -fi -rm -f conftest.err "conftest.$ac_ext" -fi -echo "$as_me:8706: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 -echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 -if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then - cat >>confdefs.h <&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >"conftest.$ac_ext" <<_ACEOF -#line 8725 "configure" -#include "confdefs.h" -#define $ac_func autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef $ac_func + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" -#ifdef __cplusplus -extern "C" -#endif + ;; + esac + ;; + (*) -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (void); + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" -int -main (void) -{ + ;; + esac + ;; +(yes) -/* The GNU C library defines stubs for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -#error found stub for $ac_func -#endif + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8756: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:8759: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8762: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:8765: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -eval "$as_ac_var=no" -fi -rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" -fi -echo "$as_me:8775: result: `eval echo '${'"$as_ac_var"'}'`" >&5 -echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 -if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then - cat >>confdefs.h <&5 -echo $ECHO_N "checking for working mmap... $ECHO_C" >&6 -if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - ac_cv_func_mmap_fixed_mapped=no -else - cat >"conftest.$ac_ext" <<_ACEOF -#line 8794 "configure" -#include "confdefs.h" -$ac_includes_default -/* Thanks to Mike Haertel and Jim Avera for this test. - Here is a matrix of mmap possibilities: - mmap private not fixed - mmap private fixed at somewhere currently unmapped - mmap private fixed at somewhere already mapped - mmap shared not fixed - mmap shared fixed at somewhere currently unmapped - mmap shared fixed at somewhere already mapped - For private mappings, we should verify that changes cannot be read() - back from the file, nor mmap's back from the file at a different - address. (There have been systems where private was not correctly - implemented like the infamous i386 svr4.0, and systems where the - VM page cache was not coherent with the file system buffer cache - like early versions of FreeBSD and possibly contemporary NetBSD.) - For shared mappings, we should conversely verify that changes get - propagated back to all the places they're supposed to be. - - Grep wants private fixed already mapped. - The main things grep needs to know about mmap are: - * does it exist and is it safe to write into the mmap'd area - * how to use it (BSD variants) */ - -#include -#include - -#if !STDC_HEADERS && !HAVE_STDLIB_H -char *malloc (); -#endif +if test -n "$cf_new_cflags" ; then -/* This mess was copied from the GNU getpagesize.h. */ -#if !HAVE_GETPAGESIZE -/* Assume that all systems that can run configure have sys/param.h. */ -# if !HAVE_SYS_PARAM_H -# define HAVE_SYS_PARAM_H 1 -# endif + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" -# ifdef _SC_PAGESIZE -# define getpagesize() sysconf(_SC_PAGESIZE) -# else /* no _SC_PAGESIZE */ -# if HAVE_SYS_PARAM_H -# include -# ifdef EXEC_PAGESIZE -# define getpagesize() EXEC_PAGESIZE -# else /* no EXEC_PAGESIZE */ -# ifdef NBPG -# define getpagesize() NBPG * CLSIZE -# ifndef CLSIZE -# define CLSIZE 1 -# endif /* no CLSIZE */ -# else /* no NBPG */ -# ifdef NBPC -# define getpagesize() NBPC -# else /* no NBPC */ -# ifdef PAGESIZE -# define getpagesize() PAGESIZE -# endif /* PAGESIZE */ -# endif /* no NBPC */ -# endif /* no NBPG */ -# endif /* no EXEC_PAGESIZE */ -# else /* no HAVE_SYS_PARAM_H */ -# define getpagesize() 8192 /* punt totally */ -# endif /* no HAVE_SYS_PARAM_H */ -# endif /* no _SC_PAGESIZE */ - -#endif /* no HAVE_GETPAGESIZE */ - -int -main (void) -{ - char *data, *data2, *data3; - int i, pagesize; - int fd; - - pagesize = getpagesize (); - - /* First, make a file with some known garbage in it. */ - data = (char *) malloc (pagesize); - if (!data) - $ac_main_return (1); - for (i = 0; i < pagesize; ++i) - *(data + i) = rand (); - umask (0); - fd = creat ("conftest.mmap", 0600); - if (fd < 0) - $ac_main_return (1); - if (write (fd, data, pagesize) != pagesize) - $ac_main_return (1); - close (fd); - - /* Next, try to mmap the file at a fixed address which already has - something else allocated at it. If we can, also make sure that - we see the same garbage. */ - fd = open ("conftest.mmap", O_RDWR); - if (fd < 0) - $ac_main_return (1); - data2 = (char *) malloc (2 * pagesize); - if (!data2) - $ac_main_return (1); - data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1); - if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_FIXED, fd, 0L)) - $ac_main_return (1); - for (i = 0; i < pagesize; ++i) - if (*(data + i) != *(data2 + i)) - $ac_main_return (1); - - /* Finally, make sure that changes to the mapped area do not - percolate back to the file as seen by read(). (This is a bug on - some variants of i386 svr4.0.) */ - for (i = 0; i < pagesize; ++i) - *(data2 + i) = *(data2 + i) + 1; - data3 = (char *) malloc (pagesize); - if (!data3) - $ac_main_return (1); - if (read (fd, data3, pagesize) != pagesize) - $ac_main_return (1); - for (i = 0; i < pagesize; ++i) - if (*(data + i) != *(data3 + i)) - $ac_main_return (1); - close (fd); - $ac_main_return (0); -} -_ACEOF -rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:8921: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:8924: \$? = $ac_status" >&5 - (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:8926: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:8929: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_func_mmap_fixed_mapped=yes -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -ac_cv_func_mmap_fixed_mapped=no fi -rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" -fi -fi -echo "$as_me:8941: result: $ac_cv_func_mmap_fixed_mapped" >&5 -echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6 -if test $ac_cv_func_mmap_fixed_mapped = yes; then -cat >>confdefs.h <<\EOF -#define HAVE_MMAP 1 -EOF +if test -n "$cf_new_cppflags" ; then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" fi -rm -f conftest.mmap -echo "$as_me:8952: checking whether we are using the GNU C Library 2.1 or newer" >&5 -echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6 -if test "${ac_cv_gnu_library_2_1+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >"conftest.$ac_ext" <<_ACEOF -#line 8958 "configure" -#include "confdefs.h" +if test -n "$cf_new_extra_cppflags" ; then -#include -#ifdef __GNU_LIBRARY__ - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) - Lucky GNU user - #endif -#endif + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Lucky GNU user" >/dev/null 2>&1; then - ac_cv_gnu_library_2_1=yes -else - ac_cv_gnu_library_2_1=no fi -rm -rf conftest* + +done fi -echo "$as_me:8978: result: $ac_cv_gnu_library_2_1" >&5 -echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6 - GLIBC21="$ac_cv_gnu_library_2_1" + cf_save_xopen_cppflags="$CPPFLAGS" -cf_makefile=makefile +if test "$cf_cv_posix_visible" = no; then -test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d "$srcdir/po" && cd "$srcdir/po" && echo *.po|sed -e 's/\.po//g' -e 's/*//'` +cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE -# Allow override of "config.h" definition: -: ${CONFIG_H:=config.h} +cf_save_CFLAGS="$CFLAGS" +cf_save_CPPFLAGS="$CPPFLAGS" -if test -z "$PACKAGE" ; then - { { echo "$as_me:8991: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&5 -echo "$as_me: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&2;} - { (exit 1); exit 1; }; } -fi +cf_trim_CFLAGS=`echo "$cf_save_CFLAGS" | \ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -if test -z "$VERSION" ; then -if test -f "$srcdir/VERSION" ; then - VERSION=`sed -e '2,$d' "$srcdir/VERSION" |cut -f1` -else - VERSION=unknown -fi -fi +cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ -stdlib.h string.h unistd.h sys/param.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:9008: 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 "$as_me:8657: 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 - cat >"conftest.$ac_ext" <<_ACEOF -#line 9014 "configure" -#include "confdefs.h" -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:9018: \"$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:9024: \$? = $ac_status" >&5 - (exit "$ac_status"); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 - cat "conftest.$ac_ext" >&5 - eval "$as_ac_Header=no" -fi -rm -f conftest.err "conftest.$ac_ext" -fi -echo "$as_me:9043: 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 -for ac_func in feof_unlocked fgets_unlocked getcwd getegid geteuid \ -getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \ -strdup strtoul tsearch __argz_count __argz_stringify __argz_next -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:9058: 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 9064 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8666 "configure" #include "confdefs.h" -#define $ac_func autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef $ac_func - -#ifdef __cplusplus -extern "C" -#endif - -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (void); - +#include int main (void) { -/* The GNU C library defines stubs for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -#error found stub for $ac_func +#ifndef _POSIX_C_SOURCE +#error _POSIX_C_SOURCE is not defined #endif - - return $ac_func (); ; return 0; } _ACEOF -rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9095: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:8681: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9098: \$? = $ac_status" >&5 + echo "$as_me:8684: \$? = $ac_status" >&5 (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9101: \"$ac_try\"") >&5 + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:8687: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9104: \$? = $ac_status" >&5 + echo "$as_me:8690: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - eval "$as_ac_var=yes" + cf_cv_posix_c_source=no else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -eval "$as_ac_var=no" -fi -rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" -fi -echo "$as_me:9114: result: `eval echo '${'"$as_ac_var"'}'`" >&5 -echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 -if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then - cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF -#line 9165 "configure" +cf_want_posix_source=no + case .$cf_POSIX_C_SOURCE in + (.[12]??*) + cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" + ;; + (.2) + cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" + cf_want_posix_source=yes + ;; + (.*) + cf_want_posix_source=yes + ;; + esac + if test "$cf_want_posix_source" = yes ; then + cat >"conftest.$ac_ext" <<_ACEOF +#line 8711 "configure" #include "confdefs.h" -#include +#include int main (void) { -printf("Hello") + +#ifdef _POSIX_SOURCE +#error _POSIX_SOURCE is defined +#endif ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9177: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8726: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9180: \$? = $ac_status" >&5 + echo "$as_me:8729: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9183: \"$ac_try\"") >&5 + { (eval echo "$as_me:8732: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9186: \$? = $ac_status" >&5 + echo "$as_me:8735: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -cf_have_incdir=yes +cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - CPPFLAGS=$cf_save_CPPFLAGS - fi - fi - fi - - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - -echo "${as_me:-configure}:9203: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - - cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'` - test "$cf_top_incdir" = "$cf_add_incdir" && break - cf_add_incdir="$cf_top_incdir" - else - break - fi - else - break - fi - done - done -fi - - elif test -d "$cf_searchpath/../include" ; then + fi -if test -n "$cf_searchpath/../include" ; then - for cf_add_incdir in $cf_searchpath/../include - do - while test "$cf_add_incdir" != /usr/include - do - if test -d "$cf_add_incdir" - then - cf_have_incdir=no - if test -n "$CFLAGS$CPPFLAGS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_incdir in $CFLAGS $CPPFLAGS ; do - if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then - cf_have_incdir=yes; break - fi - done - fi +echo "${as_me:-configure}:8746: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 - if test "$cf_have_incdir" = no ; then - if test "$cf_add_incdir" = /usr/local/include ; then - if test "$GCC" = yes - then - cf_save_CPPFLAGS=$CPPFLAGS + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS" test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" - cat >"conftest.$ac_ext" <<_ACEOF -#line 9249 "configure" +echo "${as_me:-configure}:8754: testing if the second compile does not leave our definition intact error ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +#line 8757 "configure" #include "confdefs.h" -#include +#include int main (void) { -printf("Hello") + +#ifndef _POSIX_C_SOURCE +#error _POSIX_C_SOURCE is not defined +#endif ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9261: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8772: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9264: \$? = $ac_status" >&5 + echo "$as_me:8775: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9267: \"$ac_try\"") >&5 + { (eval echo "$as_me:8778: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9270: \$? = $ac_status" >&5 + echo "$as_me:8781: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -cf_have_incdir=yes +cf_cv_posix_c_source=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - CPPFLAGS=$cf_save_CPPFLAGS - fi - fi - fi - - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - -echo "${as_me:-configure}:9287: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - - cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'` - test "$cf_top_incdir" = "$cf_add_incdir" && break - cf_add_incdir="$cf_top_incdir" - else - break - fi - else - break - fi - done - done -fi - - else -{ { echo "$as_me:9305: error: cannot find libiconv under $withval" >&5 -echo "$as_me: error: cannot find libiconv under $withval" >&2;} - { (exit 1); exit 1; }; } - fi - if test -d "$cf_searchpath/lib" ; then - -if test -n "$cf_searchpath/lib" ; then - for cf_add_libdir in $cf_searchpath/lib - do - if test "$cf_add_libdir" = /usr/lib ; then - : - elif test -d "$cf_add_libdir" - then - cf_have_libdir=no - if test -n "$LDFLAGS$LIBS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_libdir in $LDFLAGS $LIBS ; do - if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then - cf_have_libdir=yes; break - fi - done - fi - if test "$cf_have_libdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 - -echo "${as_me:-configure}:9330: testing adding $cf_add_libdir to library-path ..." 1>&5 + CFLAGS="$cf_save_CFLAGS" + CPPFLAGS="$cf_save_CPPFLAGS" - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi - fi - done fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" - elif test -d "$cf_searchpath" ; then - -if test -n "$cf_searchpath" ; then - for cf_add_libdir in $cf_searchpath - do - if test "$cf_add_libdir" = /usr/lib ; then - : - elif test -d "$cf_add_libdir" - then - cf_have_libdir=no - if test -n "$LDFLAGS$LIBS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_libdir in $LDFLAGS $LIBS ; do - if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then - cf_have_libdir=yes; break - fi - done - fi - if test "$cf_have_libdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 - -echo "${as_me:-configure}:9359: testing adding $cf_add_libdir to library-path ..." 1>&5 - - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi - fi - done fi +echo "$as_me:8797: result: $cf_cv_posix_c_source" >&5 +echo "${ECHO_T}$cf_cv_posix_c_source" >&6 - else -{ { echo "$as_me:9368: error: cannot find libiconv under $withval" >&5 -echo "$as_me: error: cannot find libiconv under $withval" >&2;} - { (exit 1); exit 1; }; } - fi -done - - ;; -esac - -fi; - - echo "$as_me:9379: checking for iconv" >&5 -echo $ECHO_N "checking for iconv... $ECHO_C" >&6 -if test "${am_cv_func_iconv+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -# If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these -# will be set on completion of the AC_TRY_LINK below. -cf_cv_header_path_iconv= -cf_cv_library_path_iconv= - -echo "${as_me:-configure}:9390: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5 - -cf_save_LIBS="$LIBS" - -cat >"conftest.$ac_ext" <<_ACEOF -#line 9395 "configure" -#include "confdefs.h" - -#include -#include - -int -main (void) -{ - - iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); - - ; - return 0; -} -_ACEOF -rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9414: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:9417: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9420: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:9423: \$? = $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 - -LIBS="-liconv $cf_save_LIBS" - -cat >"conftest.$ac_ext" <<_ACEOF -#line 9437 "configure" -#include "confdefs.h" +if test "$cf_cv_posix_c_source" != no ; then + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS" -#include -#include +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= -int -main (void) -{ +for cf_add_cflags in $cf_cv_posix_c_source +do +case "$cf_fix_cppflags" in +(no) + case "$cf_add_cflags" in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) + case "$cf_add_cflags" in + (-D*) + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes - ; - return 0; -} -_ACEOF -rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9456: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:9459: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9462: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:9465: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then + if test "$cf_fix_cppflags" = yes ; 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" + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" -else - echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 + continue + elif test "${cf_tst_cflags}" = "\"'" ; then - cf_cv_find_linkage_iconv=no - LIBS="$cf_save_LIBS" + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - test -n "$verbose" && echo " find linkage for iconv library" 1>&6 + continue + fi + ;; + esac + case "$CPPFLAGS" in + (*$cf_add_cflags) + ;; + (*) + case "$cf_add_cflags" in + (-D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` -echo "${as_me:-configure}:9482: testing find linkage for iconv library ..." 1>&5 +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` -echo "${as_me:-configure}:9484: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5 + ;; + esac - cf_save_CPPFLAGS="$CPPFLAGS" - cf_test_CPPFLAGS="$CPPFLAGS" + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" -cf_search= + ;; + esac + ;; + (*) -# collect the current set of include-directories from compiler flags -cf_header_path_list="" -if test -n "${CFLAGS}${CPPFLAGS}" ; then - for cf_header_path in $CPPFLAGS $CFLAGS - do - case "$cf_header_path" in - (-I*) - cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" -test "x$cf_header_path" != "xNONE" && \ -test -d "$cf_header_path" && \ - { - test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" - test -d "$cf_header_path/include" && cf_search="$cf_search $cf_header_path/include" - test -d "$cf_header_path/include/iconv" && cf_search="$cf_search $cf_header_path/include/iconv" - test -d "$cf_header_path/include/iconv/include" && cf_search="$cf_search $cf_header_path/include/iconv/include" - test -d "$cf_header_path/iconv/include" && cf_search="$cf_search $cf_header_path/iconv/include" - test -d "$cf_header_path/iconv/include/iconv" && cf_search="$cf_search $cf_header_path/iconv/include/iconv" -} + ;; + esac + ;; +(yes) - cf_header_path_list="$cf_header_path_list $cf_search" - ;; - esac - done -fi + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" -# add the variations for the package we are looking for + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` -cf_search= + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done -test "x$prefix" != "xNONE" && \ -test -d "$prefix" && \ - { - test -n "$verbose" && echo " ... testing for include-directories under $prefix" - test -d "$prefix/include" && cf_search="$cf_search $prefix/include" - test -d "$prefix/include/iconv" && cf_search="$cf_search $prefix/include/iconv" - test -d "$prefix/include/iconv/include" && cf_search="$cf_search $prefix/include/iconv/include" - test -d "$prefix/iconv/include" && cf_search="$cf_search $prefix/iconv/include" - test -d "$prefix/iconv/include/iconv" && cf_search="$cf_search $prefix/iconv/include/iconv" -} +if test -n "$cf_new_cflags" ; then -for cf_subdir_prefix in \ - /usr \ - /usr/local \ - /usr/pkg \ - /opt \ - /opt/local \ - $HOME -do + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" -test "x$cf_subdir_prefix" != "x$prefix" && \ -test -d "$cf_subdir_prefix" && \ -{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && { - test -n "$verbose" && echo " ... testing for include-directories under $cf_subdir_prefix" - test -d "$cf_subdir_prefix/include" && cf_search="$cf_search $cf_subdir_prefix/include" - test -d "$cf_subdir_prefix/include/iconv" && cf_search="$cf_search $cf_subdir_prefix/include/iconv" - test -d "$cf_subdir_prefix/include/iconv/include" && cf_search="$cf_search $cf_subdir_prefix/include/iconv/include" - test -d "$cf_subdir_prefix/iconv/include" && cf_search="$cf_search $cf_subdir_prefix/iconv/include" - test -d "$cf_subdir_prefix/iconv/include/iconv" && cf_search="$cf_search $cf_subdir_prefix/iconv/include/iconv" -} +fi -done +if test -n "$cf_new_cppflags" ; then -test "$includedir" != NONE && \ -test "$includedir" != "/usr/include" && \ -test -d "$includedir" && { - test -d "$includedir" && cf_search="$cf_search $includedir" - test -d "$includedir/iconv" && cf_search="$cf_search $includedir/iconv" -} + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" -test "$oldincludedir" != NONE && \ -test "$oldincludedir" != "/usr/include" && \ -test -d "$oldincludedir" && { - test -d "$oldincludedir" && cf_search="$cf_search $oldincludedir" - test -d "$oldincludedir/iconv" && cf_search="$cf_search $oldincludedir/iconv" -} +fi -cf_search="$cf_search $cf_header_path_list" +if test -n "$cf_new_extra_cppflags" ; then - for cf_cv_header_path_iconv in $cf_search - do - if test -d "$cf_cv_header_path_iconv" ; then - test -n "$verbose" && echo " ... testing $cf_cv_header_path_iconv" 1>&6 + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" -echo "${as_me:-configure}:9575: testing ... testing $cf_cv_header_path_iconv ..." 1>&5 +fi - CPPFLAGS="$cf_save_CPPFLAGS" +fi - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_iconv" +fi # cf_cv_posix_visible - cat >"conftest.$ac_ext" <<_ACEOF -#line 9583 "configure" + # Some of these niche implementations use copy/paste, double-check... + if test "$cf_cv_xopen_source" = no ; then + test -n "$verbose" && echo " checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6 + +echo "${as_me:-configure}:8910: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +#line 8913 "configure" #include "confdefs.h" -#include -#include +$ac_includes_default int main (void) { - iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); +#ifndef _XOPEN_SOURCE +#error _XOPEN_SOURCE is not defined +#endif ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9602: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8931: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9605: \$? = $ac_status" >&5 + echo "$as_me:8934: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9608: \"$ac_try\"") >&5 + { (eval echo "$as_me:8937: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9611: \$? = $ac_status" >&5 + echo "$as_me:8940: \$? = $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}:9616: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5 - - cf_cv_find_linkage_iconv=maybe - cf_test_CPPFLAGS="$CPPFLAGS" - break + : else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 - CPPFLAGS="$cf_save_CPPFLAGS" - + { echo "$as_me:8947: WARNING: _POSIX_C_SOURCE definition is not usable" >&5 +echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;} + CPPFLAGS="$cf_save_xopen_cppflags" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - fi - done + fi + ;; +esac - if test "$cf_cv_find_linkage_iconv" = maybe ; then +if test -n "$cf_xopen_source" ; then -echo "${as_me:-configure}:9634: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5 +for cf_add_cflags in $cf_xopen_source +do + case "x$cf_add_cflags" in + (x-[DU]*) - cf_save_LIBS="$LIBS" - cf_save_LDFLAGS="$LDFLAGS" +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + test -n "$verbose" && echo " removing old option $cf_add_cflags from CFLAGS" 1>&6 - if test "$cf_cv_find_linkage_iconv" != yes ; then +echo "${as_me:-configure}:8970: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 -cf_search= -cf_library_path_list="" -if test -n "${LDFLAGS}${LIBS}" ; then - for cf_library_path in $LDFLAGS $LIBS - do - case "$cf_library_path" in - (-L*) - cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` + CFLAGS="$cf_old_cflag" +done -test "x$cf_library_path" != "xNONE" && \ -test -d "$cf_library_path" && \ - { - test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" - test -d "$cf_library_path/lib" && cf_search="$cf_search $cf_library_path/lib" - test -d "$cf_library_path/lib/iconv" && cf_search="$cf_search $cf_library_path/lib/iconv" - test -d "$cf_library_path/lib/iconv/lib" && cf_search="$cf_search $cf_library_path/lib/iconv/lib" - test -d "$cf_library_path/iconv/lib" && cf_search="$cf_search $cf_library_path/iconv/lib" - test -d "$cf_library_path/iconv/lib/iconv" && cf_search="$cf_search $cf_library_path/iconv/lib/iconv" -} +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + test -n "$verbose" && echo " removing old option $cf_add_cflags from CPPFLAGS" 1>&6 - cf_library_path_list="$cf_library_path_list $cf_search" - ;; - esac - done -fi +echo "${as_me:-configure}:8982: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 -cf_search= + CPPFLAGS="$cf_old_cflag" +done -test "x$prefix" != "xNONE" && \ -test -d "$prefix" && \ - { - test -n "$verbose" && echo " ... testing for lib-directories under $prefix" - test -d "$prefix/lib" && cf_search="$cf_search $prefix/lib" - test -d "$prefix/lib/iconv" && cf_search="$cf_search $prefix/lib/iconv" - test -d "$prefix/lib/iconv/lib" && cf_search="$cf_search $prefix/lib/iconv/lib" - test -d "$prefix/iconv/lib" && cf_search="$cf_search $prefix/iconv/lib" - test -d "$prefix/iconv/lib/iconv" && cf_search="$cf_search $prefix/iconv/lib/iconv" -} + ;; + esac -for cf_subdir_prefix in \ - /usr \ - /usr/local \ - /usr/pkg \ - /opt \ - /opt/local \ - $HOME +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in $cf_add_cflags do +case "$cf_fix_cppflags" in +(no) + case "$cf_add_cflags" in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) + case "$cf_add_cflags" in + (-D*) + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` -test "x$cf_subdir_prefix" != "x$prefix" && \ -test -d "$cf_subdir_prefix" && \ -{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && { - test -n "$verbose" && echo " ... testing for lib-directories under $cf_subdir_prefix" - test -d "$cf_subdir_prefix/lib" && cf_search="$cf_search $cf_subdir_prefix/lib" - test -d "$cf_subdir_prefix/lib/iconv" && cf_search="$cf_search $cf_subdir_prefix/lib/iconv" - test -d "$cf_subdir_prefix/lib/iconv/lib" && cf_search="$cf_search $cf_subdir_prefix/lib/iconv/lib" - test -d "$cf_subdir_prefix/iconv/lib" && cf_search="$cf_search $cf_subdir_prefix/iconv/lib" - test -d "$cf_subdir_prefix/iconv/lib/iconv" && cf_search="$cf_search $cf_subdir_prefix/iconv/lib/iconv" -} + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes -done + if test "$cf_fix_cppflags" = yes ; then -cf_search="$cf_library_path_list $cf_search" + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - for cf_cv_library_path_iconv in $cf_search - do - if test -d "$cf_cv_library_path_iconv" ; then - test -n "$verbose" && echo " ... testing $cf_cv_library_path_iconv" 1>&6 + continue + elif test "${cf_tst_cflags}" = "\"'" ; then -echo "${as_me:-configure}:9709: testing ... testing $cf_cv_library_path_iconv ..." 1>&5 + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - CPPFLAGS="$cf_test_CPPFLAGS" - LIBS="-liconv $cf_save_LIBS" - LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_iconv" - cat >"conftest.$ac_ext" <<_ACEOF -#line 9715 "configure" -#include "confdefs.h" + continue + fi + ;; + esac + case "$CPPFLAGS" in + (*$cf_add_cflags) + ;; + (*) + case "$cf_add_cflags" in + (-D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` -#include -#include +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` -int -main (void) -{ + ;; + esac - iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" - ; - return 0; -} -_ACEOF -rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9734: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:9737: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9740: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:9743: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then + ;; + esac + ;; + (*) - test -n "$verbose" && echo " ... found iconv library in $cf_cv_library_path_iconv" 1>&6 + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" -echo "${as_me:-configure}:9748: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5 + ;; + esac + ;; +(yes) - cf_cv_find_linkage_iconv=yes - cf_cv_library_file_iconv="-liconv" - break -else - echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - CPPFLAGS="$cf_save_CPPFLAGS" - LIBS="$cf_save_LIBS" - LDFLAGS="$cf_save_LDFLAGS" + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` -fi -rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - fi - done - CPPFLAGS="$cf_save_CPPFLAGS" - LDFLAGS="$cf_save_LDFLAGS" - fi + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done - else - cf_cv_find_linkage_iconv=no - fi +if test -n "$cf_new_cflags" ; then + test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -fi -rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +echo "${as_me:-configure}:9070: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" fi -rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" -LIBS="$cf_save_LIBS" +if test -n "$cf_new_cppflags" ; then + test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -if test "$cf_cv_find_linkage_iconv" = yes ; then -am_cv_func_iconv=yes -else -am_cv_func_iconv="no, consider installing GNU libiconv" -fi +echo "${as_me:-configure}:9080: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" fi -echo "$as_me:9788: result: $am_cv_func_iconv" >&5 -echo "${ECHO_T}$am_cv_func_iconv" >&6 - if test "$am_cv_func_iconv" = yes; then +if test -n "$cf_new_extra_cppflags" ; then + test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -cat >>confdefs.h <<\EOF -#define HAVE_ICONV 1 -EOF +echo "${as_me:-configure}:9090: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 - echo "$as_me:9797: 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 + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" - cat >"conftest.$ac_ext" <<_ACEOF -#line 9804 "configure" -#include "confdefs.h" +fi -#include -#include +done -extern -#ifdef __cplusplus -"C" -#endif -#if defined(__STDC__) || defined(__cplusplus) -size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); -#else -size_t iconv(); -#endif +fi +if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then + echo "$as_me:9102: checking if _XOPEN_SOURCE really is set" >&5 +echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6 + cat >"conftest.$ac_ext" <<_ACEOF +#line 9105 "configure" +#include "confdefs.h" +#include int main (void) { +#ifndef _XOPEN_SOURCE +#error _XOPEN_SOURCE is not defined +#endif ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9829: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9120: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9832: \$? = $ac_status" >&5 + echo "$as_me:9123: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9835: \"$ac_try\"") >&5 + { (eval echo "$as_me:9126: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9838: \$? = $ac_status" >&5 + echo "$as_me:9129: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - am_cv_proto_iconv_const=no + cf_XOPEN_SOURCE_set=yes else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -am_cv_proto_iconv_const=yes +cf_XOPEN_SOURCE_set=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -fi -echo "$as_me:9848: result: $am_cv_proto_iconv_const" >&5 -echo "${ECHO_T}$am_cv_proto_iconv_const" >&6 - - if test "$am_cv_proto_iconv_const" = yes ; then - am_cv_proto_iconv_arg1="const" - else - am_cv_proto_iconv_arg1="" - fi - -cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF -#line 9893 "configure" + echo "$as_me:9138: result: $cf_XOPEN_SOURCE_set" >&5 +echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6 + if test "$cf_XOPEN_SOURCE_set" = yes + then + cat >"conftest.$ac_ext" <<_ACEOF +#line 9143 "configure" #include "confdefs.h" -#include +#include int main (void) { -printf("Hello") + +#if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE +#error (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE +#endif ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9905: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9158: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9908: \$? = $ac_status" >&5 + echo "$as_me:9161: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9911: \"$ac_try\"") >&5 + { (eval echo "$as_me:9164: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9914: \$? = $ac_status" >&5 + echo "$as_me:9167: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - : + cf_XOPEN_SOURCE_set_ok=yes else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -cf_have_incdir=yes +cf_XOPEN_SOURCE_set_ok=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - CPPFLAGS=$cf_save_CPPFLAGS - fi - fi - fi - - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - -echo "${as_me:-configure}:9931: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - - cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'` - test "$cf_top_incdir" = "$cf_add_incdir" && break - cf_add_incdir="$cf_top_incdir" - else - break - fi - else - break - fi - done - done -fi - - if test -n "$cf_cv_library_file_iconv" ; then - LIBICONV="-liconv" - -if test -n "$cf_cv_library_path_iconv" ; then - for cf_add_libdir in $cf_cv_library_path_iconv - do - if test "$cf_add_libdir" = /usr/lib ; then - : - elif test -d "$cf_add_libdir" + if test "$cf_XOPEN_SOURCE_set_ok" = no then - cf_have_libdir=no - if test -n "$LDFLAGS$LIBS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_libdir in $LDFLAGS $LIBS ; do - if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then - cf_have_libdir=yes; break - fi - done - fi - if test "$cf_have_libdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 - -echo "${as_me:-configure}:9970: testing adding $cf_add_libdir to library-path ..." 1>&5 - - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi + { echo "$as_me:9178: WARNING: _XOPEN_SOURCE is lower than requested" >&5 +echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} fi - done -fi - - fi - fi + else -echo "$as_me:9981: 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 "$as_me:9183: 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 9987 "configure" + + cat >"conftest.$ac_ext" <<_ACEOF +#line 9190 "configure" #include "confdefs.h" $ac_includes_default -#include + int main (void) { -char* cs = nl_langinfo(CODESET); (void)cs + +#ifndef _XOPEN_SOURCE +#error _XOPEN_SOURCE is not defined +#endif + ; return 0; } _ACEOF -rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10001: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:9208: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10004: \$? = $ac_status" >&5 + echo "$as_me:9211: \$? = $ac_status" >&5 (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10007: \"$ac_try\"") >&5 + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:9214: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10010: \$? = $ac_status" >&5 + echo "$as_me:9217: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - am_cv_langinfo_codeset=yes + cf_cv_xopen_source=no else - echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -am_cv_langinfo_codeset=no -fi -rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_save="$CPPFLAGS" -fi -echo "$as_me:10021: result: $am_cv_langinfo_codeset" >&5 -echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 - if test "$am_cv_langinfo_codeset" = yes; then + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" -cat >>confdefs.h <<\EOF -#define HAVE_LANGINFO_CODESET 1 -EOF + cat >"conftest.$ac_ext" <<_ACEOF +#line 9229 "configure" +#include "confdefs.h" - fi +$ac_includes_default - if test "$ac_cv_header_locale_h" = yes; then - echo "$as_me:10032: 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 10038 "configure" -#include "confdefs.h" -#include int main (void) { -return LC_MESSAGES + +#ifndef _XOPEN_SOURCE +#error _XOPEN_SOURCE is not defined +#endif + ; return 0; } _ACEOF -rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10050: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:9247: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10053: \$? = $ac_status" >&5 + echo "$as_me:9250: \$? = $ac_status" >&5 (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10056: \"$ac_try\"") >&5 + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:9253: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10059: \$? = $ac_status" >&5 + echo "$as_me:9256: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - am_cv_val_LC_MESSAGES=yes + cf_cv_xopen_source=no else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -am_cv_val_LC_MESSAGES=no -fi -rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +cf_cv_xopen_source=$cf_XOPEN_SOURCE fi -echo "$as_me:10069: result: $am_cv_val_LC_MESSAGES" >&5 -echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6 - if test "$am_cv_val_LC_MESSAGES" = yes; then - -cat >>confdefs.h <<\EOF -#define HAVE_LC_MESSAGES 1 -EOF +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + CPPFLAGS="$cf_save" - fi fi - echo "$as_me:10079: 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. -if test "${enable_nls+set}" = set; then - enableval="$enable_nls" - USE_NLS=$enableval -else - USE_NLS=no -fi; - echo "$as_me:10089: result: $USE_NLS" >&5 -echo "${ECHO_T}$USE_NLS" >&6 - - BUILD_INCLUDED_LIBINTL=no - USE_INCLUDED_LIBINTL=no - INTLLIBS= - - if test "$USE_NLS" = "yes"; then - POSUB=po - -cat >>confdefs.h <<\EOF -#define ENABLE_NLS 1 -EOF - - echo "$as_me:10103: checking whether included gettext is requested" >&5 -echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6 - -# Check whether --with-included-gettext or --without-included-gettext was given. -if test "${with_included_gettext+set}" = set; then - withval="$with_included_gettext" - nls_cv_force_use_gnu_gettext=$withval -else - nls_cv_force_use_gnu_gettext=no -fi; - echo "$as_me:10113: result: $nls_cv_force_use_gnu_gettext" >&5 -echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6 - - # Extract the first word of "msgfmt", so it can be a program name with args. +rm -f "conftest.$ac_objext" "conftest.$ac_ext" -set dummy msgfmt; ac_word=$2 -echo "$as_me:10119: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_MSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case "$MSGFMT" in - ([\\/]*|?:[\\/]*) - ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. - ;; - (*) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_word$ac_exeext" ; then - if "$ac_dir/$ac_word" --statistics /dev/null >/dev/null 2>&1; then - ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exeext" - break - fi - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" - ;; -esac -fi -MSGFMT="$ac_cv_path_MSGFMT" -if test "$MSGFMT" != ":"; then - echo "$as_me:10146: result: $MSGFMT" >&5 -echo "${ECHO_T}$MSGFMT" >&6 -else - echo "$as_me:10149: result: no" >&5 -echo "${ECHO_T}no" >&6 fi +echo "$as_me:9271: result: $cf_cv_xopen_source" >&5 +echo "${ECHO_T}$cf_cv_xopen_source" >&6 - # Extract the first word of "gmsgfmt", so it can be a program name with args. -set dummy gmsgfmt; ac_word=$2 -echo "$as_me:10155: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_GMSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $GMSGFMT in - [\\/]* | ?:[\\/]*) - ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. - ;; - *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_GMSGFMT="$ac_dir/$ac_word" - echo "$as_me:10172: found $ac_dir/$ac_word" >&5 - break -fi -done +if test "$cf_cv_xopen_source" != no ; then - test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" - ;; -esac -fi -GMSGFMT=$ac_cv_path_GMSGFMT +CFLAGS=`echo "$CFLAGS" | \ + sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` -if test -n "$GMSGFMT"; then - echo "$as_me:10184: result: $GMSGFMT" >&5 -echo "${ECHO_T}$GMSGFMT" >&6 -else - echo "$as_me:10187: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` - # Extract the first word of "xgettext", so it can be a program name with args. + cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" -set dummy xgettext; ac_word=$2 -echo "$as_me:10194: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_XGETTEXT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case "$XGETTEXT" in - ([\\/]*|?:[\\/]*) - ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. - ;; - (*) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_word$ac_exeext" ; then - if "$ac_dir/$ac_word" --omit-header /dev/null >/dev/null 2>&1; then - ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exeext" - break - fi - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" - ;; -esac -fi -XGETTEXT="$ac_cv_path_XGETTEXT" -if test "$XGETTEXT" != ":"; then - echo "$as_me:10221: result: $XGETTEXT" >&5 -echo "${ECHO_T}$XGETTEXT" >&6 -else - echo "$as_me:10224: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi +for cf_add_cflags in $cf_temp_xopen_source +do + case "x$cf_add_cflags" in + (x-[DU]*) - nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" - if test "$nls_cv_force_use_gnu_gettext" != "yes"; then - CATOBJEXT=NONE +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break - cf_save_msgfmt_path="$MSGFMT" - cf_save_xgettext_path="$XGETTEXT" + CFLAGS="$cf_old_cflag" +done - cf_save_LIBS_1="$LIBS" +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break -cf_add_libs="$LIBS" -# reverse order -cf_add_0lib= -for cf_add_1lib in $LIBICONV; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done -# filter duplicates -for cf_add_1lib in $cf_add_0lib; do - for cf_add_2lib in $cf_add_libs; do - if test "x$cf_add_1lib" = "x$cf_add_2lib"; then - cf_add_1lib= - break - fi - done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" + CPPFLAGS="$cf_old_cflag" done -LIBS="$cf_add_libs" - cf_save_OPTS_1="$CPPFLAGS" - if test "x$cf_save_msgfmt_path" = "x$MSGFMT" && \ - test "x$cf_save_xgettext_path" = "x$XGETTEXT" ; then + ;; + esac cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in -DIGNORE_MSGFMT_HACK +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -10352,905 +9407,551 @@ if test -n "$cf_new_extra_cppflags" ; then fi - fi - -# If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these -# will be set on completion of the AC_TRY_LINK below. -cf_cv_header_path_intl= -cf_cv_library_path_intl= +done -echo "${as_me:-configure}:10362: testing Starting FIND_LINKAGE(intl,) ..." 1>&5 +fi -cf_save_LIBS="$LIBS" + fi +fi +fi # cf_cv_posix_visible -cat >"conftest.$ac_ext" <<_ACEOF -#line 10367 "configure" -#include "confdefs.h" +# Check whether --enable-largefile or --disable-largefile was given. +if test "${enable_largefile+set}" = set; then + enableval="$enable_largefile" -#include -extern int _nl_msg_cat_cntr; +fi; +if test "$enable_largefile" != no; then + echo "$as_me:9425: checking for special C compiler options needed for large files" >&5 +echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 +if test "${ac_cv_sys_largefile_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_sys_largefile_CC=no + if test "$GCC" != yes; then + ac_save_CC=$CC + while :; do + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat >"conftest.$ac_ext" <<_ACEOF +#line 9437 "configure" +#include "confdefs.h" +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; int main (void) { - bindtextdomain ("", ""); - return (gettext ("") != 0) - -#ifndef IGNORE_MSGFMT_HACK - + _nl_msg_cat_cntr -#endif - ; return 0; } _ACEOF -rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10389: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 + rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:9457: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10392: \$? = $ac_status" >&5 + echo "$as_me:9460: \$? = $ac_status" >&5 (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10395: \"$ac_try\"") >&5 + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:9463: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10398: \$? = $ac_status" >&5 + echo "$as_me:9466: \$? = $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 - + break else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 +fi +rm -f "conftest.$ac_objext" + CC="$CC -n32" + rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:9476: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:9479: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:9482: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9485: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_largefile_CC=' -n32'; break +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +fi +rm -f "conftest.$ac_objext" + break + done + CC=$ac_save_CC + rm -f "conftest.$ac_ext" + fi +fi +echo "$as_me:9499: result: $ac_cv_sys_largefile_CC" >&5 +echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 + if test "$ac_cv_sys_largefile_CC" != no; then + CC=$CC$ac_cv_sys_largefile_CC + fi -LIBS="-lintl $cf_save_LIBS" - -cat >"conftest.$ac_ext" <<_ACEOF -#line 10412 "configure" + echo "$as_me:9505: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 +if test "${ac_cv_sys_file_offset_bits+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + while :; do + ac_cv_sys_file_offset_bits=no + cat >"conftest.$ac_ext" <<_ACEOF +#line 9513 "configure" #include "confdefs.h" - -#include -extern int _nl_msg_cat_cntr; - +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; int main (void) { - bindtextdomain ("", ""); - return (gettext ("") != 0) - -#ifndef IGNORE_MSGFMT_HACK - + _nl_msg_cat_cntr -#endif - ; return 0; } _ACEOF -rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10434: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:9533: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10437: \$? = $ac_status" >&5 + echo "$as_me:9536: \$? = $ac_status" >&5 (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10440: \"$ac_try\"") >&5 + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:9539: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10443: \$? = $ac_status" >&5 + echo "$as_me:9542: \$? = $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" - + break else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 - - 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}:10460: testing find linkage for intl library ..." 1>&5 - -echo "${as_me:-configure}:10462: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5 - - cf_save_CPPFLAGS="$CPPFLAGS" - cf_test_CPPFLAGS="$CPPFLAGS" - -cf_search= - -# collect the current set of include-directories from compiler flags -cf_header_path_list="" -if test -n "${CFLAGS}${CPPFLAGS}" ; then - for cf_header_path in $CPPFLAGS $CFLAGS - do - case "$cf_header_path" in - (-I*) - cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` - -test "x$cf_header_path" != "xNONE" && \ -test -d "$cf_header_path" && \ - { - test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" - test -d "$cf_header_path/include" && cf_search="$cf_search $cf_header_path/include" - test -d "$cf_header_path/include/intl" && cf_search="$cf_search $cf_header_path/include/intl" - test -d "$cf_header_path/include/intl/include" && cf_search="$cf_search $cf_header_path/include/intl/include" - test -d "$cf_header_path/intl/include" && cf_search="$cf_search $cf_header_path/intl/include" - test -d "$cf_header_path/intl/include/intl" && cf_search="$cf_search $cf_header_path/intl/include/intl" -} - - cf_header_path_list="$cf_header_path_list $cf_search" - ;; - esac - done fi - -# add the variations for the package we are looking for - -cf_search= - -test "x$prefix" != "xNONE" && \ -test -d "$prefix" && \ - { - test -n "$verbose" && echo " ... testing for include-directories under $prefix" - test -d "$prefix/include" && cf_search="$cf_search $prefix/include" - test -d "$prefix/include/intl" && cf_search="$cf_search $prefix/include/intl" - test -d "$prefix/include/intl/include" && cf_search="$cf_search $prefix/include/intl/include" - test -d "$prefix/intl/include" && cf_search="$cf_search $prefix/intl/include" - test -d "$prefix/intl/include/intl" && cf_search="$cf_search $prefix/intl/include/intl" -} - -for cf_subdir_prefix in \ - /usr \ - /usr/local \ - /usr/pkg \ - /opt \ - /opt/local \ - $HOME -do - -test "x$cf_subdir_prefix" != "x$prefix" && \ -test -d "$cf_subdir_prefix" && \ -{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && { - test -n "$verbose" && echo " ... testing for include-directories under $cf_subdir_prefix" - test -d "$cf_subdir_prefix/include" && cf_search="$cf_search $cf_subdir_prefix/include" - test -d "$cf_subdir_prefix/include/intl" && cf_search="$cf_search $cf_subdir_prefix/include/intl" - test -d "$cf_subdir_prefix/include/intl/include" && cf_search="$cf_search $cf_subdir_prefix/include/intl/include" - test -d "$cf_subdir_prefix/intl/include" && cf_search="$cf_search $cf_subdir_prefix/intl/include" - test -d "$cf_subdir_prefix/intl/include/intl" && cf_search="$cf_search $cf_subdir_prefix/intl/include/intl" -} - -done - -test "$includedir" != NONE && \ -test "$includedir" != "/usr/include" && \ -test -d "$includedir" && { - test -d "$includedir" && cf_search="$cf_search $includedir" - test -d "$includedir/intl" && cf_search="$cf_search $includedir/intl" -} - -test "$oldincludedir" != NONE && \ -test "$oldincludedir" != "/usr/include" && \ -test -d "$oldincludedir" && { - test -d "$oldincludedir" && cf_search="$cf_search $oldincludedir" - test -d "$oldincludedir/intl" && cf_search="$cf_search $oldincludedir/intl" -} - -cf_search="$cf_search $cf_header_path_list" - - for cf_cv_header_path_intl in $cf_search - do - if test -d "$cf_cv_header_path_intl" ; then - test -n "$verbose" && echo " ... testing $cf_cv_header_path_intl" 1>&6 - -echo "${as_me:-configure}:10553: testing ... testing $cf_cv_header_path_intl ..." 1>&5 - - CPPFLAGS="$cf_save_CPPFLAGS" - - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_intl" - - cat >"conftest.$ac_ext" <<_ACEOF -#line 10561 "configure" +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +#line 9551 "configure" #include "confdefs.h" - -#include -extern int _nl_msg_cat_cntr; - +#define _FILE_OFFSET_BITS 64 +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; int main (void) { - bindtextdomain ("", ""); - return (gettext ("") != 0) + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:9572: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:9575: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:9578: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9581: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_file_offset_bits=64; break +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + break +done +fi +echo "$as_me:9592: result: $ac_cv_sys_file_offset_bits" >&5 +echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 +if test "$ac_cv_sys_file_offset_bits" != no; then -#ifndef IGNORE_MSGFMT_HACK - + _nl_msg_cat_cntr -#endif +cat >>confdefs.h <&5 +echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 +if test "${ac_cv_sys_large_files+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + while :; do + ac_cv_sys_large_files=no + cat >"conftest.$ac_ext" <<_ACEOF +#line 9610 "configure" +#include "confdefs.h" +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main (void) +{ ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10583: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9630: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10586: \$? = $ac_status" >&5 + echo "$as_me:9633: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10589: \"$ac_try\"") >&5 + { (eval echo "$as_me:9636: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10592: \$? = $ac_status" >&5 + echo "$as_me:9639: \$? = $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}:10597: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5 - - cf_cv_find_linkage_intl=maybe - cf_test_CPPFLAGS="$CPPFLAGS" - break + break else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 - - CPPFLAGS="$cf_save_CPPFLAGS" - fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - fi - done - - if test "$cf_cv_find_linkage_intl" = maybe ; then - -echo "${as_me:-configure}:10615: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5 - - cf_save_LIBS="$LIBS" - cf_save_LDFLAGS="$LDFLAGS" - - if test "$cf_cv_find_linkage_intl" != yes ; then - -cf_search= -cf_library_path_list="" -if test -n "${LDFLAGS}${LIBS}" ; then - for cf_library_path in $LDFLAGS $LIBS - do - case "$cf_library_path" in - (-L*) - cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` - -test "x$cf_library_path" != "xNONE" && \ -test -d "$cf_library_path" && \ - { - test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" - test -d "$cf_library_path/lib" && cf_search="$cf_search $cf_library_path/lib" - test -d "$cf_library_path/lib/intl" && cf_search="$cf_search $cf_library_path/lib/intl" - test -d "$cf_library_path/lib/intl/lib" && cf_search="$cf_search $cf_library_path/lib/intl/lib" - test -d "$cf_library_path/intl/lib" && cf_search="$cf_search $cf_library_path/intl/lib" - test -d "$cf_library_path/intl/lib/intl" && cf_search="$cf_search $cf_library_path/intl/lib/intl" -} - - cf_library_path_list="$cf_library_path_list $cf_search" - ;; - esac - done -fi - -cf_search= - -test "x$prefix" != "xNONE" && \ -test -d "$prefix" && \ - { - test -n "$verbose" && echo " ... testing for lib-directories under $prefix" - test -d "$prefix/lib" && cf_search="$cf_search $prefix/lib" - test -d "$prefix/lib/intl" && cf_search="$cf_search $prefix/lib/intl" - test -d "$prefix/lib/intl/lib" && cf_search="$cf_search $prefix/lib/intl/lib" - test -d "$prefix/intl/lib" && cf_search="$cf_search $prefix/intl/lib" - test -d "$prefix/intl/lib/intl" && cf_search="$cf_search $prefix/intl/lib/intl" -} - -for cf_subdir_prefix in \ - /usr \ - /usr/local \ - /usr/pkg \ - /opt \ - /opt/local \ - $HOME -do - -test "x$cf_subdir_prefix" != "x$prefix" && \ -test -d "$cf_subdir_prefix" && \ -{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && { - test -n "$verbose" && echo " ... testing for lib-directories under $cf_subdir_prefix" - test -d "$cf_subdir_prefix/lib" && cf_search="$cf_search $cf_subdir_prefix/lib" - test -d "$cf_subdir_prefix/lib/intl" && cf_search="$cf_search $cf_subdir_prefix/lib/intl" - test -d "$cf_subdir_prefix/lib/intl/lib" && cf_search="$cf_search $cf_subdir_prefix/lib/intl/lib" - test -d "$cf_subdir_prefix/intl/lib" && cf_search="$cf_search $cf_subdir_prefix/intl/lib" - test -d "$cf_subdir_prefix/intl/lib/intl" && cf_search="$cf_search $cf_subdir_prefix/intl/lib/intl" -} - -done - -cf_search="$cf_library_path_list $cf_search" - - for cf_cv_library_path_intl in $cf_search - do - if test -d "$cf_cv_library_path_intl" ; then - test -n "$verbose" && echo " ... testing $cf_cv_library_path_intl" 1>&6 - -echo "${as_me:-configure}:10690: 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 10696 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 9648 "configure" #include "confdefs.h" - -#include -extern int _nl_msg_cat_cntr; - +#define _LARGE_FILES 1 +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; int main (void) { - bindtextdomain ("", ""); - return (gettext ("") != 0) - -#ifndef IGNORE_MSGFMT_HACK - + _nl_msg_cat_cntr -#endif - ; return 0; } _ACEOF -rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10718: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:9669: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10721: \$? = $ac_status" >&5 + echo "$as_me:9672: \$? = $ac_status" >&5 (exit "$ac_status"); } && - { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10724: \"$ac_try\"") >&5 + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:9675: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10727: \$? = $ac_status" >&5 + echo "$as_me:9678: \$? = $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}:10732: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5 - - cf_cv_find_linkage_intl=yes - cf_cv_library_file_intl="-lintl" - break + ac_cv_sys_large_files=1; break else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 - - CPPFLAGS="$cf_save_CPPFLAGS" - LIBS="$cf_save_LIBS" - LDFLAGS="$cf_save_LDFLAGS" - fi -rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - fi - done - CPPFLAGS="$cf_save_CPPFLAGS" - LDFLAGS="$cf_save_LDFLAGS" - fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + break +done +fi +echo "$as_me:9689: result: $ac_cv_sys_large_files" >&5 +echo "${ECHO_T}$ac_cv_sys_large_files" >&6 +if test "$ac_cv_sys_large_files" != no; then - else - cf_cv_find_linkage_intl=no - fi +cat >>confdefs.h <&5 +echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6 +if test "${ac_cv_sys_largefile_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + while :; do + ac_cv_sys_largefile_source=no + cat >"conftest.$ac_ext" <<_ACEOF +#line 9710 "configure" +#include "confdefs.h" +#include + #include +int +main (void) +{ -if test "$cf_cv_find_linkage_intl" = yes ; then -cf_cv_func_gettext=yes + int (*my_fseeko)(FILE *, off_t, int) = fseeko; + return my_fseeko(stdin, 0, 0); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:9725: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:9728: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:9731: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9734: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break else -cf_cv_func_gettext=no + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 fi - - echo "$as_me:10771: checking for libintl.h and gettext()" >&5 -echo $ECHO_N "checking for libintl.h and gettext()... $ECHO_C" >&6 - echo "$as_me:10773: result: $cf_cv_func_gettext" >&5 -echo "${ECHO_T}$cf_cv_func_gettext" >&6 - - LIBS="$cf_save_LIBS_1" - CPPFLAGS="$cf_save_OPTS_1" - - if test "$cf_cv_func_gettext" = yes ; then - -cat >>confdefs.h <<\EOF -#define HAVE_LIBINTL_H 1 -EOF - - if test "$PACKAGE" != gettext; then - -cat >>confdefs.h <<\EOF -#define HAVE_GETTEXT 1 -EOF - -if test -n "$cf_cv_header_path_intl" ; then - for cf_add_incdir in $cf_cv_header_path_intl - do - while test "$cf_add_incdir" != /usr/include - do - if test -d "$cf_add_incdir" - then - cf_have_incdir=no - if test -n "$CFLAGS$CPPFLAGS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_incdir in $CFLAGS $CPPFLAGS ; do - if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then - cf_have_incdir=yes; break - fi - done - fi - - if test "$cf_have_incdir" = no ; then - if test "$cf_add_incdir" = /usr/local/include ; then - if test "$GCC" = yes - then - cf_save_CPPFLAGS=$CPPFLAGS - - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" - - cat >"conftest.$ac_ext" <<_ACEOF -#line 10818 "configure" +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +#line 9743 "configure" #include "confdefs.h" +#define _LARGEFILE_SOURCE 1 #include + #include int main (void) { -printf("Hello") + + int (*my_fseeko)(FILE *, off_t, int) = fseeko; + return my_fseeko(stdin, 0, 0); ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10830: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9759: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10833: \$? = $ac_status" >&5 + echo "$as_me:9762: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10836: \"$ac_try\"") >&5 + { (eval echo "$as_me:9765: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10839: \$? = $ac_status" >&5 + echo "$as_me:9768: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - : + ac_cv_sys_largefile_source=1; break else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -cf_have_incdir=yes fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - CPPFLAGS=$cf_save_CPPFLAGS - fi - fi - fi - - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - -echo "${as_me:-configure}:10856: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - - cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'` - test "$cf_top_incdir" = "$cf_add_incdir" && break - cf_add_incdir="$cf_top_incdir" - else - break - fi - else - break - fi - done - done + break +done fi +echo "$as_me:9779: result: $ac_cv_sys_largefile_source" >&5 +echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 +if test "$ac_cv_sys_largefile_source" != no; then - if test -n "$cf_cv_library_file_intl" ; then - INTLLIBS="$cf_cv_library_file_intl $LIBICONV" - -if test -n "$cf_cv_library_path_intl" ; then - for cf_add_libdir in $cf_cv_library_path_intl - do - if test "$cf_add_libdir" = /usr/lib ; then - : - elif test -d "$cf_add_libdir" - then - cf_have_libdir=no - if test -n "$LDFLAGS$LIBS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_libdir in $LDFLAGS $LIBS ; do - if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then - cf_have_libdir=yes; break - fi - done - fi - if test "$cf_have_libdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 - -echo "${as_me:-configure}:10895: testing adding $cf_add_libdir to library-path ..." 1>&5 +cat >>confdefs.h <&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug +# in glibc 2.1.3, but that breaks too many other things. +# If you want fseeko and ftello with glibc, upgrade to a fixed glibc. +echo "$as_me:9793: checking for fseeko" >&5 +echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 +if test "${ac_cv_func_fseeko+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 10917 "configure" +#line 9799 "configure" #include "confdefs.h" -#define $ac_func autoconf_temporary -#include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef $ac_func - -#ifdef __cplusplus -extern "C" -#endif - -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (void); - +#include + #include int main (void) { - -/* The GNU C library defines stubs for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -#error found stub for $ac_func -#endif - - return $ac_func (); +int (*my_fseeko)(FILE *, off_t, int) = fseeko; + return my_fseeko && my_fseeko (stdin, 0, 0); ; return 0; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10948: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9813: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10951: \$? = $ac_status" >&5 + echo "$as_me:9816: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10954: \"$ac_try\"") >&5 + { (eval echo "$as_me:9819: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10957: \$? = $ac_status" >&5 + echo "$as_me:9822: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - eval "$as_ac_var=yes" + ac_cv_func_fseeko=yes else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -eval "$as_ac_var=no" +ac_cv_func_fseeko=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:10967: result: `eval echo '${'"$as_ac_var"'}'`" >&5 -echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 -if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then - cat >>confdefs.h <&5 -echo "$as_me: WARNING: disabling NLS feature" >&2;} - sed -e /ENABLE_NLS/d confdefs.h >confdefs.tmp - mv confdefs.tmp confdefs.h - ALL_LINGUAS= - CATOBJEXT=.ignored - MSGFMT=":" - GMSGFMT=":" - XGETTEXT=":" - POSUB= - BUILD_INCLUDED_LIBINTL=no - USE_INCLUDED_LIBINTL=no - USE_NLS=no - nls_cv_use_gnu_gettext=no - fi - - if test "$CATOBJEXT" = "NONE"; then - nls_cv_use_gnu_gettext=maybe - fi - fi - - if test "$nls_cv_use_gnu_gettext" != "no"; then - CATOBJEXT=.gmo - if test -f "$srcdir/intl/libintl.h" || test -f "$srcdir/intl/libgnuintl.h" ; then +echo "$as_me:9832: result: $ac_cv_func_fseeko" >&5 +echo "${ECHO_T}$ac_cv_func_fseeko" >&6 +if test $ac_cv_func_fseeko = yes; then cat >>confdefs.h <<\EOF -#define HAVE_LIBINTL_H 1 +#define HAVE_FSEEKO 1 EOF - INTLOBJS="\$(GETTOBJS)" - BUILD_INCLUDED_LIBINTL=yes - USE_INCLUDED_LIBINTL=yes - INTLLIBS="\$(top_builddir)/intl/libintl.a $LIBICONV" - LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` - elif test "$nls_cv_use_gnu_gettext" = "yes"; then - nls_cv_use_gnu_gettext=no - { echo "$as_me:11018: WARNING: no NLS library is packaged with this application" >&5 -echo "$as_me: WARNING: no NLS library is packaged with this application" >&2;} - fi - fi - - if test "$GMSGFMT" != ":"; then - if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then - : ; - else - { echo "$as_me:11027: WARNING: found msgfmt program is not GNU msgfmt" >&5 -echo "$as_me: WARNING: found msgfmt program is not GNU msgfmt" >&2;} - fi - fi - - if test "$XGETTEXT" != ":"; then - if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then - : ; - else - { echo "$as_me:11036: WARNING: found xgettext program is not GNU xgettext" >&5 -echo "$as_me: WARNING: found xgettext program is not GNU xgettext" >&2;} - fi - fi - fi - - if test "$XGETTEXT" != ":"; then - ac_config_commands="$ac_config_commands default-1" - - if test "$PACKAGE" = gettext; then - BUILD_INCLUDED_LIBINTL=yes - fi - - if test "$nls_cv_use_gnu_gettext" = "yes"; then - for ac_prog in byacc bison -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:11054: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_INTL_YACC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$INTL_YACC"; then - ac_cv_prog_INTL_YACC="$INTL_YACC" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_INTL_YACC="$ac_prog" -echo "$as_me:11069: found $ac_dir/$ac_word" >&5 -break -done - fi -fi -INTL_YACC=$ac_cv_prog_INTL_YACC -if test -n "$INTL_YACC"; then - echo "$as_me:11077: result: $INTL_YACC" >&5 -echo "${ECHO_T}$INTL_YACC" >&6 -else - echo "$as_me:11080: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$INTL_YACC" && break -done - - if test -z "$INTL_YACC"; then - ac_verc_fail=yes - else - echo "$as_me:11090: checking version of $INTL_YACC" >&5 -echo $ECHO_N "checking version of $INTL_YACC... $ECHO_C" >&6 - ac_prog_version=`$INTL_YACC -V 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p;s/^\(byacc\) - \([0-9][0-9.]*\) \([0-9]*\).*$/\1-\2.\3/p'` - case "$ac_prog_version" in - (byacc-[0-9].[0-9].20[1-9]*) - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - ('') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; - (1.2[6-9]*|1.[3-9][0-9]*|2.[0-3]*) - 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:11101: result: $ac_prog_version" >&5 -echo "${ECHO_T}$ac_prog_version" >&6 - fi - if test "$ac_verc_fail" = yes; then - INTL_YACC=: - fi - fi - - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done - fi - - nls_cv_header_intl= - nls_cv_header_libgt= - DATADIRNAME=share + # Normally we would collect these definitions in the config.h, + # but (like _XOPEN_SOURCE), some environments rely on having these + # defined before any of the system headers are included. Another + # case comes up with C++, e.g., on AIX the compiler compiles the + # header files by themselves before looking at the body files it is + # told to compile. For ncurses, those header files do not include + # the config.h + if test "$ac_cv_sys_large_files" != no + then - INSTOBJEXT=.mo + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-D_LARGE_FILES" - GENCAT=gencat + fi + if test "$ac_cv_sys_largefile_source" != no + then - if test "x$CATOBJEXT" != "x"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - echo "$as_me:11128: checking for catalogs to be installed" >&5 -echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6 - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - ("$presentlang"*) useit=yes;; - esac - done - if test "$useit" = yes; then - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi - done - LINGUAS=$NEW_LINGUAS - echo "$as_me:11148: result: $LINGUAS" >&5 -echo "${ECHO_T}$LINGUAS" >&6 - fi + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-D_LARGEFILE_SOURCE" - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi + fi + if test "$ac_cv_sys_file_offset_bits" != no + then - INTL_LIBTOOL_SUFFIX_PREFIX= + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits" -if test "$USE_NLS" = yes ; then + fi -# Check whether --with-textdomain or --without-textdomain was given. -if test "${with_textdomain+set}" = set; then - withval="$with_textdomain" - NLS_TEXTDOMAIN=$withval + echo "$as_me:9871: checking whether to use struct dirent64" >&5 +echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6 +if test "${cf_cv_struct_dirent64+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - NLS_TEXTDOMAIN=$PACKAGE -fi; -cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF +#line 9878 "configure" +#include "confdefs.h" -fi +#pragma GCC diagnostic error "-Wincompatible-pointer-types" +#include +#include -INTLDIR_MAKE= -MSG_DIR_MAKE= -SUB_MAKEFILE= +#ifndef __REDIRECT +/* if transitional largefile support is setup, this is true */ +extern struct dirent64 * readdir(DIR *); +#endif -cf_makefile=makefile +int +main (void) +{ -use_our_messages=no -if test "$USE_NLS" = yes ; then -if test -d "$srcdir/po" ; then -echo "$as_me:11184: checking if we should use included message-library" >&5 -echo $ECHO_N "checking if we should use included message-library... $ECHO_C" >&6 + DIR *dp = opendir("."); + struct dirent64 *x = readdir(dp); + struct dirent *y = readdir(dp); + int z = x - y; + (void)z; -# Check whether --enable-included-msgs or --disable-included-msgs was given. -if test "${enable_included_msgs+set}" = set; then - enableval="$enable_included_msgs" - use_our_messages=$enableval + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:9905: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:9908: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:9911: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9914: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_struct_dirent64=yes else - use_our_messages=yes -fi; -fi -echo "$as_me:11195: result: $use_our_messages" >&5 -echo "${ECHO_T}$use_our_messages" >&6 + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_cv_struct_dirent64=no fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" -MSG_DIR_MAKE="#" -if test "$use_our_messages" = yes -then - SUB_MAKEFILE="$SUB_MAKEFILE po/$cf_makefile.in:$srcdir/po/$cf_makefile.inn" - MSG_DIR_MAKE= fi - -if test "$USE_INCLUDED_LIBINTL" = yes ; then - if test "$nls_cv_force_use_gnu_gettext" = yes ; then - : - elif test "$nls_cv_use_gnu_gettext" != no ; then - : - else - INTLDIR_MAKE="#" - fi - if test -z "$INTLDIR_MAKE"; then - +echo "$as_me:9925: result: $cf_cv_struct_dirent64" >&5 +echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 + test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF -#define HAVE_LIBGETTEXT_H 1 +#define HAVE_STRUCT_DIRENT64 1 EOF - for cf_makefile in \ - $srcdir/intl/Makefile.in \ - $srcdir/intl/makefile.in - do - if test -f "$cf_makefile" ; then - SUB_MAKEFILE="$SUB_MAKEFILE `echo \"${cf_makefile}\"|sed -e 's,^'$srcdir/',,' -e 's/\.in$//'`:${cf_makefile}" - break - fi - done fi -else - INTLDIR_MAKE="#" - if test "$USE_NLS" = yes ; then -for ac_header in libintl.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:11237: 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 "$as_me:9934: 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 11243 "configure" +#line 9940 "configure" #include "confdefs.h" -#include <$ac_header> +#include +#include +#include +#include + _ACEOF -if { (eval echo "$as_me:11247: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:9948: \"$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:11253: \$? = $ac_status" >&5 + echo "$as_me:9954: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -11261,211 +9962,174 @@ else ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 - eval "$as_ac_Header=no" + ac_cv_header_stdc=no fi rm -f conftest.err "conftest.$ac_ext" -fi -echo "$as_me:11272: 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 9976 "configure" +#include "confdefs.h" +#include -if test "$BUILD_INCLUDED_LIBINTL" = yes ; then - GT_YES="#" - GT_NO= +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then + : else - GT_YES= - GT_NO="#" + ac_cv_header_stdc=no fi +rm -rf conftest* -if test "$USE_INCLUDED_LIBINTL" = yes ; then - if test "$nls_cv_force_use_gnu_gettext" = yes ; then - -cat >>confdefs.h <<\EOF -#define HAVE_GETTEXT 1 -EOF - - elif test "$nls_cv_use_gnu_gettext" = yes ; then - -cat >>confdefs.h <<\EOF -#define HAVE_GETTEXT 1 -EOF - - fi - if test -n "$nls_cv_header_intl" ; then +fi -cat >>confdefs.h <<\EOF -#define HAVE_LIBINTL_H 1 -EOF +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >"conftest.$ac_ext" <<_ACEOF +#line 9994 "configure" +#include "confdefs.h" +#include - fi +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no fi +rm -rf conftest* -INTLDIR_CPPFLAGS="#" -if test -z "$INTLDIR_MAKE" ; then - INTLDIR_CPPFLAGS= fi -# Check whether --with-nls-datadir or --without-nls-datadir was given. -if test "${with_nls_datadir+set}" = set; then - withval="$with_nls_datadir" - +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then + : else - withval="${NLS_DATADIR:-$prefix/$DATADIRNAME}" -fi; if test -n "$prefix/$DATADIRNAME" ; then + cat >"conftest.$ac_ext" <<_ACEOF +#line 10015 "configure" +#include "confdefs.h" +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif -if test "x$prefix" != xNONE; then - cf_path_syntax="$prefix" +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main (void) +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + $ac_main_return(2); + $ac_main_return (0); +} +_ACEOF +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:10041: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:10044: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:10046: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10049: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : else - cf_path_syntax="$ac_default_prefix" + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_header_stdc=no fi - -case ".$withval" in -(.\$\(*\)*|.\'*\'*) - ;; -(..|./*|.\\*) - ;; -(.[a-zA-Z]:[\\/]*) # OS/2 EMX - ;; -(.\$\{*prefix\}*|.\$\{*dir\}*) - eval withval="$withval" - case ".$withval" in - (.NONE/*) - withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` - ;; - esac - ;; -(.no|.NONE/*) - withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` - ;; -(*) - { { echo "$as_me:11361: error: expected a pathname, not \"$withval\"" >&5 -echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} - { (exit 1); exit 1; }; } - ;; -esac - +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi -eval NLS_DATADIR="$withval" - -echo "$as_me:11370: checking if you want full utility pathnames" >&5 -echo $ECHO_N "checking if you want full utility pathnames... $ECHO_C" >&6 - -# Check whether --enable-full-paths or --disable-full-paths was given. -if test "${enable_full_paths+set}" = set; then - enableval="$enable_full_paths" - test "$enableval" != no && enableval=yes - if test "$enableval" != "yes" ; then - with_full_paths=no - else - with_full_paths=yes - fi -else - enableval=yes - with_full_paths=yes +fi +fi +echo "$as_me:10062: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6 +if test $ac_cv_header_stdc = yes; then -fi; -echo "$as_me:11387: 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 +#define STDC_HEADERS 1 EOF -echo "$as_me:11394: 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 -else - - cf_cv_SYSTEM_MAIL=unknown - for cv_path in /usr/mmdf/bin/submit \ - /usr/sbin/sendmail \ - /usr/lib/sendmail \ - - do - if test -f "$cv_path" ; then - cf_cv_SYSTEM_MAIL="$cv_path" - break - fi - done - fi -echo "$as_me:11414: result: $cf_cv_SYSTEM_MAIL" >&5 -echo "${ECHO_T}$cf_cv_SYSTEM_MAIL" >&6 - -cat >>confdefs.h <&5 -echo $ECHO_N "checking system mail flags... $ECHO_C" >&6 -if test "${cf_cv_system_mail_flags+set}" = set; then +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:10078: 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 - - case "$cf_cv_SYSTEM_MAIL" in - (*/mmdf/*) - cf_cv_system_mail_flags="-mlruxto,cc\\\\*" - ;; - (*) - cf_cv_system_mail_flags="-t -oi" - esac - + cat >"conftest.$ac_ext" <<_ACEOF +#line 10084 "configure" +#include "confdefs.h" +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:10090: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:10093: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:10096: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10099: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +eval "$as_ac_Header=no" fi - -echo "$as_me:11437: result: $cf_cv_system_mail_flags" >&5 -echo "${ECHO_T}$cf_cv_system_mail_flags" >&6 - -cat >>confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 -echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6 -if test "${cf_cv_posix_visible+set}" = set; then +echo "$as_me:10119: checking whether exit is declared" >&5 +echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6 +if test "${ac_cv_have_decl_exit+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - -cat >"conftest.$ac_ext" <<_ACEOF -#line 11457 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 10125 "configure" #include "confdefs.h" -#include +$ac_includes_default int main (void) { - -#if defined(__POSIX_VISIBLE) && ((__POSIX_VISIBLE - 0L) > 0) \ - && defined(__XSI_VISIBLE) && ((__XSI_VISIBLE - 0L) > 0) \ - && defined(__BSD_VISIBLE) && ((__BSD_VISIBLE - 0L) > 0) \ - && defined(__ISO_C_VISIBLE) && ((__ISO_C_VISIBLE - 0L) > 0) -#error conflicting symbols found +#ifndef exit + (void) exit; #endif ; @@ -11473,1021 +10137,1225 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11476: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10140: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11479: \$? = $ac_status" >&5 + echo "$as_me:10143: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11482: \"$ac_try\"") >&5 + { (eval echo "$as_me:10146: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11485: \$? = $ac_status" >&5 + echo "$as_me:10149: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - cf_cv_posix_visible=no + ac_cv_have_decl_exit=yes else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -cf_cv_posix_visible=yes +ac_cv_have_decl_exit=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - fi -echo "$as_me:11496: result: $cf_cv_posix_visible" >&5 -echo "${ECHO_T}$cf_cv_posix_visible" >&6 +echo "$as_me:10159: result: $ac_cv_have_decl_exit" >&5 +echo "${ECHO_T}$ac_cv_have_decl_exit" >&6 -if test "$cf_cv_posix_visible" = no; then +if test -z "$ALL_LINGUAS" ; then + ALL_LINGUAS=`test -d "$srcdir/po" && cd "$srcdir/po" && echo *.po|sed -e 's/\.po//g' -e 's/*//'` -cf_XOPEN_SOURCE=500 -cf_POSIX_C_SOURCE=199506L -cf_xopen_source= + echo "$as_me:10165: checking for PATH separator" >&5 +echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6 + case "$cf_cv_system_name" in + (os2*) PATH_SEPARATOR=';' ;; + (*) ${PATH_SEPARATOR:=':'} ;; + esac -case "$host_os" in -(aix[4-7]*) - cf_xopen_source="-D_ALL_SOURCE" - ;; -(darwin[0-8].*) - cf_xopen_source="-D_APPLE_C_SOURCE" - ;; -(darwin*) - cf_xopen_source="-D_DARWIN_C_SOURCE" - cf_XOPEN_SOURCE= - ;; -(freebsd*|dragonfly*|midnightbsd*) - # 5.x headers associate - # _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L - # _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L - cf_POSIX_C_SOURCE=200112L - cf_XOPEN_SOURCE=600 - cf_xopen_source="-D_BSD_TYPES -D__BSD_VISIBLE -D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" - ;; -(hpux11*) - cf_xopen_source="-D_HPUX_SOURCE -D_XOPEN_SOURCE=500" - ;; -(hpux*) - cf_xopen_source="-D_HPUX_SOURCE" - ;; -(irix[56].*) - cf_xopen_source="-D_SGI_SOURCE" - cf_XOPEN_SOURCE= - ;; -(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) + echo "$as_me:10172: result: $PATH_SEPARATOR" >&5 +echo "${ECHO_T}$PATH_SEPARATOR" >&6 -cf_gnu_xopen_source=$cf_XOPEN_SOURCE +# Extract the first word of "msginit", so it can be a program name with args. -echo "$as_me:11538: checking if this is the GNU C library" >&5 -echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6 -if test "${cf_cv_gnu_library+set}" = set; then +set dummy msginit; ac_word=$2 +echo "$as_me:10178: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_MSGINIT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + case "$MSGINIT" in + ([\\/]*|?:[\\/]*) + ac_cv_path_MSGINIT="$MSGINIT" # Let the user override the test with a path. + ;; + (*) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_word$ac_exeext" ; then + if "$ac_dir/$ac_word" --no-translator --version /dev/null >/dev/null 2>&1; then + ac_cv_path_MSGINIT="$ac_dir/$ac_word$ac_exeext" + break + fi + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_MSGINIT" && ac_cv_path_MSGINIT=":" + ;; +esac +fi +MSGINIT="$ac_cv_path_MSGINIT" +if test "$MSGINIT" != ":"; then + echo "$as_me:10205: result: $MSGINIT" >&5 +echo "${ECHO_T}$MSGINIT" >&6 +else + echo "$as_me:10208: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi -cat >"conftest.$ac_ext" <<_ACEOF -#line 11545 "configure" + if test "$MSGINIT" != ":" ; then + test -n "$verbose" && echo " adding en.po" 1>&6 + +echo "${as_me:-configure}:10215: testing adding en.po ..." 1>&5 + + ALL_LINGUAS="$ALL_LINGUAS en" + fi +fi + +cf_makefile=makefile + +test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d "$srcdir/po" && cd "$srcdir/po" && echo *.po|sed -e 's/\.po//g' -e 's/*//'` + +# Allow override of "config.h" definition: +: ${CONFIG_H:=config.h} + +if test -z "$PACKAGE" ; then + { { echo "$as_me:10229: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&5 +echo "$as_me: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&2;} + { (exit 1); exit 1; }; } +fi + +if test -z "$VERSION" ; then +if test -f "$srcdir/VERSION" ; then + VERSION=`sed -e '2,$d' "$srcdir/VERSION" |cut -f1` +else + VERSION=unknown +fi +fi + +# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given. +if test "${with_libiconv_prefix+set}" = set; then + withval="$with_libiconv_prefix" + +case "$withval" in +(no|yes) + ;; +(*) + +for cf_searchpath in `echo "$withval" | tr $PATH_SEPARATOR ' '`; do + if test -d "$cf_searchpath/include" ; then + +if test -n "$cf_searchpath/include" ; then + for cf_add_incdir in $cf_searchpath/include + do + while test "$cf_add_incdir" != /usr/include + do + if test -d "$cf_add_incdir" + then + cf_have_incdir=no + if test -n "$CFLAGS$CPPFLAGS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then + cf_have_incdir=yes; break + fi + done + fi + + if test "$cf_have_incdir" = no ; then + if test "$cf_add_incdir" = /usr/local/include ; then + if test "$GCC" = yes + then + cf_save_CPPFLAGS=$CPPFLAGS + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +#line 10281 "configure" #include "confdefs.h" -#include +#include int main (void) { - - #if __GLIBC__ > 0 && __GLIBC_MINOR__ >= 0 - return 0; - #elif __NEWLIB__ > 0 && __NEWLIB_MINOR__ >= 0 - return 0; - #else - # error not GNU C library - #endif +printf("Hello") ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11564: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10293: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11567: \$? = $ac_status" >&5 + echo "$as_me:10296: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11570: \"$ac_try\"") >&5 + { (eval echo "$as_me:10299: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11573: \$? = $ac_status" >&5 + echo "$as_me:10302: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - cf_cv_gnu_library=yes + : else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -cf_cv_gnu_library=no +cf_have_incdir=yes fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" + CPPFLAGS=$cf_save_CPPFLAGS + fi + fi + fi + + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +echo "${as_me:-configure}:10319: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'` + test "$cf_top_incdir" = "$cf_add_incdir" && break + cf_add_incdir="$cf_top_incdir" + else + break + fi + else + break + fi + done + done fi -echo "$as_me:11584: result: $cf_cv_gnu_library" >&5 -echo "${ECHO_T}$cf_cv_gnu_library" >&6 -if test x$cf_cv_gnu_library = xyes; then + elif test -d "$cf_searchpath/../include" ; then - # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE - # was changed to help a little. newlib incorporated the change about 4 - # years later. - echo "$as_me:11592: checking if _DEFAULT_SOURCE can be used as a basis" >&5 -echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6 -if test "${cf_cv_gnu_library_219+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else +if test -n "$cf_searchpath/../include" ; then + for cf_add_incdir in $cf_searchpath/../include + do + while test "$cf_add_incdir" != /usr/include + do + if test -d "$cf_add_incdir" + then + cf_have_incdir=no + if test -n "$CFLAGS$CPPFLAGS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then + cf_have_incdir=yes; break + fi + done + fi - cf_save="$CPPFLAGS" + if test "$cf_have_incdir" = no ; then + if test "$cf_add_incdir" = /usr/local/include ; then + if test "$GCC" = yes + then + cf_save_CPPFLAGS=$CPPFLAGS test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" - cat >"conftest.$ac_ext" <<_ACEOF -#line 11604 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 10365 "configure" #include "confdefs.h" -#include +#include int main (void) { - - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 19) || (__GLIBC__ > 2) - return 0; - #elif (__NEWLIB__ == 2 && __NEWLIB_MINOR__ >= 4) || (__GLIBC__ > 3) - return 0; - #else - # error GNU C library __GLIBC__.__GLIBC_MINOR__ is too old - #endif +printf("Hello") ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11623: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10377: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11626: \$? = $ac_status" >&5 + echo "$as_me:10380: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11629: \"$ac_try\"") >&5 + { (eval echo "$as_me:10383: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11632: \$? = $ac_status" >&5 + echo "$as_me:10386: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - cf_cv_gnu_library_219=yes + : else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -cf_cv_gnu_library_219=no +cf_have_incdir=yes fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - CPPFLAGS="$cf_save" - -fi -echo "$as_me:11644: result: $cf_cv_gnu_library_219" >&5 -echo "${ECHO_T}$cf_cv_gnu_library_219" >&6 - - if test "x$cf_cv_gnu_library_219" = xyes; then - cf_save="$CPPFLAGS" - echo "$as_me:11649: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 -echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6 -if test "${cf_cv_gnu_dftsrc_219+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else + CPPFLAGS=$cf_save_CPPFLAGS + fi + fi + fi -cf_fix_cppflags=no -cf_new_cflags= -cf_new_cppflags= -cf_new_extra_cppflags= + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -for cf_add_cflags in -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=$cf_gnu_xopen_source -do -case "$cf_fix_cppflags" in -(no) - case "$cf_add_cflags" in - (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case "$cf_add_cflags" in - (-D*) - cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` +echo "${as_me:-configure}:10403: testing adding $cf_add_incdir to include-path ..." 1>&5 - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - if test "$cf_fix_cppflags" = yes ; then + cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'` + test "$cf_top_incdir" = "$cf_add_incdir" && break + cf_add_incdir="$cf_top_incdir" + else + break + fi + else + break + fi + done + done +fi - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + else +{ { echo "$as_me:10421: error: cannot find libiconv under $withval" >&5 +echo "$as_me: error: cannot find libiconv under $withval" >&2;} + { (exit 1); exit 1; }; } + fi + if test -d "$cf_searchpath/lib" ; then - continue - elif test "${cf_tst_cflags}" = "\"'" ; then +if test -n "$cf_searchpath/lib" ; then + for cf_add_libdir in $cf_searchpath/lib + do + if test "$cf_add_libdir" = /usr/lib ; then + : + elif test -d "$cf_add_libdir" + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" +echo "${as_me:-configure}:10446: testing adding $cf_add_libdir to library-path ..." 1>&5 - continue + LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi - ;; - esac - case "$CPPFLAGS" in - (*$cf_add_cflags) - ;; - (*) - case "$cf_add_cflags" in - (-D*) - cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - -CPPFLAGS=`echo "$CPPFLAGS" | \ - sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + fi + done +fi - ;; - esac + elif test -d "$cf_searchpath" ; then - test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " - cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" +if test -n "$cf_searchpath" ; then + for cf_add_libdir in $cf_searchpath + do + if test "$cf_add_libdir" = /usr/lib ; then + : + elif test -d "$cf_add_libdir" + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 - ;; - esac - ;; - (*) +echo "${as_me:-configure}:10475: testing adding $cf_add_libdir to library-path ..." 1>&5 - test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " - cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done +fi - ;; - esac - ;; -(yes) + else +{ { echo "$as_me:10484: error: cannot find libiconv under $withval" >&5 +echo "$as_me: error: cannot find libiconv under $withval" >&2;} + { (exit 1); exit 1; }; } + fi +done - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + test -n "$verbose" && echo " setting path value for libiconv to $withval" 1>&6 - cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` +echo "${as_me:-configure}:10492: testing setting path value for libiconv to $withval ..." 1>&5 - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=no ;; esac -done - -if test -n "$cf_new_cflags" ; then - - test -n "$CFLAGS" && CFLAGS="$CFLAGS " - CFLAGS="${CFLAGS}$cf_new_cflags" - -fi - -if test -n "$cf_new_cppflags" ; then - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" +fi; -fi + echo "$as_me:10499: checking for iconv" >&5 +echo $ECHO_N "checking for iconv... $ECHO_C" >&6 +if test "${am_cv_func_iconv+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else -if test -n "$cf_new_extra_cppflags" ; then +# If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these +# will be set on completion of the AC_TRY_LINK below. +cf_cv_header_path_iconv= +cf_cv_library_path_iconv= - test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " - EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" +echo "${as_me:-configure}:10510: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5 -fi +cf_save_LIBS="$LIBS" - cat >"conftest.$ac_ext" <<_ACEOF -#line 11754 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 10515 "configure" #include "confdefs.h" - #include - #include +#include +#include int main (void) { - #if (_XOPEN_SOURCE >= $cf_gnu_xopen_source) && (MB_LEN_MAX > 1) - return 0; - #else - # error GNU C library is too old - #endif + iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); + ; return 0; } _ACEOF -rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11774: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:10534: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11777: \$? = $ac_status" >&5 + echo "$as_me:10537: \$? = $ac_status" >&5 (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11780: \"$ac_try\"") >&5 + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:10540: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11783: \$? = $ac_status" >&5 + echo "$as_me:10543: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - cf_cv_gnu_dftsrc_219=yes + + cf_cv_find_linkage_iconv=yes + cf_cv_header_path_iconv=/usr/include + cf_cv_library_path_iconv=/usr/lib + else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -cf_cv_gnu_dftsrc_219=no -fi -rm -f "conftest.$ac_objext" "conftest.$ac_ext" -fi -echo "$as_me:11794: result: $cf_cv_gnu_dftsrc_219" >&5 -echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 - test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save" - else - cf_cv_gnu_dftsrc_219=maybe - fi +LIBS="-liconv $cf_save_LIBS" - if test "x$cf_cv_gnu_dftsrc_219" != xyes; then +cat >"conftest.$ac_ext" <<_ACEOF +#line 10557 "configure" +#include "confdefs.h" - echo "$as_me:11803: 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 +#include +#include - cat >"conftest.$ac_ext" <<_ACEOF -#line 11810 "configure" -#include "confdefs.h" -#include int main (void) { - #ifndef _XOPEN_SOURCE - #error expected _XOPEN_SOURCE to be defined - #endif + iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); + ; return 0; } _ACEOF -rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11825: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:10576: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11828: \$? = $ac_status" >&5 + echo "$as_me:10579: \$? = $ac_status" >&5 (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11831: \"$ac_try\"") >&5 + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:10582: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11834: \$? = $ac_status" >&5 + echo "$as_me:10585: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - cf_cv_gnu_source=no + + 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_save="$CPPFLAGS" - -cf_fix_cppflags=no -cf_new_cflags= -cf_new_cppflags= -cf_new_extra_cppflags= - -for cf_add_cflags in -D_GNU_SOURCE -do -case "$cf_fix_cppflags" in -(no) - case "$cf_add_cflags" in - (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case "$cf_add_cflags" in - (-D*) - cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes - if test "$cf_fix_cppflags" = yes ; then + cf_cv_find_linkage_iconv=no + LIBS="$cf_save_LIBS" - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + test -n "$verbose" && echo " find linkage for iconv library" 1>&6 - continue - elif test "${cf_tst_cflags}" = "\"'" ; then +echo "${as_me:-configure}:10602: testing find linkage for iconv library ..." 1>&5 - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" +echo "${as_me:-configure}:10604: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5 - continue - fi - ;; - esac - case "$CPPFLAGS" in - (*$cf_add_cflags) - ;; - (*) - case "$cf_add_cflags" in - (-D*) - cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" -CPPFLAGS=`echo "$CPPFLAGS" | \ - sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` +cf_search= - ;; - esac +# collect the current set of include-directories from compiler flags +cf_header_path_list="" +if test -n "${CFLAGS}${CPPFLAGS}" ; then + for cf_header_path in $CPPFLAGS $CFLAGS + do + case "$cf_header_path" in + (-I*) + cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` - test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " - cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" +test "x$cf_header_path" != "xNONE" && \ +test -d "$cf_header_path" && \ + { + test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" + test -d "$cf_header_path/include" && cf_search="$cf_search $cf_header_path/include" + test -d "$cf_header_path/include/iconv" && cf_search="$cf_search $cf_header_path/include/iconv" + test -d "$cf_header_path/include/iconv/include" && cf_search="$cf_search $cf_header_path/include/iconv/include" + test -d "$cf_header_path/iconv/include" && cf_search="$cf_search $cf_header_path/iconv/include" + test -d "$cf_header_path/iconv/include/iconv" && cf_search="$cf_search $cf_header_path/iconv/include/iconv" +} + cf_header_path_list="$cf_header_path_list $cf_search" ;; esac - ;; - (*) + done +fi - test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " - cf_new_cflags="${cf_new_cflags}$cf_add_cflags" +# add the variations for the package we are looking for - ;; - esac - ;; -(yes) +cf_search= - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" +test "x$prefix" != "xNONE" && \ +test -d "$prefix" && \ + { + test -n "$verbose" && echo " ... testing for include-directories under $prefix" + test -d "$prefix/include" && cf_search="$cf_search $prefix/include" + test -d "$prefix/include/iconv" && cf_search="$cf_search $prefix/include/iconv" + test -d "$prefix/include/iconv/include" && cf_search="$cf_search $prefix/include/iconv/include" + test -d "$prefix/iconv/include" && cf_search="$cf_search $prefix/iconv/include" + test -d "$prefix/iconv/include/iconv" && cf_search="$cf_search $prefix/iconv/include/iconv" +} - cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` +for cf_subdir_prefix in \ + /usr \ + /usr/local \ + /usr/pkg \ + /opt \ + /opt/local \ + $HOME +do + +test "x$cf_subdir_prefix" != "x$prefix" && \ +test -d "$cf_subdir_prefix" && \ +{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && { + test -n "$verbose" && echo " ... testing for include-directories under $cf_subdir_prefix" + test -d "$cf_subdir_prefix/include" && cf_search="$cf_search $cf_subdir_prefix/include" + test -d "$cf_subdir_prefix/include/iconv" && cf_search="$cf_search $cf_subdir_prefix/include/iconv" + test -d "$cf_subdir_prefix/include/iconv/include" && cf_search="$cf_search $cf_subdir_prefix/include/iconv/include" + test -d "$cf_subdir_prefix/iconv/include" && cf_search="$cf_search $cf_subdir_prefix/iconv/include" + test -d "$cf_subdir_prefix/iconv/include/iconv" && cf_search="$cf_search $cf_subdir_prefix/iconv/include/iconv" +} - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=no - ;; -esac done -if test -n "$cf_new_cflags" ; then +test "$includedir" != NONE && \ +test "$includedir" != "/usr/include" && \ +test -d "$includedir" && { + test -d "$includedir" && cf_search="$cf_search $includedir" + test -d "$includedir/iconv" && cf_search="$cf_search $includedir/iconv" +} - test -n "$CFLAGS" && CFLAGS="$CFLAGS " - CFLAGS="${CFLAGS}$cf_new_cflags" +test "$oldincludedir" != NONE && \ +test "$oldincludedir" != "/usr/include" && \ +test -d "$oldincludedir" && { + test -d "$oldincludedir" && cf_search="$cf_search $oldincludedir" + test -d "$oldincludedir/iconv" && cf_search="$cf_search $oldincludedir/iconv" +} -fi +cf_search="$cf_search $cf_header_path_list" -if test -n "$cf_new_cppflags" ; then + for cf_cv_header_path_iconv in $cf_search + do + if test -d "$cf_cv_header_path_iconv" ; then + test -n "$verbose" && echo " ... testing $cf_cv_header_path_iconv" 1>&6 - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" +echo "${as_me:-configure}:10695: testing ... testing $cf_cv_header_path_iconv ..." 1>&5 -fi + CPPFLAGS="$cf_save_CPPFLAGS" -if test -n "$cf_new_extra_cppflags" ; then + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_iconv" - test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " - EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + cat >"conftest.$ac_ext" <<_ACEOF +#line 10703 "configure" +#include "confdefs.h" -fi +#include +#include - cat >"conftest.$ac_ext" <<_ACEOF -#line 11941 "configure" -#include "confdefs.h" -#include int main (void) { - #ifdef _XOPEN_SOURCE - #error expected _XOPEN_SOURCE to be undefined - #endif + iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); + ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11956: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10722: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11959: \$? = $ac_status" >&5 + echo "$as_me:10725: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11962: \"$ac_try\"") >&5 + { (eval echo "$as_me:10728: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11965: \$? = $ac_status" >&5 + echo "$as_me:10731: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - cf_cv_gnu_source=no + + test -n "$verbose" && echo " ... found iconv headers in $cf_cv_header_path_iconv" 1>&6 + +echo "${as_me:-configure}:10736: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5 + + cf_cv_find_linkage_iconv=maybe + cf_test_CPPFLAGS="$CPPFLAGS" + break else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -cf_cv_gnu_source=yes -fi -rm -f "conftest.$ac_objext" "conftest.$ac_ext" - CPPFLAGS="$cf_save" + + CPPFLAGS="$cf_save_CPPFLAGS" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi + done + + if test "$cf_cv_find_linkage_iconv" = maybe ; then + +echo "${as_me:-configure}:10754: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5 + + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" + + if test "$cf_cv_find_linkage_iconv" != yes ; then + +cf_search= +cf_library_path_list="" +if test -n "${LDFLAGS}${LIBS}" ; then + for cf_library_path in $LDFLAGS $LIBS + do + case "$cf_library_path" in + (-L*) + cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` + +test "x$cf_library_path" != "xNONE" && \ +test -d "$cf_library_path" && \ + { + test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" + test -d "$cf_library_path/lib" && cf_search="$cf_search $cf_library_path/lib" + test -d "$cf_library_path/lib/iconv" && cf_search="$cf_search $cf_library_path/lib/iconv" + test -d "$cf_library_path/lib/iconv/lib" && cf_search="$cf_search $cf_library_path/lib/iconv/lib" + test -d "$cf_library_path/iconv/lib" && cf_search="$cf_search $cf_library_path/iconv/lib" + test -d "$cf_library_path/iconv/lib/iconv" && cf_search="$cf_search $cf_library_path/iconv/lib/iconv" +} + cf_library_path_list="$cf_library_path_list $cf_search" + ;; + esac + done fi -echo "$as_me:11980: result: $cf_cv_gnu_source" >&5 -echo "${ECHO_T}$cf_cv_gnu_source" >&6 - if test "$cf_cv_gnu_source" = yes - then - echo "$as_me:11985: checking if we should also define _DEFAULT_SOURCE" >&5 -echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6 -if test "${cf_cv_default_source+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else +cf_search= + +test "x$prefix" != "xNONE" && \ +test -d "$prefix" && \ + { + test -n "$verbose" && echo " ... testing for lib-directories under $prefix" + test -d "$prefix/lib" && cf_search="$cf_search $prefix/lib" + test -d "$prefix/lib/iconv" && cf_search="$cf_search $prefix/lib/iconv" + test -d "$prefix/lib/iconv/lib" && cf_search="$cf_search $prefix/lib/iconv/lib" + test -d "$prefix/iconv/lib" && cf_search="$cf_search $prefix/iconv/lib" + test -d "$prefix/iconv/lib/iconv" && cf_search="$cf_search $prefix/iconv/lib/iconv" +} + +for cf_subdir_prefix in \ + /usr \ + /usr/local \ + /usr/pkg \ + /opt \ + /opt/local \ + $HOME +do + +test "x$cf_subdir_prefix" != "x$prefix" && \ +test -d "$cf_subdir_prefix" && \ +{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && { + test -n "$verbose" && echo " ... testing for lib-directories under $cf_subdir_prefix" + test -d "$cf_subdir_prefix/lib" && cf_search="$cf_search $cf_subdir_prefix/lib" + test -d "$cf_subdir_prefix/lib/iconv" && cf_search="$cf_search $cf_subdir_prefix/lib/iconv" + test -d "$cf_subdir_prefix/lib/iconv/lib" && cf_search="$cf_search $cf_subdir_prefix/lib/iconv/lib" + test -d "$cf_subdir_prefix/iconv/lib" && cf_search="$cf_search $cf_subdir_prefix/iconv/lib" + test -d "$cf_subdir_prefix/iconv/lib/iconv" && cf_search="$cf_search $cf_subdir_prefix/iconv/lib/iconv" +} + +done + +cf_search="$cf_library_path_list $cf_search" - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE" + for cf_cv_library_path_iconv in $cf_search + do + if test -d "$cf_cv_library_path_iconv" ; then + test -n "$verbose" && echo " ... testing $cf_cv_library_path_iconv" 1>&6 - cat >"conftest.$ac_ext" <<_ACEOF -#line 11995 "configure" +echo "${as_me:-configure}:10829: 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 10835 "configure" #include "confdefs.h" -#include + +#include +#include + int main (void) { - #ifdef _DEFAULT_SOURCE - #error expected _DEFAULT_SOURCE to be undefined - #endif + iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); + ; return 0; } _ACEOF -rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12010: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:10854: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12013: \$? = $ac_status" >&5 + echo "$as_me:10857: \$? = $ac_status" >&5 (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12016: \"$ac_try\"") >&5 + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:10860: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12019: \$? = $ac_status" >&5 + echo "$as_me:10863: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - cf_cv_default_source=no + + test -n "$verbose" && echo " ... found iconv library in $cf_cv_library_path_iconv" 1>&6 + +echo "${as_me:-configure}:10868: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5 + + cf_cv_find_linkage_iconv=yes + cf_cv_library_file_iconv="-liconv" + break else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -cf_cv_default_source=yes -fi -rm -f "conftest.$ac_objext" "conftest.$ac_ext" - -fi -echo "$as_me:12030: result: $cf_cv_default_source" >&5 -echo "${ECHO_T}$cf_cv_default_source" >&6 - if test "$cf_cv_default_source" = yes - then - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" + LDFLAGS="$cf_save_LDFLAGS" - fi +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi + done + CPPFLAGS="$cf_save_CPPFLAGS" + LDFLAGS="$cf_save_LDFLAGS" fi + + else + cf_cv_find_linkage_iconv=no fi fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - ;; -(minix*) - cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this... - ;; -(mirbsd*) - # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks and other headers which use u_int / u_short types - cf_XOPEN_SOURCE= +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" -if test "$cf_cv_posix_visible" = no; then +LIBS="$cf_save_LIBS" -cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE +if test "$cf_cv_find_linkage_iconv" = yes ; then +am_cv_func_iconv=yes +else +am_cv_func_iconv="no, consider installing GNU libiconv" +fi -cf_save_CFLAGS="$CFLAGS" -cf_save_CPPFLAGS="$CPPFLAGS" +fi +echo "$as_me:10908: result: $am_cv_func_iconv" >&5 +echo "${ECHO_T}$am_cv_func_iconv" >&6 -cf_trim_CFLAGS=`echo "$cf_save_CFLAGS" | \ - sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` + if test "$am_cv_func_iconv" = yes; then -cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ - sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` +cat >>confdefs.h <<\EOF +#define HAVE_ICONV 1 +EOF -echo "$as_me:12067: 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 "$as_me:10917: 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 -echo "${as_me:-configure}:12073: testing if the symbol is already defined go no further ..." 1>&5 - - cat >"conftest.$ac_ext" <<_ACEOF -#line 12076 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 10924 "configure" #include "confdefs.h" -#include -int -main (void) -{ -#ifndef _POSIX_C_SOURCE -#error _POSIX_C_SOURCE is not defined +#include +#include + +extern +#ifdef __cplusplus +"C" #endif - ; - return 0; -} -_ACEOF -rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12091: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:12094: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12097: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:12100: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_posix_c_source=no -else - echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -cf_want_posix_source=no - case .$cf_POSIX_C_SOURCE in - (.[12]??*) - cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" - ;; - (.2) - cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" - cf_want_posix_source=yes - ;; - (.*) - cf_want_posix_source=yes - ;; - esac - if test "$cf_want_posix_source" = yes ; then - cat >"conftest.$ac_ext" <<_ACEOF -#line 12121 "configure" -#include "confdefs.h" -#include +#if defined(__STDC__) || defined(__cplusplus) +size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); +#else +size_t iconv(); +#endif + int main (void) { -#ifdef _POSIX_SOURCE -#error _POSIX_SOURCE is defined -#endif ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12136: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10949: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12139: \$? = $ac_status" >&5 + echo "$as_me:10952: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12142: \"$ac_try\"") >&5 + { (eval echo "$as_me:10955: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12145: \$? = $ac_status" >&5 + echo "$as_me:10958: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - : + am_cv_proto_iconv_const=no else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE" +am_cv_proto_iconv_const=yes fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - fi +fi +echo "$as_me:10968: result: $am_cv_proto_iconv_const" >&5 +echo "${ECHO_T}$am_cv_proto_iconv_const" >&6 -echo "${as_me:-configure}:12156: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 + if test "$am_cv_proto_iconv_const" = yes ; then + am_cv_proto_iconv_arg1="const" + else + am_cv_proto_iconv_arg1="" + fi - CFLAGS="$cf_trim_CFLAGS" - CPPFLAGS="$cf_trim_CPPFLAGS" +cat >>confdefs.h <&5 + LIBICONV= + if test "$cf_cv_find_linkage_iconv" = yes; then - cat >"conftest.$ac_ext" <<_ACEOF -#line 12167 "configure" +if test -n "$cf_cv_header_path_iconv" ; then + for cf_add_incdir in $cf_cv_header_path_iconv + do + while test "$cf_add_incdir" != /usr/include + do + if test -d "$cf_add_incdir" + then + cf_have_incdir=no + if test -n "$CFLAGS$CPPFLAGS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then + cf_have_incdir=yes; break + fi + done + fi + + if test "$cf_have_incdir" = no ; then + if test "$cf_add_incdir" = /usr/local/include ; then + if test "$GCC" = yes + then + cf_save_CPPFLAGS=$CPPFLAGS + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +#line 11013 "configure" #include "confdefs.h" -#include +#include int main (void) { - -#ifndef _POSIX_C_SOURCE -#error _POSIX_C_SOURCE is not defined -#endif +printf("Hello") ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12182: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11025: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12185: \$? = $ac_status" >&5 + echo "$as_me:11028: \$? = $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:11031: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12191: \$? = $ac_status" >&5 + echo "$as_me:11034: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -cf_cv_posix_c_source=no -fi -rm -f "conftest.$ac_objext" "conftest.$ac_ext" - CFLAGS="$cf_save_CFLAGS" - CPPFLAGS="$cf_save_CPPFLAGS" - +cf_have_incdir=yes fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - -fi -echo "$as_me:12207: 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 - CFLAGS="$cf_trim_CFLAGS" - CPPFLAGS="$cf_trim_CPPFLAGS" - -cf_fix_cppflags=no -cf_new_cflags= -cf_new_cppflags= -cf_new_extra_cppflags= - -for cf_add_cflags in $cf_cv_posix_c_source -do -case "$cf_fix_cppflags" in -(no) - case "$cf_add_cflags" in - (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case "$cf_add_cflags" in - (-D*) - cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes - - if test "$cf_fix_cppflags" = yes ; then - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - - continue - elif test "${cf_tst_cflags}" = "\"'" ; then - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - - continue + CPPFLAGS=$cf_save_CPPFLAGS fi - ;; - esac - case "$CPPFLAGS" in - (*$cf_add_cflags) - ;; - (*) - case "$cf_add_cflags" in - (-D*) - cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - -CPPFLAGS=`echo "$CPPFLAGS" | \ - sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` - - ;; - esac - - test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " - cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" - - ;; - esac - ;; - (*) - - test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " - cf_new_cflags="${cf_new_cflags}$cf_add_cflags" - - ;; - esac - ;; -(yes) - - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - - cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` - - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=no - ;; -esac -done - -if test -n "$cf_new_cflags" ; then - - test -n "$CFLAGS" && CFLAGS="$CFLAGS " - CFLAGS="${CFLAGS}$cf_new_cflags" + fi + fi -fi + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -if test -n "$cf_new_cppflags" ; then +echo "${as_me:-configure}:11051: testing adding $cf_add_incdir to include-path ..." 1>&5 - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'` + test "$cf_top_incdir" = "$cf_add_incdir" && break + cf_add_incdir="$cf_top_incdir" + else + break + fi + else + break + fi + done + done fi -if test -n "$cf_new_extra_cppflags" ; then + if test -n "$cf_cv_library_file_iconv" ; then + LIBICONV="-liconv" - test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " - EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" +if test -n "$cf_cv_library_path_iconv" ; then + for cf_add_libdir in $cf_cv_library_path_iconv + do + if test "$cf_add_libdir" = /usr/lib ; then + : + elif test -d "$cf_add_libdir" + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -fi +echo "${as_me:-configure}:11090: testing adding $cf_add_libdir to library-path ..." 1>&5 + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done fi -fi # cf_cv_posix_visible - - ;; -(netbsd*) - cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw - ;; -(openbsd[6-9]*) - # OpenBSD 6.x has broken locale support, both compile-time and runtime. - # see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html - # Abusing the conformance level is a workaround. - { echo "$as_me:12324: WARNING: this system does not provide usable locale support" >&5 -echo "$as_me: WARNING: this system does not provide usable locale support" >&2;} - cf_xopen_source="-D_BSD_SOURCE" - cf_XOPEN_SOURCE=700 - ;; -(openbsd[4-5]*) - # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw - cf_xopen_source="-D_BSD_SOURCE" - cf_XOPEN_SOURCE=600 - ;; -(openbsd*) - # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw - ;; -(osf[45]*) - cf_xopen_source="-D_OSF_SOURCE" - ;; -(nto-qnx*) - cf_xopen_source="-D_QNX_SOURCE" - ;; -(sco*) - # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer - ;; -(solaris2.*) - cf_xopen_source="-D__EXTENSIONS__" - cf_cv_xopen_source=broken - ;; -(sysv4.2uw2.*) # Novell/SCO UnixWare 2.x (tested on 2.1.2) - cf_XOPEN_SOURCE= - cf_POSIX_C_SOURCE= - ;; -(*) + fi + fi -echo "$as_me:12356: 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 "$as_me:11101: 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 12363 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 11107 "configure" #include "confdefs.h" $ac_includes_default - +#include int main (void) { - -#ifndef _XOPEN_SOURCE -#error _XOPEN_SOURCE is not defined -#endif - +char* cs = nl_langinfo(CODESET); (void)cs ; return 0; } _ACEOF -rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12381: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:11121: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12384: \$? = $ac_status" >&5 + echo "$as_me:11124: \$? = $ac_status" >&5 (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12387: \"$ac_try\"") >&5 + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:11127: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12390: \$? = $ac_status" >&5 + echo "$as_me:11130: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - cf_cv_xopen_source=no + am_cv_langinfo_codeset=yes else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -cf_save="$CPPFLAGS" +am_cv_langinfo_codeset=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" +fi +echo "$as_me:11141: result: $am_cv_langinfo_codeset" >&5 +echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 + if test "$am_cv_langinfo_codeset" = yes; then - cat >"conftest.$ac_ext" <<_ACEOF -#line 12402 "configure" -#include "confdefs.h" +cat >>confdefs.h <<\EOF +#define HAVE_LANGINFO_CODESET 1 +EOF -$ac_includes_default + fi + if test "$ac_cv_header_locale_h" = yes; then + echo "$as_me:11152: 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 11158 "configure" +#include "confdefs.h" +#include int main (void) { - -#ifndef _XOPEN_SOURCE -#error _XOPEN_SOURCE is not defined -#endif - +return LC_MESSAGES ; return 0; } _ACEOF -rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12420: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:11170: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12423: \$? = $ac_status" >&5 + echo "$as_me:11173: \$? = $ac_status" >&5 (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12426: \"$ac_try\"") >&5 + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:11176: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12429: \$? = $ac_status" >&5 + echo "$as_me:11179: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - cf_cv_xopen_source=no + am_cv_val_LC_MESSAGES=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +am_cv_val_LC_MESSAGES=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +fi +echo "$as_me:11189: result: $am_cv_val_LC_MESSAGES" >&5 +echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6 + if test "$am_cv_val_LC_MESSAGES" = yes; then + +cat >>confdefs.h <<\EOF +#define HAVE_LC_MESSAGES 1 +EOF + + fi +fi + echo "$as_me:11199: 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. +if test "${enable_nls+set}" = set; then + enableval="$enable_nls" + USE_NLS=$enableval +else + USE_NLS=no +fi; + echo "$as_me:11209: result: $USE_NLS" >&5 +echo "${ECHO_T}$USE_NLS" >&6 + + if test "$USE_NLS" = "yes"; then + + # Extract the first word of "msgfmt", so it can be a program name with args. + +set dummy msgfmt; ac_word=$2 +echo "$as_me:11217: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_MSGFMT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case "$MSGFMT" in + ([\\/]*|?:[\\/]*) + ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. + ;; + (*) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_word$ac_exeext" ; then + if "$ac_dir/$ac_word" --statistics /dev/null >/dev/null 2>&1; then + ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exeext" + break + fi + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" + ;; +esac +fi +MSGFMT="$ac_cv_path_MSGFMT" +if test "$MSGFMT" != ":"; then + echo "$as_me:11244: result: $MSGFMT" >&5 +echo "${ECHO_T}$MSGFMT" >&6 else - echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -cf_cv_xopen_source=$cf_XOPEN_SOURCE + echo "$as_me:11247: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -rm -f "conftest.$ac_objext" "conftest.$ac_ext" - CPPFLAGS="$cf_save" + # Extract the first word of "gmsgfmt", so it can be a program name with args. +set dummy gmsgfmt; ac_word=$2 +echo "$as_me:11253: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_GMSGFMT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $GMSGFMT in + [\\/]* | ?:[\\/]*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_GMSGFMT="$ac_dir/$ac_word" + echo "$as_me:11270: found $ac_dir/$ac_word" >&5 + break fi -rm -f "conftest.$ac_objext" "conftest.$ac_ext" +done + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" + ;; +esac fi -echo "$as_me:12444: result: $cf_cv_xopen_source" >&5 -echo "${ECHO_T}$cf_cv_xopen_source" >&6 - -if test "$cf_cv_xopen_source" != no ; then +GMSGFMT=$ac_cv_path_GMSGFMT -CFLAGS=`echo "$CFLAGS" | \ - sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` +if test -n "$GMSGFMT"; then + echo "$as_me:11282: result: $GMSGFMT" >&5 +echo "${ECHO_T}$GMSGFMT" >&6 +else + echo "$as_me:11285: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi -CPPFLAGS=`echo "$CPPFLAGS" | \ - sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` + # Extract the first word of "xgettext", so it can be a program name with args. - cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" +set dummy xgettext; ac_word=$2 +echo "$as_me:11292: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_XGETTEXT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case "$XGETTEXT" in + ([\\/]*|?:[\\/]*) + ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. + ;; + (*) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_word$ac_exeext" ; then + if "$ac_dir/$ac_word" --omit-header /dev/null >/dev/null 2>&1; then + ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exeext" + break + fi + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" + ;; +esac +fi +XGETTEXT="$ac_cv_path_XGETTEXT" +if test "$XGETTEXT" != ":"; then + echo "$as_me:11319: result: $XGETTEXT" >&5 +echo "${ECHO_T}$XGETTEXT" >&6 +else + echo "$as_me:11322: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi -for cf_add_cflags in $cf_temp_xopen_source -do - case "x$cf_add_cflags" in - (x-[DU]*) + CATOBJEXT=NONE -cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` -while true -do - cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` - test "$CFLAGS" != "$cf_old_cflag" || break + cf_save_msgfmt_path="$MSGFMT" + cf_save_xgettext_path="$XGETTEXT" - CFLAGS="$cf_old_cflag" +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $LIBICONV; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done +LIBS="$cf_add_libs" -cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` -while true -do - cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` - test "$CPPFLAGS" != "$cf_old_cflag" || break - - CPPFLAGS="$cf_old_cflag" -done + cf_save_LIBS_1="$LIBS" - ;; - esac + cf_save_OPTS_1="$CPPFLAGS" + if test "x$cf_save_msgfmt_path" = "x$MSGFMT" && \ + test "x$cf_save_xgettext_path" = "x$XGETTEXT" ; then cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in $cf_add_cflags +for cf_add_cflags in -DIGNORE_MSGFMT_HACK do case "$cf_fix_cppflags" in (no) @@ -12580,294 +11448,484 @@ if test -n "$cf_new_extra_cppflags" ; then fi -done - -fi - - cf_save_xopen_cppflags="$CPPFLAGS" - -if test "$cf_cv_posix_visible" = no; then + fi -cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE +# Check whether --with-libintl-prefix or --without-libintl-prefix was given. +if test "${with_libintl_prefix+set}" = set; then + withval="$with_libintl_prefix" -cf_save_CFLAGS="$CFLAGS" -cf_save_CPPFLAGS="$CPPFLAGS" +case "$withval" in +(no|yes) + ;; +(*) -cf_trim_CFLAGS=`echo "$cf_save_CFLAGS" | \ - sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` +for cf_searchpath in `echo "$withval" | tr $PATH_SEPARATOR ' '`; do + if test -d "$cf_searchpath/include" ; then -cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ - sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` +if test -n "$cf_searchpath/include" ; then + for cf_add_incdir in $cf_searchpath/include + do + while test "$cf_add_incdir" != /usr/include + do + if test -d "$cf_add_incdir" + then + cf_have_incdir=no + if test -n "$CFLAGS$CPPFLAGS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then + cf_have_incdir=yes; break + fi + done + fi -echo "$as_me:12604: 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 + if test "$cf_have_incdir" = no ; then + if test "$cf_add_incdir" = /usr/local/include ; then + if test "$GCC" = yes + then + cf_save_CPPFLAGS=$CPPFLAGS -echo "${as_me:-configure}:12610: testing if the symbol is already defined go no further ..." 1>&5 + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" - cat >"conftest.$ac_ext" <<_ACEOF -#line 12613 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 11492 "configure" #include "confdefs.h" -#include +#include int main (void) { - -#ifndef _POSIX_C_SOURCE -#error _POSIX_C_SOURCE is not defined -#endif +printf("Hello") ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12628: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11504: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12631: \$? = $ac_status" >&5 + echo "$as_me:11507: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12634: \"$ac_try\"") >&5 + { (eval echo "$as_me:11510: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12637: \$? = $ac_status" >&5 + echo "$as_me:11513: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - cf_cv_posix_c_source=no + : else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -cf_want_posix_source=no - case .$cf_POSIX_C_SOURCE in - (.[12]??*) - cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" - ;; - (.2) - cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" - cf_want_posix_source=yes - ;; - (.*) - cf_want_posix_source=yes - ;; - esac - if test "$cf_want_posix_source" = yes ; then - cat >"conftest.$ac_ext" <<_ACEOF -#line 12658 "configure" +cf_have_incdir=yes +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + CPPFLAGS=$cf_save_CPPFLAGS + fi + fi + fi + + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +echo "${as_me:-configure}:11530: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + + cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'` + test "$cf_top_incdir" = "$cf_add_incdir" && break + cf_add_incdir="$cf_top_incdir" + else + break + fi + else + break + fi + done + done +fi + + elif test -d "$cf_searchpath/../include" ; then + +if test -n "$cf_searchpath/../include" ; then + for cf_add_incdir in $cf_searchpath/../include + do + while test "$cf_add_incdir" != /usr/include + do + if test -d "$cf_add_incdir" + then + cf_have_incdir=no + if test -n "$CFLAGS$CPPFLAGS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then + cf_have_incdir=yes; break + fi + done + fi + + if test "$cf_have_incdir" = no ; then + if test "$cf_add_incdir" = /usr/local/include ; then + if test "$GCC" = yes + then + cf_save_CPPFLAGS=$CPPFLAGS + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" + + cat >"conftest.$ac_ext" <<_ACEOF +#line 11576 "configure" #include "confdefs.h" -#include +#include int main (void) { - -#ifdef _POSIX_SOURCE -#error _POSIX_SOURCE is defined -#endif +printf("Hello") ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12673: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11588: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12676: \$? = $ac_status" >&5 + echo "$as_me:11591: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12679: \"$ac_try\"") >&5 + { (eval echo "$as_me:11594: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12682: \$? = $ac_status" >&5 + echo "$as_me:11597: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE" +cf_have_incdir=yes fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - fi + CPPFLAGS=$cf_save_CPPFLAGS + fi + fi + fi -echo "${as_me:-configure}:12693: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - CFLAGS="$cf_trim_CFLAGS" - CPPFLAGS="$cf_trim_CPPFLAGS" +echo "${as_me:-configure}:11614: testing adding $cf_add_incdir to include-path ..." 1>&5 - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" -echo "${as_me:-configure}:12701: testing if the second compile does not leave our definition intact error ..." 1>&5 + cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'` + test "$cf_top_incdir" = "$cf_add_incdir" && break + cf_add_incdir="$cf_top_incdir" + else + break + fi + else + break + fi + done + done +fi - cat >"conftest.$ac_ext" <<_ACEOF -#line 12704 "configure" + else +{ { echo "$as_me:11632: error: cannot find libintl under $withval" >&5 +echo "$as_me: error: cannot find libintl under $withval" >&2;} + { (exit 1); exit 1; }; } + fi + if test -d "$cf_searchpath/lib" ; then + +if test -n "$cf_searchpath/lib" ; then + for cf_add_libdir in $cf_searchpath/lib + do + if test "$cf_add_libdir" = /usr/lib ; then + : + elif test -d "$cf_add_libdir" + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +echo "${as_me:-configure}:11657: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done +fi + + elif test -d "$cf_searchpath" ; then + +if test -n "$cf_searchpath" ; then + for cf_add_libdir in $cf_searchpath + do + if test "$cf_add_libdir" = /usr/lib ; then + : + elif test -d "$cf_add_libdir" + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +echo "${as_me:-configure}:11686: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done +fi + + else +{ { echo "$as_me:11695: error: cannot find libintl under $withval" >&5 +echo "$as_me: error: cannot find libintl under $withval" >&2;} + { (exit 1); exit 1; }; } + fi +done + + test -n "$verbose" && echo " setting path value for libintl to $withval" 1>&6 + +echo "${as_me:-configure}:11703: testing setting path value for libintl to $withval ..." 1>&5 + + ;; +esac + +fi; + +# If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these +# will be set on completion of the AC_TRY_LINK below. +cf_cv_header_path_intl= +cf_cv_library_path_intl= + +echo "${as_me:-configure}:11715: testing Starting FIND_LINKAGE(intl,) ..." 1>&5 + +cf_save_LIBS="$LIBS" + +cat >"conftest.$ac_ext" <<_ACEOF +#line 11720 "configure" #include "confdefs.h" -#include + +#include +extern int _nl_msg_cat_cntr; + int main (void) { -#ifndef _POSIX_C_SOURCE -#error _POSIX_C_SOURCE is not defined + bindtextdomain ("", ""); + return (gettext ("") != 0) + +#ifndef IGNORE_MSGFMT_HACK + + _nl_msg_cat_cntr #endif + ; return 0; } _ACEOF -rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12719: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:11742: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12722: \$? = $ac_status" >&5 + echo "$as_me:11745: \$? = $ac_status" >&5 (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12725: \"$ac_try\"") >&5 + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:11748: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12728: \$? = $ac_status" >&5 + echo "$as_me:11751: \$? = $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_cv_posix_c_source=no -fi -rm -f "conftest.$ac_objext" "conftest.$ac_ext" - CFLAGS="$cf_save_CFLAGS" - CPPFLAGS="$cf_save_CPPFLAGS" - -fi -rm -f "conftest.$ac_objext" "conftest.$ac_ext" - -fi -echo "$as_me:12744: 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 - CFLAGS="$cf_trim_CFLAGS" - CPPFLAGS="$cf_trim_CPPFLAGS" +LIBS="-lintl $cf_save_LIBS" -cf_fix_cppflags=no -cf_new_cflags= -cf_new_cppflags= -cf_new_extra_cppflags= +cat >"conftest.$ac_ext" <<_ACEOF +#line 11765 "configure" +#include "confdefs.h" -for cf_add_cflags in $cf_cv_posix_c_source -do -case "$cf_fix_cppflags" in -(no) - case "$cf_add_cflags" in - (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case "$cf_add_cflags" in - (-D*) - cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` +#include +extern int _nl_msg_cat_cntr; - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes +int +main (void) +{ - if test "$cf_fix_cppflags" = yes ; then + bindtextdomain ("", ""); + return (gettext ("") != 0) - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" +#ifndef IGNORE_MSGFMT_HACK + + _nl_msg_cat_cntr +#endif - continue - elif test "${cf_tst_cflags}" = "\"'" ; then + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:11787: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:11790: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:11793: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11796: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + 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" - continue - fi - ;; - esac - case "$CPPFLAGS" in - (*$cf_add_cflags) - ;; - (*) - case "$cf_add_cflags" in - (-D*) - cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 -CPPFLAGS=`echo "$CPPFLAGS" | \ - sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + cf_cv_find_linkage_intl=no + LIBS="$cf_save_LIBS" - ;; - esac + test -n "$verbose" && echo " find linkage for intl library" 1>&6 - test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " - cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" +echo "${as_me:-configure}:11813: testing find linkage for intl library ..." 1>&5 - ;; - esac - ;; - (*) +echo "${as_me:-configure}:11815: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5 - test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " - cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" - ;; - esac - ;; -(yes) +cf_search= - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" +# collect the current set of include-directories from compiler flags +cf_header_path_list="" +if test -n "${CFLAGS}${CPPFLAGS}" ; then + for cf_header_path in $CPPFLAGS $CFLAGS + do + case "$cf_header_path" in + (-I*) + cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` - cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` +test "x$cf_header_path" != "xNONE" && \ +test -d "$cf_header_path" && \ + { + test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" + test -d "$cf_header_path/include" && cf_search="$cf_search $cf_header_path/include" + test -d "$cf_header_path/include/intl" && cf_search="$cf_search $cf_header_path/include/intl" + test -d "$cf_header_path/include/intl/include" && cf_search="$cf_search $cf_header_path/include/intl/include" + test -d "$cf_header_path/intl/include" && cf_search="$cf_search $cf_header_path/intl/include" + test -d "$cf_header_path/intl/include/intl" && cf_search="$cf_search $cf_header_path/intl/include/intl" +} - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=no - ;; -esac -done + cf_header_path_list="$cf_header_path_list $cf_search" + ;; + esac + done +fi -if test -n "$cf_new_cflags" ; then +# add the variations for the package we are looking for - test -n "$CFLAGS" && CFLAGS="$CFLAGS " - CFLAGS="${CFLAGS}$cf_new_cflags" +cf_search= -fi +test "x$prefix" != "xNONE" && \ +test -d "$prefix" && \ + { + test -n "$verbose" && echo " ... testing for include-directories under $prefix" + test -d "$prefix/include" && cf_search="$cf_search $prefix/include" + test -d "$prefix/include/intl" && cf_search="$cf_search $prefix/include/intl" + test -d "$prefix/include/intl/include" && cf_search="$cf_search $prefix/include/intl/include" + test -d "$prefix/intl/include" && cf_search="$cf_search $prefix/intl/include" + test -d "$prefix/intl/include/intl" && cf_search="$cf_search $prefix/intl/include/intl" +} -if test -n "$cf_new_cppflags" ; then +for cf_subdir_prefix in \ + /usr \ + /usr/local \ + /usr/pkg \ + /opt \ + /opt/local \ + $HOME +do - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" +test "x$cf_subdir_prefix" != "x$prefix" && \ +test -d "$cf_subdir_prefix" && \ +{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && { + test -n "$verbose" && echo " ... testing for include-directories under $cf_subdir_prefix" + test -d "$cf_subdir_prefix/include" && cf_search="$cf_search $cf_subdir_prefix/include" + test -d "$cf_subdir_prefix/include/intl" && cf_search="$cf_search $cf_subdir_prefix/include/intl" + test -d "$cf_subdir_prefix/include/intl/include" && cf_search="$cf_search $cf_subdir_prefix/include/intl/include" + test -d "$cf_subdir_prefix/intl/include" && cf_search="$cf_search $cf_subdir_prefix/intl/include" + test -d "$cf_subdir_prefix/intl/include/intl" && cf_search="$cf_search $cf_subdir_prefix/intl/include/intl" +} -fi +done -if test -n "$cf_new_extra_cppflags" ; then +test "$includedir" != NONE && \ +test "$includedir" != "/usr/include" && \ +test -d "$includedir" && { + test -d "$includedir" && cf_search="$cf_search $includedir" + test -d "$includedir/intl" && cf_search="$cf_search $includedir/intl" +} - test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " - EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" +test "$oldincludedir" != NONE && \ +test "$oldincludedir" != "/usr/include" && \ +test -d "$oldincludedir" && { + test -d "$oldincludedir" && cf_search="$cf_search $oldincludedir" + test -d "$oldincludedir/intl" && cf_search="$cf_search $oldincludedir/intl" +} -fi +cf_search="$cf_search $cf_header_path_list" -fi + for cf_cv_header_path_intl in $cf_search + do + if test -d "$cf_cv_header_path_intl" ; then + test -n "$verbose" && echo " ... testing $cf_cv_header_path_intl" 1>&6 -fi # cf_cv_posix_visible +echo "${as_me:-configure}:11906: testing ... testing $cf_cv_header_path_intl ..." 1>&5 - # Some of these niche implementations use copy/paste, double-check... - if test "$cf_cv_xopen_source" = no ; then - test -n "$verbose" && echo " checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6 + CPPFLAGS="$cf_save_CPPFLAGS" -echo "${as_me:-configure}:12857: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5 + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_intl" - cat >"conftest.$ac_ext" <<_ACEOF -#line 12860 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 11914 "configure" #include "confdefs.h" -$ac_includes_default +#include +extern int _nl_msg_cat_cntr; int main (void) { -#ifndef _XOPEN_SOURCE -#error _XOPEN_SOURCE is not defined + bindtextdomain ("", ""); + return (gettext ("") != 0) + +#ifndef IGNORE_MSGFMT_HACK + + _nl_msg_cat_cntr #endif ; @@ -12875,501 +11933,713 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12878: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11936: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12881: \$? = $ac_status" >&5 + echo "$as_me:11939: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12884: \"$ac_try\"") >&5 + { (eval echo "$as_me:11942: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12887: \$? = $ac_status" >&5 + echo "$as_me:11945: \$? = $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}:11950: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5 + + cf_cv_find_linkage_intl=maybe + cf_test_CPPFLAGS="$CPPFLAGS" + break else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 - { echo "$as_me:12894: WARNING: _POSIX_C_SOURCE definition is not usable" >&5 -echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;} - CPPFLAGS="$cf_save_xopen_cppflags" + CPPFLAGS="$cf_save_CPPFLAGS" + fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - fi - ;; -esac - -if test -n "$cf_xopen_source" ; then + fi + done -for cf_add_cflags in $cf_xopen_source -do - case "x$cf_add_cflags" in - (x-[DU]*) + if test "$cf_cv_find_linkage_intl" = maybe ; then -cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` -while true -do - cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` - test "$CFLAGS" != "$cf_old_cflag" || break - test -n "$verbose" && echo " removing old option $cf_add_cflags from CFLAGS" 1>&6 +echo "${as_me:-configure}:11968: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5 -echo "${as_me:-configure}:12917: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" - CFLAGS="$cf_old_cflag" -done + if test "$cf_cv_find_linkage_intl" != yes ; then -cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` -while true -do - cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` - test "$CPPFLAGS" != "$cf_old_cflag" || break - test -n "$verbose" && echo " removing old option $cf_add_cflags from CPPFLAGS" 1>&6 +cf_search= +cf_library_path_list="" +if test -n "${LDFLAGS}${LIBS}" ; then + for cf_library_path in $LDFLAGS $LIBS + do + case "$cf_library_path" in + (-L*) + cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` -echo "${as_me:-configure}:12929: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 +test "x$cf_library_path" != "xNONE" && \ +test -d "$cf_library_path" && \ + { + test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" + test -d "$cf_library_path/lib" && cf_search="$cf_search $cf_library_path/lib" + test -d "$cf_library_path/lib/intl" && cf_search="$cf_search $cf_library_path/lib/intl" + test -d "$cf_library_path/lib/intl/lib" && cf_search="$cf_search $cf_library_path/lib/intl/lib" + test -d "$cf_library_path/intl/lib" && cf_search="$cf_search $cf_library_path/intl/lib" + test -d "$cf_library_path/intl/lib/intl" && cf_search="$cf_search $cf_library_path/intl/lib/intl" +} - CPPFLAGS="$cf_old_cflag" -done + cf_library_path_list="$cf_library_path_list $cf_search" + ;; + esac + done +fi - ;; - esac +cf_search= -cf_fix_cppflags=no -cf_new_cflags= -cf_new_cppflags= -cf_new_extra_cppflags= +test "x$prefix" != "xNONE" && \ +test -d "$prefix" && \ + { + test -n "$verbose" && echo " ... testing for lib-directories under $prefix" + test -d "$prefix/lib" && cf_search="$cf_search $prefix/lib" + test -d "$prefix/lib/intl" && cf_search="$cf_search $prefix/lib/intl" + test -d "$prefix/lib/intl/lib" && cf_search="$cf_search $prefix/lib/intl/lib" + test -d "$prefix/intl/lib" && cf_search="$cf_search $prefix/intl/lib" + test -d "$prefix/intl/lib/intl" && cf_search="$cf_search $prefix/intl/lib/intl" +} -for cf_add_cflags in $cf_add_cflags +for cf_subdir_prefix in \ + /usr \ + /usr/local \ + /usr/pkg \ + /opt \ + /opt/local \ + $HOME do -case "$cf_fix_cppflags" in -(no) - case "$cf_add_cflags" in - (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case "$cf_add_cflags" in - (-D*) - cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes - if test "$cf_fix_cppflags" = yes ; then +test "x$cf_subdir_prefix" != "x$prefix" && \ +test -d "$cf_subdir_prefix" && \ +{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && { + test -n "$verbose" && echo " ... testing for lib-directories under $cf_subdir_prefix" + test -d "$cf_subdir_prefix/lib" && cf_search="$cf_search $cf_subdir_prefix/lib" + test -d "$cf_subdir_prefix/lib/intl" && cf_search="$cf_search $cf_subdir_prefix/lib/intl" + test -d "$cf_subdir_prefix/lib/intl/lib" && cf_search="$cf_search $cf_subdir_prefix/lib/intl/lib" + test -d "$cf_subdir_prefix/intl/lib" && cf_search="$cf_search $cf_subdir_prefix/intl/lib" + test -d "$cf_subdir_prefix/intl/lib/intl" && cf_search="$cf_search $cf_subdir_prefix/intl/lib/intl" +} - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" +done - continue - elif test "${cf_tst_cflags}" = "\"'" ; then +cf_search="$cf_library_path_list $cf_search" - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + for cf_cv_library_path_intl in $cf_search + do + if test -d "$cf_cv_library_path_intl" ; then + test -n "$verbose" && echo " ... testing $cf_cv_library_path_intl" 1>&6 - continue - fi - ;; - esac - case "$CPPFLAGS" in - (*$cf_add_cflags) - ;; - (*) - case "$cf_add_cflags" in - (-D*) - cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` +echo "${as_me:-configure}:12043: testing ... testing $cf_cv_library_path_intl ..." 1>&5 -CPPFLAGS=`echo "$CPPFLAGS" | \ - sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + 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 12049 "configure" +#include "confdefs.h" - ;; - esac +#include +extern int _nl_msg_cat_cntr; - test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " - cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" +int +main (void) +{ - ;; - esac - ;; - (*) + bindtextdomain ("", ""); + return (gettext ("") != 0) - test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " - cf_new_cflags="${cf_new_cflags}$cf_add_cflags" +#ifndef IGNORE_MSGFMT_HACK + + _nl_msg_cat_cntr +#endif - ;; - esac - ;; -(yes) + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:12071: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:12074: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:12077: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:12080: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + test -n "$verbose" && echo " ... found intl library in $cf_cv_library_path_intl" 1>&6 - cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` +echo "${as_me:-configure}:12085: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5 - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=no - ;; -esac -done + cf_cv_find_linkage_intl=yes + cf_cv_library_file_intl="-lintl" + break +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 -if test -n "$cf_new_cflags" ; then - test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" + LDFLAGS="$cf_save_LDFLAGS" -echo "${as_me:-configure}:13017: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi + done + CPPFLAGS="$cf_save_CPPFLAGS" + LDFLAGS="$cf_save_LDFLAGS" + fi - test -n "$CFLAGS" && CFLAGS="$CFLAGS " - CFLAGS="${CFLAGS}$cf_new_cflags" + else + cf_cv_find_linkage_intl=no + fi fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" -if test -n "$cf_new_cppflags" ; then - test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 - -echo "${as_me:-configure}:13027: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" +LIBS="$cf_save_LIBS" +if test "$cf_cv_find_linkage_intl" = yes ; then +cf_cv_func_gettext=yes +else +cf_cv_func_gettext=no fi -if test -n "$cf_new_extra_cppflags" ; then - test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 + echo "$as_me:12124: checking for libintl.h and gettext()" >&5 +echo $ECHO_N "checking for libintl.h and gettext()... $ECHO_C" >&6 + echo "$as_me:12126: result: $cf_cv_func_gettext" >&5 +echo "${ECHO_T}$cf_cv_func_gettext" >&6 -echo "${as_me:-configure}:13037: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 + if test "$cf_cv_func_gettext" = yes ; then - test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " - EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" +cat >>confdefs.h <<\EOF +#define HAVE_LIBINTL_H 1 +EOF -fi +cat >>confdefs.h <<\EOF +#define HAVE_GETTEXT 1 +EOF -done +if test -n "$cf_cv_header_path_intl" ; then + for cf_add_incdir in $cf_cv_header_path_intl + do + while test "$cf_add_incdir" != /usr/include + do + if test -d "$cf_add_incdir" + then + cf_have_incdir=no + if test -n "$CFLAGS$CPPFLAGS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then + cf_have_incdir=yes; break + fi + done + fi -fi + if test "$cf_have_incdir" = no ; then + if test "$cf_add_incdir" = /usr/local/include ; then + if test "$GCC" = yes + then + cf_save_CPPFLAGS=$CPPFLAGS -if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then - echo "$as_me:13049: checking if _XOPEN_SOURCE really is set" >&5 -echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6 - cat >"conftest.$ac_ext" <<_ACEOF -#line 13052 "configure" -#include "confdefs.h" -#include -int -main (void) -{ + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" -#ifndef _XOPEN_SOURCE -#error _XOPEN_SOURCE is not defined -#endif - ; - return 0; -} -_ACEOF -rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13067: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:13070: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13073: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:13076: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_XOPEN_SOURCE_set=yes -else - echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -cf_XOPEN_SOURCE_set=no -fi -rm -f "conftest.$ac_objext" "conftest.$ac_ext" - echo "$as_me:13085: result: $cf_XOPEN_SOURCE_set" >&5 -echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6 - if test "$cf_XOPEN_SOURCE_set" = yes - then - cat >"conftest.$ac_ext" <<_ACEOF -#line 13090 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 12166 "configure" #include "confdefs.h" -#include +#include int main (void) { - -#if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE -#error (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE -#endif +printf("Hello") ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13105: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12178: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13108: \$? = $ac_status" >&5 + echo "$as_me:12181: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13111: \"$ac_try\"") >&5 + { (eval echo "$as_me:12184: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13114: \$? = $ac_status" >&5 + echo "$as_me:12187: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - cf_XOPEN_SOURCE_set_ok=yes + : else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -cf_XOPEN_SOURCE_set_ok=no +cf_have_incdir=yes fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - if test "$cf_XOPEN_SOURCE_set_ok" = no - then - { echo "$as_me:13125: WARNING: _XOPEN_SOURCE is lower than requested" >&5 -echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} + CPPFLAGS=$cf_save_CPPFLAGS + fi + fi fi - else -echo "$as_me:13130: 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 + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - cat >"conftest.$ac_ext" <<_ACEOF -#line 13137 "configure" -#include "confdefs.h" +echo "${as_me:-configure}:12204: testing adding $cf_add_incdir to include-path ..." 1>&5 -$ac_includes_default + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" -int -main (void) -{ + cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'` + test "$cf_top_incdir" = "$cf_add_incdir" && break + cf_add_incdir="$cf_top_incdir" + else + break + fi + else + break + fi + done + done +fi -#ifndef _XOPEN_SOURCE -#error _XOPEN_SOURCE is not defined -#endif + if test -n "$cf_cv_library_file_intl" ; then + INTLLIBS="$cf_cv_library_file_intl" - ; - return 0; -} -_ACEOF -rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13155: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:13158: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13161: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:13164: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - cf_cv_xopen_source=no -else - echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -cf_save="$CPPFLAGS" +if test -n "$cf_cv_library_path_intl" ; then + for cf_add_libdir in $cf_cv_library_path_intl + do + if test "$cf_add_libdir" = /usr/lib ; then + : + elif test -d "$cf_add_libdir" + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" +echo "${as_me:-configure}:12243: testing adding $cf_add_libdir to library-path ..." 1>&5 - cat >"conftest.$ac_ext" <<_ACEOF -#line 13176 "configure" + INTLLIBS="-L$cf_add_libdir $INTLLIBS" + fi + fi + done +fi + + fi + + LIBS="$LIBS $INTLLIBS" + +for ac_func in dcgettext +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:12258: 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 12264 "configure" #include "confdefs.h" +#define $ac_func autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func -$ac_includes_default +#ifdef __cplusplus +extern "C" +#endif + +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (void); int main (void) { -#ifndef _XOPEN_SOURCE -#error _XOPEN_SOURCE is not defined +/* The GNU C library defines stubs for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#error found stub for $ac_func #endif + return $ac_func (); ; return 0; } _ACEOF -rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13194: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:12295: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13197: \$? = $ac_status" >&5 + echo "$as_me:12298: \$? = $ac_status" >&5 (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13200: \"$ac_try\"") >&5 + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:12301: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13203: \$? = $ac_status" >&5 + echo "$as_me:12304: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - cf_cv_xopen_source=no + eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -cf_cv_xopen_source=$cf_XOPEN_SOURCE +eval "$as_ac_var=no" fi -rm -f "conftest.$ac_objext" "conftest.$ac_ext" - CPPFLAGS="$cf_save" - +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -rm -f "conftest.$ac_objext" "conftest.$ac_ext" +echo "$as_me:12314: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 +if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then + cat >>confdefs.h <&5 -echo "${ECHO_T}$cf_cv_xopen_source" >&6 +done -if test "$cf_cv_xopen_source" != no ; then + CATOBJEXT=.gmo -CFLAGS=`echo "$CFLAGS" | \ - sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` +cat >>confdefs.h <<\EOF +#define ENABLE_NLS 1 +EOF -CPPFLAGS=`echo "$CPPFLAGS" | \ - sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` + elif test -z "$MSGFMT" || test -z "$XGETTEXT" ; then + { echo "$as_me:12331: WARNING: disabling NLS feature" >&5 +echo "$as_me: WARNING: disabling NLS feature" >&2;} + ALL_LINGUAS= + CATOBJEXT=.ignored + MSGFMT=":" + GMSGFMT=":" + XGETTEXT=":" + USE_NLS=no + LIBS="$cf_save_LIBS_1" + CPPFLAGS="$cf_save_OPTS_1" + fi - cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" + if test "$GMSGFMT" != ":"; then + if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then + : ; + else + { echo "$as_me:12347: WARNING: found msgfmt program is not GNU msgfmt" >&5 +echo "$as_me: WARNING: found msgfmt program is not GNU msgfmt" >&2;} + fi + fi -for cf_add_cflags in $cf_temp_xopen_source -do - case "x$cf_add_cflags" in - (x-[DU]*) + if test "$XGETTEXT" != ":"; then + if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then + : ; + else + { echo "$as_me:12356: WARNING: found xgettext program is not GNU xgettext" >&5 +echo "$as_me: WARNING: found xgettext program is not GNU xgettext" >&2;} + fi + fi + fi -cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` -while true -do - cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` - test "$CFLAGS" != "$cf_old_cflag" || break + if test "$XGETTEXT" != ":"; then + ac_config_commands="$ac_config_commands default-1" - CFLAGS="$cf_old_cflag" -done + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done + fi -cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` -while true -do - cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` - test "$CPPFLAGS" != "$cf_old_cflag" || break + nls_cv_header_intl= + nls_cv_header_libgt= - CPPFLAGS="$cf_old_cflag" -done + DATADIRNAME=share - ;; - esac + INSTOBJEXT=.mo -cf_fix_cppflags=no -cf_new_cflags= -cf_new_cppflags= -cf_new_extra_cppflags= + GENCAT=gencat -for cf_add_cflags in $cf_add_cflags -do -case "$cf_fix_cppflags" in -(no) - case "$cf_add_cflags" in - (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case "$cf_add_cflags" in - (-D*) - cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + if test "$USE_NLS" = "yes"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + echo "$as_me:12384: checking for catalogs to be installed" >&5 +echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6 + NEW_LINGUAS= + for presentlang in $ALL_LINGUAS; do + useit=no + for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + ("$presentlang"*) useit=yes;; + esac + done + if test "$useit" = yes; then + NEW_LINGUAS="$NEW_LINGUAS $presentlang" + fi + done + LINGUAS=$NEW_LINGUAS + echo "$as_me:12404: result: $LINGUAS" >&5 +echo "${ECHO_T}$LINGUAS" >&6 + fi - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done + fi + else + CATALOGS= + fi - if test "$cf_fix_cppflags" = yes ; then +if test "$USE_NLS" = yes ; then - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" +# Check whether --with-textdomain or --without-textdomain was given. +if test "${with_textdomain+set}" = set; then + withval="$with_textdomain" + NLS_TEXTDOMAIN=$withval +else + NLS_TEXTDOMAIN=$PACKAGE +fi; - continue - elif test "${cf_tst_cflags}" = "\"'" ; then +cat >>confdefs.h <&5 +echo $ECHO_N "checking if we should use included message-library... $ECHO_C" >&6 - test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " - cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" +# Check whether --enable-included-msgs or --disable-included-msgs was given. +if test "${enable_included_msgs+set}" = set; then + enableval="$enable_included_msgs" + use_our_messages=$enableval +else + use_our_messages=yes +fi; +fi +echo "$as_me:12450: result: $use_our_messages" >&5 +echo "${ECHO_T}$use_our_messages" >&6 +fi - ;; - esac - ;; - (*) +MSG_DIR_MAKE="#" +if test "$use_our_messages" = yes +then + SUB_MAKEFILE="$SUB_MAKEFILE po/$cf_makefile.in:$srcdir/po/$cf_makefile.inn" + MSG_DIR_MAKE= +fi - test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " - cf_new_cflags="${cf_new_cflags}$cf_add_cflags" +if test "$USE_NLS" = yes ; then - ;; - esac - ;; -(yes) +for ac_header in libintl.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:12466: 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 12472 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:12476: \"$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:12482: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + eval "$as_ac_Header=no" +fi +rm -f conftest.err "conftest.$ac_ext" +fi +echo "$as_me:12501: 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: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } ;; esac -done -if test -n "$cf_new_cflags" ; then +fi +eval NLS_DATADIR="$withval" - test -n "$CFLAGS" && CFLAGS="$CFLAGS " - CFLAGS="${CFLAGS}$cf_new_cflags" +echo "$as_me:12555: checking if you want full utility pathnames" >&5 +echo $ECHO_N "checking if you want full utility pathnames... $ECHO_C" >&6 -fi +# Check whether --enable-full-paths or --disable-full-paths was given. +if test "${enable_full_paths+set}" = set; then + enableval="$enable_full_paths" + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + with_full_paths=no + else + with_full_paths=yes + fi +else + enableval=yes + with_full_paths=yes -if test -n "$cf_new_cppflags" ; then +fi; +echo "$as_me:12572: 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 - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" +echo "$as_me:12579: 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 +else + + cf_cv_SYSTEM_MAIL=unknown + for cv_path in /usr/mmdf/bin/submit \ + /usr/sbin/sendmail \ + /usr/lib/sendmail \ + + do + if test -f "$cv_path" ; then + cf_cv_SYSTEM_MAIL="$cv_path" + break + fi + done fi -if test -n "$cf_new_extra_cppflags" ; then +echo "$as_me:12599: result: $cf_cv_SYSTEM_MAIL" >&5 +echo "${ECHO_T}$cf_cv_SYSTEM_MAIL" >&6 - test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " - EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" +cat >>confdefs.h <&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 +else -done + case "$cf_cv_SYSTEM_MAIL" in + (*/mmdf/*) + cf_cv_system_mail_flags="-mlruxto,cc\\\\*" + ;; + (*) + cf_cv_system_mail_flags="-t -oi" + esac fi - fi +echo "$as_me:12622: result: $cf_cv_system_mail_flags" >&5 +echo "${ECHO_T}$cf_cv_system_mail_flags" >&6 + +cat >>confdefs.h <&5 +echo "$as_me:12635: 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 13372 "configure" +#line 12642 "configure" #include "confdefs.h" #include @@ -13384,23 +12654,23 @@ int x = SIGWINCH; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13387: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12657: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13390: \$? = $ac_status" >&5 + echo "$as_me:12660: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13393: \"$ac_try\"") >&5 + { (eval echo "$as_me:12663: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13396: \$? = $ac_status" >&5 + echo "$as_me:12666: \$? = $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 13403 "configure" +#line 12673 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -13418,16 +12688,16 @@ int x = SIGWINCH; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13421: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12691: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13424: \$? = $ac_status" >&5 + echo "$as_me:12694: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13427: \"$ac_try\"") >&5 + { (eval echo "$as_me:12697: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13430: \$? = $ac_status" >&5 + echo "$as_me:12700: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_define_sigwinch=maybe else @@ -13441,11 +12711,11 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:13444: result: $cf_cv_define_sigwinch" >&5 +echo "$as_me:12714: 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:13448: checking for actual SIGWINCH definition" >&5 +echo "$as_me:12718: 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 @@ -13456,7 +12726,7 @@ cf_sigwinch=32 while test "$cf_sigwinch" != 1 do cat >"conftest.$ac_ext" <<_ACEOF -#line 13459 "configure" +#line 12729 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -13478,16 +12748,16 @@ int x = SIGWINCH; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13481: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12751: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13484: \$? = $ac_status" >&5 + echo "$as_me:12754: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13487: \"$ac_try\"") >&5 + { (eval echo "$as_me:12757: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13490: \$? = $ac_status" >&5 + echo "$as_me:12760: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_fixup_sigwinch=$cf_sigwinch break @@ -13501,7 +12771,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`" done fi -echo "$as_me:13504: result: $cf_cv_fixup_sigwinch" >&5 +echo "$as_me:12774: result: $cf_cv_fixup_sigwinch" >&5 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 if test "$cf_cv_fixup_sigwinch" != unknown ; then @@ -13513,7 +12783,7 @@ if test -n "$TRY_CFLAGS" ; then test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me:-configure}:13516: testing checking additions to CFLAGS ..." 1>&5 +echo "${as_me:-configure}:12786: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" cf_check_cppflags="$CPPFLAGS" @@ -13598,7 +12868,7 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:13601: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:12871: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -13608,7 +12878,7 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:13611: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:12881: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -13618,7 +12888,7 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:13621: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:12891: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" @@ -13627,7 +12897,7 @@ fi if test "x$cf_check_cflags" != "x$CFLAGS" ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 13630 "configure" +#line 12900 "configure" #include "confdefs.h" #include int @@ -13639,16 +12909,16 @@ printf("Hello world"); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13642: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12912: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13645: \$? = $ac_status" >&5 + echo "$as_me:12915: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13648: \"$ac_try\"") >&5 + { (eval echo "$as_me:12918: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13651: \$? = $ac_status" >&5 + echo "$as_me:12921: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -13656,12 +12926,12 @@ else cat "conftest.$ac_ext" >&5 test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 -echo "${as_me:-configure}:13659: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 +echo "${as_me:-configure}:12929: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 -echo "${as_me:-configure}:13664: testing but keeping change to \$CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:12934: testing but keeping change to \$CPPFLAGS ..." 1>&5 fi CFLAGS="$cf_check_cflags" @@ -13673,7 +12943,7 @@ fi ### Look for network libraries first, since some functions (such as gethostname) ### are used in a lot of places. -echo "$as_me:13676: checking if you want NSS compatible SSL libraries" >&5 +echo "$as_me:12946: 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 @@ -13688,10 +12958,10 @@ else fi; fi -echo "$as_me:13691: result: $cf_cv_use_libnss_compat" >&5 +echo "$as_me:12961: result: $cf_cv_use_libnss_compat" >&5 echo "${ECHO_T}$cf_cv_use_libnss_compat" >&6 -echo "$as_me:13694: checking if you want ssl library" >&5 +echo "$as_me:12964: 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 @@ -13706,10 +12976,10 @@ else fi; fi -echo "$as_me:13709: result: $cf_cv_use_libssl" >&5 +echo "$as_me:12979: result: $cf_cv_use_libssl" >&5 echo "${ECHO_T}$cf_cv_use_libssl" >&6 -echo "$as_me:13712: checking if you want gnutls support" >&5 +echo "$as_me:12982: 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 @@ -13724,11 +12994,11 @@ else fi; fi -echo "$as_me:13727: result: $cf_cv_use_libgnutls" >&5 +echo "$as_me:12997: 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:13731: checking if you want gnutls-openssl compat" >&5 +echo "$as_me:13001: 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 @@ -13743,10 +13013,10 @@ else fi; fi -echo "$as_me:13746: result: $cf_cv_gnutls_compat" >&5 +echo "$as_me:13016: result: $cf_cv_gnutls_compat" >&5 echo "${ECHO_T}$cf_cv_gnutls_compat" >&6 -echo "$as_me:13749: checking if you want socks library" >&5 +echo "$as_me:13019: 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 @@ -13761,10 +13031,10 @@ else fi; fi -echo "$as_me:13764: result: $cf_cv_use_libsocks" >&5 +echo "$as_me:13034: result: $cf_cv_use_libsocks" >&5 echo "${ECHO_T}$cf_cv_use_libsocks" >&6 -echo "$as_me:13767: checking if you want socks5 library" >&5 +echo "$as_me:13037: 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 @@ -13779,15 +13049,13 @@ else fi; fi -echo "$as_me:13782: result: $cf_cv_use_libsocks5" >&5 +echo "$as_me:13052: result: $cf_cv_use_libsocks5" >&5 echo "${ECHO_T}$cf_cv_use_libsocks5" >&6 if test "x$cf_cv_use_libsocks" != xno ; then case "$cf_cv_use_libsocks" in -(no) - ;; -(yes) +(no|yes) ;; (*) @@ -13821,7 +13089,7 @@ if test -n "$cf_searchpath/include" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 13824 "configure" +#line 13092 "configure" #include "confdefs.h" #include int @@ -13833,16 +13101,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13836: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13104: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13839: \$? = $ac_status" >&5 + echo "$as_me:13107: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13842: \"$ac_try\"") >&5 + { (eval echo "$as_me:13110: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13845: \$? = $ac_status" >&5 + echo "$as_me:13113: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -13859,7 +13127,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:13862: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:13130: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -13905,7 +13173,7 @@ if test -n "$cf_searchpath/../include" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 13908 "configure" +#line 13176 "configure" #include "confdefs.h" #include int @@ -13917,16 +13185,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13920: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13188: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13923: \$? = $ac_status" >&5 + echo "$as_me:13191: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13926: \"$ac_try\"") >&5 + { (eval echo "$as_me:13194: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13929: \$? = $ac_status" >&5 + echo "$as_me:13197: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -13943,7 +13211,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:13946: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:13214: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -13961,7 +13229,7 @@ echo "${as_me:-configure}:13946: testing adding $cf_add_incdir to include-path . fi else -{ { echo "$as_me:13964: error: cannot find socks library under $cf_cv_use_libsocks" >&5 +{ { echo "$as_me:13232: 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 @@ -13986,7 +13254,7 @@ if test -n "$cf_searchpath/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:13989: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:13257: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -14015,7 +13283,7 @@ if test -n "$cf_searchpath" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:14018: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:13286: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -14024,12 +13292,16 @@ echo "${as_me:-configure}:14018: testing adding $cf_add_libdir to library-path . fi else -{ { echo "$as_me:14027: error: cannot find socks library under $cf_cv_use_libsocks" >&5 +{ { echo "$as_me:13295: error: cannot find socks library under $cf_cv_use_libsocks" >&5 echo "$as_me: error: cannot find socks library under $cf_cv_use_libsocks" >&2;} { (exit 1); exit 1; }; } fi done + test -n "$verbose" && echo " setting path value for socks library to $cf_cv_use_libsocks" 1>&6 + +echo "${as_me:-configure}:13303: testing setting path value for socks library to $cf_cv_use_libsocks ..." 1>&5 + ;; esac @@ -14038,12 +13310,12 @@ esac cf_cv_header_path_socks= cf_cv_library_path_socks= -echo "${as_me:-configure}:14041: testing Starting FIND_LINKAGE(socks,) ..." 1>&5 +echo "${as_me:-configure}:13313: testing Starting FIND_LINKAGE(socks,) ..." 1>&5 cf_save_LIBS="$LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 14046 "configure" +#line 13318 "configure" #include "confdefs.h" #include @@ -14059,16 +13331,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:14062: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13334: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14065: \$? = $ac_status" >&5 + echo "$as_me:13337: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:14068: \"$ac_try\"") >&5 + { (eval echo "$as_me:13340: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14071: \$? = $ac_status" >&5 + echo "$as_me:13343: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_socks=yes @@ -14082,7 +13354,7 @@ cat "conftest.$ac_ext" >&5 LIBS="-lsocks $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 14085 "configure" +#line 13357 "configure" #include "confdefs.h" #include @@ -14098,16 +13370,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:14101: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13373: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14104: \$? = $ac_status" >&5 + echo "$as_me:13376: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:14107: \"$ac_try\"") >&5 + { (eval echo "$as_me:13379: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14110: \$? = $ac_status" >&5 + echo "$as_me:13382: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_socks=yes @@ -14124,9 +13396,9 @@ cat "conftest.$ac_ext" >&5 test -n "$verbose" && echo " find linkage for socks library" 1>&6 -echo "${as_me:-configure}:14127: testing find linkage for socks library ..." 1>&5 +echo "${as_me:-configure}:13399: testing find linkage for socks library ..." 1>&5 -echo "${as_me:-configure}:14129: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5 +echo "${as_me:-configure}:13401: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -14217,7 +13489,7 @@ cf_search="$cf_search $cf_header_path_list" if test -d "$cf_cv_header_path_socks" ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_socks" 1>&6 -echo "${as_me:-configure}:14220: testing ... testing $cf_cv_header_path_socks ..." 1>&5 +echo "${as_me:-configure}:13492: testing ... testing $cf_cv_header_path_socks ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS" @@ -14225,7 +13497,7 @@ echo "${as_me:-configure}:14220: testing ... testing $cf_cv_header_path_socks .. CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_socks" cat >"conftest.$ac_ext" <<_ACEOF -#line 14228 "configure" +#line 13500 "configure" #include "confdefs.h" #include @@ -14241,21 +13513,21 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14244: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13516: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14247: \$? = $ac_status" >&5 + echo "$as_me:13519: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14250: \"$ac_try\"") >&5 + { (eval echo "$as_me:13522: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14253: \$? = $ac_status" >&5 + echo "$as_me:13525: \$? = $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}:14258: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5 +echo "${as_me:-configure}:13530: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5 cf_cv_find_linkage_socks=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -14273,7 +13545,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_cv_find_linkage_socks" = maybe ; then -echo "${as_me:-configure}:14276: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5 +echo "${as_me:-configure}:13548: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -14348,13 +13620,13 @@ cf_search="$cf_library_path_list $cf_search" if test -d "$cf_cv_library_path_socks" ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_socks" 1>&6 -echo "${as_me:-configure}:14351: testing ... testing $cf_cv_library_path_socks ..." 1>&5 +echo "${as_me:-configure}:13623: 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 14357 "configure" +#line 13629 "configure" #include "confdefs.h" #include @@ -14370,21 +13642,21 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:14373: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13645: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14376: \$? = $ac_status" >&5 + echo "$as_me:13648: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:14379: \"$ac_try\"") >&5 + { (eval echo "$as_me:13651: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14382: \$? = $ac_status" >&5 + echo "$as_me:13654: \$? = $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}:14387: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5 +echo "${as_me:-configure}:13659: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5 cf_cv_find_linkage_socks=yes cf_cv_library_file_socks="-lsocks" @@ -14446,7 +13718,7 @@ if test -n "$cf_cv_header_path_socks" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 14449 "configure" +#line 13721 "configure" #include "confdefs.h" #include int @@ -14458,16 +13730,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14461: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13733: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14464: \$? = $ac_status" >&5 + echo "$as_me:13736: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14467: \"$ac_try\"") >&5 + { (eval echo "$as_me:13739: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14470: \$? = $ac_status" >&5 + echo "$as_me:13742: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -14484,7 +13756,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:14487: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:13759: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -14520,7 +13792,7 @@ if test -n "$cf_cv_library_path_socks" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:14523: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:13795: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -14545,7 +13817,7 @@ done LIBS="$cf_add_libs" else -{ echo "$as_me:14548: WARNING: Cannot find socks library" >&5 +{ echo "$as_me:13820: WARNING: Cannot find socks library" >&5 echo "$as_me: WARNING: Cannot find socks library" >&2;} fi @@ -14588,7 +13860,7 @@ cat >>confdefs.h <<\EOF EOF else - { { echo "$as_me:14591: error: cannot link with socks library" >&5 + { { echo "$as_me:13863: error: cannot link with socks library" >&5 echo "$as_me: error: cannot link with socks library" >&2;} { (exit 1); exit 1; }; } fi @@ -14596,9 +13868,7 @@ echo "$as_me: error: cannot link with socks library" >&2;} elif test "x$cf_cv_use_libsocks5" != xno ; then case "$cf_cv_use_libsocks5" in -(no) - ;; -(yes) +(no|yes) ;; (*) @@ -14632,7 +13902,7 @@ if test -n "$cf_searchpath/include" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 14635 "configure" +#line 13905 "configure" #include "confdefs.h" #include int @@ -14644,16 +13914,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14647: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13917: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14650: \$? = $ac_status" >&5 + echo "$as_me:13920: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14653: \"$ac_try\"") >&5 + { (eval echo "$as_me:13923: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14656: \$? = $ac_status" >&5 + echo "$as_me:13926: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -14670,7 +13940,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:14673: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:13943: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -14716,7 +13986,7 @@ if test -n "$cf_searchpath/../include" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 14719 "configure" +#line 13989 "configure" #include "confdefs.h" #include int @@ -14728,16 +13998,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14731: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14001: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14734: \$? = $ac_status" >&5 + echo "$as_me:14004: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14737: \"$ac_try\"") >&5 + { (eval echo "$as_me:14007: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14740: \$? = $ac_status" >&5 + echo "$as_me:14010: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -14754,7 +14024,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:14757: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:14027: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -14772,7 +14042,7 @@ echo "${as_me:-configure}:14757: testing adding $cf_add_incdir to include-path . fi else -{ { echo "$as_me:14775: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5 +{ { echo "$as_me:14045: 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 @@ -14797,7 +14067,7 @@ if test -n "$cf_searchpath/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:14800: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:14070: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -14826,7 +14096,7 @@ if test -n "$cf_searchpath" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:14829: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:14099: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -14835,12 +14105,16 @@ echo "${as_me:-configure}:14829: testing adding $cf_add_libdir to library-path . fi else -{ { echo "$as_me:14838: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5 +{ { echo "$as_me:14108: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5 echo "$as_me: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&2;} { (exit 1); exit 1; }; } fi done + test -n "$verbose" && echo " setting path value for socks5 library to $cf_cv_use_libsocks5" 1>&6 + +echo "${as_me:-configure}:14116: testing setting path value for socks5 library to $cf_cv_use_libsocks5 ..." 1>&5 + ;; esac @@ -14868,11 +14142,11 @@ cat >>confdefs.h <<\EOF #define SOCKS 1 EOF -echo "$as_me:14871: checking if the socks library uses socks4 prefix" >&5 +echo "$as_me:14145: 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 14875 "configure" +#line 14149 "configure" #include "confdefs.h" #include @@ -14886,16 +14160,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:14889: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14163: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14892: \$? = $ac_status" >&5 + echo "$as_me:14166: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:14895: \"$ac_try\"") >&5 + { (eval echo "$as_me:14169: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14898: \$? = $ac_status" >&5 + echo "$as_me:14172: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cat >>confdefs.h <<\EOF @@ -14907,7 +14181,7 @@ else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 14910 "configure" +#line 14184 "configure" #include "confdefs.h" #include int @@ -14919,29 +14193,29 @@ SOCKSinit((char *)0) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:14922: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14196: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14925: \$? = $ac_status" >&5 + echo "$as_me:14199: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:14928: \"$ac_try\"") >&5 + { (eval echo "$as_me:14202: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14931: \$? = $ac_status" >&5 + echo "$as_me:14205: \$? = $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:14937: error: Cannot link with socks5 library" >&5 +{ { echo "$as_me:14211: 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:14944: result: $cf_use_socks4" >&5 +echo "$as_me:14218: result: $cf_use_socks4" >&5 echo "${ECHO_T}$cf_use_socks4" >&6 if test "$cf_use_socks4" = "yes" ; then @@ -14996,10 +14270,10 @@ EOF fi -echo "$as_me:14999: checking if socks5p.h is available" >&5 +echo "$as_me:14273: 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 15002 "configure" +#line 14276 "configure" #include "confdefs.h" #define INCLUDE_PROTOTYPES @@ -15014,16 +14288,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:15017: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14291: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15020: \$? = $ac_status" >&5 + echo "$as_me:14294: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:15023: \"$ac_try\"") >&5 + { (eval echo "$as_me:14297: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15026: \$? = $ac_status" >&5 + echo "$as_me:14300: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_use_socks5p_h=yes else @@ -15032,7 +14306,7 @@ cat "conftest.$ac_ext" >&5 cf_use_socks5p_h=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:15035: result: $cf_use_socks5p_h" >&5 +echo "$as_me:14309: result: $cf_use_socks5p_h" >&5 echo "${ECHO_T}$cf_use_socks5p_h" >&6 test "$cf_use_socks5p_h" = yes && @@ -15044,14 +14318,14 @@ else cf_test_netlibs=no -echo "$as_me:15047: checking for network libraries" >&5 +echo "$as_me:14321: 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:15054: result: working..." >&5 +echo "$as_me:14328: result: working..." >&5 echo "${ECHO_T}working..." >&6 cf_cv_netlibs="" @@ -15063,23 +14337,23 @@ case "$host_os" in for ac_header in windows.h winsock.h winsock2.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:15066: checking for $ac_header" >&5 +echo "$as_me:14340: 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 15072 "configure" +#line 14346 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:15076: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:14350: \"$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:15082: \$? = $ac_status" >&5 + echo "$as_me:14356: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -15098,7 +14372,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:15101: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:14375: 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 15136 "configure" +#line 14410 "configure" #include "confdefs.h" #ifdef HAVE_WINDOWS_H @@ -15160,22 +14434,22 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15163: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14437: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15166: \$? = $ac_status" >&5 + echo "$as_me:14440: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15169: \"$ac_try\"") >&5 + { (eval echo "$as_me:14443: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15172: \$? = $ac_status" >&5 + echo "$as_me:14446: \$? = $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:15178: error: Cannot link against winsock library" >&5 +{ { echo "$as_me:14452: error: Cannot link against winsock library" >&5 echo "$as_me: error: Cannot link against winsock library" >&2;} { (exit 1); exit 1; }; } fi @@ -15188,13 +14462,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" for ac_func in gethostname do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:15191: checking for $ac_func" >&5 +echo "$as_me:14465: 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 15197 "configure" +#line 14471 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -15225,16 +14499,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15228: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14502: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15231: \$? = $ac_status" >&5 + echo "$as_me:14505: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15234: \"$ac_try\"") >&5 + { (eval echo "$as_me:14508: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15237: \$? = $ac_status" >&5 + echo "$as_me:14511: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -15244,7 +14518,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:15247: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:14521: 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:14530: 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 @@ -15261,7 +14535,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $cf_cv_netlibs $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 15264 "configure" +#line 14538 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15280,16 +14554,16 @@ gethostname (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15283: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14557: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15286: \$? = $ac_status" >&5 + echo "$as_me:14560: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15289: \"$ac_try\"") >&5 + { (eval echo "$as_me:14563: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15292: \$? = $ac_status" >&5 + echo "$as_me:14566: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_nsl_gethostname=yes else @@ -15300,7 +14574,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15303: result: $ac_cv_lib_nsl_gethostname" >&5 +echo "$as_me:14577: 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 @@ -15317,7 +14591,7 @@ else ac_cv_func_gethostname=unknown unset ac_cv_func_gethostname 2>/dev/null -echo "$as_me:15320: checking for gethostname in -lsocket" >&5 +echo "$as_me:14594: 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 @@ -15325,7 +14599,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $cf_cv_netlibs $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 15328 "configure" +#line 14602 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15344,16 +14618,16 @@ gethostname (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15347: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14621: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15350: \$? = $ac_status" >&5 + echo "$as_me:14624: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15353: \"$ac_try\"") >&5 + { (eval echo "$as_me:14627: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15356: \$? = $ac_status" >&5 + echo "$as_me:14630: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_socket_gethostname=yes else @@ -15364,7 +14638,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15367: result: $ac_cv_lib_socket_gethostname" >&5 +echo "$as_me:14641: 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 @@ -15388,7 +14662,7 @@ fi fi done - echo "$as_me:15391: checking for main in -linet" >&5 + echo "$as_me:14665: 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 @@ -15396,7 +14670,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-linet $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 15399 "configure" +#line 14673 "configure" #include "confdefs.h" int @@ -15408,16 +14682,16 @@ main (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15411: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14685: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15414: \$? = $ac_status" >&5 + echo "$as_me:14688: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15417: \"$ac_try\"") >&5 + { (eval echo "$as_me:14691: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15420: \$? = $ac_status" >&5 + echo "$as_me:14694: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_inet_main=yes else @@ -15428,7 +14702,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15431: result: $ac_cv_lib_inet_main" >&5 +echo "$as_me:14705: 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" @@ -15439,13 +14713,13 @@ fi for ac_func in socket do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:15442: checking for $ac_func" >&5 +echo "$as_me:14716: 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 15448 "configure" +#line 14722 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -15476,16 +14750,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15479: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14753: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15482: \$? = $ac_status" >&5 + echo "$as_me:14756: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15485: \"$ac_try\"") >&5 + { (eval echo "$as_me:14759: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15488: \$? = $ac_status" >&5 + echo "$as_me:14762: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -15495,7 +14769,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:15498: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:14772: 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:14781: 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 @@ -15512,7 +14786,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $cf_cv_netlibs $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 15515 "configure" +#line 14789 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15531,16 +14805,16 @@ socket (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15534: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14808: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15537: \$? = $ac_status" >&5 + echo "$as_me:14811: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15540: \"$ac_try\"") >&5 + { (eval echo "$as_me:14814: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15543: \$? = $ac_status" >&5 + echo "$as_me:14817: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_socket_socket=yes else @@ -15551,7 +14825,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15554: result: $ac_cv_lib_socket_socket" >&5 +echo "$as_me:14828: 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 @@ -15568,7 +14842,7 @@ else ac_cv_func_socket=unknown unset ac_cv_func_socket 2>/dev/null -echo "$as_me:15571: checking for socket in -lbsd" >&5 +echo "$as_me:14845: 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 @@ -15576,7 +14850,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $cf_cv_netlibs $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 15579 "configure" +#line 14853 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15595,16 +14869,16 @@ socket (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15598: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14872: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15601: \$? = $ac_status" >&5 + echo "$as_me:14875: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15604: \"$ac_try\"") >&5 + { (eval echo "$as_me:14878: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15607: \$? = $ac_status" >&5 + echo "$as_me:14881: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_bsd_socket=yes else @@ -15615,7 +14889,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15618: result: $ac_cv_lib_bsd_socket" >&5 +echo "$as_me:14892: 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 @@ -15644,13 +14918,13 @@ done for ac_func in gethostbyname do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:15647: checking for $ac_func" >&5 +echo "$as_me:14921: 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 15653 "configure" +#line 14927 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -15681,16 +14955,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15684: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14958: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15687: \$? = $ac_status" >&5 + echo "$as_me:14961: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15690: \"$ac_try\"") >&5 + { (eval echo "$as_me:14964: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15693: \$? = $ac_status" >&5 + echo "$as_me:14967: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -15700,7 +14974,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:15703: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:14977: 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:14986: 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 @@ -15717,7 +14991,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $cf_cv_netlibs $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 15720 "configure" +#line 14994 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15736,16 +15010,16 @@ gethostbyname (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15739: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15013: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15742: \$? = $ac_status" >&5 + echo "$as_me:15016: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15745: \"$ac_try\"") >&5 + { (eval echo "$as_me:15019: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15748: \$? = $ac_status" >&5 + echo "$as_me:15022: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_nsl_gethostbyname=yes else @@ -15756,7 +15030,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15759: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "$as_me:15033: 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 @@ -15781,13 +15055,13 @@ done for ac_func in inet_ntoa do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:15784: checking for $ac_func" >&5 +echo "$as_me:15058: 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 15790 "configure" +#line 15064 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -15818,16 +15092,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15821: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15095: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15824: \$? = $ac_status" >&5 + echo "$as_me:15098: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15827: \"$ac_try\"") >&5 + { (eval echo "$as_me:15101: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15830: \$? = $ac_status" >&5 + echo "$as_me:15104: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -15837,7 +15111,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:15840: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:15114: 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:15123: checking for inet_ntoa in -lnsl" >&5 echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6 if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15854,7 +15128,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $cf_cv_netlibs $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 15857 "configure" +#line 15131 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15873,16 +15147,16 @@ inet_ntoa (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15876: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15150: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15879: \$? = $ac_status" >&5 + echo "$as_me:15153: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15882: \"$ac_try\"") >&5 + { (eval echo "$as_me:15156: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15885: \$? = $ac_status" >&5 + echo "$as_me:15159: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_nsl_inet_ntoa=yes else @@ -15893,7 +15167,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15896: result: $ac_cv_lib_nsl_inet_ntoa" >&5 +echo "$as_me:15170: result: $ac_cv_lib_nsl_inet_ntoa" >&5 echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6 if test "$ac_cv_lib_nsl_inet_ntoa" = yes; then @@ -15918,13 +15192,13 @@ done for ac_func in gethostbyname do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:15921: checking for $ac_func" >&5 +echo "$as_me:15195: 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 15927 "configure" +#line 15201 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -15955,16 +15229,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15958: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15232: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15961: \$? = $ac_status" >&5 + echo "$as_me:15235: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15964: \"$ac_try\"") >&5 + { (eval echo "$as_me:15238: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15967: \$? = $ac_status" >&5 + echo "$as_me:15241: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -15974,7 +15248,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:15977: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:15251: 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:15260: 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 @@ -15991,7 +15265,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lnetwork $cf_cv_netlibs $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 15994 "configure" +#line 15268 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16010,16 +15284,16 @@ gethostbyname (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16013: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15287: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16016: \$? = $ac_status" >&5 + echo "$as_me:15290: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16019: \"$ac_try\"") >&5 + { (eval echo "$as_me:15293: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16022: \$? = $ac_status" >&5 + echo "$as_me:15296: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_network_gethostbyname=yes else @@ -16030,7 +15304,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16033: result: $ac_cv_lib_network_gethostbyname" >&5 +echo "$as_me:15307: 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 @@ -16055,13 +15329,13 @@ done for ac_func in strcasecmp do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:16058: checking for $ac_func" >&5 +echo "$as_me:15332: 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 16064 "configure" +#line 15338 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -16092,16 +15366,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16095: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15369: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16098: \$? = $ac_status" >&5 + echo "$as_me:15372: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16101: \"$ac_try\"") >&5 + { (eval echo "$as_me:15375: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16104: \$? = $ac_status" >&5 + echo "$as_me:15378: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -16111,7 +15385,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:16114: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:15388: 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:15397: 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 @@ -16128,7 +15402,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lresolv $cf_cv_netlibs $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 16131 "configure" +#line 15405 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16147,16 +15421,16 @@ strcasecmp (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16150: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15424: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16153: \$? = $ac_status" >&5 + echo "$as_me:15427: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16156: \"$ac_try\"") >&5 + { (eval echo "$as_me:15430: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16159: \$? = $ac_status" >&5 + echo "$as_me:15433: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_resolv_strcasecmp=yes else @@ -16167,7 +15441,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16170: result: $ac_cv_lib_resolv_strcasecmp" >&5 +echo "$as_me:15444: 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 @@ -16224,14 +15498,14 @@ test "$cf_test_netlibs" = no && echo "$cf_cv_netlibs" >&6 fi -echo "$as_me:16227: checking for inet_aton function" >&5 +echo "$as_me:15501: 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 16234 "configure" +#line 15508 "configure" #include "confdefs.h" $ac_includes_default @@ -16267,16 +15541,16 @@ inet_aton(0, (struct in_addr *)0) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16270: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15544: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16273: \$? = $ac_status" >&5 + echo "$as_me:15547: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16276: \"$ac_try\"") >&5 + { (eval echo "$as_me:15550: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16279: \$? = $ac_status" >&5 + echo "$as_me:15553: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_inet_aton=yes else @@ -16286,7 +15560,7 @@ cf_cv_have_inet_aton=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:16289: result: $cf_cv_have_inet_aton" >&5 +echo "$as_me:15563: 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 @@ -16295,14 +15569,14 @@ cat >>confdefs.h <<\EOF EOF else - echo "$as_me:16298: checking for inet_addr function" >&5 + echo "$as_me:15572: 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 16305 "configure" +#line 15579 "configure" #include "confdefs.h" $ac_includes_default @@ -16338,16 +15612,16 @@ inet_addr(0) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16341: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15615: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16344: \$? = $ac_status" >&5 + echo "$as_me:15618: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16347: \"$ac_try\"") >&5 + { (eval echo "$as_me:15621: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16350: \$? = $ac_status" >&5 + echo "$as_me:15624: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_inet_addr=yes else @@ -16357,10 +15631,10 @@ cf_cv_have_inet_addr=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:16360: result: $cf_cv_have_inet_addr" >&5 +echo "$as_me:15634: 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:16363: checking for library with inet_addr" >&5 + echo "$as_me:15637: 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 @@ -16371,7 +15645,7 @@ else do LIBS="$cf_save_LIBS $cf_inetlib" cat >"conftest.$ac_ext" <<_ACEOF -#line 16374 "configure" +#line 15648 "configure" #include "confdefs.h" #include #include @@ -16387,16 +15661,16 @@ inet_addr(0) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16390: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15664: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16393: \$? = $ac_status" >&5 + echo "$as_me:15667: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16396: \"$ac_try\"") >&5 + { (eval echo "$as_me:15670: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16399: \$? = $ac_status" >&5 + echo "$as_me:15673: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_lib_inet_addr=$cf_inetlib else @@ -16410,7 +15684,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" done fi -echo "$as_me:16413: result: $cf_cv_lib_inet_addr" >&5 +echo "$as_me:15687: 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 @@ -16431,13 +15705,13 @@ done LIBS="$cf_add_libs" else - { echo "$as_me:16434: WARNING: Unable to find library for inet_addr function" >&5 + { echo "$as_me:15708: 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:16440: checking if you want to use pkg-config" >&5 +echo "$as_me:15714: 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. @@ -16447,7 +15721,7 @@ if test "${with_pkg_config+set}" = set; then else cf_pkg_config=yes fi; -echo "$as_me:16450: result: $cf_pkg_config" >&5 +echo "$as_me:15724: result: $cf_pkg_config" >&5 echo "${ECHO_T}$cf_pkg_config" >&6 case "$cf_pkg_config" in @@ -16459,7 +15733,7 @@ case "$cf_pkg_config" in if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -echo "$as_me:16462: checking for $ac_word" >&5 +echo "$as_me:15736: 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 @@ -16476,7 +15750,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" - echo "$as_me:16479: found $ac_dir/$ac_word" >&5 + echo "$as_me:15753: found $ac_dir/$ac_word" >&5 break fi done @@ -16487,10 +15761,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - echo "$as_me:16490: result: $PKG_CONFIG" >&5 + echo "$as_me:15764: result: $PKG_CONFIG" >&5 echo "${ECHO_T}$PKG_CONFIG" >&6 else - echo "$as_me:16493: result: no" >&5 + echo "$as_me:15767: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -16499,7 +15773,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:16502: checking for $ac_word" >&5 +echo "$as_me:15776: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16516,7 +15790,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word" - echo "$as_me:16519: found $ac_dir/$ac_word" >&5 + echo "$as_me:15793: found $ac_dir/$ac_word" >&5 break fi done @@ -16528,10 +15802,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - echo "$as_me:16531: result: $ac_pt_PKG_CONFIG" >&5 + echo "$as_me:15805: result: $ac_pt_PKG_CONFIG" >&5 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 else - echo "$as_me:16534: result: no" >&5 + echo "$as_me:15808: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -16574,14 +15848,14 @@ case ".$PKG_CONFIG" in PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:16577: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 + { { echo "$as_me:15851: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;} { (exit 1); exit 1; }; } ;; esac elif test "x$cf_pkg_config" != xno ; then - { echo "$as_me:16584: WARNING: pkg-config is not installed" >&5 + { echo "$as_me:15858: WARNING: pkg-config is not installed" >&5 echo "$as_me: WARNING: pkg-config is not installed" >&2;} fi @@ -16593,9 +15867,7 @@ if test "x$cf_cv_use_libssl" != xno ; then # command-line option, etc., override default behavior case "$cf_cv_use_libssl" in -(no) - ;; -(yes) +(no|yes) ;; (*) @@ -16629,7 +15901,7 @@ if test -n "$cf_searchpath/include" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 16632 "configure" +#line 15904 "configure" #include "confdefs.h" #include int @@ -16641,16 +15913,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16644: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15916: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16647: \$? = $ac_status" >&5 + echo "$as_me:15919: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16650: \"$ac_try\"") >&5 + { (eval echo "$as_me:15922: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16653: \$? = $ac_status" >&5 + echo "$as_me:15925: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -16667,7 +15939,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:16670: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:15942: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -16713,7 +15985,7 @@ if test -n "$cf_searchpath/../include" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 16716 "configure" +#line 15988 "configure" #include "confdefs.h" #include int @@ -16725,16 +15997,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16728: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16000: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16731: \$? = $ac_status" >&5 + echo "$as_me:16003: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16734: \"$ac_try\"") >&5 + { (eval echo "$as_me:16006: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16737: \$? = $ac_status" >&5 + echo "$as_me:16009: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -16751,7 +16023,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:16754: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:16026: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -16769,7 +16041,7 @@ echo "${as_me:-configure}:16754: testing adding $cf_add_incdir to include-path . fi else -{ { echo "$as_me:16772: error: cannot find ssl library under $cf_cv_use_libssl" >&5 +{ { echo "$as_me:16044: 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 @@ -16794,7 +16066,7 @@ if test -n "$cf_searchpath/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:16797: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:16069: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -16823,7 +16095,7 @@ if test -n "$cf_searchpath" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:16826: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:16098: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -16832,12 +16104,16 @@ echo "${as_me:-configure}:16826: testing adding $cf_add_libdir to library-path . fi else -{ { echo "$as_me:16835: error: cannot find ssl library under $cf_cv_use_libssl" >&5 +{ { echo "$as_me:16107: error: cannot find ssl library under $cf_cv_use_libssl" >&5 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libssl" >&2;} { (exit 1); exit 1; }; } fi done + test -n "$verbose" && echo " setting path value for ssl library to $cf_cv_use_libssl" 1>&6 + +echo "${as_me:-configure}:16115: testing setting path value for ssl library to $cf_cv_use_libssl ..." 1>&5 + ;; esac @@ -16849,15 +16125,15 @@ esac cf_cv_pkg_ssl= for cf_try_package in openssl libssl do - echo "$as_me:16852: checking pkg-config for $cf_try_package" >&5 + echo "$as_me:16128: checking pkg-config for $cf_try_package" >&5 echo $ECHO_N "checking pkg-config for $cf_try_package... $ECHO_C" >&6 if "$PKG_CONFIG" --exists $cf_try_package ; then cf_cv_pkg_ssl=$cf_try_package - echo "$as_me:16856: result: yes" >&5 + echo "$as_me:16132: result: yes" >&5 echo "${ECHO_T}yes" >&6 break else - echo "$as_me:16860: result: no" >&5 + echo "$as_me:16136: result: no" >&5 echo "${ECHO_T}no" >&6 fi done @@ -17001,7 +16277,7 @@ fi esac test -n "$verbose" && echo " adding $cf_libs_ssl to LIBS" 1>&6 -echo "${as_me:-configure}:17004: testing adding $cf_libs_ssl to LIBS ..." 1>&5 +echo "${as_me:-configure}:16280: testing adding $cf_libs_ssl to LIBS ..." 1>&5 cf_add_libs="$LIBS" # reverse order @@ -17037,7 +16313,7 @@ LIBS="$cf_add_libs" (*-ldl) ;; (*) - echo "$as_me:17040: checking for dlsym in -ldl" >&5 + echo "$as_me:16316: 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 @@ -17045,7 +16321,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 17048 "configure" +#line 16324 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -17064,16 +16340,16 @@ dlsym (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17067: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16343: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17070: \$? = $ac_status" >&5 + echo "$as_me:16346: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17073: \"$ac_try\"") >&5 + { (eval echo "$as_me:16349: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17076: \$? = $ac_status" >&5 + echo "$as_me:16352: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dl_dlsym=yes else @@ -17084,7 +16360,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:17087: result: $ac_cv_lib_dl_dlsym" >&5 +echo "$as_me:16363: 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" @@ -17100,12 +16376,12 @@ fi cf_cv_header_path_ssl= cf_cv_library_path_ssl= -echo "${as_me:-configure}:17103: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5 +echo "${as_me:-configure}:16379: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5 cf_save_LIBS="$LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 17108 "configure" +#line 16384 "configure" #include "confdefs.h" #include @@ -17134,16 +16410,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17137: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16413: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17140: \$? = $ac_status" >&5 + echo "$as_me:16416: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17143: \"$ac_try\"") >&5 + { (eval echo "$as_me:16419: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17146: \$? = $ac_status" >&5 + echo "$as_me:16422: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_ssl=yes @@ -17157,7 +16433,7 @@ cat "conftest.$ac_ext" >&5 LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 17160 "configure" +#line 16436 "configure" #include "confdefs.h" #include @@ -17186,16 +16462,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17189: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16465: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17192: \$? = $ac_status" >&5 + echo "$as_me:16468: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17195: \"$ac_try\"") >&5 + { (eval echo "$as_me:16471: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17198: \$? = $ac_status" >&5 + echo "$as_me:16474: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_ssl=yes @@ -17212,9 +16488,9 @@ cat "conftest.$ac_ext" >&5 test -n "$verbose" && echo " find linkage for ssl library" 1>&6 -echo "${as_me:-configure}:17215: testing find linkage for ssl library ..." 1>&5 +echo "${as_me:-configure}:16491: testing find linkage for ssl library ..." 1>&5 -echo "${as_me:-configure}:17217: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5 +echo "${as_me:-configure}:16493: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -17305,7 +16581,7 @@ cf_search="$cf_search $cf_header_path_list" if test -d "$cf_cv_header_path_ssl" ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_ssl" 1>&6 -echo "${as_me:-configure}:17308: testing ... testing $cf_cv_header_path_ssl ..." 1>&5 +echo "${as_me:-configure}:16584: testing ... testing $cf_cv_header_path_ssl ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS" @@ -17313,7 +16589,7 @@ echo "${as_me:-configure}:17308: testing ... testing $cf_cv_header_path_ssl ..." CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_ssl" cat >"conftest.$ac_ext" <<_ACEOF -#line 17316 "configure" +#line 16592 "configure" #include "confdefs.h" #include @@ -17342,21 +16618,21 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17345: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16621: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17348: \$? = $ac_status" >&5 + echo "$as_me:16624: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17351: \"$ac_try\"") >&5 + { (eval echo "$as_me:16627: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17354: \$? = $ac_status" >&5 + echo "$as_me:16630: \$? = $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}:17359: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5 +echo "${as_me:-configure}:16635: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5 cf_cv_find_linkage_ssl=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -17374,7 +16650,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_cv_find_linkage_ssl" = maybe ; then -echo "${as_me:-configure}:17377: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5 +echo "${as_me:-configure}:16653: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -17382,7 +16658,7 @@ echo "${as_me:-configure}:17377: testing Searching for ssl library in FIND_LINKA CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 17385 "configure" +#line 16661 "configure" #include "confdefs.h" #include @@ -17411,21 +16687,21 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17414: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16690: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17417: \$? = $ac_status" >&5 + echo "$as_me:16693: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17420: \"$ac_try\"") >&5 + { (eval echo "$as_me:16696: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17423: \$? = $ac_status" >&5 + echo "$as_me:16699: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then test -n "$verbose" && echo " ... found ssl library in system" 1>&6 -echo "${as_me:-configure}:17428: testing ... found ssl library in system ..." 1>&5 +echo "${as_me:-configure}:16704: testing ... found ssl library in system ..." 1>&5 cf_cv_find_linkage_ssl=yes else @@ -17506,13 +16782,13 @@ cf_search="$cf_library_path_list $cf_search" if test -d "$cf_cv_library_path_ssl" ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_ssl" 1>&6 -echo "${as_me:-configure}:17509: testing ... testing $cf_cv_library_path_ssl ..." 1>&5 +echo "${as_me:-configure}:16785: 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 17515 "configure" +#line 16791 "configure" #include "confdefs.h" #include @@ -17541,21 +16817,21 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17544: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16820: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17547: \$? = $ac_status" >&5 + echo "$as_me:16823: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17550: \"$ac_try\"") >&5 + { (eval echo "$as_me:16826: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17553: \$? = $ac_status" >&5 + echo "$as_me:16829: \$? = $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}:17558: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5 +echo "${as_me:-configure}:16834: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5 cf_cv_find_linkage_ssl=yes cf_cv_library_file_ssl="-lssl" @@ -17617,7 +16893,7 @@ if test -n "$cf_cv_library_path_ssl" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:17620: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:16896: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -17676,7 +16952,7 @@ if test -n "$cf_cv_header_path_ssl" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 17679 "configure" +#line 16955 "configure" #include "confdefs.h" #include int @@ -17688,16 +16964,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17691: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16967: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17694: \$? = $ac_status" >&5 + echo "$as_me:16970: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17697: \"$ac_try\"") >&5 + { (eval echo "$as_me:16973: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17700: \$? = $ac_status" >&5 + echo "$as_me:16976: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -17714,7 +16990,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:17717: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:16993: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -17747,7 +17023,7 @@ EOF if test -n "$cf_cv_header_path_ssl" ; then test -n "$verbose" && echo " checking ssl header-path $cf_cv_header_path_ssl" 1>&6 -echo "${as_me:-configure}:17750: testing checking ssl header-path $cf_cv_header_path_ssl ..." 1>&5 +echo "${as_me:-configure}:17026: testing checking ssl header-path $cf_cv_header_path_ssl ..." 1>&5 case "$cf_cv_header_path_ssl" in (*/openssl) @@ -17760,10 +17036,10 @@ EOF esac fi -echo "$as_me:17763: checking for X509 support" >&5 +echo "$as_me:17039: checking for X509 support" >&5 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 17766 "configure" +#line 17042 "configure" #include "confdefs.h" #include @@ -17792,16 +17068,16 @@ X509_verify_cert_error_string(X509_STORE_CTX_get_error(NULL)) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17795: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17071: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17798: \$? = $ac_status" >&5 + echo "$as_me:17074: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17801: \"$ac_try\"") >&5 + { (eval echo "$as_me:17077: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17804: \$? = $ac_status" >&5 + echo "$as_me:17080: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_x509_support=yes else @@ -17810,7 +17086,7 @@ cat "conftest.$ac_ext" >&5 cf_x509_support=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" -echo "$as_me:17813: result: $cf_x509_support" >&5 +echo "$as_me:17089: result: $cf_x509_support" >&5 echo "${ECHO_T}$cf_x509_support" >&6 if test "$cf_x509_support" = yes ; then @@ -17829,9 +17105,7 @@ elif test "x$cf_cv_use_libgnutls" != xno ; then cf_cv_pkg_config_ssl=no case "$cf_cv_use_libgnutls" in -(no) - ;; -(yes) +(no|yes) ;; (*) @@ -17865,7 +17139,7 @@ if test -n "$cf_searchpath/include" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 17868 "configure" +#line 17142 "configure" #include "confdefs.h" #include int @@ -17877,16 +17151,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17880: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17154: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17883: \$? = $ac_status" >&5 + echo "$as_me:17157: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17886: \"$ac_try\"") >&5 + { (eval echo "$as_me:17160: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17889: \$? = $ac_status" >&5 + echo "$as_me:17163: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -17903,7 +17177,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:17906: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:17180: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -17949,7 +17223,7 @@ if test -n "$cf_searchpath/../include" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 17952 "configure" +#line 17226 "configure" #include "confdefs.h" #include int @@ -17961,16 +17235,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17964: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17238: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17967: \$? = $ac_status" >&5 + echo "$as_me:17241: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17970: \"$ac_try\"") >&5 + { (eval echo "$as_me:17244: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17973: \$? = $ac_status" >&5 + echo "$as_me:17247: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -17987,7 +17261,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:17990: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:17264: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -18005,7 +17279,7 @@ echo "${as_me:-configure}:17990: testing adding $cf_add_incdir to include-path . fi else -{ { echo "$as_me:18008: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5 +{ { echo "$as_me:17282: 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 @@ -18030,7 +17304,7 @@ if test -n "$cf_searchpath/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:18033: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:17307: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -18059,7 +17333,7 @@ if test -n "$cf_searchpath" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:18062: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:17336: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -18068,12 +17342,16 @@ echo "${as_me:-configure}:18062: testing adding $cf_add_libdir to library-path . fi else -{ { echo "$as_me:18071: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5 +{ { echo "$as_me:17345: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libgnutls" >&2;} { (exit 1); exit 1; }; } fi done + test -n "$verbose" && echo " setting path value for ssl library to $cf_cv_use_libgnutls" 1>&6 + +echo "${as_me:-configure}:17353: testing setting path value for ssl library to $cf_cv_use_libgnutls ..." 1>&5 + ;; esac @@ -18086,12 +17364,12 @@ esac (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}:18089: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5 +echo "${as_me:-configure}:17367: 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}:18094: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5 +echo "${as_me:-configure}:17372: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5 cf_cv_have_gnutls=yes cf_cv_pkg_config_ssl=yes @@ -18223,7 +17501,7 @@ fi esac test -n "$verbose" && echo " adding $cf_libs_ssl to LIBS" 1>&6 -echo "${as_me:-configure}:18226: testing adding $cf_libs_ssl to LIBS ..." 1>&5 +echo "${as_me:-configure}:17504: testing adding $cf_libs_ssl to LIBS ..." 1>&5 cf_add_libs="$LIBS" # reverse order @@ -18245,7 +17523,7 @@ LIBS="$cf_add_libs" else test -n "$verbose" && echo " ... did not find $cf_pkg_gnutls in pkg-config" 1>&6 -echo "${as_me:-configure}:18248: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5 +echo "${as_me:-configure}:17526: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5 cf_pkg_gnutls=none fi @@ -18265,12 +17543,12 @@ EOF cf_cv_header_path_gnutls= cf_cv_library_path_gnutls= -echo "${as_me:-configure}:18268: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5 +echo "${as_me:-configure}:17546: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5 cf_save_LIBS="$LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 18273 "configure" +#line 17551 "configure" #include "confdefs.h" #include @@ -18299,16 +17577,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18302: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17580: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18305: \$? = $ac_status" >&5 + echo "$as_me:17583: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18308: \"$ac_try\"") >&5 + { (eval echo "$as_me:17586: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18311: \$? = $ac_status" >&5 + echo "$as_me:17589: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_gnutls=yes @@ -18322,7 +17600,7 @@ cat "conftest.$ac_ext" >&5 LIBS="-lgnutls $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 18325 "configure" +#line 17603 "configure" #include "confdefs.h" #include @@ -18351,16 +17629,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18354: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17632: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18357: \$? = $ac_status" >&5 + echo "$as_me:17635: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18360: \"$ac_try\"") >&5 + { (eval echo "$as_me:17638: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18363: \$? = $ac_status" >&5 + echo "$as_me:17641: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_gnutls=yes @@ -18377,9 +17655,9 @@ cat "conftest.$ac_ext" >&5 test -n "$verbose" && echo " find linkage for gnutls library" 1>&6 -echo "${as_me:-configure}:18380: testing find linkage for gnutls library ..." 1>&5 +echo "${as_me:-configure}:17658: testing find linkage for gnutls library ..." 1>&5 -echo "${as_me:-configure}:18382: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5 +echo "${as_me:-configure}:17660: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -18470,7 +17748,7 @@ cf_search="$cf_search $cf_header_path_list" if test -d "$cf_cv_header_path_gnutls" ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_gnutls" 1>&6 -echo "${as_me:-configure}:18473: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5 +echo "${as_me:-configure}:17751: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS" @@ -18478,7 +17756,7 @@ echo "${as_me:-configure}:18473: testing ... testing $cf_cv_header_path_gnutls . CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_gnutls" cat >"conftest.$ac_ext" <<_ACEOF -#line 18481 "configure" +#line 17759 "configure" #include "confdefs.h" #include @@ -18507,21 +17785,21 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:18510: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17788: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18513: \$? = $ac_status" >&5 + echo "$as_me:17791: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:18516: \"$ac_try\"") >&5 + { (eval echo "$as_me:17794: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18519: \$? = $ac_status" >&5 + echo "$as_me:17797: \$? = $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}:18524: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5 +echo "${as_me:-configure}:17802: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5 cf_cv_find_linkage_gnutls=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -18539,7 +17817,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_cv_find_linkage_gnutls" = maybe ; then -echo "${as_me:-configure}:18542: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5 +echo "${as_me:-configure}:17820: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -18614,13 +17892,13 @@ cf_search="$cf_library_path_list $cf_search" if test -d "$cf_cv_library_path_gnutls" ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_gnutls" 1>&6 -echo "${as_me:-configure}:18617: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5 +echo "${as_me:-configure}:17895: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5 CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-lgnutls $cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_gnutls" cat >"conftest.$ac_ext" <<_ACEOF -#line 18623 "configure" +#line 17901 "configure" #include "confdefs.h" #include @@ -18649,21 +17927,21 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18652: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17930: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18655: \$? = $ac_status" >&5 + echo "$as_me:17933: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18658: \"$ac_try\"") >&5 + { (eval echo "$as_me:17936: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18661: \$? = $ac_status" >&5 + echo "$as_me:17939: \$? = $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}:18666: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5 +echo "${as_me:-configure}:17944: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5 cf_cv_find_linkage_gnutls=yes cf_cv_library_file_gnutls="-lgnutls" @@ -18743,7 +18021,7 @@ if test -n "$cf_cv_header_path_gnutls" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 18746 "configure" +#line 18024 "configure" #include "confdefs.h" #include int @@ -18755,16 +18033,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:18758: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18036: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18761: \$? = $ac_status" >&5 + echo "$as_me:18039: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:18764: \"$ac_try\"") >&5 + { (eval echo "$as_me:18042: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18767: \$? = $ac_status" >&5 + echo "$as_me:18045: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -18781,7 +18059,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:18784: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:18062: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -18822,7 +18100,7 @@ if test -n "$cf_cv_library_path_gnutls" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:18825: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:18103: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -18851,13 +18129,13 @@ LIBS="$cf_add_libs" for ac_func in gnutls_protocol_set_priority do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:18854: checking for $ac_func" >&5 +echo "$as_me:18132: 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 18860 "configure" +#line 18138 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -18888,16 +18166,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18891: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18169: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18894: \$? = $ac_status" >&5 + echo "$as_me:18172: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18897: \"$ac_try\"") >&5 + { (eval echo "$as_me:18175: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18900: \$? = $ac_status" >&5 + echo "$as_me:18178: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -18907,7 +18185,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:18910: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:18188: 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:18198: checking for gnutls_rnd" >&5 echo $ECHO_N "checking for gnutls_rnd... $ECHO_C" >&6 if test "${ac_cv_func_gnutls_rnd+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 18926 "configure" +#line 18204 "configure" #include "confdefs.h" #define gnutls_rnd autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -18954,16 +18232,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18957: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18235: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18960: \$? = $ac_status" >&5 + echo "$as_me:18238: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18963: \"$ac_try\"") >&5 + { (eval echo "$as_me:18241: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18966: \$? = $ac_status" >&5 + echo "$as_me:18244: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_gnutls_rnd=yes else @@ -18973,7 +18251,7 @@ ac_cv_func_gnutls_rnd=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:18976: result: $ac_cv_func_gnutls_rnd" >&5 +echo "$as_me:18254: result: $ac_cv_func_gnutls_rnd" >&5 echo "${ECHO_T}$ac_cv_func_gnutls_rnd" >&6 if test "$ac_cv_func_gnutls_rnd" = yes; then @@ -19003,10 +18281,10 @@ fi EXTRA_OBJS="$EXTRA_OBJS tidy_tls\$o" -echo "$as_me:19006: checking for X509 support" >&5 +echo "$as_me:18284: checking for X509 support" >&5 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 19009 "configure" +#line 18287 "configure" #include "confdefs.h" #include @@ -19035,16 +18313,16 @@ X509_verify_cert_error_string(X509_STORE_CTX_get_error(NULL)) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19038: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18316: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19041: \$? = $ac_status" >&5 + echo "$as_me:18319: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19044: \"$ac_try\"") >&5 + { (eval echo "$as_me:18322: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19047: \$? = $ac_status" >&5 + echo "$as_me:18325: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_x509_support=yes else @@ -19053,7 +18331,7 @@ cat "conftest.$ac_ext" >&5 cf_x509_support=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" -echo "$as_me:19056: result: $cf_x509_support" >&5 +echo "$as_me:18334: result: $cf_x509_support" >&5 echo "${ECHO_T}$cf_x509_support" >&6 if test "$cf_x509_support" = yes ; then @@ -19071,9 +18349,7 @@ fi cf_cv_pkg_config_ssl=no case "$cf_cv_use_libgnutls" in -(no) - ;; -(yes) +(no|yes) ;; (*) @@ -19107,7 +18383,7 @@ if test -n "$cf_searchpath/include" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 19110 "configure" +#line 18386 "configure" #include "confdefs.h" #include int @@ -19119,16 +18395,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19122: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18398: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19125: \$? = $ac_status" >&5 + echo "$as_me:18401: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19128: \"$ac_try\"") >&5 + { (eval echo "$as_me:18404: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19131: \$? = $ac_status" >&5 + echo "$as_me:18407: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -19145,7 +18421,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:19148: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:18424: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -19191,7 +18467,7 @@ if test -n "$cf_searchpath/../include" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 19194 "configure" +#line 18470 "configure" #include "confdefs.h" #include int @@ -19203,16 +18479,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19206: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18482: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19209: \$? = $ac_status" >&5 + echo "$as_me:18485: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19212: \"$ac_try\"") >&5 + { (eval echo "$as_me:18488: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19215: \$? = $ac_status" >&5 + echo "$as_me:18491: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -19229,7 +18505,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:19232: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:18508: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -19247,7 +18523,7 @@ echo "${as_me:-configure}:19232: testing adding $cf_add_incdir to include-path . fi else -{ { echo "$as_me:19250: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5 +{ { echo "$as_me:18526: 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 @@ -19272,7 +18548,7 @@ if test -n "$cf_searchpath/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:19275: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:18551: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -19301,7 +18577,7 @@ if test -n "$cf_searchpath" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:19304: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:18580: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -19310,12 +18586,16 @@ echo "${as_me:-configure}:19304: testing adding $cf_add_libdir to library-path . fi else -{ { echo "$as_me:19313: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5 +{ { echo "$as_me:18589: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libgnutls" >&2;} { (exit 1); exit 1; }; } fi done + test -n "$verbose" && echo " setting path value for ssl library to $cf_cv_use_libgnutls" 1>&6 + +echo "${as_me:-configure}:18597: testing setting path value for ssl library to $cf_cv_use_libgnutls ..." 1>&5 + ;; esac @@ -19328,12 +18608,12 @@ esac (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}:19331: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5 +echo "${as_me:-configure}:18611: 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}:19336: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5 +echo "${as_me:-configure}:18616: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5 cf_cv_have_gnutls=yes cf_cv_pkg_config_ssl=yes @@ -19465,7 +18745,7 @@ fi esac test -n "$verbose" && echo " adding $cf_libs_ssl to LIBS" 1>&6 -echo "${as_me:-configure}:19468: testing adding $cf_libs_ssl to LIBS ..." 1>&5 +echo "${as_me:-configure}:18748: testing adding $cf_libs_ssl to LIBS ..." 1>&5 cf_add_libs="$LIBS" # reverse order @@ -19487,7 +18767,7 @@ LIBS="$cf_add_libs" else test -n "$verbose" && echo " ... did not find $cf_pkg_gnutls in pkg-config" 1>&6 -echo "${as_me:-configure}:19490: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5 +echo "${as_me:-configure}:18770: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5 cf_pkg_gnutls=none fi @@ -19507,12 +18787,12 @@ EOF cf_cv_header_path_gnutls= cf_cv_library_path_gnutls= -echo "${as_me:-configure}:19510: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5 +echo "${as_me:-configure}:18790: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5 cf_save_LIBS="$LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 19515 "configure" +#line 18795 "configure" #include "confdefs.h" #include @@ -19541,16 +18821,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19544: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18824: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19547: \$? = $ac_status" >&5 + echo "$as_me:18827: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19550: \"$ac_try\"") >&5 + { (eval echo "$as_me:18830: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19553: \$? = $ac_status" >&5 + echo "$as_me:18833: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_gnutls=yes @@ -19564,7 +18844,7 @@ cat "conftest.$ac_ext" >&5 LIBS="-lgnutls -lgnutls-openssl $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 19567 "configure" +#line 18847 "configure" #include "confdefs.h" #include @@ -19593,16 +18873,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19596: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18876: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19599: \$? = $ac_status" >&5 + echo "$as_me:18879: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19602: \"$ac_try\"") >&5 + { (eval echo "$as_me:18882: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19605: \$? = $ac_status" >&5 + echo "$as_me:18885: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_gnutls=yes @@ -19619,9 +18899,9 @@ cat "conftest.$ac_ext" >&5 test -n "$verbose" && echo " find linkage for gnutls library" 1>&6 -echo "${as_me:-configure}:19622: testing find linkage for gnutls library ..." 1>&5 +echo "${as_me:-configure}:18902: testing find linkage for gnutls library ..." 1>&5 -echo "${as_me:-configure}:19624: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5 +echo "${as_me:-configure}:18904: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -19712,7 +18992,7 @@ cf_search="$cf_search $cf_header_path_list" if test -d "$cf_cv_header_path_gnutls" ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_gnutls" 1>&6 -echo "${as_me:-configure}:19715: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5 +echo "${as_me:-configure}:18995: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS" @@ -19720,7 +19000,7 @@ echo "${as_me:-configure}:19715: testing ... testing $cf_cv_header_path_gnutls . CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_gnutls" cat >"conftest.$ac_ext" <<_ACEOF -#line 19723 "configure" +#line 19003 "configure" #include "confdefs.h" #include @@ -19749,21 +19029,21 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19752: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19032: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19755: \$? = $ac_status" >&5 + echo "$as_me:19035: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19758: \"$ac_try\"") >&5 + { (eval echo "$as_me:19038: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19761: \$? = $ac_status" >&5 + echo "$as_me:19041: \$? = $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}:19766: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5 +echo "${as_me:-configure}:19046: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5 cf_cv_find_linkage_gnutls=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -19781,7 +19061,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_cv_find_linkage_gnutls" = maybe ; then -echo "${as_me:-configure}:19784: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5 +echo "${as_me:-configure}:19064: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -19856,13 +19136,13 @@ cf_search="$cf_library_path_list $cf_search" if test -d "$cf_cv_library_path_gnutls" ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_gnutls" 1>&6 -echo "${as_me:-configure}:19859: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5 +echo "${as_me:-configure}:19139: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5 CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-lgnutls -lgnutls-openssl $cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_gnutls" cat >"conftest.$ac_ext" <<_ACEOF -#line 19865 "configure" +#line 19145 "configure" #include "confdefs.h" #include @@ -19891,21 +19171,21 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19894: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19174: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19897: \$? = $ac_status" >&5 + echo "$as_me:19177: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19900: \"$ac_try\"") >&5 + { (eval echo "$as_me:19180: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19903: \$? = $ac_status" >&5 + echo "$as_me:19183: \$? = $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}:19908: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5 +echo "${as_me:-configure}:19188: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5 cf_cv_find_linkage_gnutls=yes cf_cv_library_file_gnutls="-lgnutls" @@ -19985,7 +19265,7 @@ if test -n "$cf_cv_header_path_gnutls" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 19988 "configure" +#line 19268 "configure" #include "confdefs.h" #include int @@ -19997,16 +19277,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20000: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19280: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20003: \$? = $ac_status" >&5 + echo "$as_me:19283: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20006: \"$ac_try\"") >&5 + { (eval echo "$as_me:19286: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20009: \$? = $ac_status" >&5 + echo "$as_me:19289: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -20023,7 +19303,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:20026: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:19306: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -20064,7 +19344,7 @@ if test -n "$cf_cv_library_path_gnutls" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:20067: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:19347: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -20093,13 +19373,13 @@ LIBS="$cf_add_libs" for ac_func in gnutls_protocol_set_priority do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:20096: checking for $ac_func" >&5 +echo "$as_me:19376: 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 20102 "configure" +#line 19382 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -20130,16 +19410,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20133: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19413: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20136: \$? = $ac_status" >&5 + echo "$as_me:19416: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20139: \"$ac_try\"") >&5 + { (eval echo "$as_me:19419: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20142: \$? = $ac_status" >&5 + echo "$as_me:19422: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -20149,7 +19429,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:20152: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:19432: 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:19442: checking for gnutls_rnd" >&5 echo $ECHO_N "checking for gnutls_rnd... $ECHO_C" >&6 if test "${ac_cv_func_gnutls_rnd+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 20168 "configure" +#line 19448 "configure" #include "confdefs.h" #define gnutls_rnd autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -20196,16 +19476,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20199: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19479: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20202: \$? = $ac_status" >&5 + echo "$as_me:19482: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20205: \"$ac_try\"") >&5 + { (eval echo "$as_me:19485: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20208: \$? = $ac_status" >&5 + echo "$as_me:19488: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_gnutls_rnd=yes else @@ -20215,7 +19495,7 @@ ac_cv_func_gnutls_rnd=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:20218: result: $ac_cv_func_gnutls_rnd" >&5 +echo "$as_me:19498: result: $ac_cv_func_gnutls_rnd" >&5 echo "${ECHO_T}$ac_cv_func_gnutls_rnd" >&6 if test "$ac_cv_func_gnutls_rnd" = yes; then @@ -20244,7 +19524,7 @@ LIBS="$cf_add_libs" fi if test "$cf_pkg_gnutls" = none ; then - echo "$as_me:20247: checking for SSL_connect in -lgnutls-openssl" >&5 + echo "$as_me:19527: 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 @@ -20252,7 +19532,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgnutls-openssl $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 20255 "configure" +#line 19535 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -20271,16 +19551,16 @@ SSL_connect (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20274: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19554: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20277: \$? = $ac_status" >&5 + echo "$as_me:19557: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20280: \"$ac_try\"") >&5 + { (eval echo "$as_me:19560: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20283: \$? = $ac_status" >&5 + echo "$as_me:19563: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gnutls_openssl_SSL_connect=yes else @@ -20291,7 +19571,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:20294: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5 +echo "$as_me:19574: 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 @@ -20312,7 +19592,7 @@ done LIBS="$cf_add_libs" else - echo "$as_me:20315: checking for SSL_connect in -lgnutls-extra" >&5 + echo "$as_me:19595: 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 @@ -20320,7 +19600,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgnutls-extra $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 20323 "configure" +#line 19603 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -20339,16 +19619,16 @@ SSL_connect (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20342: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19622: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20345: \$? = $ac_status" >&5 + echo "$as_me:19625: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20348: \"$ac_try\"") >&5 + { (eval echo "$as_me:19628: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20351: \$? = $ac_status" >&5 + echo "$as_me:19631: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gnutls_extra_SSL_connect=yes else @@ -20359,7 +19639,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:20362: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5 +echo "$as_me:19642: 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 @@ -20380,7 +19660,7 @@ done LIBS="$cf_add_libs" else - { { echo "$as_me:20383: error: cannot find gnutls openssl functions" >&5 + { { echo "$as_me:19663: error: cannot find gnutls openssl functions" >&5 echo "$as_me: error: cannot find gnutls openssl functions" >&2;} { (exit 1); exit 1; }; } fi @@ -20389,10 +19669,10 @@ fi fi -echo "$as_me:20392: checking for X509 support" >&5 +echo "$as_me:19672: checking for X509 support" >&5 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 20395 "configure" +#line 19675 "configure" #include "confdefs.h" #include @@ -20421,16 +19701,16 @@ X509_verify_cert_error_string(X509_STORE_CTX_get_error(NULL)) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20424: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19704: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20427: \$? = $ac_status" >&5 + echo "$as_me:19707: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20430: \"$ac_try\"") >&5 + { (eval echo "$as_me:19710: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20433: \$? = $ac_status" >&5 + echo "$as_me:19713: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_x509_support=yes else @@ -20439,7 +19719,7 @@ cat "conftest.$ac_ext" >&5 cf_x509_support=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" -echo "$as_me:20442: result: $cf_x509_support" >&5 +echo "$as_me:19722: result: $cf_x509_support" >&5 echo "${ECHO_T}$cf_x509_support" >&6 if test "$cf_x509_support" = yes ; then @@ -20471,7 +19751,7 @@ case "$cf_cv_use_libnss_compat" in ;; (yes) -echo "$as_me:20474: checking for SSL_get_version in -lnss_compat_ossl" >&5 +echo "$as_me:19754: 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 @@ -20479,7 +19759,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lnss_compat_ossl -lnss_compat_ossl $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 20482 "configure" +#line 19762 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -20498,16 +19778,16 @@ SSL_get_version (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20501: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19781: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20504: \$? = $ac_status" >&5 + echo "$as_me:19784: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20507: \"$ac_try\"") >&5 + { (eval echo "$as_me:19787: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20510: \$? = $ac_status" >&5 + echo "$as_me:19790: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_nss_compat_ossl_SSL_get_version=yes else @@ -20518,7 +19798,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:20521: result: $ac_cv_lib_nss_compat_ossl_SSL_get_version" >&5 +echo "$as_me:19801: 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}:20536: testing assume it is in $cf_ssl_root ..." 1>&5 +echo "${as_me:-configure}:19816: 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:20540: error: cannot find NSS compliant libraries" >&5 + { { echo "$as_me:19820: error: cannot find NSS compliant libraries" >&5 echo "$as_me: error: cannot find NSS compliant libraries" >&2;} { (exit 1); exit 1; }; } fi @@ -20552,13 +19832,13 @@ fi elif test -d "$cf_cv_use_libnss_compat/../include" ; then cf_ssl_root=$cf_cv_use_libnss_compat/.. else - { { echo "$as_me:20555: error: cannot find NSS compliant library under $cf_cv_use_libnss_compat" >&5 + { { echo "$as_me:19835: error: cannot find NSS compliant library under $cf_cv_use_libnss_compat" >&5 echo "$as_me: error: cannot find NSS compliant 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:20561: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5 + { echo "$as_me:19841: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5 echo "$as_me: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&2;} fi ;; @@ -20687,10 +19967,10 @@ if test -n "$cf_new_extra_cppflags" ; then fi if test "$cf_ssl_subincs" = yes ; then -echo "$as_me:20690: checking for NSS compliant include directory" >&5 +echo "$as_me:19970: checking for NSS compliant include directory" >&5 echo $ECHO_N "checking for NSS compliant include directory... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 20693 "configure" +#line 19973 "configure" #include "confdefs.h" #include @@ -20704,16 +19984,16 @@ SSL_shutdown((SSL *)0) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20707: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19987: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20710: \$? = $ac_status" >&5 + echo "$as_me:19990: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20713: \"$ac_try\"") >&5 + { (eval echo "$as_me:19993: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20716: \$? = $ac_status" >&5 + echo "$as_me:19996: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_ssl_incl=yes else @@ -20722,7 +20002,7 @@ cat "conftest.$ac_ext" >&5 cf_ssl_incl=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:20725: result: $cf_ssl_incl" >&5 +echo "$as_me:20005: result: $cf_ssl_incl" >&5 echo "${ECHO_T}$cf_ssl_incl" >&6 test "$cf_ssl_incl" = yes && cat >>confdefs.h <<\EOF @@ -20731,10 +20011,10 @@ EOF fi -echo "$as_me:20734: checking if we can link to NSS compliant library" >&5 +echo "$as_me:20014: checking if we can link to NSS compliant library" >&5 echo $ECHO_N "checking if we can link to NSS compliant library... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 20737 "configure" +#line 20017 "configure" #include "confdefs.h" #include @@ -20753,16 +20033,16 @@ SSL_shutdown((SSL *)0) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20756: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20036: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20759: \$? = $ac_status" >&5 + echo "$as_me:20039: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20762: \"$ac_try\"") >&5 + { (eval echo "$as_me:20042: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20765: \$? = $ac_status" >&5 + echo "$as_me:20045: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_ssl_library=yes else @@ -20771,7 +20051,7 @@ cat "conftest.$ac_ext" >&5 cf_ssl_library=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" -echo "$as_me:20774: result: $cf_ssl_library" >&5 +echo "$as_me:20054: result: $cf_ssl_library" >&5 echo "${ECHO_T}$cf_ssl_library" >&6 if test "$cf_ssl_library" = yes ; then @@ -20784,7 +20064,7 @@ cat >>confdefs.h <<\EOF EOF else - { { echo "$as_me:20787: error: Cannot link with NSS compliant libraries" >&5 + { { echo "$as_me:20067: error: Cannot link with NSS compliant libraries" >&5 echo "$as_me: error: Cannot link with NSS compliant libraries" >&2;} { (exit 1); exit 1; }; } fi @@ -20792,7 +20072,7 @@ fi fi ### check for ipv6 support -echo "$as_me:20795: checking whether to enable ipv6" >&5 +echo "$as_me:20075: 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. @@ -20809,11 +20089,11 @@ EOF else enableval=no fi; -echo "$as_me:20812: result: $enableval" >&5 +echo "$as_me:20092: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" = "yes"; then -echo "$as_me:20816: checking ipv6 stack type" >&5 +echo "$as_me:20096: 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 @@ -20834,7 +20114,7 @@ do ;; (inria) cat >"conftest.$ac_ext" <<_ACEOF -#line 20837 "configure" +#line 20117 "configure" #include "confdefs.h" #include @@ -20851,7 +20131,7 @@ rm -rf conftest* ;; (kame) cat >"conftest.$ac_ext" <<_ACEOF -#line 20854 "configure" +#line 20134 "configure" #include "confdefs.h" #include @@ -20868,7 +20148,7 @@ rm -rf conftest* ;; (linux-glibc) cat >"conftest.$ac_ext" <<_ACEOF -#line 20871 "configure" +#line 20151 "configure" #include "confdefs.h" #include @@ -20894,7 +20174,7 @@ rm -rf conftest* ;; (toshiba) cat >"conftest.$ac_ext" <<_ACEOF -#line 20897 "configure" +#line 20177 "configure" #include "confdefs.h" #include @@ -20911,7 +20191,7 @@ rm -rf conftest* ;; (v6d) cat >"conftest.$ac_ext" <<_ACEOF -#line 20914 "configure" +#line 20194 "configure" #include "confdefs.h" #include @@ -20928,7 +20208,7 @@ rm -rf conftest* ;; (zeta) cat >"conftest.$ac_ext" <<_ACEOF -#line 20931 "configure" +#line 20211 "configure" #include "confdefs.h" #include @@ -20950,13 +20230,13 @@ rm -rf conftest* done fi -echo "$as_me:20953: result: $cf_cv_ipv6type" >&5 +echo "$as_me:20233: result: $cf_cv_ipv6type" >&5 echo "${ECHO_T}$cf_cv_ipv6type" >&6 cf_ipv6lib=none cf_ipv6dir=none -echo "$as_me:20959: checking for IPv6 library if required" >&5 +echo "$as_me:20239: checking for IPv6 library if required" >&5 echo $ECHO_N "checking for IPv6 library if required... $ECHO_C" >&6 case "$cf_cv_ipv6type" in (solaris) @@ -20986,13 +20266,13 @@ case "$cf_cv_ipv6type" in cf_ipv6dir=v6 ;; esac -echo "$as_me:20989: result: $cf_ipv6lib" >&5 +echo "$as_me:20269: result: $cf_ipv6lib" >&5 echo "${ECHO_T}$cf_ipv6lib" >&6 if test "$cf_ipv6lib" != "none"; then cat >"conftest.$ac_ext" <<_ACEOF -#line 20995 "configure" +#line 20275 "configure" #include "confdefs.h" #include @@ -21008,16 +20288,16 @@ getaddrinfo(0, 0, 0, 0) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21011: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20291: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21014: \$? = $ac_status" >&5 + echo "$as_me:20294: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21017: \"$ac_try\"") >&5 + { (eval echo "$as_me:20297: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21020: \$? = $ac_status" >&5 + echo "$as_me:20300: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -21138,7 +20418,7 @@ if test -n "$cf_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 21141 "configure" +#line 20421 "configure" #include "confdefs.h" #include int @@ -21150,16 +20430,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:21153: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20433: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21156: \$? = $ac_status" >&5 + echo "$as_me:20436: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:21159: \"$ac_try\"") >&5 + { (eval echo "$as_me:20439: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21162: \$? = $ac_status" >&5 + echo "$as_me:20442: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -21176,7 +20456,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:21179: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:20459: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -21204,13 +20484,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" eval 'cf_cv_have_lib_'"$cf_ipv6lib"'=no' cf_libdir="" - echo "$as_me:21207: checking for getaddrinfo" >&5 + echo "$as_me:20487: 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 21213 "configure" +#line 20493 "configure" #include "confdefs.h" #define getaddrinfo autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21241,16 +20521,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21244: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20524: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21247: \$? = $ac_status" >&5 + echo "$as_me:20527: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21250: \"$ac_try\"") >&5 + { (eval echo "$as_me:20530: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21253: \$? = $ac_status" >&5 + echo "$as_me:20533: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_getaddrinfo=yes else @@ -21260,18 +20540,18 @@ ac_cv_func_getaddrinfo=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21263: result: $ac_cv_func_getaddrinfo" >&5 +echo "$as_me:20543: 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:21270: checking for getaddrinfo in -l$cf_ipv6lib" >&5 + echo "$as_me:20550: 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 21274 "configure" +#line 20554 "configure" #include "confdefs.h" #include @@ -21287,25 +20567,25 @@ getaddrinfo(0, 0, 0, 0) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21290: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20570: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21293: \$? = $ac_status" >&5 + echo "$as_me:20573: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21296: \"$ac_try\"") >&5 + { (eval echo "$as_me:20576: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21299: \$? = $ac_status" >&5 + echo "$as_me:20579: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:21301: result: yes" >&5 + echo "$as_me:20581: 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:21308: result: no" >&5 +echo "$as_me:20588: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -21373,11 +20653,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:21376: checking for -l$cf_ipv6lib in $cf_libdir" >&5 + echo "$as_me:20656: 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 21380 "configure" +#line 20660 "configure" #include "confdefs.h" #include @@ -21393,25 +20673,25 @@ getaddrinfo(0, 0, 0, 0) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21396: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20676: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21399: \$? = $ac_status" >&5 + echo "$as_me:20679: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21402: \"$ac_try\"") >&5 + { (eval echo "$as_me:20682: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21405: \$? = $ac_status" >&5 + echo "$as_me:20685: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:21407: result: yes" >&5 + echo "$as_me:20687: 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:21414: result: no" >&5 +echo "$as_me:20694: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -21426,7 +20706,7 @@ fi eval 'cf_found_library="$cf_cv_have_lib_'"$cf_ipv6lib"\" if test "$cf_found_library" = no ; then - { { echo "$as_me:21429: error: No $cf_ipv6lib library found, cannot continue. You must fetch lib$cf_ipv6lib.a + { { echo "$as_me:20709: 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;} @@ -21434,7 +20714,7 @@ from an appropriate IPv6 kit and compile beforehand." >&2;} fi fi -echo "$as_me:21437: checking working getaddrinfo" >&5 +echo "$as_me:20717: 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 @@ -21444,7 +20724,7 @@ if test "$cross_compiling" = yes; then cf_cv_getaddrinfo=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 21447 "configure" +#line 20727 "configure" #include "confdefs.h" $ac_includes_default @@ -21524,15 +20804,15 @@ int main(void) _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:21527: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20807: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21530: \$? = $ac_status" >&5 + echo "$as_me:20810: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:21532: \"$ac_try\"") >&5 + { (eval echo "$as_me:20812: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21535: \$? = $ac_status" >&5 + echo "$as_me:20815: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_getaddrinfo=yes else @@ -21545,7 +20825,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi -echo "$as_me:21548: result: $cf_cv_getaddrinfo" >&5 +echo "$as_me:20828: result: $cf_cv_getaddrinfo" >&5 echo "${ECHO_T}$cf_cv_getaddrinfo" >&6 if test "$cf_cv_getaddrinfo" = yes ; then @@ -21561,12 +20841,12 @@ fi if test "$cf_cv_getaddrinfo" != "yes"; then if test "$cf_cv_ipv6type" != "linux"; then - { echo "$as_me:21564: WARNING: You must get working getaddrinfo() function, + { echo "$as_me:20844: 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:21569: WARNING: The getaddrinfo() implementation on your system seems be buggy. + { echo "$as_me:20849: 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. @@ -21577,7 +20857,7 @@ fi fi -echo "$as_me:21580: checking for screen type" >&5 +echo "$as_me:20860: 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 @@ -21591,7 +20871,7 @@ case "$withval" in (curses|ncurses*|pdcurses|slang) cf_cv_screen=$withval ;; -(*) { { echo "$as_me:21594: error: Unexpected value $withval" >&5 +(*) { { echo "$as_me:20874: error: Unexpected value $withval" >&5 echo "$as_me: error: Unexpected value $withval" >&2;} { (exit 1); exit 1; }; } ;; @@ -21600,13 +20880,13 @@ else cf_cv_screen=curses fi; fi -echo "$as_me:21603: result: $cf_cv_screen" >&5 +echo "$as_me:20883: result: $cf_cv_screen" >&5 echo "${ECHO_T}$cf_cv_screen" >&6 case "$cf_cv_screen" in (curses|ncurses*) -echo "$as_me:21609: checking for specific curses-directory" >&5 +echo "$as_me:20889: checking for specific curses-directory" >&5 echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6 # Check whether --with-curses-dir or --without-curses-dir was given. @@ -21616,7 +20896,7 @@ if test "${with_curses_dir+set}" = set; then else cf_cv_curses_dir=no fi; -echo "$as_me:21619: result: $cf_cv_curses_dir" >&5 +echo "$as_me:20899: result: $cf_cv_curses_dir" >&5 echo "${ECHO_T}$cf_cv_curses_dir" >&6 if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" @@ -21647,7 +20927,7 @@ case ".$withval" in withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:21650: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:20930: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -21683,7 +20963,7 @@ if test -n "$cf_cv_curses_dir/include" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 21686 "configure" +#line 20966 "configure" #include "confdefs.h" #include int @@ -21695,16 +20975,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:21698: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20978: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21701: \$? = $ac_status" >&5 + echo "$as_me:20981: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:21704: \"$ac_try\"") >&5 + { (eval echo "$as_me:20984: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21707: \$? = $ac_status" >&5 + echo "$as_me:20987: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -21721,7 +21001,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:21724: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:21004: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -21757,7 +21037,7 @@ if test -n "$cf_cv_curses_dir/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:21760: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:21040: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -21776,7 +21056,7 @@ dft_color_style=yes case "$cf_cv_screen" in (curses) -echo "$as_me:21779: checking for extra include directories" >&5 +echo "$as_me:21059: 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 @@ -21802,7 +21082,7 @@ case "$host_os" in esac fi -echo "$as_me:21805: result: $cf_cv_curses_incdir" >&5 +echo "$as_me:21085: result: $cf_cv_curses_incdir" >&5 echo "${ECHO_T}$cf_cv_curses_incdir" >&6 if test "$cf_cv_curses_incdir" != no then @@ -21812,7 +21092,7 @@ then fi -echo "$as_me:21815: checking if we have identified curses headers" >&5 +echo "$as_me:21095: 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 @@ -21824,7 +21104,7 @@ for cf_header in \ curses.h ncurses/ncurses.h ncurses/curses.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 21827 "configure" +#line 21107 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -21836,16 +21116,16 @@ initscr(); endwin() } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:21839: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21119: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21842: \$? = $ac_status" >&5 + echo "$as_me:21122: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:21845: \"$ac_try\"") >&5 + { (eval echo "$as_me:21125: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21848: \$? = $ac_status" >&5 + echo "$as_me:21128: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -21856,11 +21136,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:21859: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:21139: 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:21863: error: No curses header-files found" >&5 + { { echo "$as_me:21143: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -21870,23 +21150,23 @@ fi for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:21873: checking for $ac_header" >&5 +echo "$as_me:21153: 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 21879 "configure" +#line 21159 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:21883: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:21163: \"$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:21889: \$? = $ac_status" >&5 + echo "$as_me:21169: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -21905,7 +21185,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:21908: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:21188: 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:21198: 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 @@ -21933,7 +21213,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 21936 "configure" +#line 21216 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -21948,16 +21228,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:21951: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21231: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21954: \$? = $ac_status" >&5 + echo "$as_me:21234: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:21957: \"$ac_try\"") >&5 + { (eval echo "$as_me:21237: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21960: \$? = $ac_status" >&5 + echo "$as_me:21240: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -21973,7 +21253,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:21976: result: $cf_cv_term_header" >&5 +echo "$as_me:21256: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -22005,7 +21285,7 @@ EOF ;; esac -echo "$as_me:22008: checking for ncurses version" >&5 +echo "$as_me:21288: 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 @@ -22031,10 +21311,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:22034: \"$cf_try\"") >&5 + { (eval echo "$as_me:21314: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:22037: \$? = $ac_status" >&5 + echo "$as_me:21317: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` @@ -22044,7 +21324,7 @@ EOF else cat >"conftest.$ac_ext" <<_ACEOF -#line 22047 "configure" +#line 21327 "configure" #include "confdefs.h" $ac_includes_default @@ -22071,15 +21351,15 @@ int main(void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:22074: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21354: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22077: \$? = $ac_status" >&5 + echo "$as_me:21357: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:22079: \"$ac_try\"") >&5 + { (eval echo "$as_me:21359: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22082: \$? = $ac_status" >&5 + echo "$as_me:21362: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -22093,17 +21373,17 @@ fi rm -f "$cf_tempfile" fi -echo "$as_me:22096: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:21376: 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:22103: checking if we have identified curses libraries" >&5 +echo "$as_me:21383: 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 22106 "configure" +#line 21386 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -22115,16 +21395,16 @@ initscr(); endwin() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22118: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21398: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22121: \$? = $ac_status" >&5 + echo "$as_me:21401: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22124: \"$ac_try\"") >&5 + { (eval echo "$as_me:21404: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22127: \$? = $ac_status" >&5 + echo "$as_me:21407: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -22133,13 +21413,13 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" -echo "$as_me:22136: result: $cf_result" >&5 +echo "$as_me:21416: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = no ; then case "$host_os" in (freebsd*) - echo "$as_me:22142: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:21422: 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 @@ -22147,7 +21427,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 22150 "configure" +#line 21430 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -22166,16 +21446,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22169: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21449: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22172: \$? = $ac_status" >&5 + echo "$as_me:21452: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22175: \"$ac_try\"") >&5 + { (eval echo "$as_me:21455: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22178: \$? = $ac_status" >&5 + echo "$as_me:21458: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -22186,7 +21466,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22189: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:21469: 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 @@ -22216,7 +21496,7 @@ fi # term.h) for cur_colr if test "x$cf_cv_screen" = "xcurses_colr" then - echo "$as_me:22219: checking for initscr in -lcur_colr" >&5 + echo "$as_me:21499: 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 @@ -22224,7 +21504,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lcur_colr $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 22227 "configure" +#line 21507 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -22243,16 +21523,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22246: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21526: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22249: \$? = $ac_status" >&5 + echo "$as_me:21529: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22252: \"$ac_try\"") >&5 + { (eval echo "$as_me:21532: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22255: \$? = $ac_status" >&5 + echo "$as_me:21535: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_cur_colr_initscr=yes else @@ -22263,7 +21543,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22266: result: $ac_cv_lib_cur_colr_initscr" >&5 +echo "$as_me:21546: 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 @@ -22287,7 +21567,7 @@ LIBS="$cf_add_libs" else - echo "$as_me:22290: checking for initscr in -lHcurses" >&5 + echo "$as_me:21570: 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 @@ -22295,7 +21575,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lHcurses $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 22298 "configure" +#line 21578 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -22314,16 +21594,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22317: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21597: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22320: \$? = $ac_status" >&5 + echo "$as_me:21600: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22323: \"$ac_try\"") >&5 + { (eval echo "$as_me:21603: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22326: \$? = $ac_status" >&5 + echo "$as_me:21606: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_Hcurses_initscr=yes else @@ -22334,7 +21614,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22337: result: $ac_cv_lib_Hcurses_initscr" >&5 +echo "$as_me:21617: 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 @@ -22392,7 +21672,7 @@ if test -n "/lib64" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:22395: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:21675: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -22421,7 +21701,7 @@ if test -n "/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:22424: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:21704: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -22452,7 +21732,7 @@ if test -n "/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:22455: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:21735: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -22487,7 +21767,7 @@ if test -n "/usr/5lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:22490: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:21770: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -22531,13 +21811,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then # because it may be needed to link the test-case for initscr. if test "x$cf_term_lib" = x then - echo "$as_me:22534: checking for tgoto" >&5 + echo "$as_me:21814: 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 22540 "configure" +#line 21820 "configure" #include "confdefs.h" #define tgoto autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -22568,16 +21848,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22571: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21851: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22574: \$? = $ac_status" >&5 + echo "$as_me:21854: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22577: \"$ac_try\"") >&5 + { (eval echo "$as_me:21857: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22580: \$? = $ac_status" >&5 + echo "$as_me:21860: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_tgoto=yes else @@ -22587,7 +21867,7 @@ ac_cv_func_tgoto=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:22590: result: $ac_cv_func_tgoto" >&5 +echo "$as_me:21870: 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 @@ -22596,7 +21876,7 @@ else for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown do as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh` -echo "$as_me:22599: checking for tgoto in -l$cf_term_lib" >&5 +echo "$as_me:21879: 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 @@ -22604,7 +21884,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_term_lib $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 22607 "configure" +#line 21887 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -22623,16 +21903,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22626: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21906: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22629: \$? = $ac_status" >&5 + echo "$as_me:21909: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22632: \"$ac_try\"") >&5 + { (eval echo "$as_me:21912: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22635: \$? = $ac_status" >&5 + echo "$as_me:21915: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Lib=yes" else @@ -22643,7 +21923,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22646: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 +echo "$as_me:21926: 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 @@ -22666,10 +21946,10 @@ fi do LIBS="-l$cf_curs_lib $cf_save_LIBS" if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then - echo "$as_me:22669: checking if we can link with $cf_curs_lib library" >&5 + echo "$as_me:21949: 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 22672 "configure" +#line 21952 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -22681,16 +21961,16 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22684: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21964: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22687: \$? = $ac_status" >&5 + echo "$as_me:21967: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22690: \"$ac_try\"") >&5 + { (eval echo "$as_me:21970: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22693: \$? = $ac_status" >&5 + echo "$as_me:21973: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -22699,16 +21979,16 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:22702: result: $cf_result" >&5 + echo "$as_me:21982: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 test "$cf_result" = yes && break elif test "$cf_curs_lib" = "$cf_term_lib" ; then cf_result=no elif test "$cf_term_lib" != predefined ; then - echo "$as_me:22708: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 + echo "$as_me:21988: 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 22711 "configure" +#line 21991 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -22720,16 +22000,16 @@ initscr(); endwin(); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22723: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22003: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22726: \$? = $ac_status" >&5 + echo "$as_me:22006: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22729: \"$ac_try\"") >&5 + { (eval echo "$as_me:22009: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22732: \$? = $ac_status" >&5 + echo "$as_me:22012: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=no else @@ -22738,7 +22018,7 @@ cat "conftest.$ac_ext" >&5 LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 22741 "configure" +#line 22021 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -22750,16 +22030,16 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22753: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22033: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22756: \$? = $ac_status" >&5 + echo "$as_me:22036: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22759: \"$ac_try\"") >&5 + { (eval echo "$as_me:22039: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22762: \$? = $ac_status" >&5 + echo "$as_me:22042: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -22771,19 +22051,19 @@ 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:22774: result: $cf_result" >&5 + echo "$as_me:22054: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 test "$cf_result" != error && break fi done fi - test "$cf_curs_lib" = unknown && { { echo "$as_me:22780: error: no curses library found" >&5 + test "$cf_curs_lib" = unknown && { { echo "$as_me:22060: error: no curses library found" >&5 echo "$as_me: error: no curses library found" >&2;} { (exit 1); exit 1; }; } fi fi -echo "$as_me:22786: checking for curses performance tradeoff" >&5 +echo "$as_me:22066: 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 @@ -22791,7 +22071,7 @@ else cf_cv_curs_performance=no cat >"conftest.$ac_ext" <<_ACEOF -#line 22794 "configure" +#line 22074 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -22810,20 +22090,20 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:22813: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22093: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22816: \$? = $ac_status" >&5 + echo "$as_me:22096: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:22819: \"$ac_try\"") >&5 + { (eval echo "$as_me:22099: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22822: \$? = $ac_status" >&5 + echo "$as_me:22102: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cat >"conftest.$ac_ext" <<_ACEOF -#line 22826 "configure" +#line 22106 "configure" #include "confdefs.h" #define CURS_PERFORMANCE @@ -22843,16 +22123,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:22846: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22126: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22849: \$? = $ac_status" >&5 + echo "$as_me:22129: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:22852: \"$ac_try\"") >&5 + { (eval echo "$as_me:22132: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22855: \$? = $ac_status" >&5 + echo "$as_me:22135: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_curs_performance=yes else @@ -22867,21 +22147,21 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:22870: result: $cf_cv_curs_performance" >&5 +echo "$as_me:22150: 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:22877: checking for curses touchline function" >&5 +echo "$as_me:22157: 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 22884 "configure" +#line 22164 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -22894,23 +22174,23 @@ touchline(stdscr, 1,2,3); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22897: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22177: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22900: \$? = $ac_status" >&5 + echo "$as_me:22180: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22903: \"$ac_try\"") >&5 + { (eval echo "$as_me:22183: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22906: \$? = $ac_status" >&5 + echo "$as_me:22186: \$? = $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 22913 "configure" +#line 22193 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -22923,16 +22203,16 @@ touchline(stdscr, 1,2); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22926: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22206: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22929: \$? = $ac_status" >&5 + echo "$as_me:22209: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22932: \"$ac_try\"") >&5 + { (eval echo "$as_me:22212: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22935: \$? = $ac_status" >&5 + echo "$as_me:22215: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_curs_touchline=sysv else @@ -22944,7 +22224,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:22947: result: $cf_cv_curs_touchline" >&5 +echo "$as_me:22227: result: $cf_cv_curs_touchline" >&5 echo "${ECHO_T}$cf_cv_curs_touchline" >&6 case "$cf_cv_curs_touchline" in (bsd) @@ -22969,23 +22249,23 @@ esac for ac_header in wchar.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:22972: checking for $ac_header" >&5 +echo "$as_me:22252: 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 22978 "configure" +#line 22258 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:22982: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:22262: \"$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:22988: \$? = $ac_status" >&5 + echo "$as_me:22268: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -23004,7 +22284,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:23007: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:22287: 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:22297: 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 @@ -23022,7 +22302,7 @@ else cf_save_LIBS="$LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 23025 "configure" +#line 22305 "configure" #include "confdefs.h" $ac_includes_default @@ -23039,16 +22319,16 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23042: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22322: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23045: \$? = $ac_status" >&5 + echo "$as_me:22325: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23048: \"$ac_try\"") >&5 + { (eval echo "$as_me:22328: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23051: \$? = $ac_status" >&5 + echo "$as_me:22331: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_utf8_lib=yes else @@ -23060,12 +22340,12 @@ cat "conftest.$ac_ext" >&5 cf_cv_header_path_utf8= cf_cv_library_path_utf8= -echo "${as_me:-configure}:23063: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:22343: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 23068 "configure" +#line 22348 "configure" #include "confdefs.h" #include @@ -23078,16 +22358,16 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23081: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22361: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23084: \$? = $ac_status" >&5 + echo "$as_me:22364: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23087: \"$ac_try\"") >&5 + { (eval echo "$as_me:22367: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23090: \$? = $ac_status" >&5 + echo "$as_me:22370: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_utf8=yes @@ -23101,7 +22381,7 @@ cat "conftest.$ac_ext" >&5 LIBS="-lutf8 $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 23104 "configure" +#line 22384 "configure" #include "confdefs.h" #include @@ -23114,16 +22394,16 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23117: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22397: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23120: \$? = $ac_status" >&5 + echo "$as_me:22400: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23123: \"$ac_try\"") >&5 + { (eval echo "$as_me:22403: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23126: \$? = $ac_status" >&5 + echo "$as_me:22406: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_utf8=yes @@ -23140,9 +22420,9 @@ cat "conftest.$ac_ext" >&5 test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 -echo "${as_me:-configure}:23143: testing find linkage for utf8 library ..." 1>&5 +echo "${as_me:-configure}:22423: testing find linkage for utf8 library ..." 1>&5 -echo "${as_me:-configure}:23145: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:22425: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -23233,7 +22513,7 @@ cf_search="$cf_search $cf_header_path_list" if test -d "$cf_cv_header_path_utf8" ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6 -echo "${as_me:-configure}:23236: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:22516: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS" @@ -23241,7 +22521,7 @@ echo "${as_me:-configure}:23236: testing ... testing $cf_cv_header_path_utf8 ... CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8" cat >"conftest.$ac_ext" <<_ACEOF -#line 23244 "configure" +#line 22524 "configure" #include "confdefs.h" #include @@ -23254,21 +22534,21 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:23257: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22537: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23260: \$? = $ac_status" >&5 + echo "$as_me:22540: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:23263: \"$ac_try\"") >&5 + { (eval echo "$as_me:22543: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23266: \$? = $ac_status" >&5 + echo "$as_me:22546: \$? = $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}:23271: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:22551: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -23286,7 +22566,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_cv_find_linkage_utf8" = maybe ; then -echo "${as_me:-configure}:23289: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:22569: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -23361,13 +22641,13 @@ cf_search="$cf_library_path_list $cf_search" if test -d "$cf_cv_library_path_utf8" ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6 -echo "${as_me:-configure}:23364: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:22644: 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 23370 "configure" +#line 22650 "configure" #include "confdefs.h" #include @@ -23380,21 +22660,21 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23383: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22663: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23386: \$? = $ac_status" >&5 + echo "$as_me:22666: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23389: \"$ac_try\"") >&5 + { (eval echo "$as_me:22669: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23392: \$? = $ac_status" >&5 + echo "$as_me:22672: \$? = $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}:23397: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:22677: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=yes cf_cv_library_file_utf8="-lutf8" @@ -23436,7 +22716,7 @@ fi fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:23439: result: $cf_cv_utf8_lib" >&5 +echo "$as_me:22719: 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 @@ -23474,7 +22754,7 @@ if test -n "$cf_cv_header_path_utf8" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 23477 "configure" +#line 22757 "configure" #include "confdefs.h" #include int @@ -23486,16 +22766,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:23489: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22769: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23492: \$? = $ac_status" >&5 + echo "$as_me:22772: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:23495: \"$ac_try\"") >&5 + { (eval echo "$as_me:22775: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23498: \$? = $ac_status" >&5 + echo "$as_me:22778: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -23512,7 +22792,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:23515: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:22795: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -23548,7 +22828,7 @@ if test -n "$cf_cv_library_path_utf8" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:23551: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:22831: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -23578,13 +22858,13 @@ cf_ncuconfig_root=$cf_cv_screen cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:23581: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:22861: checking pkg-config for $cf_ncuconfig_root" >&5 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then - echo "$as_me:23584: result: yes" >&5 + echo "$as_me:22864: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:23587: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:22867: checking if the $cf_ncuconfig_root package files work" >&5 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 cf_have_ncuconfig=unknown @@ -23717,7 +22997,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 23720 "configure" +#line 23000 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -23729,37 +23009,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23732: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23012: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23735: \$? = $ac_status" >&5 + echo "$as_me:23015: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23738: \"$ac_try\"") >&5 + { (eval echo "$as_me:23018: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23741: \$? = $ac_status" >&5 + echo "$as_me:23021: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_test_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 23747 "configure" +#line 23027 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:23754: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23034: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23757: \$? = $ac_status" >&5 + echo "$as_me:23037: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:23759: \"$ac_try\"") >&5 + { (eval echo "$as_me:23039: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23762: \$? = $ac_status" >&5 + echo "$as_me:23042: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_test_ncuconfig=yes else @@ -23933,7 +23213,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 23936 "configure" +#line 23216 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -23945,37 +23225,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23948: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23228: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23951: \$? = $ac_status" >&5 + echo "$as_me:23231: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23954: \"$ac_try\"") >&5 + { (eval echo "$as_me:23234: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23957: \$? = $ac_status" >&5 + echo "$as_me:23237: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 23963 "configure" +#line 23243 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:23970: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23250: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23973: \$? = $ac_status" >&5 + echo "$as_me:23253: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:23975: \"$ac_try\"") >&5 + { (eval echo "$as_me:23255: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23978: \$? = $ac_status" >&5 + echo "$as_me:23258: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_ncuconfig=yes else @@ -23992,7 +23272,7 @@ cat "conftest.$ac_ext" >&5 cf_have_ncuconfig=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:23995: result: $cf_have_ncuconfig" >&5 + echo "$as_me:23275: result: $cf_have_ncuconfig" >&5 echo "${ECHO_T}$cf_have_ncuconfig" >&6 test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes if test "$cf_have_ncuconfig" != "yes" @@ -24008,7 +23288,7 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:24011: checking for terminfo header" >&5 +echo "$as_me:23291: 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 @@ -24026,7 +23306,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 24029 "configure" +#line 23309 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -24041,16 +23321,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:24044: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23324: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24047: \$? = $ac_status" >&5 + echo "$as_me:23327: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:24050: \"$ac_try\"") >&5 + { (eval echo "$as_me:23330: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24053: \$? = $ac_status" >&5 + echo "$as_me:23333: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -24066,7 +23346,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:24069: result: $cf_cv_term_header" >&5 +echo "$as_me:23349: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -24101,7 +23381,7 @@ esac fi else - echo "$as_me:24104: result: no" >&5 + echo "$as_me:23384: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -24117,7 +23397,7 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:24120: checking for $ac_word" >&5 +echo "$as_me:23400: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -24132,7 +23412,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" -echo "$as_me:24135: found $ac_dir/$ac_word" >&5 +echo "$as_me:23415: found $ac_dir/$ac_word" >&5 break done @@ -24140,10 +23420,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:24143: result: $NCURSES_CONFIG" >&5 + echo "$as_me:23423: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:24146: result: no" >&5 + echo "$as_me:23426: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -24156,7 +23436,7 @@ if test -z "$NCURSES_CONFIG"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:24159: checking for $ac_word" >&5 +echo "$as_me:23439: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -24171,7 +23451,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" -echo "$as_me:24174: found $ac_dir/$ac_word" >&5 +echo "$as_me:23454: found $ac_dir/$ac_word" >&5 break done @@ -24179,10 +23459,10 @@ fi fi ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG if test -n "$ac_ct_NCURSES_CONFIG"; then - echo "$as_me:24182: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:23462: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:24185: result: no" >&5 + echo "$as_me:23465: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -24339,7 +23619,7 @@ LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:24342: checking if we have identified curses headers" >&5 +echo "$as_me:23622: 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 @@ -24351,7 +23631,7 @@ for cf_header in \ curses.h $cf_cv_screen/curses.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 24354 "configure" +#line 23634 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -24363,16 +23643,16 @@ initscr(); endwin() } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:24366: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23646: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24369: \$? = $ac_status" >&5 + echo "$as_me:23649: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:24372: \"$ac_try\"") >&5 + { (eval echo "$as_me:23652: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24375: \$? = $ac_status" >&5 + echo "$as_me:23655: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -24383,11 +23663,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:24386: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:23666: 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:24390: error: No curses header-files found" >&5 + { { echo "$as_me:23670: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -24397,23 +23677,23 @@ fi for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:24400: checking for $ac_header" >&5 +echo "$as_me:23680: 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 24406 "configure" +#line 23686 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:24410: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:23690: \"$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:24416: \$? = $ac_status" >&5 + echo "$as_me:23696: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -24432,7 +23712,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:24435: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:23715: 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 24491 "configure" +#line 23771 "configure" #include "confdefs.h" #include int @@ -24500,16 +23780,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:24503: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23783: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24506: \$? = $ac_status" >&5 + echo "$as_me:23786: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:24509: \"$ac_try\"") >&5 + { (eval echo "$as_me:23789: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24512: \$? = $ac_status" >&5 + echo "$as_me:23792: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -24526,7 +23806,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:24529: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:23809: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -24545,7 +23825,7 @@ fi } -echo "$as_me:24548: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:23828: 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 @@ -24557,7 +23837,7 @@ else do cat >"conftest.$ac_ext" <<_ACEOF -#line 24560 "configure" +#line 23840 "configure" #include "confdefs.h" #include <$cf_header> @@ -24581,16 +23861,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:24584: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23864: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24587: \$? = $ac_status" >&5 + echo "$as_me:23867: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:24590: \"$ac_try\"") >&5 + { (eval echo "$as_me:23870: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24593: \$? = $ac_status" >&5 + echo "$as_me:23873: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h=$cf_header @@ -24605,14 +23885,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:24608: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:23888: 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:24615: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:23895: 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 @@ -24733,7 +24013,7 @@ if test -n "$cf_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 24736 "configure" +#line 24016 "configure" #include "confdefs.h" #include int @@ -24745,16 +24025,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:24748: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:24028: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24751: \$? = $ac_status" >&5 + echo "$as_me:24031: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:24754: \"$ac_try\"") >&5 + { (eval echo "$as_me:24034: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24757: \$? = $ac_status" >&5 + echo "$as_me:24037: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -24771,7 +24051,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:24774: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:24054: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -24794,7 +24074,7 @@ fi do cat >"conftest.$ac_ext" <<_ACEOF -#line 24797 "configure" +#line 24077 "configure" #include "confdefs.h" #include <$cf_header> @@ -24818,16 +24098,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:24821: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:24101: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24824: \$? = $ac_status" >&5 + echo "$as_me:24104: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:24827: \"$ac_try\"") >&5 + { (eval echo "$as_me:24107: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24830: \$? = $ac_status" >&5 + echo "$as_me:24110: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h2=$cf_header @@ -24848,12 +24128,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save2_CPPFLAGS" test "$cf_cv_ncurses_h2" != no && break done - test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:24851: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:24131: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:24856: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:24136: 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%/[^/]*$%%'` @@ -24889,7 +24169,7 @@ if test -n "$cf_1st_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 24892 "configure" +#line 24172 "configure" #include "confdefs.h" #include int @@ -24901,16 +24181,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:24904: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:24184: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24907: \$? = $ac_status" >&5 + echo "$as_me:24187: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:24910: \"$ac_try\"") >&5 + { (eval echo "$as_me:24190: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24913: \$? = $ac_status" >&5 + echo "$as_me:24193: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -24927,7 +24207,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:24930: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:24210: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -24975,7 +24255,7 @@ EOF ;; esac -echo "$as_me:24978: checking for terminfo header" >&5 +echo "$as_me:24258: 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 @@ -24993,7 +24273,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 24996 "configure" +#line 24276 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -25008,16 +24288,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:25011: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:24291: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25014: \$? = $ac_status" >&5 + echo "$as_me:24294: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:25017: \"$ac_try\"") >&5 + { (eval echo "$as_me:24297: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25020: \$? = $ac_status" >&5 + echo "$as_me:24300: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -25033,7 +24313,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:25036: result: $cf_cv_term_header" >&5 +echo "$as_me:24316: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -25071,7 +24351,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:25074: checking for ncurses version" >&5 +echo "$as_me:24354: 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 @@ -25097,10 +24377,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:25100: \"$cf_try\"") >&5 + { (eval echo "$as_me:24380: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:25103: \$? = $ac_status" >&5 + echo "$as_me:24383: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` @@ -25110,7 +24390,7 @@ EOF else cat >"conftest.$ac_ext" <<_ACEOF -#line 25113 "configure" +#line 24393 "configure" #include "confdefs.h" $ac_includes_default @@ -25137,15 +24417,15 @@ int main(void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:25140: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24420: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25143: \$? = $ac_status" >&5 + echo "$as_me:24423: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:25145: \"$ac_try\"") >&5 + { (eval echo "$as_me:24425: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25148: \$? = $ac_status" >&5 + echo "$as_me:24428: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -25159,7 +24439,7 @@ fi rm -f "$cf_tempfile" fi -echo "$as_me:25162: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:24442: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -25172,7 +24452,7 @@ cf_nculib_root=$cf_cv_screen # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:25175: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:24455: 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 @@ -25180,7 +24460,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 25183 "configure" +#line 24463 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -25199,16 +24479,16 @@ Gpm_Open (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:25202: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24482: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25205: \$? = $ac_status" >&5 + echo "$as_me:24485: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:25208: \"$ac_try\"") >&5 + { (eval echo "$as_me:24488: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25211: \$? = $ac_status" >&5 + echo "$as_me:24491: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -25219,10 +24499,10 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:25222: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:24502: 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:25225: checking for initscr in -lgpm" >&5 + echo "$as_me:24505: 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 @@ -25230,7 +24510,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 25233 "configure" +#line 24513 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -25249,16 +24529,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:25252: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24532: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25255: \$? = $ac_status" >&5 + echo "$as_me:24535: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:25258: \"$ac_try\"") >&5 + { (eval echo "$as_me:24538: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25261: \$? = $ac_status" >&5 + echo "$as_me:24541: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -25269,7 +24549,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:25272: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:24552: 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" @@ -25284,7 +24564,7 @@ case "$host_os" in # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it is static). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:25287: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:24567: 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 @@ -25292,7 +24572,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 25295 "configure" +#line 24575 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -25311,16 +24591,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:25314: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24594: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25317: \$? = $ac_status" >&5 + echo "$as_me:24597: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:25320: \"$ac_try\"") >&5 + { (eval echo "$as_me:24600: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25323: \$? = $ac_status" >&5 + echo "$as_me:24603: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -25331,7 +24611,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:25334: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:24614: 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" @@ -25380,13 +24660,13 @@ else eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' cf_libdir="" - echo "$as_me:25383: checking for initscr" >&5 + echo "$as_me:24663: 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 25389 "configure" +#line 24669 "configure" #include "confdefs.h" #define initscr autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -25417,16 +24697,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:25420: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24700: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25423: \$? = $ac_status" >&5 + echo "$as_me:24703: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:25426: \"$ac_try\"") >&5 + { (eval echo "$as_me:24706: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25429: \$? = $ac_status" >&5 + echo "$as_me:24709: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_initscr=yes else @@ -25436,18 +24716,18 @@ ac_cv_func_initscr=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:25439: result: $ac_cv_func_initscr" >&5 +echo "$as_me:24719: 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:25446: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:24726: 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 25450 "configure" +#line 24730 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -25459,25 +24739,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:25462: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24742: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25465: \$? = $ac_status" >&5 + echo "$as_me:24745: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:25468: \"$ac_try\"") >&5 + { (eval echo "$as_me:24748: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25471: \$? = $ac_status" >&5 + echo "$as_me:24751: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:25473: result: yes" >&5 + echo "$as_me:24753: 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:25480: result: no" >&5 +echo "$as_me:24760: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -25545,11 +24825,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:25548: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:24828: 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 25552 "configure" +#line 24832 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -25561,25 +24841,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:25564: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24844: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25567: \$? = $ac_status" >&5 + echo "$as_me:24847: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:25570: \"$ac_try\"") >&5 + { (eval echo "$as_me:24850: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25573: \$? = $ac_status" >&5 + echo "$as_me:24853: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:25575: result: yes" >&5 + echo "$as_me:24855: 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:25582: result: no" >&5 +echo "$as_me:24862: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -25594,7 +24874,7 @@ fi eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" if test "$cf_found_library" = no ; then - { { echo "$as_me:25597: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:24877: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -25602,7 +24882,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:25605: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:24885: 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 @@ -25612,7 +24892,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >"conftest.$ac_ext" <<_ACEOF -#line 25615 "configure" +#line 24895 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -25624,23 +24904,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:25627: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24907: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25630: \$? = $ac_status" >&5 + echo "$as_me:24910: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:25633: \"$ac_try\"") >&5 + { (eval echo "$as_me:24913: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25636: \$? = $ac_status" >&5 + echo "$as_me:24916: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:25638: result: yes" >&5 + echo "$as_me:24918: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:25643: result: no" >&5 +echo "$as_me:24923: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -25666,13 +24946,13 @@ cf_ncuconfig_root=$cf_cv_screen cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:25669: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:24949: checking pkg-config for $cf_ncuconfig_root" >&5 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then - echo "$as_me:25672: result: yes" >&5 + echo "$as_me:24952: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:25675: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:24955: checking if the $cf_ncuconfig_root package files work" >&5 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 cf_have_ncuconfig=unknown @@ -25805,7 +25085,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 25808 "configure" +#line 25088 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -25817,37 +25097,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:25820: \"$ac_link\"") >&5 +if { (eval echo "$as_me:25100: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25823: \$? = $ac_status" >&5 + echo "$as_me:25103: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:25826: \"$ac_try\"") >&5 + { (eval echo "$as_me:25106: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25829: \$? = $ac_status" >&5 + echo "$as_me:25109: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_test_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 25835 "configure" +#line 25115 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:25842: \"$ac_link\"") >&5 +if { (eval echo "$as_me:25122: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25845: \$? = $ac_status" >&5 + echo "$as_me:25125: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:25847: \"$ac_try\"") >&5 + { (eval echo "$as_me:25127: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25850: \$? = $ac_status" >&5 + echo "$as_me:25130: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_test_ncuconfig=yes else @@ -26021,7 +25301,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 26024 "configure" +#line 25304 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -26033,37 +25313,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:26036: \"$ac_link\"") >&5 +if { (eval echo "$as_me:25316: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:26039: \$? = $ac_status" >&5 + echo "$as_me:25319: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:26042: \"$ac_try\"") >&5 + { (eval echo "$as_me:25322: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26045: \$? = $ac_status" >&5 + echo "$as_me:25325: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 26051 "configure" +#line 25331 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:26058: \"$ac_link\"") >&5 +if { (eval echo "$as_me:25338: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:26061: \$? = $ac_status" >&5 + echo "$as_me:25341: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:26063: \"$ac_try\"") >&5 + { (eval echo "$as_me:25343: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26066: \$? = $ac_status" >&5 + echo "$as_me:25346: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_ncuconfig=yes else @@ -26080,7 +25360,7 @@ cat "conftest.$ac_ext" >&5 cf_have_ncuconfig=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:26083: result: $cf_have_ncuconfig" >&5 + echo "$as_me:25363: result: $cf_have_ncuconfig" >&5 echo "${ECHO_T}$cf_have_ncuconfig" >&6 test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes if test "$cf_have_ncuconfig" != "yes" @@ -26096,7 +25376,7 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:26099: checking for terminfo header" >&5 +echo "$as_me:25379: 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 @@ -26114,7 +25394,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 26117 "configure" +#line 25397 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -26129,16 +25409,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26132: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:25412: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26135: \$? = $ac_status" >&5 + echo "$as_me:25415: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26138: \"$ac_try\"") >&5 + { (eval echo "$as_me:25418: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26141: \$? = $ac_status" >&5 + echo "$as_me:25421: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -26154,7 +25434,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:26157: result: $cf_cv_term_header" >&5 +echo "$as_me:25437: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -26189,7 +25469,7 @@ esac fi else - echo "$as_me:26192: result: no" >&5 + echo "$as_me:25472: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -26205,7 +25485,7 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:26208: checking for $ac_word" >&5 +echo "$as_me:25488: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -26220,7 +25500,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" -echo "$as_me:26223: found $ac_dir/$ac_word" >&5 +echo "$as_me:25503: found $ac_dir/$ac_word" >&5 break done @@ -26228,10 +25508,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:26231: result: $NCURSES_CONFIG" >&5 + echo "$as_me:25511: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:26234: result: no" >&5 + echo "$as_me:25514: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -26244,7 +25524,7 @@ if test -z "$NCURSES_CONFIG"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:26247: checking for $ac_word" >&5 +echo "$as_me:25527: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -26259,7 +25539,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" -echo "$as_me:26262: found $ac_dir/$ac_word" >&5 +echo "$as_me:25542: found $ac_dir/$ac_word" >&5 break done @@ -26267,10 +25547,10 @@ fi fi ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG if test -n "$ac_ct_NCURSES_CONFIG"; then - echo "$as_me:26270: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:25550: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:26273: result: no" >&5 + echo "$as_me:25553: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -26427,7 +25707,7 @@ LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:26430: checking if we have identified curses headers" >&5 +echo "$as_me:25710: 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 @@ -26439,7 +25719,7 @@ for cf_header in \ curses.h $cf_cv_screen/curses.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 26442 "configure" +#line 25722 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -26451,16 +25731,16 @@ initscr(); endwin() } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26454: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:25734: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26457: \$? = $ac_status" >&5 + echo "$as_me:25737: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26460: \"$ac_try\"") >&5 + { (eval echo "$as_me:25740: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26463: \$? = $ac_status" >&5 + echo "$as_me:25743: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -26471,11 +25751,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:26474: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:25754: 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:26478: error: No curses header-files found" >&5 + { { echo "$as_me:25758: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -26485,23 +25765,23 @@ fi for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:26488: checking for $ac_header" >&5 +echo "$as_me:25768: 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 26494 "configure" +#line 25774 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:26498: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:25778: \"$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:26504: \$? = $ac_status" >&5 + echo "$as_me:25784: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -26520,7 +25800,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:26523: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:25803: 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 26579 "configure" +#line 25859 "configure" #include "confdefs.h" #include int @@ -26588,16 +25868,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26591: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:25871: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26594: \$? = $ac_status" >&5 + echo "$as_me:25874: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26597: \"$ac_try\"") >&5 + { (eval echo "$as_me:25877: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26600: \$? = $ac_status" >&5 + echo "$as_me:25880: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -26614,7 +25894,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:26617: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:25897: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -26633,7 +25913,7 @@ fi } -echo "$as_me:26636: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:25916: 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 @@ -26645,7 +25925,7 @@ else do cat >"conftest.$ac_ext" <<_ACEOF -#line 26648 "configure" +#line 25928 "configure" #include "confdefs.h" #include <$cf_header> @@ -26669,16 +25949,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26672: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:25952: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26675: \$? = $ac_status" >&5 + echo "$as_me:25955: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26678: \"$ac_try\"") >&5 + { (eval echo "$as_me:25958: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26681: \$? = $ac_status" >&5 + echo "$as_me:25961: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h=$cf_header @@ -26693,14 +25973,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:26696: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:25976: 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:26703: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:25983: 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 @@ -26821,7 +26101,7 @@ if test -n "$cf_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 26824 "configure" +#line 26104 "configure" #include "confdefs.h" #include int @@ -26833,16 +26113,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26836: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:26116: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26839: \$? = $ac_status" >&5 + echo "$as_me:26119: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26842: \"$ac_try\"") >&5 + { (eval echo "$as_me:26122: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26845: \$? = $ac_status" >&5 + echo "$as_me:26125: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -26859,7 +26139,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:26862: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:26142: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -26882,7 +26162,7 @@ fi do cat >"conftest.$ac_ext" <<_ACEOF -#line 26885 "configure" +#line 26165 "configure" #include "confdefs.h" #include <$cf_header> @@ -26906,16 +26186,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26909: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:26189: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26912: \$? = $ac_status" >&5 + echo "$as_me:26192: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26915: \"$ac_try\"") >&5 + { (eval echo "$as_me:26195: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26918: \$? = $ac_status" >&5 + echo "$as_me:26198: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h2=$cf_header @@ -26936,12 +26216,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save2_CPPFLAGS" test "$cf_cv_ncurses_h2" != no && break done - test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:26939: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:26219: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:26944: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:26224: 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%/[^/]*$%%'` @@ -26977,7 +26257,7 @@ if test -n "$cf_1st_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 26980 "configure" +#line 26260 "configure" #include "confdefs.h" #include int @@ -26989,16 +26269,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26992: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:26272: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26995: \$? = $ac_status" >&5 + echo "$as_me:26275: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26998: \"$ac_try\"") >&5 + { (eval echo "$as_me:26278: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27001: \$? = $ac_status" >&5 + echo "$as_me:26281: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -27015,7 +26295,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:27018: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:26298: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -27063,7 +26343,7 @@ EOF ;; esac -echo "$as_me:27066: checking for terminfo header" >&5 +echo "$as_me:26346: 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 @@ -27081,7 +26361,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 27084 "configure" +#line 26364 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -27096,16 +26376,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:27099: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:26379: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:27102: \$? = $ac_status" >&5 + echo "$as_me:26382: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:27105: \"$ac_try\"") >&5 + { (eval echo "$as_me:26385: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27108: \$? = $ac_status" >&5 + echo "$as_me:26388: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -27121,7 +26401,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:27124: result: $cf_cv_term_header" >&5 +echo "$as_me:26404: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -27159,7 +26439,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:27162: checking for ncurses version" >&5 +echo "$as_me:26442: 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 @@ -27185,10 +26465,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:27188: \"$cf_try\"") >&5 + { (eval echo "$as_me:26468: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:27191: \$? = $ac_status" >&5 + echo "$as_me:26471: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` @@ -27198,7 +26478,7 @@ EOF else cat >"conftest.$ac_ext" <<_ACEOF -#line 27201 "configure" +#line 26481 "configure" #include "confdefs.h" $ac_includes_default @@ -27225,15 +26505,15 @@ int main(void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:27228: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26508: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:27231: \$? = $ac_status" >&5 + echo "$as_me:26511: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:27233: \"$ac_try\"") >&5 + { (eval echo "$as_me:26513: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27236: \$? = $ac_status" >&5 + echo "$as_me:26516: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -27247,7 +26527,7 @@ fi rm -f "$cf_tempfile" fi -echo "$as_me:27250: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:26530: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -27260,7 +26540,7 @@ cf_nculib_root=$cf_cv_screen # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:27263: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:26543: 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 @@ -27268,7 +26548,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 27271 "configure" +#line 26551 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -27287,16 +26567,16 @@ Gpm_Open (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:27290: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26570: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:27293: \$? = $ac_status" >&5 + echo "$as_me:26573: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:27296: \"$ac_try\"") >&5 + { (eval echo "$as_me:26576: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27299: \$? = $ac_status" >&5 + echo "$as_me:26579: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -27307,10 +26587,10 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:27310: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:26590: 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:27313: checking for initscr in -lgpm" >&5 + echo "$as_me:26593: 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 @@ -27318,7 +26598,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 27321 "configure" +#line 26601 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -27337,16 +26617,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:27340: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26620: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:27343: \$? = $ac_status" >&5 + echo "$as_me:26623: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:27346: \"$ac_try\"") >&5 + { (eval echo "$as_me:26626: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27349: \$? = $ac_status" >&5 + echo "$as_me:26629: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -27357,7 +26637,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:27360: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:26640: 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" @@ -27372,7 +26652,7 @@ case "$host_os" in # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it is static). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:27375: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:26655: 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 @@ -27380,7 +26660,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 27383 "configure" +#line 26663 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -27399,16 +26679,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:27402: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26682: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:27405: \$? = $ac_status" >&5 + echo "$as_me:26685: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:27408: \"$ac_try\"") >&5 + { (eval echo "$as_me:26688: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27411: \$? = $ac_status" >&5 + echo "$as_me:26691: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -27419,7 +26699,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:27422: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:26702: 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" @@ -27468,13 +26748,13 @@ else eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' cf_libdir="" - echo "$as_me:27471: checking for initscr" >&5 + echo "$as_me:26751: 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 27477 "configure" +#line 26757 "configure" #include "confdefs.h" #define initscr autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -27505,16 +26785,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:27508: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26788: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:27511: \$? = $ac_status" >&5 + echo "$as_me:26791: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:27514: \"$ac_try\"") >&5 + { (eval echo "$as_me:26794: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27517: \$? = $ac_status" >&5 + echo "$as_me:26797: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_initscr=yes else @@ -27524,18 +26804,18 @@ ac_cv_func_initscr=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:27527: result: $ac_cv_func_initscr" >&5 +echo "$as_me:26807: 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:27534: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:26814: 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 27538 "configure" +#line 26818 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -27547,25 +26827,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:27550: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26830: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:27553: \$? = $ac_status" >&5 + echo "$as_me:26833: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:27556: \"$ac_try\"") >&5 + { (eval echo "$as_me:26836: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27559: \$? = $ac_status" >&5 + echo "$as_me:26839: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:27561: result: yes" >&5 + echo "$as_me:26841: 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:27568: result: no" >&5 +echo "$as_me:26848: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -27633,11 +26913,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:27636: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:26916: 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 27640 "configure" +#line 26920 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -27649,25 +26929,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:27652: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26932: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:27655: \$? = $ac_status" >&5 + echo "$as_me:26935: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:27658: \"$ac_try\"") >&5 + { (eval echo "$as_me:26938: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27661: \$? = $ac_status" >&5 + echo "$as_me:26941: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:27663: result: yes" >&5 + echo "$as_me:26943: 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:27670: result: no" >&5 +echo "$as_me:26950: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -27682,7 +26962,7 @@ fi eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" if test "$cf_found_library" = no ; then - { { echo "$as_me:27685: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:26965: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -27690,7 +26970,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:27693: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:26973: 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 @@ -27700,7 +26980,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >"conftest.$ac_ext" <<_ACEOF -#line 27703 "configure" +#line 26983 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -27712,23 +26992,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:27715: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26995: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:27718: \$? = $ac_status" >&5 + echo "$as_me:26998: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:27721: \"$ac_try\"") >&5 + { (eval echo "$as_me:27001: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27724: \$? = $ac_status" >&5 + echo "$as_me:27004: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:27726: result: yes" >&5 + echo "$as_me:27006: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:27731: result: no" >&5 +echo "$as_me:27011: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -27760,7 +27040,7 @@ fi ;; (slang) -echo "$as_me:27763: checking for slang header file" >&5 +echo "$as_me:27043: 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 @@ -27768,7 +27048,7 @@ else cf_cv_slang_header=no cat >"conftest.$ac_ext" <<_ACEOF -#line 27771 "configure" +#line 27051 "configure" #include "confdefs.h" #include int @@ -27780,16 +27060,16 @@ printf("%s\\n", SLANG_VERSION_STRING) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:27783: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:27063: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:27786: \$? = $ac_status" >&5 + echo "$as_me:27066: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:27789: \"$ac_try\"") >&5 + { (eval echo "$as_me:27069: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27792: \$? = $ac_status" >&5 + echo "$as_me:27072: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_slang_header=predefined else @@ -27894,7 +27174,7 @@ cf_search="$cf_search $cf_header_path_list" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:27897: result: $cf_cv_slang_header" >&5 +echo "$as_me:27177: result: $cf_cv_slang_header" >&5 echo "${ECHO_T}$cf_cv_slang_header" >&6 if test "x$cf_cv_slang_header" != xno @@ -27938,7 +27218,7 @@ if test -n "$cf_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 27941 "configure" +#line 27221 "configure" #include "confdefs.h" #include int @@ -27950,16 +27230,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:27953: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:27233: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:27956: \$? = $ac_status" >&5 + echo "$as_me:27236: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:27959: \"$ac_try\"") >&5 + { (eval echo "$as_me:27239: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27962: \$? = $ac_status" >&5 + echo "$as_me:27242: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -27976,7 +27256,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:27979: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:27259: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -28008,7 +27288,7 @@ else cf_cv_termlib=none cat >"conftest.$ac_ext" <<_ACEOF -#line 28011 "configure" +#line 27291 "configure" #include "confdefs.h" extern char *tgoto(const char*,int,int); int @@ -28020,19 +27300,19 @@ char *x=tgoto("",0,0); (void)x; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:28023: \"$ac_link\"") >&5 +if { (eval echo "$as_me:27303: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:28026: \$? = $ac_status" >&5 + echo "$as_me:27306: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:28029: \"$ac_try\"") >&5 + { (eval echo "$as_me:27309: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28032: \$? = $ac_status" >&5 + echo "$as_me:27312: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cat >"conftest.$ac_ext" <<_ACEOF -#line 28035 "configure" +#line 27315 "configure" #include "confdefs.h" extern char *tigetstr(const char *); int @@ -28044,16 +27324,16 @@ char *x=tigetstr(""); (void)x; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:28047: \"$ac_link\"") >&5 +if { (eval echo "$as_me:27327: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:28050: \$? = $ac_status" >&5 + echo "$as_me:27330: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:28053: \"$ac_try\"") >&5 + { (eval echo "$as_me:27333: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28056: \$? = $ac_status" >&5 + echo "$as_me:27336: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_termlib=terminfo else @@ -28064,7 +27344,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" test -n "$verbose" && echo " using functions in predefined $cf_cv_termlib LIBS" 1>&6 -echo "${as_me:-configure}:28067: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5 +echo "${as_me:-configure}:27347: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5 else echo "$as_me: failed program was:" >&5 @@ -28079,10 +27359,10 @@ if test "$cf_cv_termlib" = none; then LIBS="-l$cf_lib $cf_save_LIBS" for cf_func in tigetstr tgetstr do - echo "$as_me:28082: checking for $cf_func in -l$cf_lib" >&5 + echo "$as_me:27362: 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 28085 "configure" +#line 27365 "configure" #include "confdefs.h" extern char *$cf_func(const char *); int @@ -28094,16 +27374,16 @@ char *x = $cf_func(""); (void)x } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:28097: \"$ac_link\"") >&5 +if { (eval echo "$as_me:27377: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:28100: \$? = $ac_status" >&5 + echo "$as_me:27380: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:28103: \"$ac_try\"") >&5 + { (eval echo "$as_me:27383: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28106: \$? = $ac_status" >&5 + echo "$as_me:27386: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -28112,7 +27392,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:28115: result: $cf_result" >&5 + echo "$as_me:27395: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then if test "$cf_func" = tigetstr ; then @@ -28129,7 +27409,7 @@ echo "${ECHO_T}$cf_result" >&6 fi if test "$cf_cv_termlib" = none; then # allow curses library for broken AIX system. - echo "$as_me:28132: checking for initscr in -lcurses" >&5 + echo "$as_me:27412: 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 @@ -28137,7 +27417,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lcurses $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 28140 "configure" +#line 27420 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -28156,16 +27436,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:28159: \"$ac_link\"") >&5 +if { (eval echo "$as_me:27439: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:28162: \$? = $ac_status" >&5 + echo "$as_me:27442: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:28165: \"$ac_try\"") >&5 + { (eval echo "$as_me:27445: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28168: \$? = $ac_status" >&5 + echo "$as_me:27448: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_curses_initscr=yes else @@ -28176,7 +27456,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:28179: result: $ac_cv_lib_curses_initscr" >&5 +echo "$as_me:27459: 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 @@ -28198,7 +27478,7 @@ LIBS="$cf_add_libs" fi - echo "$as_me:28201: checking for tgoto in -ltermcap" >&5 + echo "$as_me:27481: 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 @@ -28206,7 +27486,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ltermcap $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 28209 "configure" +#line 27489 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -28225,16 +27505,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:28228: \"$ac_link\"") >&5 +if { (eval echo "$as_me:27508: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:28231: \$? = $ac_status" >&5 + echo "$as_me:27511: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:28234: \"$ac_try\"") >&5 + { (eval echo "$as_me:27514: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28237: \$? = $ac_status" >&5 + echo "$as_me:27517: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_termcap_tgoto=yes else @@ -28245,7 +27525,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:28248: result: $ac_cv_lib_termcap_tgoto" >&5 +echo "$as_me:27528: 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 @@ -28272,20 +27552,20 @@ fi fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" if test "$cf_cv_termlib" = none; then - { echo "$as_me:28275: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5 + { echo "$as_me:27555: 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:28282: checking for acos" >&5 +echo "$as_me:27562: 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 28288 "configure" +#line 27568 "configure" #include "confdefs.h" #define acos autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -28316,16 +27596,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:28319: \"$ac_link\"") >&5 +if { (eval echo "$as_me:27599: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:28322: \$? = $ac_status" >&5 + echo "$as_me:27602: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:28325: \"$ac_try\"") >&5 + { (eval echo "$as_me:27605: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28328: \$? = $ac_status" >&5 + echo "$as_me:27608: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_acos=yes else @@ -28335,13 +27615,13 @@ ac_cv_func_acos=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:28338: result: $ac_cv_func_acos" >&5 +echo "$as_me:27618: 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:28344: checking for acos in -lm" >&5 +echo "$as_me:27624: 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 @@ -28349,7 +27629,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lm $LIBS $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 28352 "configure" +#line 27632 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -28368,16 +27648,16 @@ acos (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:28371: \"$ac_link\"") >&5 +if { (eval echo "$as_me:27651: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:28374: \$? = $ac_status" >&5 + echo "$as_me:27654: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:28377: \"$ac_try\"") >&5 + { (eval echo "$as_me:27657: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28380: \$? = $ac_status" >&5 + echo "$as_me:27660: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_m_acos=yes else @@ -28388,7 +27668,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:28391: result: $ac_cv_lib_m_acos" >&5 +echo "$as_me:27671: 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 @@ -28414,13 +27694,13 @@ case "$host_os" in eval 'cf_cv_have_lib_'"video"'=no' cf_libdir="" - echo "$as_me:28417: checking for v_init" >&5 + echo "$as_me:27697: 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 28423 "configure" +#line 27703 "configure" #include "confdefs.h" #define v_init autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -28451,16 +27731,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:28454: \"$ac_link\"") >&5 +if { (eval echo "$as_me:27734: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:28457: \$? = $ac_status" >&5 + echo "$as_me:27737: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:28460: \"$ac_try\"") >&5 + { (eval echo "$as_me:27740: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28463: \$? = $ac_status" >&5 + echo "$as_me:27743: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_v_init=yes else @@ -28470,18 +27750,18 @@ ac_cv_func_v_init=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:28473: result: $ac_cv_func_v_init" >&5 +echo "$as_me:27753: 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:28480: checking for v_init in -lvideo" >&5 + echo "$as_me:27760: 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 28484 "configure" +#line 27764 "configure" #include "confdefs.h" #include int @@ -28493,25 +27773,25 @@ v_init() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:28496: \"$ac_link\"") >&5 +if { (eval echo "$as_me:27776: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:28499: \$? = $ac_status" >&5 + echo "$as_me:27779: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:28502: \"$ac_try\"") >&5 + { (eval echo "$as_me:27782: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28505: \$? = $ac_status" >&5 + echo "$as_me:27785: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:28507: result: yes" >&5 + echo "$as_me:27787: 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:28514: result: no" >&5 +echo "$as_me:27794: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -28579,11 +27859,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:28582: checking for -lvideo in $cf_libdir" >&5 + echo "$as_me:27862: 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 28586 "configure" +#line 27866 "configure" #include "confdefs.h" #include int @@ -28595,25 +27875,25 @@ v_init() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:28598: \"$ac_link\"") >&5 +if { (eval echo "$as_me:27878: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:28601: \$? = $ac_status" >&5 + echo "$as_me:27881: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:28604: \"$ac_try\"") >&5 + { (eval echo "$as_me:27884: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28607: \$? = $ac_status" >&5 + echo "$as_me:27887: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:28609: result: yes" >&5 + echo "$as_me:27889: 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:28616: result: no" >&5 +echo "$as_me:27896: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -28628,7 +27908,7 @@ fi eval 'cf_found_library="$cf_cv_have_lib_'"video"\" if test "$cf_found_library" = no ; then - { { echo "$as_me:28631: error: Cannot link video library" >&5 + { { echo "$as_me:27911: error: Cannot link video library" >&5 echo "$as_me: error: Cannot link video library" >&2;} { (exit 1); exit 1; }; } fi @@ -28638,13 +27918,13 @@ esac eval 'cf_cv_have_lib_'"slang"'=no' cf_libdir="" - echo "$as_me:28641: checking for SLtt_get_screen_size" >&5 + echo "$as_me:27921: 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 28647 "configure" +#line 27927 "configure" #include "confdefs.h" #define SLtt_get_screen_size autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -28675,16 +27955,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:28678: \"$ac_link\"") >&5 +if { (eval echo "$as_me:27958: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:28681: \$? = $ac_status" >&5 + echo "$as_me:27961: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:28684: \"$ac_try\"") >&5 + { (eval echo "$as_me:27964: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28687: \$? = $ac_status" >&5 + echo "$as_me:27967: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_SLtt_get_screen_size=yes else @@ -28694,18 +27974,18 @@ ac_cv_func_SLtt_get_screen_size=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:28697: result: $ac_cv_func_SLtt_get_screen_size" >&5 +echo "$as_me:27977: 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:28704: checking for SLtt_get_screen_size in -lslang" >&5 + echo "$as_me:27984: 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 28708 "configure" +#line 27988 "configure" #include "confdefs.h" #include int @@ -28717,25 +27997,25 @@ SLtt_get_screen_size() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:28720: \"$ac_link\"") >&5 +if { (eval echo "$as_me:28000: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:28723: \$? = $ac_status" >&5 + echo "$as_me:28003: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:28726: \"$ac_try\"") >&5 + { (eval echo "$as_me:28006: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28729: \$? = $ac_status" >&5 + echo "$as_me:28009: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:28731: result: yes" >&5 + echo "$as_me:28011: 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:28738: result: no" >&5 +echo "$as_me:28018: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -28803,11 +28083,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:28806: checking for -lslang in $cf_libdir" >&5 + echo "$as_me:28086: 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 28810 "configure" +#line 28090 "configure" #include "confdefs.h" #include int @@ -28819,25 +28099,25 @@ SLtt_get_screen_size() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:28822: \"$ac_link\"") >&5 +if { (eval echo "$as_me:28102: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:28825: \$? = $ac_status" >&5 + echo "$as_me:28105: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:28828: \"$ac_try\"") >&5 + { (eval echo "$as_me:28108: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28831: \$? = $ac_status" >&5 + echo "$as_me:28111: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:28833: result: yes" >&5 + echo "$as_me:28113: 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:28840: result: no" >&5 +echo "$as_me:28120: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -28852,13 +28132,13 @@ fi eval 'cf_found_library="$cf_cv_have_lib_'"slang"\" if test "$cf_found_library" = no ; then - { { echo "$as_me:28855: error: Cannot link slang library" >&5 + { { echo "$as_me:28135: 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:28861: checking if we can link slang without termcap" >&5 +echo "$as_me:28141: 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%^.%%'` @@ -28867,7 +28147,7 @@ else fi LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'` cat >"conftest.$ac_ext" <<_ACEOF -#line 28870 "configure" +#line 28150 "configure" #include "confdefs.h" #include int @@ -28879,16 +28159,16 @@ SLtt_get_screen_size() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:28882: \"$ac_link\"") >&5 +if { (eval echo "$as_me:28162: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:28885: \$? = $ac_status" >&5 + echo "$as_me:28165: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:28888: \"$ac_try\"") >&5 + { (eval echo "$as_me:28168: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28891: \$? = $ac_status" >&5 + echo "$as_me:28171: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -28897,13 +28177,13 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" -echo "$as_me:28900: result: $cf_result" >&5 +echo "$as_me:28180: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 test "$cf_result" = no && LIBS="$cf_slang_LIBS3" else -echo "$as_me:28906: checking for slang2 header file" >&5 +echo "$as_me:28186: 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 @@ -28911,7 +28191,7 @@ else cf_cv_slang2_header=no cat >"conftest.$ac_ext" <<_ACEOF -#line 28914 "configure" +#line 28194 "configure" #include "confdefs.h" #include int @@ -28923,16 +28203,16 @@ printf("%s\\n", SLANG_VERSION_STRING) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:28926: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:28206: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:28929: \$? = $ac_status" >&5 + echo "$as_me:28209: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:28932: \"$ac_try\"") >&5 + { (eval echo "$as_me:28212: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28935: \$? = $ac_status" >&5 + echo "$as_me:28215: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_slang2_header=predefined else @@ -29037,7 +28317,7 @@ cf_search="$cf_search $cf_header_path_list" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:29040: result: $cf_cv_slang2_header" >&5 +echo "$as_me:28320: result: $cf_cv_slang2_header" >&5 echo "${ECHO_T}$cf_cv_slang2_header" >&6 if test "x$cf_cv_slang2_header" != xno @@ -29081,7 +28361,7 @@ if test -n "$cf_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 29084 "configure" +#line 28364 "configure" #include "confdefs.h" #include int @@ -29093,16 +28373,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:29096: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:28376: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:29099: \$? = $ac_status" >&5 + echo "$as_me:28379: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:29102: \"$ac_try\"") >&5 + { (eval echo "$as_me:28382: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29105: \$? = $ac_status" >&5 + echo "$as_me:28385: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -29119,7 +28399,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:29122: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:28402: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -29151,7 +28431,7 @@ else cf_cv_termlib=none cat >"conftest.$ac_ext" <<_ACEOF -#line 29154 "configure" +#line 28434 "configure" #include "confdefs.h" extern char *tgoto(const char*,int,int); int @@ -29163,19 +28443,19 @@ char *x=tgoto("",0,0); (void)x; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:29166: \"$ac_link\"") >&5 +if { (eval echo "$as_me:28446: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:29169: \$? = $ac_status" >&5 + echo "$as_me:28449: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:29172: \"$ac_try\"") >&5 + { (eval echo "$as_me:28452: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29175: \$? = $ac_status" >&5 + echo "$as_me:28455: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cat >"conftest.$ac_ext" <<_ACEOF -#line 29178 "configure" +#line 28458 "configure" #include "confdefs.h" extern char *tigetstr(const char *); int @@ -29187,16 +28467,16 @@ char *x=tigetstr(""); (void)x; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:29190: \"$ac_link\"") >&5 +if { (eval echo "$as_me:28470: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:29193: \$? = $ac_status" >&5 + echo "$as_me:28473: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:29196: \"$ac_try\"") >&5 + { (eval echo "$as_me:28476: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29199: \$? = $ac_status" >&5 + echo "$as_me:28479: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_termlib=terminfo else @@ -29207,7 +28487,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" test -n "$verbose" && echo " using functions in predefined $cf_cv_termlib LIBS" 1>&6 -echo "${as_me:-configure}:29210: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5 +echo "${as_me:-configure}:28490: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5 else echo "$as_me: failed program was:" >&5 @@ -29222,10 +28502,10 @@ if test "$cf_cv_termlib" = none; then LIBS="-l$cf_lib $cf_save_LIBS" for cf_func in tigetstr tgetstr do - echo "$as_me:29225: checking for $cf_func in -l$cf_lib" >&5 + echo "$as_me:28505: 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 29228 "configure" +#line 28508 "configure" #include "confdefs.h" extern char *$cf_func(const char *); int @@ -29237,16 +28517,16 @@ char *x = $cf_func(""); (void)x } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:29240: \"$ac_link\"") >&5 +if { (eval echo "$as_me:28520: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:29243: \$? = $ac_status" >&5 + echo "$as_me:28523: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:29246: \"$ac_try\"") >&5 + { (eval echo "$as_me:28526: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29249: \$? = $ac_status" >&5 + echo "$as_me:28529: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -29255,7 +28535,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:29258: result: $cf_result" >&5 + echo "$as_me:28538: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then if test "$cf_func" = tigetstr ; then @@ -29272,7 +28552,7 @@ echo "${ECHO_T}$cf_result" >&6 fi if test "$cf_cv_termlib" = none; then # allow curses library for broken AIX system. - echo "$as_me:29275: checking for initscr in -lcurses" >&5 + echo "$as_me:28555: 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 @@ -29280,7 +28560,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lcurses $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 29283 "configure" +#line 28563 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -29299,16 +28579,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:29302: \"$ac_link\"") >&5 +if { (eval echo "$as_me:28582: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:29305: \$? = $ac_status" >&5 + echo "$as_me:28585: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:29308: \"$ac_try\"") >&5 + { (eval echo "$as_me:28588: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29311: \$? = $ac_status" >&5 + echo "$as_me:28591: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_curses_initscr=yes else @@ -29319,7 +28599,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:29322: result: $ac_cv_lib_curses_initscr" >&5 +echo "$as_me:28602: 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 @@ -29341,7 +28621,7 @@ LIBS="$cf_add_libs" fi - echo "$as_me:29344: checking for tgoto in -ltermcap" >&5 + echo "$as_me:28624: 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 @@ -29349,7 +28629,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ltermcap $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 29352 "configure" +#line 28632 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -29368,16 +28648,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:29371: \"$ac_link\"") >&5 +if { (eval echo "$as_me:28651: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:29374: \$? = $ac_status" >&5 + echo "$as_me:28654: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:29377: \"$ac_try\"") >&5 + { (eval echo "$as_me:28657: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29380: \$? = $ac_status" >&5 + echo "$as_me:28660: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_termcap_tgoto=yes else @@ -29388,7 +28668,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:29391: result: $ac_cv_lib_termcap_tgoto" >&5 +echo "$as_me:28671: 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 @@ -29415,20 +28695,20 @@ fi fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" if test "$cf_cv_termlib" = none; then - { echo "$as_me:29418: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5 + { echo "$as_me:28698: 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:29425: checking for acos" >&5 +echo "$as_me:28705: 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 29431 "configure" +#line 28711 "configure" #include "confdefs.h" #define acos autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -29459,16 +28739,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:29462: \"$ac_link\"") >&5 +if { (eval echo "$as_me:28742: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:29465: \$? = $ac_status" >&5 + echo "$as_me:28745: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:29468: \"$ac_try\"") >&5 + { (eval echo "$as_me:28748: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29471: \$? = $ac_status" >&5 + echo "$as_me:28751: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_acos=yes else @@ -29478,13 +28758,13 @@ ac_cv_func_acos=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:29481: result: $ac_cv_func_acos" >&5 +echo "$as_me:28761: 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:29487: checking for acos in -lm" >&5 +echo "$as_me:28767: 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 @@ -29492,7 +28772,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lm $LIBS $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 29495 "configure" +#line 28775 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -29511,16 +28791,16 @@ acos (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:29514: \"$ac_link\"") >&5 +if { (eval echo "$as_me:28794: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:29517: \$? = $ac_status" >&5 + echo "$as_me:28797: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:29520: \"$ac_try\"") >&5 + { (eval echo "$as_me:28800: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29523: \$? = $ac_status" >&5 + echo "$as_me:28803: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_m_acos=yes else @@ -29531,7 +28811,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:29534: result: $ac_cv_lib_m_acos" >&5 +echo "$as_me:28814: 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 @@ -29557,13 +28837,13 @@ case "$host_os" in eval 'cf_cv_have_lib_'"video"'=no' cf_libdir="" - echo "$as_me:29560: checking for v_init" >&5 + echo "$as_me:28840: 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 29566 "configure" +#line 28846 "configure" #include "confdefs.h" #define v_init autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -29594,16 +28874,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:29597: \"$ac_link\"") >&5 +if { (eval echo "$as_me:28877: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:29600: \$? = $ac_status" >&5 + echo "$as_me:28880: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:29603: \"$ac_try\"") >&5 + { (eval echo "$as_me:28883: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29606: \$? = $ac_status" >&5 + echo "$as_me:28886: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_v_init=yes else @@ -29613,18 +28893,18 @@ ac_cv_func_v_init=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:29616: result: $ac_cv_func_v_init" >&5 +echo "$as_me:28896: 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:29623: checking for v_init in -lvideo" >&5 + echo "$as_me:28903: 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 29627 "configure" +#line 28907 "configure" #include "confdefs.h" #include int @@ -29636,25 +28916,25 @@ v_init() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:29639: \"$ac_link\"") >&5 +if { (eval echo "$as_me:28919: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:29642: \$? = $ac_status" >&5 + echo "$as_me:28922: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:29645: \"$ac_try\"") >&5 + { (eval echo "$as_me:28925: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29648: \$? = $ac_status" >&5 + echo "$as_me:28928: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:29650: result: yes" >&5 + echo "$as_me:28930: 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:29657: result: no" >&5 +echo "$as_me:28937: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -29722,11 +29002,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:29725: checking for -lvideo in $cf_libdir" >&5 + echo "$as_me:29005: 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 29729 "configure" +#line 29009 "configure" #include "confdefs.h" #include int @@ -29738,25 +29018,25 @@ v_init() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:29741: \"$ac_link\"") >&5 +if { (eval echo "$as_me:29021: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:29744: \$? = $ac_status" >&5 + echo "$as_me:29024: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:29747: \"$ac_try\"") >&5 + { (eval echo "$as_me:29027: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29750: \$? = $ac_status" >&5 + echo "$as_me:29030: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:29752: result: yes" >&5 + echo "$as_me:29032: 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:29759: result: no" >&5 +echo "$as_me:29039: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -29771,7 +29051,7 @@ fi eval 'cf_found_library="$cf_cv_have_lib_'"video"\" if test "$cf_found_library" = no ; then - { { echo "$as_me:29774: error: Cannot link video library" >&5 + { { echo "$as_me:29054: error: Cannot link video library" >&5 echo "$as_me: error: Cannot link video library" >&2;} { (exit 1); exit 1; }; } fi @@ -29781,13 +29061,13 @@ esac eval 'cf_cv_have_lib_'"slang2"'=no' cf_libdir="" - echo "$as_me:29784: checking for SLtt_get_screen_size" >&5 + echo "$as_me:29064: 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 29790 "configure" +#line 29070 "configure" #include "confdefs.h" #define SLtt_get_screen_size autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -29818,16 +29098,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:29821: \"$ac_link\"") >&5 +if { (eval echo "$as_me:29101: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:29824: \$? = $ac_status" >&5 + echo "$as_me:29104: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:29827: \"$ac_try\"") >&5 + { (eval echo "$as_me:29107: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29830: \$? = $ac_status" >&5 + echo "$as_me:29110: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_SLtt_get_screen_size=yes else @@ -29837,18 +29117,18 @@ ac_cv_func_SLtt_get_screen_size=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:29840: result: $ac_cv_func_SLtt_get_screen_size" >&5 +echo "$as_me:29120: 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:29847: checking for SLtt_get_screen_size in -lslang2" >&5 + echo "$as_me:29127: 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 29851 "configure" +#line 29131 "configure" #include "confdefs.h" #include int @@ -29860,25 +29140,25 @@ SLtt_get_screen_size() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:29863: \"$ac_link\"") >&5 +if { (eval echo "$as_me:29143: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:29866: \$? = $ac_status" >&5 + echo "$as_me:29146: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:29869: \"$ac_try\"") >&5 + { (eval echo "$as_me:29149: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29872: \$? = $ac_status" >&5 + echo "$as_me:29152: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:29874: result: yes" >&5 + echo "$as_me:29154: 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:29881: result: no" >&5 +echo "$as_me:29161: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -29946,11 +29226,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:29949: checking for -lslang2 in $cf_libdir" >&5 + echo "$as_me:29229: 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 29953 "configure" +#line 29233 "configure" #include "confdefs.h" #include int @@ -29962,25 +29242,25 @@ SLtt_get_screen_size() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:29965: \"$ac_link\"") >&5 +if { (eval echo "$as_me:29245: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:29968: \$? = $ac_status" >&5 + echo "$as_me:29248: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:29971: \"$ac_try\"") >&5 + { (eval echo "$as_me:29251: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29974: \$? = $ac_status" >&5 + echo "$as_me:29254: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:29976: result: yes" >&5 + echo "$as_me:29256: 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:29983: result: no" >&5 +echo "$as_me:29263: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -29995,13 +29275,13 @@ fi eval 'cf_found_library="$cf_cv_have_lib_'"slang2"\" if test "$cf_found_library" = no ; then - { { echo "$as_me:29998: error: Cannot link slang2 library" >&5 + { { echo "$as_me:29278: 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:30004: checking if we can link slang2 without termcap" >&5 +echo "$as_me:29284: 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%^.%%'` @@ -30010,7 +29290,7 @@ else fi LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'` cat >"conftest.$ac_ext" <<_ACEOF -#line 30013 "configure" +#line 29293 "configure" #include "confdefs.h" #include int @@ -30022,16 +29302,16 @@ SLtt_get_screen_size() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:30025: \"$ac_link\"") >&5 +if { (eval echo "$as_me:29305: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:30028: \$? = $ac_status" >&5 + echo "$as_me:29308: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:30031: \"$ac_try\"") >&5 + { (eval echo "$as_me:29311: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:30034: \$? = $ac_status" >&5 + echo "$as_me:29314: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -30040,12 +29320,12 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" -echo "$as_me:30043: result: $cf_result" >&5 +echo "$as_me:29323: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 test "$cf_result" = no && LIBS="$cf_slang_LIBS3" else - { { echo "$as_me:30048: error: cannot find slang headers" >&5 + { { echo "$as_me:29328: error: cannot find slang headers" >&5 echo "$as_me: error: cannot find slang headers" >&2;} { (exit 1); exit 1; }; } fi @@ -30053,14 +29333,14 @@ fi # There's an unofficial set of patches for slang that gives it some limited # UTF8 capability. Unfortunately it won't compile unless one defines UTF8. -echo "$as_me:30056: checking if we must define UTF8" >&5 +echo "$as_me:29336: 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 30063 "configure" +#line 29343 "configure" #include "confdefs.h" #include int @@ -30072,16 +29352,16 @@ SLtt_get_screen_size() } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:30075: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:29355: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:30078: \$? = $ac_status" >&5 + echo "$as_me:29358: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:30081: \"$ac_try\"") >&5 + { (eval echo "$as_me:29361: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:30084: \$? = $ac_status" >&5 + echo "$as_me:29364: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_slang_utf8=no else @@ -30089,7 +29369,7 @@ else cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 30092 "configure" +#line 29372 "configure" #include "confdefs.h" #define UTF8 @@ -30103,16 +29383,16 @@ SLtt_get_screen_size() } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:30106: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:29386: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:30109: \$? = $ac_status" >&5 + echo "$as_me:29389: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:30112: \"$ac_try\"") >&5 + { (eval echo "$as_me:29392: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:30115: \$? = $ac_status" >&5 + echo "$as_me:29395: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_slang_utf8=yes else @@ -30125,7 +29405,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:30128: result: $cf_cv_slang_utf8" >&5 +echo "$as_me:29408: result: $cf_cv_slang_utf8" >&5 echo "${ECHO_T}$cf_cv_slang_utf8" >&6 if test "$cf_cv_slang_utf8" = yes ; then @@ -30136,14 +29416,14 @@ EOF fi -echo "$as_me:30139: checking if we must tell slang this is UNIX" >&5 +echo "$as_me:29419: 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 30146 "configure" +#line 29426 "configure" #include "confdefs.h" #include int @@ -30162,16 +29442,16 @@ SLang_TT_Baud_Rate = 1 } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:30165: \"$ac_link\"") >&5 +if { (eval echo "$as_me:29445: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:30168: \$? = $ac_status" >&5 + echo "$as_me:29448: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:30171: \"$ac_try\"") >&5 + { (eval echo "$as_me:29451: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:30174: \$? = $ac_status" >&5 + echo "$as_me:29454: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_slang_unix=yes else @@ -30182,20 +29462,20 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:30185: result: $cf_cv_slang_unix" >&5 +echo "$as_me:29465: result: $cf_cv_slang_unix" >&5 echo "${ECHO_T}$cf_cv_slang_unix" >&6 test "$cf_cv_slang_unix" = yes && cat >>confdefs.h <<\EOF #define REAL_UNIX_SYSTEM 1 EOF - echo "$as_me:30192: checking for SLsmg_Color_Type" >&5 + echo "$as_me:29472: checking for SLsmg_Color_Type" >&5 echo $ECHO_N "checking for SLsmg_Color_Type... $ECHO_C" >&6 if test "${ac_cv_type_SLsmg_Color_Type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 30198 "configure" +#line 29478 "configure" #include "confdefs.h" #include @@ -30211,16 +29491,16 @@ if (sizeof (SLsmg_Color_Type)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:30214: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:29494: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:30217: \$? = $ac_status" >&5 + echo "$as_me:29497: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:30220: \"$ac_try\"") >&5 + { (eval echo "$as_me:29500: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:30223: \$? = $ac_status" >&5 + echo "$as_me:29503: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_SLsmg_Color_Type=yes else @@ -30230,7 +29510,7 @@ ac_cv_type_SLsmg_Color_Type=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:30233: result: $ac_cv_type_SLsmg_Color_Type" >&5 +echo "$as_me:29513: result: $ac_cv_type_SLsmg_Color_Type" >&5 echo "${ECHO_T}$ac_cv_type_SLsmg_Color_Type" >&6 if test "$ac_cv_type_SLsmg_Color_Type" = yes; then ac_cv_type_SLsmg_Color_Type=yes @@ -30246,13 +29526,13 @@ EOF fi - echo "$as_me:30249: checking for SLtt_Char_Type" >&5 + echo "$as_me:29529: checking for SLtt_Char_Type" >&5 echo $ECHO_N "checking for SLtt_Char_Type... $ECHO_C" >&6 if test "${ac_cv_type_SLtt_Char_Type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 30255 "configure" +#line 29535 "configure" #include "confdefs.h" #include @@ -30268,16 +29548,16 @@ if (sizeof (SLtt_Char_Type)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:30271: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:29551: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:30274: \$? = $ac_status" >&5 + echo "$as_me:29554: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:30277: \"$ac_try\"") >&5 + { (eval echo "$as_me:29557: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:30280: \$? = $ac_status" >&5 + echo "$as_me:29560: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_SLtt_Char_Type=yes else @@ -30287,7 +29567,7 @@ ac_cv_type_SLtt_Char_Type=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:30290: result: $ac_cv_type_SLtt_Char_Type" >&5 +echo "$as_me:29570: result: $ac_cv_type_SLtt_Char_Type" >&5 echo "${ECHO_T}$ac_cv_type_SLtt_Char_Type" >&6 if test "$ac_cv_type_SLtt_Char_Type" = yes; then ac_cv_type_SLtt_Char_Type=yes @@ -30310,7 +29590,7 @@ esac LD_RPATH_OPT= if test "x$cf_cv_enable_rpath" != xno then - echo "$as_me:30313: checking for an rpath option" >&5 + echo "$as_me:29593: checking for an rpath option" >&5 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 case "$cf_cv_system_name" in (irix*) @@ -30341,12 +29621,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 (*) ;; esac - echo "$as_me:30344: result: $LD_RPATH_OPT" >&5 + echo "$as_me:29624: result: $LD_RPATH_OPT" >&5 echo "${ECHO_T}$LD_RPATH_OPT" >&6 case "x$LD_RPATH_OPT" in (x-R*) - echo "$as_me:30349: checking if we need a space after rpath option" >&5 + echo "$as_me:29629: 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" @@ -30367,7 +29647,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 30370 "configure" +#line 29650 "configure" #include "confdefs.h" int @@ -30379,16 +29659,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:30382: \"$ac_link\"") >&5 +if { (eval echo "$as_me:29662: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:30385: \$? = $ac_status" >&5 + echo "$as_me:29665: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:30388: \"$ac_try\"") >&5 + { (eval echo "$as_me:29668: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:30391: \$? = $ac_status" >&5 + echo "$as_me:29671: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_rpath_space=no else @@ -30398,7 +29678,7 @@ cf_rpath_space=yes fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" - echo "$as_me:30401: result: $cf_rpath_space" >&5 + echo "$as_me:29681: result: $cf_rpath_space" >&5 echo "${ECHO_T}$cf_rpath_space" >&6 test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " ;; @@ -30409,13 +29689,13 @@ if test -z "$LD_RPATH_OPT" then test -n "$verbose" && echo " will not attempt to use rpath" 1>&6 -echo "${as_me:-configure}:30412: testing will not attempt to use rpath ..." 1>&5 +echo "${as_me:-configure}:29692: testing will not attempt to use rpath ..." 1>&5 elif test "x${enable_rpath_hack:-yes}" = "xno" then test -n "$verbose" && echo " rpath is disabled" 1>&6 -echo "${as_me:-configure}:30418: testing rpath is disabled ..." 1>&5 +echo "${as_me:-configure}:29698: testing rpath is disabled ..." 1>&5 elif test -z "${LD_RUN_PATH}${LD_LIBRARY_PATH}" then @@ -30426,7 +29706,7 @@ if test "$cross_compiling" = yes; then cf_check_run=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 30429 "configure" +#line 29709 "configure" #include "confdefs.h" $ac_includes_default int main(void) { @@ -30435,15 +29715,15 @@ int main(void) { } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:30438: \"$ac_link\"") >&5 +if { (eval echo "$as_me:29718: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:30441: \$? = $ac_status" >&5 + echo "$as_me:29721: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:30443: \"$ac_try\"") >&5 + { (eval echo "$as_me:29723: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:30446: \$? = $ac_status" >&5 + echo "$as_me:29726: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_check_run=yes else @@ -30459,7 +29739,7 @@ fi then test -n "$verbose" && echo " linkage is broken" 1>&6 -echo "${as_me:-configure}:30462: testing linkage is broken ..." 1>&5 +echo "${as_me:-configure}:29742: testing linkage is broken ..." 1>&5 cf_result= for cf_item in $LIBS @@ -30491,7 +29771,7 @@ if test "$cross_compiling" = yes; then cf_check_run=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 30494 "configure" +#line 29774 "configure" #include "confdefs.h" $ac_includes_default int main(void) { @@ -30500,15 +29780,15 @@ int main(void) { } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:30503: \"$ac_link\"") >&5 +if { (eval echo "$as_me:29783: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:30506: \$? = $ac_status" >&5 + echo "$as_me:29786: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:30508: \"$ac_try\"") >&5 + { (eval echo "$as_me:29788: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:30511: \$? = $ac_status" >&5 + echo "$as_me:29791: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_check_run=yes else @@ -30524,12 +29804,12 @@ fi then test -n "$verbose" && echo " use rpath for $cf_save_LIBS" 1>&6 -echo "${as_me:-configure}:30527: testing use rpath for $cf_save_LIBS ..." 1>&5 +echo "${as_me:-configure}:29807: testing use rpath for $cf_save_LIBS ..." 1>&5 LIBS="$cf_result" test -n "$verbose" && echo " result is now $LIBS" 1>&6 -echo "${as_me:-configure}:30532: testing result is now $LIBS ..." 1>&5 +echo "${as_me:-configure}:29812: testing result is now $LIBS ..." 1>&5 else LIBS="$cf_save_LIBS" @@ -30540,20 +29820,20 @@ echo "${as_me:-configure}:30532: testing result is now $LIBS ..." 1>&5 (*) test -n "$verbose" && echo " will not attempt to use rpath" 1>&6 -echo "${as_me:-configure}:30543: testing will not attempt to use rpath ..." 1>&5 +echo "${as_me:-configure}:29823: testing will not attempt to use rpath ..." 1>&5 ;; esac fi -echo "$as_me:30549: checking for chtype typedef" >&5 +echo "$as_me:29829: 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 30556 "configure" +#line 29836 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -30565,16 +29845,16 @@ chtype foo; (void)foo } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:30568: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:29848: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:30571: \$? = $ac_status" >&5 + echo "$as_me:29851: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:30574: \"$ac_try\"") >&5 + { (eval echo "$as_me:29854: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:30577: \$? = $ac_status" >&5 + echo "$as_me:29857: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_chtype_decl=yes else @@ -30584,7 +29864,7 @@ cf_cv_chtype_decl=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:30587: result: $cf_cv_chtype_decl" >&5 +echo "$as_me:29867: result: $cf_cv_chtype_decl" >&5 echo "${ECHO_T}$cf_cv_chtype_decl" >&6 if test "$cf_cv_chtype_decl" = yes ; then @@ -30592,14 +29872,14 @@ cat >>confdefs.h <<\EOF #define HAVE_TYPE_CHTYPE 1 EOF - echo "$as_me:30595: checking if chtype is scalar or struct" >&5 + echo "$as_me:29875: 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 30602 "configure" +#line 29882 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -30611,16 +29891,16 @@ static chtype foo; long x = foo; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:30614: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:29894: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:30617: \$? = $ac_status" >&5 + echo "$as_me:29897: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:30620: \"$ac_try\"") >&5 + { (eval echo "$as_me:29900: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:30623: \$? = $ac_status" >&5 + echo "$as_me:29903: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_chtype_type=scalar else @@ -30630,7 +29910,7 @@ cf_cv_chtype_type=struct fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:30633: result: $cf_cv_chtype_type" >&5 +echo "$as_me:29913: result: $cf_cv_chtype_type" >&5 echo "${ECHO_T}$cf_cv_chtype_type" >&6 if test "$cf_cv_chtype_type" = scalar ; then @@ -30641,7 +29921,7 @@ EOF fi fi -echo "$as_me:30644: checking if you want the wide-curses features" >&5 +echo "$as_me:29924: 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. @@ -30658,10 +29938,10 @@ else use_wide_curses=$cf_wide_curses fi; -echo "$as_me:30661: result: $use_wide_curses" >&5 +echo "$as_me:29941: result: $use_wide_curses" >&5 echo "${ECHO_T}$use_wide_curses" >&6 -echo "$as_me:30664: checking if color-style code should be used" >&5 +echo "$as_me:29944: 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. @@ -30681,7 +29961,7 @@ fi; case "$use_color_style" in (no) - echo "$as_me:30684: result: no" >&5 + echo "$as_me:29964: result: no" >&5 echo "${ECHO_T}no" >&6 INSTALL_LSS= ;; @@ -30691,10 +29971,10 @@ cat >>confdefs.h <<\EOF #define USE_COLOR_STYLE 1 EOF - echo "$as_me:30694: result: yes" >&5 + echo "$as_me:29974: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:30697: checking for location of style-sheet file" >&5 + echo "$as_me:29977: 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. @@ -30730,7 +30010,7 @@ case ".$withval" in withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:30733: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:30013: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -30739,7 +30019,7 @@ esac fi eval LYNX_LSS_FILE="$withval" - echo "$as_me:30742: result: $LYNX_LSS_FILE" >&5 + echo "$as_me:30022: result: $LYNX_LSS_FILE" >&5 echo "${ECHO_T}$LYNX_LSS_FILE" >&6 test "$LYNX_LSS_FILE" = no && LYNX_LSS_FILE= @@ -30752,7 +30032,7 @@ EOF ;; esac -echo "$as_me:30755: checking for the default configuration-file" >&5 +echo "$as_me:30035: 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. @@ -30788,7 +30068,7 @@ case ".$withval" in withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:30791: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:30071: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -30797,7 +30077,7 @@ esac fi eval LYNX_CFG_FILE="$withval" -echo "$as_me:30800: result: $LYNX_CFG_FILE" >&5 +echo "$as_me:30080: result: $LYNX_CFG_FILE" >&5 echo "${ECHO_T}$LYNX_CFG_FILE" >&6 test "$LYNX_CFG_FILE" = no && LYNX_CFG_FILE= @@ -30806,7 +30086,7 @@ cat >>confdefs.h <&5 +echo "$as_me:30089: checking for the default configuration-path" >&5 echo $ECHO_N "checking for the default configuration-path... $ECHO_C" >&6 # Check whether --with-cfg-path or --without-cfg-path was given. @@ -30842,7 +30122,7 @@ case ".$withval" in withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:30845: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:30125: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -30851,7 +30131,7 @@ esac fi eval LYNX_CFG_PATH="$withval" -echo "$as_me:30854: result: $LYNX_CFG_PATH" >&5 +echo "$as_me:30134: result: $LYNX_CFG_PATH" >&5 echo "${ECHO_T}$LYNX_CFG_PATH" >&6 test -z "$LYNX_CFG_PATH" && LYNX_CFG_PATH="`echo "$LYNX_CFG_FILE" | sed -e 's%/[^/]*$%%'`" @@ -30861,7 +30141,7 @@ cat >>confdefs.h <&5 +echo "$as_me:30144: 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. @@ -30878,7 +30158,7 @@ else use_htmlized_cfg=no fi; -echo "$as_me:30881: result: $use_htmlized_cfg" >&5 +echo "$as_me:30161: result: $use_htmlized_cfg" >&5 echo "${ECHO_T}$use_htmlized_cfg" >&6 LYNXCFG_MAKE='' @@ -30889,7 +30169,7 @@ else LYNXCFG_NO_MAKE='#' fi -echo "$as_me:30892: checking if local doc directory should be linked to help page" >&5 +echo "$as_me:30172: 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. @@ -30906,7 +30186,7 @@ else use_local_docs=no fi; -echo "$as_me:30909: result: $use_local_docs" >&5 +echo "$as_me:30189: result: $use_local_docs" >&5 echo "${ECHO_T}$use_local_docs" >&6 LYNXDOC_MAKE='' @@ -30914,7 +30194,7 @@ if test "$use_local_docs" = no ; then LYNXDOC_MAKE='#' fi -echo "$as_me:30917: checking for MIME library directory" >&5 +echo "$as_me:30197: 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. @@ -30950,7 +30230,7 @@ case ".$withval" in withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:30953: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:30233: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -30959,7 +30239,7 @@ esac fi eval MIME_LIBDIR="$withval" -echo "$as_me:30962: result: $MIME_LIBDIR" >&5 +echo "$as_me:30242: result: $MIME_LIBDIR" >&5 echo "${ECHO_T}$MIME_LIBDIR" >&6 MIME_LIBDIR=`echo "$MIME_LIBDIR" | sed -e 's,/$,,' -e 's,$,/,'` @@ -30967,7 +30247,7 @@ cat >>confdefs.h <&5 +echo "$as_me:30250: 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. @@ -30984,7 +30264,7 @@ else use_locale_charset=yes fi; -echo "$as_me:30987: result: $use_locale_charset" >&5 +echo "$as_me:30267: result: $use_locale_charset" >&5 echo "${ECHO_T}$use_locale_charset" >&6 test "$use_locale_charset" != no && cat >>confdefs.h <<\EOF @@ -30993,7 +30273,7 @@ EOF CHARSET_DEFS= -echo "$as_me:30996: checking if you want only a few charsets" >&5 +echo "$as_me:30276: 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. @@ -31005,7 +30285,7 @@ else fi; if test -n "$cf_charsets" ; then - echo "$as_me:31008: result: yes" >&5 + echo "$as_me:30288: result: yes" >&5 echo "${ECHO_T}yes" >&6 cat >>confdefs.h <<\EOF @@ -31019,7 +30299,7 @@ EOF if test "$cf_charsets" = "minimal" ; then test -n "$verbose" && echo " using minimal list of charsets: $cf_min_charsets" 1>&6 -echo "${as_me:-configure}:31022: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5 +echo "${as_me:-configure}:30302: 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'` @@ -31046,71 +30326,28 @@ echo "${as_me:-configure}:31022: testing using minimal list of charsets: $cf_min then test -n "$verbose" && echo " found $cf_charset" 1>&6 -echo "${as_me:-configure}:31049: testing found $cf_charset ..." 1>&5 +echo "${as_me:-configure}:30329: 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}:31055: testing not found $cf_charset ..." 1>&5 +echo "${as_me:-configure}:30335: testing not found $cf_charset ..." 1>&5 fi done else - echo "$as_me:31060: result: no" >&5 + echo "$as_me:30340: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:31064: checking whether exit is declared" >&5 -echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6 -if test "${ac_cv_have_decl_exit+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >"conftest.$ac_ext" <<_ACEOF -#line 31070 "configure" -#include "confdefs.h" -$ac_includes_default -int -main (void) -{ -#ifndef exit - (void) exit; -#endif - - ; - return 0; -} -_ACEOF -rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:31085: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:31088: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:31091: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:31094: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - ac_cv_have_decl_exit=yes -else - echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -ac_cv_have_decl_exit=no -fi -rm -f "conftest.$ac_objext" "conftest.$ac_ext" -fi -echo "$as_me:31104: result: $ac_cv_have_decl_exit" >&5 -echo "${ECHO_T}$ac_cv_have_decl_exit" >&6 - -echo "$as_me:31107: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:30344: 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 31113 "configure" +#line 30350 "configure" #include "confdefs.h" #include #include @@ -31126,16 +30363,16 @@ return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:31129: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:30366: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:31132: \$? = $ac_status" >&5 + echo "$as_me:30369: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:31135: \"$ac_try\"") >&5 + { (eval echo "$as_me:30372: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:31138: \$? = $ac_status" >&5 + echo "$as_me:30375: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_header_time=yes else @@ -31145,7 +30382,7 @@ ac_cv_header_time=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:31148: result: $ac_cv_header_time" >&5 +echo "$as_me:30385: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -31158,13 +30395,13 @@ fi ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -echo "$as_me:31161: checking for $ac_hdr that defines DIR" >&5 +echo "$as_me:30398: 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 31167 "configure" +#line 30404 "configure" #include "confdefs.h" #include #include <$ac_hdr> @@ -31179,16 +30416,16 @@ return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:31182: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:30419: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:31185: \$? = $ac_status" >&5 + echo "$as_me:30422: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:31188: \"$ac_try\"") >&5 + { (eval echo "$as_me:30425: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:31191: \$? = $ac_status" >&5 + echo "$as_me:30428: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Header=yes" else @@ -31198,7 +30435,7 @@ eval "$as_ac_Header=no" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:31201: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:30438: 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:30451: 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 @@ -31219,7 +30456,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldir $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 31222 "configure" +#line 30459 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -31238,16 +30475,16 @@ opendir (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:31241: \"$ac_link\"") >&5 +if { (eval echo "$as_me:30478: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:31244: \$? = $ac_status" >&5 + echo "$as_me:30481: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:31247: \"$ac_try\"") >&5 + { (eval echo "$as_me:30484: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:31250: \$? = $ac_status" >&5 + echo "$as_me:30487: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dir_opendir=yes else @@ -31258,14 +30495,14 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:31261: result: $ac_cv_lib_dir_opendir" >&5 +echo "$as_me:30498: 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:31268: checking for opendir in -lx" >&5 + echo "$as_me:30505: 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 @@ -31273,7 +30510,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lx $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 31276 "configure" +#line 30513 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -31292,16 +30529,16 @@ opendir (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:31295: \"$ac_link\"") >&5 +if { (eval echo "$as_me:30532: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:31298: \$? = $ac_status" >&5 + echo "$as_me:30535: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:31301: \"$ac_try\"") >&5 + { (eval echo "$as_me:30538: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:31304: \$? = $ac_status" >&5 + echo "$as_me:30541: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_x_opendir=yes else @@ -31312,7 +30549,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:31315: result: $ac_cv_lib_x_opendir" >&5 +echo "$as_me:30552: 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" @@ -31338,23 +30575,23 @@ for ac_header in \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:31341: checking for $ac_header" >&5 +echo "$as_me:30578: 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 31347 "configure" +#line 30584 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:31351: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:30588: \"$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:31357: \$? = $ac_status" >&5 + echo "$as_me:30594: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -31373,7 +30610,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:31376: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:30613: 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:30623: 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 31393 "configure" +#line 30630 "configure" #include "confdefs.h" #include @@ -31409,16 +30646,16 @@ putchar (0x0a) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:31412: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:30649: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:31415: \$? = $ac_status" >&5 + echo "$as_me:30652: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:31418: \"$ac_try\"") >&5 + { (eval echo "$as_me:30655: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:31421: \$? = $ac_status" >&5 + echo "$as_me:30658: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_termio_and_termios=yes else @@ -31429,21 +30666,21 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:31432: result: $cf_cv_termio_and_termios" >&5 +echo "$as_me:30669: 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:31439: checking for sigaction and structs" >&5 +echo "$as_me:30676: 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 31446 "configure" +#line 30683 "configure" #include "confdefs.h" #include @@ -31463,16 +30700,16 @@ struct sigaction act; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:31466: \"$ac_link\"") >&5 +if { (eval echo "$as_me:30703: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:31469: \$? = $ac_status" >&5 + echo "$as_me:30706: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:31472: \"$ac_try\"") >&5 + { (eval echo "$as_me:30709: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:31475: \$? = $ac_status" >&5 + echo "$as_me:30712: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_sigaction=yes else @@ -31483,7 +30720,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:31486: result: $cf_cv_func_sigaction" >&5 +echo "$as_me:30723: result: $cf_cv_func_sigaction" >&5 echo "${ECHO_T}$cf_cv_func_sigaction" >&6 test "$cf_cv_func_sigaction" = yes && cat >>confdefs.h <<\EOF @@ -31493,23 +30730,23 @@ EOF for ac_header in sys/wait.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:31496: checking for $ac_header" >&5 +echo "$as_me:30733: 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 31502 "configure" +#line 30739 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:31506: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:30743: \"$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:31512: \$? = $ac_status" >&5 + echo "$as_me:30749: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -31528,7 +30765,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:31531: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:30768: 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:30789: 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 31558 "configure" +#line 30795 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:31562: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:30799: \"$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:31568: \$? = $ac_status" >&5 + echo "$as_me:30805: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -31584,7 +30821,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:31587: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:30824: 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:30837: 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 31606 "configure" +#line 30843 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:31610: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:30847: \"$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:31616: \$? = $ac_status" >&5 + echo "$as_me:30853: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -31632,7 +30869,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:31635: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:30872: 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:30894: 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 31664 "configure" +#line 30901 "configure" #include "confdefs.h" $cf_wait_headers int @@ -31680,16 +30917,16 @@ static int x; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:31683: \"$ac_link\"") >&5 +if { (eval echo "$as_me:30920: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:31686: \$? = $ac_status" >&5 + echo "$as_me:30923: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:31689: \"$ac_try\"") >&5 + { (eval echo "$as_me:30926: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:31692: \$? = $ac_status" >&5 + echo "$as_me:30929: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_type_unionwait=no echo compiles ok w/o union wait 1>&5 @@ -31699,7 +30936,7 @@ else cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 31702 "configure" +#line 30939 "configure" #include "confdefs.h" $cf_wait_headers int @@ -31726,16 +30963,16 @@ union wait x; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:31729: \"$ac_link\"") >&5 +if { (eval echo "$as_me:30966: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:31732: \$? = $ac_status" >&5 + echo "$as_me:30969: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:31735: \"$ac_try\"") >&5 + { (eval echo "$as_me:30972: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:31738: \$? = $ac_status" >&5 + echo "$as_me:30975: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_type_unionwait=yes echo compiles ok with union wait and possibly macros too 1>&5 @@ -31750,7 +30987,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:31753: result: $cf_cv_type_unionwait" >&5 +echo "$as_me:30990: result: $cf_cv_type_unionwait" >&5 echo "${ECHO_T}$cf_cv_type_unionwait" >&6 test "$cf_cv_type_unionwait" = yes && cat >>confdefs.h <<\EOF @@ -31759,14 +30996,14 @@ EOF if test "$cf_cv_type_unionwait" = yes; then - echo "$as_me:31762: checking if union wait can be used as wait-arg" >&5 + echo "$as_me:30999: 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 31769 "configure" +#line 31006 "configure" #include "confdefs.h" $cf_wait_headers int @@ -31778,16 +31015,16 @@ union wait x; wait(&x) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:31781: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:31018: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:31784: \$? = $ac_status" >&5 + echo "$as_me:31021: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:31787: \"$ac_try\"") >&5 + { (eval echo "$as_me:31024: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:31790: \$? = $ac_status" >&5 + echo "$as_me:31027: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_arg_union_wait=yes else @@ -31799,21 +31036,21 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi - echo "$as_me:31802: result: $cf_cv_arg_union_wait" >&5 + echo "$as_me:31039: 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:31809: checking if union wait can be used as waitpid-arg" >&5 + echo "$as_me:31046: 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 31816 "configure" +#line 31053 "configure" #include "confdefs.h" $cf_wait_headers int @@ -31825,16 +31062,16 @@ union wait x; waitpid(0, &x, 0) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:31828: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:31065: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:31831: \$? = $ac_status" >&5 + echo "$as_me:31068: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:31834: \"$ac_try\"") >&5 + { (eval echo "$as_me:31071: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:31837: \$? = $ac_status" >&5 + echo "$as_me:31074: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_arg_union_waitpid=yes else @@ -31846,7 +31083,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi - echo "$as_me:31849: result: $cf_cv_arg_union_waitpid" >&5 + echo "$as_me:31086: 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 @@ -31855,13 +31092,13 @@ EOF fi -echo "$as_me:31858: checking for uid_t in sys/types.h" >&5 +echo "$as_me:31095: 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 31864 "configure" +#line 31101 "configure" #include "confdefs.h" #include @@ -31875,7 +31112,7 @@ fi rm -rf conftest* fi -echo "$as_me:31878: result: $ac_cv_type_uid_t" >&5 +echo "$as_me:31115: 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 @@ -31889,7 +31126,7 @@ EOF fi -echo "$as_me:31892: checking type of array argument to getgroups" >&5 +echo "$as_me:31129: 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 @@ -31898,7 +31135,7 @@ else ac_cv_type_getgroups=cross else cat >"conftest.$ac_ext" <<_ACEOF -#line 31901 "configure" +#line 31138 "configure" #include "confdefs.h" $ac_includes_default /* Thanks to Mike Rendell for this test. */ @@ -31925,15 +31162,15 @@ main (void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:31928: \"$ac_link\"") >&5 +if { (eval echo "$as_me:31165: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:31931: \$? = $ac_status" >&5 + echo "$as_me:31168: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:31933: \"$ac_try\"") >&5 + { (eval echo "$as_me:31170: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:31936: \$? = $ac_status" >&5 + echo "$as_me:31173: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_getgroups=gid_t else @@ -31946,7 +31183,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi if test $ac_cv_type_getgroups = cross; then cat >"conftest.$ac_ext" <<_ACEOF -#line 31949 "configure" +#line 31186 "configure" #include "confdefs.h" #include @@ -31961,20 +31198,20 @@ rm -rf conftest* fi fi -echo "$as_me:31964: result: $ac_cv_type_getgroups" >&5 +echo "$as_me:31201: result: $ac_cv_type_getgroups" >&5 echo "${ECHO_T}$ac_cv_type_getgroups" >&6 cat >>confdefs.h <&5 +echo "$as_me:31208: 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 31977 "configure" +#line 31214 "configure" #include "confdefs.h" $ac_includes_default int @@ -31989,16 +31226,16 @@ if (sizeof (off_t)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:31992: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:31229: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:31995: \$? = $ac_status" >&5 + echo "$as_me:31232: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:31998: \"$ac_try\"") >&5 + { (eval echo "$as_me:31235: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32001: \$? = $ac_status" >&5 + echo "$as_me:31238: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_off_t=yes else @@ -32008,7 +31245,7 @@ ac_cv_type_off_t=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:32011: result: $ac_cv_type_off_t" >&5 +echo "$as_me:31248: 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 : @@ -32020,13 +31257,13 @@ EOF fi -echo "$as_me:32023: checking for pid_t" >&5 +echo "$as_me:31260: 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 32029 "configure" +#line 31266 "configure" #include "confdefs.h" $ac_includes_default int @@ -32041,16 +31278,16 @@ if (sizeof (pid_t)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:32044: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:31281: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:32047: \$? = $ac_status" >&5 + echo "$as_me:31284: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:32050: \"$ac_try\"") >&5 + { (eval echo "$as_me:31287: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32053: \$? = $ac_status" >&5 + echo "$as_me:31290: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_pid_t=yes else @@ -32060,7 +31297,7 @@ ac_cv_type_pid_t=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:32063: result: $ac_cv_type_pid_t" >&5 +echo "$as_me:31300: 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 : @@ -32072,13 +31309,13 @@ EOF fi -echo "$as_me:32075: checking for uid_t in sys/types.h" >&5 +echo "$as_me:31312: 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 32081 "configure" +#line 31318 "configure" #include "confdefs.h" #include @@ -32092,7 +31329,7 @@ fi rm -rf conftest* fi -echo "$as_me:32095: result: $ac_cv_type_uid_t" >&5 +echo "$as_me:31332: 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 @@ -32106,13 +31343,13 @@ EOF fi -echo "$as_me:32109: checking for mode_t" >&5 +echo "$as_me:31346: 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 32115 "configure" +#line 31352 "configure" #include "confdefs.h" $ac_includes_default int @@ -32127,16 +31364,16 @@ if (sizeof (mode_t)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:32130: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:31367: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:32133: \$? = $ac_status" >&5 + echo "$as_me:31370: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:32136: \"$ac_try\"") >&5 + { (eval echo "$as_me:31373: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32139: \$? = $ac_status" >&5 + echo "$as_me:31376: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_mode_t=yes else @@ -32146,7 +31383,7 @@ ac_cv_type_mode_t=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:32149: result: $ac_cv_type_mode_t" >&5 +echo "$as_me:31386: 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 : @@ -32158,13 +31395,13 @@ EOF fi - echo "$as_me:32161: checking for ssize_t" >&5 + echo "$as_me:31398: checking for ssize_t" >&5 echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6 if test "${ac_cv_type_ssize_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 32167 "configure" +#line 31404 "configure" #include "confdefs.h" $ac_includes_default int @@ -32179,16 +31416,16 @@ if (sizeof (ssize_t)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:32182: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:31419: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:32185: \$? = $ac_status" >&5 + echo "$as_me:31422: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:32188: \"$ac_try\"") >&5 + { (eval echo "$as_me:31425: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32191: \$? = $ac_status" >&5 + echo "$as_me:31428: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_ssize_t=yes else @@ -32198,7 +31435,7 @@ ac_cv_type_ssize_t=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:32201: result: $ac_cv_type_ssize_t" >&5 +echo "$as_me:31438: result: $ac_cv_type_ssize_t" >&5 echo "${ECHO_T}$ac_cv_type_ssize_t" >&6 if test "$ac_cv_type_ssize_t" = yes; then ac_cv_type_ssize_t=yes @@ -32214,13 +31451,13 @@ EOF fi - echo "$as_me:32217: checking for socklen_t" >&5 + echo "$as_me:31454: 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 32223 "configure" +#line 31460 "configure" #include "confdefs.h" #include @@ -32238,16 +31475,16 @@ if (sizeof (socklen_t)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:32241: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:31478: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:32244: \$? = $ac_status" >&5 + echo "$as_me:31481: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:32247: \"$ac_try\"") >&5 + { (eval echo "$as_me:31484: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32250: \$? = $ac_status" >&5 + echo "$as_me:31487: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_socklen_t=yes else @@ -32257,7 +31494,7 @@ ac_cv_type_socklen_t=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:32260: result: $ac_cv_type_socklen_t" >&5 +echo "$as_me:31497: 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 @@ -32273,7 +31510,7 @@ EOF fi -echo "$as_me:32276: checking for long long type" >&5 +echo "$as_me:31513: 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 @@ -32304,7 +31541,7 @@ _CFEOF rm -f conftest* fi -echo "$as_me:32307: result: $cf_cv_type_long_long" >&5 +echo "$as_me:31544: 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 @@ -32315,14 +31552,14 @@ EOF fi -echo "$as_me:32318: checking for tm.tm_gmtoff" >&5 +echo "$as_me:31555: 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 32325 "configure" +#line 31562 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME @@ -32347,16 +31584,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:32350: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:31587: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:32353: \$? = $ac_status" >&5 + echo "$as_me:31590: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:32356: \"$ac_try\"") >&5 + { (eval echo "$as_me:31593: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32359: \$? = $ac_status" >&5 + echo "$as_me:31596: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_tm_gmtoff=yes else @@ -32367,20 +31604,20 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:32370: result: $cf_cv_tm_gmtoff" >&5 +echo "$as_me:31607: 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:32377: checking for int" >&5 +echo "$as_me:31614: 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 32383 "configure" +#line 31620 "configure" #include "confdefs.h" $ac_includes_default int @@ -32395,16 +31632,16 @@ if (sizeof (int)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:32398: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:31635: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:32401: \$? = $ac_status" >&5 + echo "$as_me:31638: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:32404: \"$ac_try\"") >&5 + { (eval echo "$as_me:31641: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32407: \$? = $ac_status" >&5 + echo "$as_me:31644: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_int=yes else @@ -32414,10 +31651,10 @@ ac_cv_type_int=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:32417: result: $ac_cv_type_int" >&5 +echo "$as_me:31654: result: $ac_cv_type_int" >&5 echo "${ECHO_T}$ac_cv_type_int" >&6 -echo "$as_me:32420: checking size of int" >&5 +echo "$as_me:31657: 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 @@ -32426,7 +31663,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >"conftest.$ac_ext" <<_ACEOF -#line 32429 "configure" +#line 31666 "configure" #include "confdefs.h" $ac_includes_default int @@ -32438,21 +31675,21 @@ int _array_ [1 - 2 * !((sizeof (int)) >= 0)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:32441: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:31678: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:32444: \$? = $ac_status" >&5 + echo "$as_me:31681: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:32447: \"$ac_try\"") >&5 + { (eval echo "$as_me:31684: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32450: \$? = $ac_status" >&5 + echo "$as_me:31687: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=0 ac_mid=0 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 32455 "configure" +#line 31692 "configure" #include "confdefs.h" $ac_includes_default int @@ -32464,16 +31701,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:32467: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:31704: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:32470: \$? = $ac_status" >&5 + echo "$as_me:31707: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:32473: \"$ac_try\"") >&5 + { (eval echo "$as_me:31710: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32476: \$? = $ac_status" >&5 + echo "$as_me:31713: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid; break else @@ -32489,7 +31726,7 @@ cat "conftest.$ac_ext" >&5 ac_hi=-1 ac_mid=-1 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 32492 "configure" +#line 31729 "configure" #include "confdefs.h" $ac_includes_default int @@ -32501,16 +31738,16 @@ int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:32504: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:31741: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:32507: \$? = $ac_status" >&5 + echo "$as_me:31744: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:32510: \"$ac_try\"") >&5 + { (eval echo "$as_me:31747: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32513: \$? = $ac_status" >&5 + echo "$as_me:31750: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=$ac_mid; break else @@ -32526,7 +31763,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` cat >"conftest.$ac_ext" <<_ACEOF -#line 32529 "configure" +#line 31766 "configure" #include "confdefs.h" $ac_includes_default int @@ -32538,16 +31775,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:32541: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:31778: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:32544: \$? = $ac_status" >&5 + echo "$as_me:31781: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:32547: \"$ac_try\"") >&5 + { (eval echo "$as_me:31784: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32550: \$? = $ac_status" >&5 + echo "$as_me:31787: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid else @@ -32560,12 +31797,12 @@ done ac_cv_sizeof_int=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:32563: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:31800: 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 32568 "configure" +#line 31805 "configure" #include "confdefs.h" $ac_includes_default int @@ -32581,15 +31818,15 @@ fclose (f); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:32584: \"$ac_link\"") >&5 +if { (eval echo "$as_me:31821: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:32587: \$? = $ac_status" >&5 + echo "$as_me:31824: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:32589: \"$ac_try\"") >&5 + { (eval echo "$as_me:31826: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32592: \$? = $ac_status" >&5 + echo "$as_me:31829: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sizeof_int=`cat conftest.val` else @@ -32605,7 +31842,7 @@ else ac_cv_sizeof_int=0 fi fi -echo "$as_me:32608: result: $ac_cv_sizeof_int" >&5 +echo "$as_me:31845: result: $ac_cv_sizeof_int" >&5 echo "${ECHO_T}$ac_cv_sizeof_int" >&6 cat >>confdefs.h <&5 + { echo "$as_me:31854: WARNING: using 4 for sizeof int" >&5 echo "$as_me: WARNING: using 4 for sizeof int" >&2;} ac_cv_sizeof_int=4 elif test "x${ac_cv_sizeof_int}" = x0; then - { echo "$as_me:32621: WARNING: sizeof int not found, using 4" >&5 + { echo "$as_me:31858: WARNING: sizeof int not found, using 4" >&5 echo "$as_me: WARNING: sizeof int not found, using 4" >&2;} ac_cv_sizeof_int=4 fi @@ -32632,13 +31869,13 @@ cf_cv_type=`echo "sizeof_int" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKL fi fi -echo "$as_me:32635: checking for long" >&5 +echo "$as_me:31872: 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 32641 "configure" +#line 31878 "configure" #include "confdefs.h" $ac_includes_default int @@ -32653,16 +31890,16 @@ if (sizeof (long)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:32656: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:31893: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:32659: \$? = $ac_status" >&5 + echo "$as_me:31896: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:32662: \"$ac_try\"") >&5 + { (eval echo "$as_me:31899: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32665: \$? = $ac_status" >&5 + echo "$as_me:31902: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_long=yes else @@ -32672,10 +31909,10 @@ ac_cv_type_long=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:32675: result: $ac_cv_type_long" >&5 +echo "$as_me:31912: result: $ac_cv_type_long" >&5 echo "${ECHO_T}$ac_cv_type_long" >&6 -echo "$as_me:32678: checking size of long" >&5 +echo "$as_me:31915: 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 @@ -32684,7 +31921,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >"conftest.$ac_ext" <<_ACEOF -#line 32687 "configure" +#line 31924 "configure" #include "confdefs.h" $ac_includes_default int @@ -32696,21 +31933,21 @@ int _array_ [1 - 2 * !((sizeof (long)) >= 0)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:32699: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:31936: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:32702: \$? = $ac_status" >&5 + echo "$as_me:31939: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:32705: \"$ac_try\"") >&5 + { (eval echo "$as_me:31942: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32708: \$? = $ac_status" >&5 + echo "$as_me:31945: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=0 ac_mid=0 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 32713 "configure" +#line 31950 "configure" #include "confdefs.h" $ac_includes_default int @@ -32722,16 +31959,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:32725: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:31962: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:32728: \$? = $ac_status" >&5 + echo "$as_me:31965: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:32731: \"$ac_try\"") >&5 + { (eval echo "$as_me:31968: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32734: \$? = $ac_status" >&5 + echo "$as_me:31971: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid; break else @@ -32747,7 +31984,7 @@ cat "conftest.$ac_ext" >&5 ac_hi=-1 ac_mid=-1 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 32750 "configure" +#line 31987 "configure" #include "confdefs.h" $ac_includes_default int @@ -32759,16 +31996,16 @@ int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:32762: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:31999: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:32765: \$? = $ac_status" >&5 + echo "$as_me:32002: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:32768: \"$ac_try\"") >&5 + { (eval echo "$as_me:32005: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32771: \$? = $ac_status" >&5 + echo "$as_me:32008: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=$ac_mid; break else @@ -32784,7 +32021,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` cat >"conftest.$ac_ext" <<_ACEOF -#line 32787 "configure" +#line 32024 "configure" #include "confdefs.h" $ac_includes_default int @@ -32796,16 +32033,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:32799: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:32036: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:32802: \$? = $ac_status" >&5 + echo "$as_me:32039: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:32805: \"$ac_try\"") >&5 + { (eval echo "$as_me:32042: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32808: \$? = $ac_status" >&5 + echo "$as_me:32045: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid else @@ -32818,12 +32055,12 @@ done ac_cv_sizeof_long=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:32821: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:32058: 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 32826 "configure" +#line 32063 "configure" #include "confdefs.h" $ac_includes_default int @@ -32839,15 +32076,15 @@ fclose (f); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:32842: \"$ac_link\"") >&5 +if { (eval echo "$as_me:32079: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:32845: \$? = $ac_status" >&5 + echo "$as_me:32082: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:32847: \"$ac_try\"") >&5 + { (eval echo "$as_me:32084: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32850: \$? = $ac_status" >&5 + echo "$as_me:32087: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sizeof_long=`cat conftest.val` else @@ -32863,7 +32100,7 @@ else ac_cv_sizeof_long=0 fi fi -echo "$as_me:32866: result: $ac_cv_sizeof_long" >&5 +echo "$as_me:32103: result: $ac_cv_sizeof_long" >&5 echo "${ECHO_T}$ac_cv_sizeof_long" >&6 cat >>confdefs.h <&5 + { echo "$as_me:32112: WARNING: using 4 for sizeof long" >&5 echo "$as_me: WARNING: using 4 for sizeof long" >&2;} ac_cv_sizeof_long=4 elif test "x${ac_cv_sizeof_long}" = x0; then - { echo "$as_me:32879: WARNING: sizeof long not found, using 4" >&5 + { echo "$as_me:32116: WARNING: sizeof long not found, using 4" >&5 echo "$as_me: WARNING: sizeof long not found, using 4" >&2;} ac_cv_sizeof_long=4 fi @@ -32890,13 +32127,13 @@ cf_cv_type=`echo "sizeof_long" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJK fi fi -echo "$as_me:32893: checking for off_t" >&5 +echo "$as_me:32130: 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 32899 "configure" +#line 32136 "configure" #include "confdefs.h" $ac_includes_default int @@ -32911,16 +32148,16 @@ if (sizeof (off_t)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:32914: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:32151: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:32917: \$? = $ac_status" >&5 + echo "$as_me:32154: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:32920: \"$ac_try\"") >&5 + { (eval echo "$as_me:32157: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32923: \$? = $ac_status" >&5 + echo "$as_me:32160: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_off_t=yes else @@ -32930,10 +32167,10 @@ ac_cv_type_off_t=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:32933: result: $ac_cv_type_off_t" >&5 +echo "$as_me:32170: result: $ac_cv_type_off_t" >&5 echo "${ECHO_T}$ac_cv_type_off_t" >&6 -echo "$as_me:32936: checking size of off_t" >&5 +echo "$as_me:32173: 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 @@ -32942,7 +32179,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >"conftest.$ac_ext" <<_ACEOF -#line 32945 "configure" +#line 32182 "configure" #include "confdefs.h" $ac_includes_default int @@ -32954,21 +32191,21 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= 0)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:32957: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:32194: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:32960: \$? = $ac_status" >&5 + echo "$as_me:32197: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:32963: \"$ac_try\"") >&5 + { (eval echo "$as_me:32200: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32966: \$? = $ac_status" >&5 + echo "$as_me:32203: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=0 ac_mid=0 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 32971 "configure" +#line 32208 "configure" #include "confdefs.h" $ac_includes_default int @@ -32980,16 +32217,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:32983: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:32220: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:32986: \$? = $ac_status" >&5 + echo "$as_me:32223: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:32989: \"$ac_try\"") >&5 + { (eval echo "$as_me:32226: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32992: \$? = $ac_status" >&5 + echo "$as_me:32229: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid; break else @@ -33005,7 +32242,7 @@ cat "conftest.$ac_ext" >&5 ac_hi=-1 ac_mid=-1 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 33008 "configure" +#line 32245 "configure" #include "confdefs.h" $ac_includes_default int @@ -33017,16 +32254,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:33020: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:32257: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:33023: \$? = $ac_status" >&5 + echo "$as_me:32260: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:33026: \"$ac_try\"") >&5 + { (eval echo "$as_me:32263: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:33029: \$? = $ac_status" >&5 + echo "$as_me:32266: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=$ac_mid; break else @@ -33042,7 +32279,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` cat >"conftest.$ac_ext" <<_ACEOF -#line 33045 "configure" +#line 32282 "configure" #include "confdefs.h" $ac_includes_default int @@ -33054,16 +32291,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:33057: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:32294: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:33060: \$? = $ac_status" >&5 + echo "$as_me:32297: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:33063: \"$ac_try\"") >&5 + { (eval echo "$as_me:32300: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:33066: \$? = $ac_status" >&5 + echo "$as_me:32303: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid else @@ -33076,12 +32313,12 @@ done ac_cv_sizeof_off_t=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:33079: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:32316: 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 33084 "configure" +#line 32321 "configure" #include "confdefs.h" $ac_includes_default int @@ -33097,15 +32334,15 @@ fclose (f); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:33100: \"$ac_link\"") >&5 +if { (eval echo "$as_me:32337: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:33103: \$? = $ac_status" >&5 + echo "$as_me:32340: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:33105: \"$ac_try\"") >&5 + { (eval echo "$as_me:32342: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:33108: \$? = $ac_status" >&5 + echo "$as_me:32345: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sizeof_off_t=`cat conftest.val` else @@ -33121,7 +32358,7 @@ else ac_cv_sizeof_off_t=0 fi fi -echo "$as_me:33124: result: $ac_cv_sizeof_off_t" >&5 +echo "$as_me:32361: result: $ac_cv_sizeof_off_t" >&5 echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6 cat >>confdefs.h <&5 + { echo "$as_me:32370: WARNING: using 4 for sizeof off_t" >&5 echo "$as_me: WARNING: using 4 for sizeof off_t" >&2;} ac_cv_sizeof_off_t=4 elif test "x${ac_cv_sizeof_off_t}" = x0; then - { echo "$as_me:33137: WARNING: sizeof off_t not found, using 4" >&5 + { echo "$as_me:32374: WARNING: sizeof off_t not found, using 4" >&5 echo "$as_me: WARNING: sizeof off_t not found, using 4" >&2;} ac_cv_sizeof_off_t=4 fi @@ -33148,13 +32385,13 @@ cf_cv_type=`echo "sizeof_off_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJ fi fi -echo "$as_me:33151: checking for size_t" >&5 +echo "$as_me:32388: checking for size_t" >&5 echo $ECHO_N "checking for size_t... $ECHO_C" >&6 if test "${ac_cv_type_size_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 33157 "configure" +#line 32394 "configure" #include "confdefs.h" $ac_includes_default int @@ -33169,16 +32406,16 @@ if (sizeof (size_t)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:33172: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:32409: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:33175: \$? = $ac_status" >&5 + echo "$as_me:32412: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:33178: \"$ac_try\"") >&5 + { (eval echo "$as_me:32415: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:33181: \$? = $ac_status" >&5 + echo "$as_me:32418: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_size_t=yes else @@ -33188,10 +32425,10 @@ ac_cv_type_size_t=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:33191: result: $ac_cv_type_size_t" >&5 +echo "$as_me:32428: result: $ac_cv_type_size_t" >&5 echo "${ECHO_T}$ac_cv_type_size_t" >&6 -echo "$as_me:33194: checking size of size_t" >&5 +echo "$as_me:32431: checking size of size_t" >&5 echo $ECHO_N "checking size of size_t... $ECHO_C" >&6 if test "${ac_cv_sizeof_size_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -33200,7 +32437,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >"conftest.$ac_ext" <<_ACEOF -#line 33203 "configure" +#line 32440 "configure" #include "confdefs.h" $ac_includes_default int @@ -33212,21 +32449,21 @@ int _array_ [1 - 2 * !((sizeof (size_t)) >= 0)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:33215: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:32452: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:33218: \$? = $ac_status" >&5 + echo "$as_me:32455: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:33221: \"$ac_try\"") >&5 + { (eval echo "$as_me:32458: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:33224: \$? = $ac_status" >&5 + echo "$as_me:32461: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=0 ac_mid=0 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 33229 "configure" +#line 32466 "configure" #include "confdefs.h" $ac_includes_default int @@ -33238,16 +32475,16 @@ int _array_ [1 - 2 * !((sizeof (size_t)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:33241: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:32478: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:33244: \$? = $ac_status" >&5 + echo "$as_me:32481: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:33247: \"$ac_try\"") >&5 + { (eval echo "$as_me:32484: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:33250: \$? = $ac_status" >&5 + echo "$as_me:32487: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid; break else @@ -33263,7 +32500,7 @@ cat "conftest.$ac_ext" >&5 ac_hi=-1 ac_mid=-1 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 33266 "configure" +#line 32503 "configure" #include "confdefs.h" $ac_includes_default int @@ -33275,16 +32512,16 @@ int _array_ [1 - 2 * !((sizeof (size_t)) >= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:33278: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:32515: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:33281: \$? = $ac_status" >&5 + echo "$as_me:32518: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:33284: \"$ac_try\"") >&5 + { (eval echo "$as_me:32521: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:33287: \$? = $ac_status" >&5 + echo "$as_me:32524: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=$ac_mid; break else @@ -33300,7 +32537,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` cat >"conftest.$ac_ext" <<_ACEOF -#line 33303 "configure" +#line 32540 "configure" #include "confdefs.h" $ac_includes_default int @@ -33312,16 +32549,16 @@ int _array_ [1 - 2 * !((sizeof (size_t)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:33315: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:32552: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:33318: \$? = $ac_status" >&5 + echo "$as_me:32555: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:33321: \"$ac_try\"") >&5 + { (eval echo "$as_me:32558: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:33324: \$? = $ac_status" >&5 + echo "$as_me:32561: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid else @@ -33334,12 +32571,12 @@ done ac_cv_sizeof_size_t=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:33337: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:32574: 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 33342 "configure" +#line 32579 "configure" #include "confdefs.h" $ac_includes_default int @@ -33355,15 +32592,15 @@ fclose (f); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:33358: \"$ac_link\"") >&5 +if { (eval echo "$as_me:32595: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:33361: \$? = $ac_status" >&5 + echo "$as_me:32598: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:33363: \"$ac_try\"") >&5 + { (eval echo "$as_me:32600: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:33366: \$? = $ac_status" >&5 + echo "$as_me:32603: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sizeof_size_t=`cat conftest.val` else @@ -33379,7 +32616,7 @@ else ac_cv_sizeof_size_t=0 fi fi -echo "$as_me:33382: result: $ac_cv_sizeof_size_t" >&5 +echo "$as_me:32619: result: $ac_cv_sizeof_size_t" >&5 echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6 cat >>confdefs.h <&5 + { echo "$as_me:32628: WARNING: using 4 for sizeof size_t" >&5 echo "$as_me: WARNING: using 4 for sizeof size_t" >&2;} ac_cv_sizeof_size_t=4 elif test "x${ac_cv_sizeof_size_t}" = x0; then - { echo "$as_me:33395: WARNING: sizeof size_t not found, using 4" >&5 + { echo "$as_me:32632: WARNING: sizeof size_t not found, using 4" >&5 echo "$as_me: WARNING: sizeof size_t not found, using 4" >&2;} ac_cv_sizeof_size_t=4 fi @@ -33406,13 +32643,13 @@ cf_cv_type=`echo "sizeof_size_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHI fi fi -echo "$as_me:33409: checking for time_t" >&5 +echo "$as_me:32646: 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 33415 "configure" +#line 32652 "configure" #include "confdefs.h" $ac_includes_default int @@ -33427,16 +32664,16 @@ if (sizeof (time_t)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:33430: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:32667: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:33433: \$? = $ac_status" >&5 + echo "$as_me:32670: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:33436: \"$ac_try\"") >&5 + { (eval echo "$as_me:32673: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:33439: \$? = $ac_status" >&5 + echo "$as_me:32676: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_time_t=yes else @@ -33446,10 +32683,10 @@ ac_cv_type_time_t=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:33449: result: $ac_cv_type_time_t" >&5 +echo "$as_me:32686: result: $ac_cv_type_time_t" >&5 echo "${ECHO_T}$ac_cv_type_time_t" >&6 -echo "$as_me:33452: checking size of time_t" >&5 +echo "$as_me:32689: 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 @@ -33458,7 +32695,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >"conftest.$ac_ext" <<_ACEOF -#line 33461 "configure" +#line 32698 "configure" #include "confdefs.h" $ac_includes_default int @@ -33470,21 +32707,21 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= 0)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:33473: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:32710: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:33476: \$? = $ac_status" >&5 + echo "$as_me:32713: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:33479: \"$ac_try\"") >&5 + { (eval echo "$as_me:32716: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:33482: \$? = $ac_status" >&5 + echo "$as_me:32719: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=0 ac_mid=0 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 33487 "configure" +#line 32724 "configure" #include "confdefs.h" $ac_includes_default int @@ -33496,16 +32733,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:33499: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:32736: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:33502: \$? = $ac_status" >&5 + echo "$as_me:32739: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:33505: \"$ac_try\"") >&5 + { (eval echo "$as_me:32742: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:33508: \$? = $ac_status" >&5 + echo "$as_me:32745: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid; break else @@ -33521,7 +32758,7 @@ cat "conftest.$ac_ext" >&5 ac_hi=-1 ac_mid=-1 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 33524 "configure" +#line 32761 "configure" #include "confdefs.h" $ac_includes_default int @@ -33533,16 +32770,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:33536: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:32773: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:33539: \$? = $ac_status" >&5 + echo "$as_me:32776: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:33542: \"$ac_try\"") >&5 + { (eval echo "$as_me:32779: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:33545: \$? = $ac_status" >&5 + echo "$as_me:32782: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=$ac_mid; break else @@ -33558,7 +32795,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` cat >"conftest.$ac_ext" <<_ACEOF -#line 33561 "configure" +#line 32798 "configure" #include "confdefs.h" $ac_includes_default int @@ -33570,16 +32807,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:33573: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:32810: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:33576: \$? = $ac_status" >&5 + echo "$as_me:32813: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:33579: \"$ac_try\"") >&5 + { (eval echo "$as_me:32816: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:33582: \$? = $ac_status" >&5 + echo "$as_me:32819: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid else @@ -33592,12 +32829,12 @@ done ac_cv_sizeof_time_t=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:33595: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:32832: 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 33600 "configure" +#line 32837 "configure" #include "confdefs.h" $ac_includes_default int @@ -33613,15 +32850,15 @@ fclose (f); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:33616: \"$ac_link\"") >&5 +if { (eval echo "$as_me:32853: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:33619: \$? = $ac_status" >&5 + echo "$as_me:32856: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:33621: \"$ac_try\"") >&5 + { (eval echo "$as_me:32858: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:33624: \$? = $ac_status" >&5 + echo "$as_me:32861: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sizeof_time_t=`cat conftest.val` else @@ -33637,7 +32874,7 @@ else ac_cv_sizeof_time_t=0 fi fi -echo "$as_me:33640: result: $ac_cv_sizeof_time_t" >&5 +echo "$as_me:32877: result: $ac_cv_sizeof_time_t" >&5 echo "${ECHO_T}$ac_cv_sizeof_time_t" >&6 cat >>confdefs.h <&5 + { echo "$as_me:32886: WARNING: using 4 for sizeof time_t" >&5 echo "$as_me: WARNING: using 4 for sizeof time_t" >&2;} ac_cv_sizeof_time_t=4 elif test "x${ac_cv_sizeof_time_t}" = x0; then - { echo "$as_me:33653: WARNING: sizeof time_t not found, using 4" >&5 + { echo "$as_me:32890: WARNING: sizeof time_t not found, using 4" >&5 echo "$as_me: WARNING: sizeof time_t not found, using 4" >&2;} ac_cv_sizeof_time_t=4 fi @@ -33664,13 +32901,13 @@ cf_cv_type=`echo "sizeof_time_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHI fi fi -echo "$as_me:33667: checking for intptr_t" >&5 +echo "$as_me:32904: checking for intptr_t" >&5 echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6 if test "${ac_cv_type_intptr_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 33673 "configure" +#line 32910 "configure" #include "confdefs.h" $ac_includes_default int @@ -33685,16 +32922,16 @@ if (sizeof (intptr_t)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:33688: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:32925: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:33691: \$? = $ac_status" >&5 + echo "$as_me:32928: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:33694: \"$ac_try\"") >&5 + { (eval echo "$as_me:32931: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:33697: \$? = $ac_status" >&5 + echo "$as_me:32934: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_intptr_t=yes else @@ -33704,7 +32941,7 @@ ac_cv_type_intptr_t=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:33707: result: $ac_cv_type_intptr_t" >&5 +echo "$as_me:32944: result: $ac_cv_type_intptr_t" >&5 echo "${ECHO_T}$ac_cv_type_intptr_t" >&6 if test "$ac_cv_type_intptr_t" = yes; then : @@ -33718,13 +32955,13 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! -echo "$as_me:33721: checking for working alloca.h" >&5 +echo "$as_me:32958: 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 33727 "configure" +#line 32964 "configure" #include "confdefs.h" #include int @@ -33736,16 +32973,16 @@ char *p = (char *) alloca (2 * sizeof (int)); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:33739: \"$ac_link\"") >&5 +if { (eval echo "$as_me:32976: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:33742: \$? = $ac_status" >&5 + echo "$as_me:32979: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:33745: \"$ac_try\"") >&5 + { (eval echo "$as_me:32982: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:33748: \$? = $ac_status" >&5 + echo "$as_me:32985: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_working_alloca_h=yes else @@ -33755,7 +32992,7 @@ ac_cv_working_alloca_h=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:33758: result: $ac_cv_working_alloca_h" >&5 +echo "$as_me:32995: 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 @@ -33765,13 +33002,13 @@ EOF fi -echo "$as_me:33768: checking for alloca" >&5 +echo "$as_me:33005: 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 33774 "configure" +#line 33011 "configure" #include "confdefs.h" #ifdef __GNUC__ # define alloca __builtin_alloca @@ -33803,16 +33040,16 @@ char *p = (char *) alloca (1); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:33806: \"$ac_link\"") >&5 +if { (eval echo "$as_me:33043: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:33809: \$? = $ac_status" >&5 + echo "$as_me:33046: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:33812: \"$ac_try\"") >&5 + { (eval echo "$as_me:33049: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:33815: \$? = $ac_status" >&5 + echo "$as_me:33052: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_alloca_works=yes else @@ -33822,7 +33059,7 @@ ac_cv_func_alloca_works=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:33825: result: $ac_cv_func_alloca_works" >&5 +echo "$as_me:33062: 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 @@ -33843,13 +33080,13 @@ cat >>confdefs.h <<\EOF #define C_ALLOCA 1 EOF -echo "$as_me:33846: checking whether \`alloca.c' needs Cray hooks" >&5 +echo "$as_me:33083: 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 33852 "configure" +#line 33089 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -33867,18 +33104,18 @@ fi rm -rf conftest* fi -echo "$as_me:33870: result: $ac_cv_os_cray" >&5 +echo "$as_me:33107: 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:33875: checking for $ac_func" >&5 +echo "$as_me:33112: 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 33881 "configure" +#line 33118 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -33909,16 +33146,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:33912: \"$ac_link\"") >&5 +if { (eval echo "$as_me:33149: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:33915: \$? = $ac_status" >&5 + echo "$as_me:33152: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:33918: \"$ac_try\"") >&5 + { (eval echo "$as_me:33155: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:33921: \$? = $ac_status" >&5 + echo "$as_me:33158: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -33928,7 +33165,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:33931: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:33168: 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 @@ -33942,7 +33179,7 @@ fi done fi -echo "$as_me:33945: checking stack direction for C alloca" >&5 +echo "$as_me:33182: 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 @@ -33951,7 +33188,7 @@ else ac_cv_c_stack_direction=0 else cat >"conftest.$ac_ext" <<_ACEOF -#line 33954 "configure" +#line 33191 "configure" #include "confdefs.h" int find_stack_direction (void) @@ -33974,15 +33211,15 @@ main (void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:33977: \"$ac_link\"") >&5 +if { (eval echo "$as_me:33214: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:33980: \$? = $ac_status" >&5 + echo "$as_me:33217: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:33982: \"$ac_try\"") >&5 + { (eval echo "$as_me:33219: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:33985: \$? = $ac_status" >&5 + echo "$as_me:33222: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_c_stack_direction=1 else @@ -33994,7 +33231,7 @@ fi rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi fi -echo "$as_me:33997: result: $ac_cv_c_stack_direction" >&5 +echo "$as_me:33234: result: $ac_cv_c_stack_direction" >&5 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6 cat >>confdefs.h <&5 +echo "$as_me:33246: 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 34015 "configure" +#line 33252 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:34019: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:33256: \"$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:34025: \$? = $ac_status" >&5 + echo "$as_me:33262: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -34041,7 +33278,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:34044: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:33281: 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:33294: 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 34063 "configure" +#line 33300 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -34091,16 +33328,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:34094: \"$ac_link\"") >&5 +if { (eval echo "$as_me:33331: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:34097: \$? = $ac_status" >&5 + echo "$as_me:33334: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:34100: \"$ac_try\"") >&5 + { (eval echo "$as_me:33337: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:34103: \$? = $ac_status" >&5 + echo "$as_me:33340: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -34110,7 +33347,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:34113: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:33350: 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:33362: 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 @@ -34145,15 +33382,15 @@ else } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:34148: \"$ac_link\"") >&5 +if { (eval echo "$as_me:33385: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:34151: \$? = $ac_status" >&5 + echo "$as_me:33388: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:34153: \"$ac_try\"") >&5 + { (eval echo "$as_me:33390: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:34156: \$? = $ac_status" >&5 + echo "$as_me:33393: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_fork_works=yes else @@ -34165,7 +33402,7 @@ fi rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi fi -echo "$as_me:34168: result: $ac_cv_func_fork_works" >&5 +echo "$as_me:33405: result: $ac_cv_func_fork_works" >&5 echo "${ECHO_T}$ac_cv_func_fork_works" >&6 fi @@ -34179,12 +33416,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then ac_cv_func_fork_works=yes ;; esac - { echo "$as_me:34182: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 + { echo "$as_me:33419: 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:34187: checking for working vfork" >&5 + echo "$as_me:33424: 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 @@ -34193,7 +33430,7 @@ else ac_cv_func_vfork_works=cross else cat >"conftest.$ac_ext" <<_ACEOF -#line 34196 "configure" +#line 33433 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include @@ -34286,15 +33523,15 @@ main (void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:34289: \"$ac_link\"") >&5 +if { (eval echo "$as_me:33526: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:34292: \$? = $ac_status" >&5 + echo "$as_me:33529: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:34294: \"$ac_try\"") >&5 + { (eval echo "$as_me:33531: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:34297: \$? = $ac_status" >&5 + echo "$as_me:33534: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_vfork_works=yes else @@ -34306,13 +33543,13 @@ fi rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi fi -echo "$as_me:34309: result: $ac_cv_func_vfork_works" >&5 +echo "$as_me:33546: 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:34315: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 + { echo "$as_me:33552: 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 @@ -34337,14 +33574,14 @@ EOF fi -echo "$as_me:34340: checking if we should use fcntl or ioctl" >&5 +echo "$as_me:33577: 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 34347 "configure" +#line 33584 "configure" #include "confdefs.h" #include @@ -34361,16 +33598,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:34364: \"$ac_link\"") >&5 +if { (eval echo "$as_me:33601: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:34367: \$? = $ac_status" >&5 + echo "$as_me:33604: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:34370: \"$ac_try\"") >&5 + { (eval echo "$as_me:33607: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:34373: \$? = $ac_status" >&5 + echo "$as_me:33610: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_fionbio=ioctl else @@ -34378,7 +33615,7 @@ else cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 34381 "configure" +#line 33618 "configure" #include "confdefs.h" #include @@ -34400,16 +33637,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:34403: \"$ac_link\"") >&5 +if { (eval echo "$as_me:33640: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:34406: \$? = $ac_status" >&5 + echo "$as_me:33643: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:34409: \"$ac_try\"") >&5 + { (eval echo "$as_me:33646: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:34412: \$? = $ac_status" >&5 + echo "$as_me:33649: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_fionbio=fcntl else @@ -34422,21 +33659,21 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:34425: result: $cf_cv_fionbio" >&5 +echo "$as_me:33662: 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:34432: checking for broken/missing definition of remove" >&5 +echo "$as_me:33669: 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 34439 "configure" +#line 33676 "configure" #include "confdefs.h" #include int @@ -34448,23 +33685,23 @@ remove("dummy") } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:34451: \"$ac_link\"") >&5 +if { (eval echo "$as_me:33688: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:34454: \$? = $ac_status" >&5 + echo "$as_me:33691: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:34457: \"$ac_try\"") >&5 + { (eval echo "$as_me:33694: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:34460: \$? = $ac_status" >&5 + echo "$as_me:33697: \$? = $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 34467 "configure" +#line 33704 "configure" #include "confdefs.h" #include int __unlink(name) { return unlink(name); } @@ -34477,16 +33714,16 @@ remove("dummy") } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:34480: \"$ac_link\"") >&5 +if { (eval echo "$as_me:33717: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:34483: \$? = $ac_status" >&5 + echo "$as_me:33720: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:34486: \"$ac_try\"") >&5 + { (eval echo "$as_me:33723: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:34489: \$? = $ac_status" >&5 + echo "$as_me:33726: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_baddef_remove=yes else @@ -34501,21 +33738,21 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:34504: result: $cf_cv_baddef_remove" >&5 +echo "$as_me:33741: 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:34511: checking for lstat" >&5 +echo "$as_me:33748: 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 34518 "configure" +#line 33755 "configure" #include "confdefs.h" $ac_includes_default int @@ -34527,16 +33764,16 @@ struct stat sb; lstat(".", &sb); (void) sb } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:34530: \"$ac_link\"") >&5 +if { (eval echo "$as_me:33767: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:34533: \$? = $ac_status" >&5 + echo "$as_me:33770: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:34536: \"$ac_try\"") >&5 + { (eval echo "$as_me:33773: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:34539: \$? = $ac_status" >&5 + echo "$as_me:33776: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_lstat=yes else @@ -34548,7 +33785,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:34551: result: $ac_cv_func_lstat " >&5 +echo "$as_me:33788: result: $ac_cv_func_lstat " >&5 echo "${ECHO_T}$ac_cv_func_lstat " >&6 if test "$ac_cv_func_lstat" = yes; then @@ -34558,14 +33795,14 @@ EOF fi -echo "$as_me:34561: checking for getpwuid" >&5 +echo "$as_me:33798: checking for getpwuid" >&5 echo $ECHO_N "checking for getpwuid... $ECHO_C" >&6 if test "${ac_cv_func_getpwuid+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 34568 "configure" +#line 33805 "configure" #include "confdefs.h" $ac_includes_default @@ -34583,16 +33820,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:34586: \"$ac_link\"") >&5 +if { (eval echo "$as_me:33823: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:34589: \$? = $ac_status" >&5 + echo "$as_me:33826: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:34592: \"$ac_try\"") >&5 + { (eval echo "$as_me:33829: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:34595: \$? = $ac_status" >&5 + echo "$as_me:33832: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_getpwuid=yes else @@ -34603,7 +33840,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:34606: result: $ac_cv_func_getpwuid" >&5 +echo "$as_me:33843: result: $ac_cv_func_getpwuid" >&5 echo "${ECHO_T}$ac_cv_func_getpwuid" >&6 if test "$ac_cv_func_getpwuid" = yes; then ac_cv_header_pwd_h=yes @@ -34618,14 +33855,14 @@ EOF fi -echo "$as_me:34621: checking for passwd.pw_gecos" >&5 +echo "$as_me:33858: checking for passwd.pw_gecos" >&5 echo $ECHO_N "checking for passwd.pw_gecos... $ECHO_C" >&6 if test "${cf_cv_pw_gecos+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 34628 "configure" +#line 33865 "configure" #include "confdefs.h" #include @@ -34642,16 +33879,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:34645: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:33882: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:34648: \$? = $ac_status" >&5 + echo "$as_me:33885: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:34651: \"$ac_try\"") >&5 + { (eval echo "$as_me:33888: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:34654: \$? = $ac_status" >&5 + echo "$as_me:33891: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_pw_gecos=yes else @@ -34661,20 +33898,20 @@ cf_cv_pw_gecos=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:34664: result: $cf_cv_pw_gecos" >&5 +echo "$as_me:33901: result: $cf_cv_pw_gecos" >&5 echo "${ECHO_T}$cf_cv_pw_gecos" >&6 test $cf_cv_pw_gecos = no && cat >>confdefs.h <<\EOF #define DONT_HAVE_PW_GECOS 1 EOF -echo "$as_me:34671: checking for vasprintf" >&5 +echo "$as_me:33908: checking for vasprintf" >&5 echo $ECHO_N "checking for vasprintf... $ECHO_C" >&6 if test "${ac_cv_func_vasprintf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 34677 "configure" +#line 33914 "configure" #include "confdefs.h" #define vasprintf autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -34705,16 +33942,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:34708: \"$ac_link\"") >&5 +if { (eval echo "$as_me:33945: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:34711: \$? = $ac_status" >&5 + echo "$as_me:33948: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:34714: \"$ac_try\"") >&5 + { (eval echo "$as_me:33951: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:34717: \$? = $ac_status" >&5 + echo "$as_me:33954: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_vasprintf=yes else @@ -34724,7 +33961,7 @@ ac_cv_func_vasprintf=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:34727: result: $ac_cv_func_vasprintf" >&5 +echo "$as_me:33964: result: $ac_cv_func_vasprintf" >&5 echo "${ECHO_T}$ac_cv_func_vasprintf" >&6 if test "$ac_cv_func_vasprintf" = yes; then @@ -34732,10 +33969,10 @@ cat >>confdefs.h <<\EOF #define HAVE_VASPRINTF 1 EOF - echo "$as_me:34735: checking if vasprintf requires workaround" >&5 + echo "$as_me:33972: checking if vasprintf requires workaround" >&5 echo $ECHO_N "checking if vasprintf requires workaround... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 34738 "configure" +#line 33975 "configure" #include "confdefs.h" #include @@ -34751,19 +33988,19 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:34754: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:33991: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:34757: \$? = $ac_status" >&5 + echo "$as_me:33994: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:34760: \"$ac_try\"") >&5 + { (eval echo "$as_me:33997: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:34763: \$? = $ac_status" >&5 + echo "$as_me:34000: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:34766: result: no" >&5 + echo "$as_me:34003: result: no" >&5 echo "${ECHO_T}no" >&6 else @@ -34771,7 +34008,7 @@ else cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 34774 "configure" +#line 34011 "configure" #include "confdefs.h" #ifndef _GNU_SOURCE @@ -34790,19 +34027,19 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:34793: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:34030: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:34796: \$? = $ac_status" >&5 + echo "$as_me:34033: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:34799: \"$ac_try\"") >&5 + { (eval echo "$as_me:34036: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:34802: \$? = $ac_status" >&5 + echo "$as_me:34039: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:34805: result: yes" >&5 + echo "$as_me:34042: result: yes" >&5 echo "${ECHO_T}yes" >&6 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " @@ -34812,7 +34049,7 @@ else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 - echo "$as_me:34815: result: unknown" >&5 + echo "$as_me:34052: result: unknown" >&5 echo "${ECHO_T}unknown" >&6 fi @@ -34845,13 +34082,13 @@ for ac_func in \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:34848: checking for $ac_func" >&5 +echo "$as_me:34085: 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 34854 "configure" +#line 34091 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -34882,16 +34119,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:34885: \"$ac_link\"") >&5 +if { (eval echo "$as_me:34122: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:34888: \$? = $ac_status" >&5 + echo "$as_me:34125: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:34891: \"$ac_try\"") >&5 + { (eval echo "$as_me:34128: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:34894: \$? = $ac_status" >&5 + echo "$as_me:34131: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -34901,7 +34138,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:34904: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:34141: 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:34155: 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 34924 "configure" +#line 34161 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -34952,16 +34189,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:34955: \"$ac_link\"") >&5 +if { (eval echo "$as_me:34192: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:34958: \$? = $ac_status" >&5 + echo "$as_me:34195: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:34961: \"$ac_try\"") >&5 + { (eval echo "$as_me:34198: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:34964: \$? = $ac_status" >&5 + echo "$as_me:34201: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -34971,7 +34208,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:34974: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:34211: 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:34223: 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 34992 "configure" +#line 34229 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -35020,16 +34257,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:35023: \"$ac_link\"") >&5 +if { (eval echo "$as_me:34260: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:35026: \$? = $ac_status" >&5 + echo "$as_me:34263: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:35029: \"$ac_try\"") >&5 + { (eval echo "$as_me:34266: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:35032: \$? = $ac_status" >&5 + echo "$as_me:34269: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -35039,7 +34276,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:35042: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:34279: 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:34299: 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 35068 "configure" +#line 34305 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -35096,16 +34333,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:35099: \"$ac_link\"") >&5 +if { (eval echo "$as_me:34336: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:35102: \$? = $ac_status" >&5 + echo "$as_me:34339: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:35105: \"$ac_try\"") >&5 + { (eval echo "$as_me:34342: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:35108: \$? = $ac_status" >&5 + echo "$as_me:34345: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -35115,7 +34352,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:35118: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:34355: 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:34370: 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 35139 "configure" +#line 34376 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:35143: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:34380: \"$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:35149: \$? = $ac_status" >&5 + echo "$as_me:34386: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -35165,7 +34402,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:35168: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:34405: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <&5 -echo $ECHO_N "checking for arc2random... $ECHO_C" >&6 -if test "${ac_cv_func_arc2random+set}" = set; then +echo "$as_me:34415: checking for arc4random" >&5 +echo $ECHO_N "checking for arc4random... $ECHO_C" >&6 +if test "${ac_cv_func_arc4random+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 35184 "configure" +#line 34421 "configure" #include "confdefs.h" -#define arc2random autoconf_temporary +#define arc4random autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ -#undef arc2random +#undef arc4random #ifdef __cplusplus extern "C" @@ -35193,7 +34430,7 @@ extern "C" /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char arc2random (void); +char arc4random (void); int main (void) @@ -35202,41 +34439,41 @@ main (void) /* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_arc2random) || defined (__stub___arc2random) -#error found stub for arc2random +#if defined (__stub_arc4random) || defined (__stub___arc4random) +#error found stub for arc4random #endif - return arc2random (); + return arc4random (); ; return 0; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:35215: \"$ac_link\"") >&5 +if { (eval echo "$as_me:34452: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:35218: \$? = $ac_status" >&5 + echo "$as_me:34455: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:35221: \"$ac_try\"") >&5 + { (eval echo "$as_me:34458: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:35224: \$? = $ac_status" >&5 + echo "$as_me:34461: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - ac_cv_func_arc2random=yes + ac_cv_func_arc4random=yes else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -ac_cv_func_arc2random=no +ac_cv_func_arc4random=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:35234: result: $ac_cv_func_arc2random" >&5 -echo "${ECHO_T}$ac_cv_func_arc2random" >&6 -if test "$ac_cv_func_arc2random" = yes; then +echo "$as_me:34471: result: $ac_cv_func_arc4random" >&5 +echo "${ECHO_T}$ac_cv_func_arc4random" >&6 +if test "$ac_cv_func_arc4random" = yes; then : else - echo "$as_me:35239: checking for arc4random in -lbsd" >&5 + echo "$as_me:34476: checking for arc4random in -lbsd" >&5 echo $ECHO_N "checking for arc4random in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_arc4random+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -35244,7 +34481,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 35247 "configure" +#line 34484 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -35263,16 +34500,16 @@ arc4random (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:35266: \"$ac_link\"") >&5 +if { (eval echo "$as_me:34503: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:35269: \$? = $ac_status" >&5 + echo "$as_me:34506: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:35272: \"$ac_try\"") >&5 + { (eval echo "$as_me:34509: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:35275: \$? = $ac_status" >&5 + echo "$as_me:34512: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_bsd_arc4random=yes else @@ -35283,7 +34520,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:35286: result: $ac_cv_lib_bsd_arc4random" >&5 +echo "$as_me:34523: result: $ac_cv_lib_bsd_arc4random" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_arc4random" >&6 if test "$ac_cv_lib_bsd_arc4random" = yes; then @@ -35307,14 +34544,14 @@ fi fi -echo "$as_me:35310: checking for random-integer functions" >&5 +echo "$as_me:34547: 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 else cf_cv_srand_func=unknown -for cf_func in arc4random_push/arc4random arc4random_stir/arc4random srandom/random srand48/lrand48 srand/rand +for cf_func in arc4random_stir/arc4random srandom/random srand48/lrand48 srand/rand do cf_srand_func=`echo $cf_func | sed -e 's%/.*%%'` @@ -35327,7 +34564,7 @@ do esac cat >"conftest.$ac_ext" <<_ACEOF -#line 35330 "configure" +#line 34567 "configure" #include "confdefs.h" $ac_includes_default @@ -35344,16 +34581,16 @@ long seed = 1; $cf_srand_func(seed); seed = $cf_rand_func(); (void)seed } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:35347: \"$ac_link\"") >&5 +if { (eval echo "$as_me:34584: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:35350: \$? = $ac_status" >&5 + echo "$as_me:34587: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:35353: \"$ac_try\"") >&5 + { (eval echo "$as_me:34590: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:35356: \$? = $ac_status" >&5 + echo "$as_me:34593: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_srand_func=$cf_func break @@ -35365,10 +34602,10 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" done fi -echo "$as_me:35368: result: $cf_cv_srand_func" >&5 +echo "$as_me:34605: 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:35371: checking for range of random-integers" >&5 + echo "$as_me:34608: 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 @@ -35389,7 +34626,7 @@ else ;; esac cat >"conftest.$ac_ext" <<_ACEOF -#line 35392 "configure" +#line 34629 "configure" #include "confdefs.h" $ac_includes_default @@ -35406,16 +34643,16 @@ long x = $cf_cv_rand_max; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:35409: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:34646: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:35412: \$? = $ac_status" >&5 + echo "$as_me:34649: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:35415: \"$ac_try\"") >&5 + { (eval echo "$as_me:34652: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:35418: \$? = $ac_status" >&5 + echo "$as_me:34655: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -35426,15 +34663,15 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:35429: result: $cf_cv_rand_max" >&5 +echo "$as_me:34666: result: $cf_cv_rand_max" >&5 echo "${ECHO_T}$cf_cv_rand_max" >&6 case "$cf_cv_srand_func" in (*/arc4random) - echo "$as_me:35434: checking if should be included" >&5 + echo "$as_me:34671: checking if should be included" >&5 echo $ECHO_N "checking if should be included... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 35437 "configure" +#line 34674 "configure" #include "confdefs.h" $ac_includes_default @@ -35452,23 +34689,23 @@ void *arc4random(int); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:35455: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:34692: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:35458: \$? = $ac_status" >&5 + echo "$as_me:34695: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:35461: \"$ac_try\"") >&5 + { (eval echo "$as_me:34698: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:35464: \$? = $ac_status" >&5 + echo "$as_me:34701: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_bsd_stdlib_h=no else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 35471 "configure" +#line 34708 "configure" #include "confdefs.h" $ac_includes_default @@ -35485,16 +34722,16 @@ unsigned long x = arc4random(); (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:35488: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:34725: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:35491: \$? = $ac_status" >&5 + echo "$as_me:34728: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:35494: \"$ac_try\"") >&5 + { (eval echo "$as_me:34731: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:35497: \$? = $ac_status" >&5 + echo "$as_me:34734: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_bsd_stdlib_h=yes else @@ -35505,7 +34742,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - echo "$as_me:35508: result: $cf_bsd_stdlib_h" >&5 + echo "$as_me:34745: result: $cf_bsd_stdlib_h" >&5 echo "${ECHO_T}$cf_bsd_stdlib_h" >&6 if test "$cf_bsd_stdlib_h" = yes then @@ -35515,10 +34752,10 @@ cat >>confdefs.h <<\EOF EOF else - echo "$as_me:35518: checking if should be included" >&5 + echo "$as_me:34755: checking if should be included" >&5 echo $ECHO_N "checking if should be included... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 35521 "configure" +#line 34758 "configure" #include "confdefs.h" $ac_includes_default @@ -35536,23 +34773,23 @@ void *arc4random(int); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:35539: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:34776: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:35542: \$? = $ac_status" >&5 + echo "$as_me:34779: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:35545: \"$ac_try\"") >&5 + { (eval echo "$as_me:34782: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:35548: \$? = $ac_status" >&5 + echo "$as_me:34785: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_bsd_random_h=no else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 35555 "configure" +#line 34792 "configure" #include "confdefs.h" #include int @@ -35564,16 +34801,16 @@ unsigned long x = arc4random(); (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:35567: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:34804: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:35570: \$? = $ac_status" >&5 + echo "$as_me:34807: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:35573: \"$ac_try\"") >&5 + { (eval echo "$as_me:34810: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:35576: \$? = $ac_status" >&5 + echo "$as_me:34813: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_bsd_random_h=yes else @@ -35584,7 +34821,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - echo "$as_me:35587: result: $cf_bsd_random_h" >&5 + echo "$as_me:34824: result: $cf_bsd_random_h" >&5 echo "${ECHO_T}$cf_bsd_random_h" >&6 if test "$cf_bsd_random_h" = yes then @@ -35594,7 +34831,7 @@ cat >>confdefs.h <<\EOF EOF else - { echo "$as_me:35597: WARNING: no header file found for arc4random" >&5 + { echo "$as_me:34834: WARNING: no header file found for arc4random" >&5 echo "$as_me: WARNING: no header file found for arc4random" >&2;} fi fi @@ -35629,13 +34866,13 @@ fi for ac_func in sleep do -echo "$as_me:35632: checking for $ac_func declaration" >&5 +echo "$as_me:34869: 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 35638 "configure" +#line 34875 "configure" #include "confdefs.h" $ac_includes_default @@ -35658,20 +34895,20 @@ extern int $ac_func(void); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:35661: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:34898: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:35664: \$? = $ac_status" >&5 + echo "$as_me:34901: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:35667: \"$ac_try\"") >&5 + { (eval echo "$as_me:34904: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:35670: \$? = $ac_status" >&5 + echo "$as_me:34907: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cat >"conftest.$ac_ext" <<_ACEOF -#line 35674 "configure" +#line 34911 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -35692,16 +34929,16 @@ int (*p)(struct cf_check_funcdecl*) = $ac_func; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:35695: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:34932: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:35698: \$? = $ac_status" >&5 + echo "$as_me:34935: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:35701: \"$ac_try\"") >&5 + { (eval echo "$as_me:34938: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:35704: \$? = $ac_status" >&5 + echo "$as_me:34941: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "ac_cv_func_decl_$ac_func=yes" @@ -35722,11 +34959,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi if eval "test \"`echo '$ac_cv_func_'decl_$ac_func`\" = yes"; then - echo "$as_me:35725: result: yes" >&5 + echo "$as_me:34962: result: yes" >&5 echo "${ECHO_T}yes" >&6 : else - echo "$as_me:35729: result: no" >&5 + echo "$as_me:34966: result: no" >&5 echo "${ECHO_T}no" >&6 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -35741,13 +34978,13 @@ done for ac_func in strstr do -echo "$as_me:35744: checking for $ac_func declaration" >&5 +echo "$as_me:34981: 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 35750 "configure" +#line 34987 "configure" #include "confdefs.h" $ac_includes_default @@ -35763,20 +35000,20 @@ extern int $ac_func(void); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:35766: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:35003: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:35769: \$? = $ac_status" >&5 + echo "$as_me:35006: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:35772: \"$ac_try\"") >&5 + { (eval echo "$as_me:35009: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:35775: \$? = $ac_status" >&5 + echo "$as_me:35012: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cat >"conftest.$ac_ext" <<_ACEOF -#line 35779 "configure" +#line 35016 "configure" #include "confdefs.h" #include int @@ -35790,16 +35027,16 @@ int (*p)(struct cf_check_funcdecl*) = $ac_func; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:35793: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:35030: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:35796: \$? = $ac_status" >&5 + echo "$as_me:35033: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:35799: \"$ac_try\"") >&5 + { (eval echo "$as_me:35036: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:35802: \$? = $ac_status" >&5 + echo "$as_me:35039: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "ac_cv_func_decl_$ac_func=yes" @@ -35820,11 +35057,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi if eval "test \"`echo '$ac_cv_func_'decl_$ac_func`\" = yes"; then - echo "$as_me:35823: result: yes" >&5 + echo "$as_me:35060: result: yes" >&5 echo "${ECHO_T}yes" >&6 : else - echo "$as_me:35827: result: no" >&5 + echo "$as_me:35064: result: no" >&5 echo "${ECHO_T}no" >&6 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -35839,13 +35076,13 @@ done for ac_func in getgrgid getgrnam do -echo "$as_me:35842: checking for $ac_func declaration" >&5 +echo "$as_me:35079: 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 35848 "configure" +#line 35085 "configure" #include "confdefs.h" $ac_includes_default @@ -35863,20 +35100,20 @@ extern int $ac_func(void); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:35866: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:35103: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:35869: \$? = $ac_status" >&5 + echo "$as_me:35106: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:35872: \"$ac_try\"") >&5 + { (eval echo "$as_me:35109: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:35875: \$? = $ac_status" >&5 + echo "$as_me:35112: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cat >"conftest.$ac_ext" <<_ACEOF -#line 35879 "configure" +#line 35116 "configure" #include "confdefs.h" #include @@ -35892,16 +35129,16 @@ int (*p)(struct cf_check_funcdecl*) = $ac_func; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:35895: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:35132: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:35898: \$? = $ac_status" >&5 + echo "$as_me:35135: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:35901: \"$ac_try\"") >&5 + { (eval echo "$as_me:35138: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:35904: \$? = $ac_status" >&5 + echo "$as_me:35141: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "ac_cv_func_decl_$ac_func=yes" @@ -35922,11 +35159,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi if eval "test \"`echo '$ac_cv_func_'decl_$ac_func`\" = yes"; then - echo "$as_me:35925: result: yes" >&5 + echo "$as_me:35162: result: yes" >&5 echo "${ECHO_T}yes" >&6 : else - echo "$as_me:35929: result: no" >&5 + echo "$as_me:35166: result: no" >&5 echo "${ECHO_T}no" >&6 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -35938,14 +35175,14 @@ EOF fi done -echo "$as_me:35941: checking if TRUE/FALSE are defined" >&5 +echo "$as_me:35178: 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 35948 "configure" +#line 35185 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -35959,16 +35196,16 @@ int x = TRUE, y = FALSE; (void)x; (void)y } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:35962: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:35199: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:35965: \$? = $ac_status" >&5 + echo "$as_me:35202: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:35968: \"$ac_try\"") >&5 + { (eval echo "$as_me:35205: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:35971: \$? = $ac_status" >&5 + echo "$as_me:35208: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_bool_defs=yes else @@ -35979,7 +35216,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:35982: result: $cf_cv_bool_defs" >&5 +echo "$as_me:35219: result: $cf_cv_bool_defs" >&5 echo "${ECHO_T}$cf_cv_bool_defs" >&6 if test "$cf_cv_bool_defs" = no ; then @@ -35993,14 +35230,14 @@ EOF fi -echo "$as_me:35996: checking if external errno is declared" >&5 +echo "$as_me:35233: 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 36003 "configure" +#line 35240 "configure" #include "confdefs.h" $ac_includes_default @@ -36014,16 +35251,16 @@ int x = (int) errno; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:36017: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:35254: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:36020: \$? = $ac_status" >&5 + echo "$as_me:35257: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:36023: \"$ac_try\"") >&5 + { (eval echo "$as_me:35260: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:36026: \$? = $ac_status" >&5 + echo "$as_me:35263: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_dcl_errno=yes else @@ -36034,7 +35271,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:36037: result: $cf_cv_dcl_errno" >&5 +echo "$as_me:35274: result: $cf_cv_dcl_errno" >&5 echo "${ECHO_T}$cf_cv_dcl_errno" >&6 if test "$cf_cv_dcl_errno" = no ; then @@ -36049,14 +35286,14 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist -echo "$as_me:36052: checking if external errno exists" >&5 +echo "$as_me:35289: 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 36059 "configure" +#line 35296 "configure" #include "confdefs.h" #undef errno @@ -36071,16 +35308,16 @@ errno = 2 } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:36074: \"$ac_link\"") >&5 +if { (eval echo "$as_me:35311: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:36077: \$? = $ac_status" >&5 + echo "$as_me:35314: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:36080: \"$ac_try\"") >&5 + { (eval echo "$as_me:35317: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:36083: \$? = $ac_status" >&5 + echo "$as_me:35320: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_errno=yes else @@ -36091,7 +35328,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:36094: result: $cf_cv_have_errno" >&5 +echo "$as_me:35331: result: $cf_cv_have_errno" >&5 echo "${ECHO_T}$cf_cv_have_errno" >&6 if test "$cf_cv_have_errno" = yes ; then @@ -36104,7 +35341,7 @@ EOF fi -echo "$as_me:36107: checking if we can set errno" >&5 +echo "$as_me:35344: 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 @@ -36112,7 +35349,7 @@ else if test "$cross_compiling" = yes; then cat >"conftest.$ac_ext" <<_ACEOF -#line 36115 "configure" +#line 35352 "configure" #include "confdefs.h" #include int @@ -36124,16 +35361,16 @@ errno = 255 } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:36127: \"$ac_link\"") >&5 +if { (eval echo "$as_me:35364: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:36130: \$? = $ac_status" >&5 + echo "$as_me:35367: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:36133: \"$ac_try\"") >&5 + { (eval echo "$as_me:35370: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:36136: \$? = $ac_status" >&5 + echo "$as_me:35373: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_set_errno=maybe else @@ -36144,7 +35381,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" else cat >"conftest.$ac_ext" <<_ACEOF -#line 36147 "configure" +#line 35384 "configure" #include "confdefs.h" $ac_includes_default @@ -36158,15 +35395,15 @@ int main(void) } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:36161: \"$ac_link\"") >&5 +if { (eval echo "$as_me:35398: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:36164: \$? = $ac_status" >&5 + echo "$as_me:35401: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:36166: \"$ac_try\"") >&5 + { (eval echo "$as_me:35403: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:36169: \$? = $ac_status" >&5 + echo "$as_me:35406: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_set_errno=yes else @@ -36179,21 +35416,21 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi -echo "$as_me:36182: result: $cf_cv_set_errno" >&5 +echo "$as_me:35419: 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:36189: checking for setlocale()" >&5 +echo "$as_me:35426: 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 36196 "configure" +#line 35433 "configure" #include "confdefs.h" $ac_includes_default @@ -36207,16 +35444,16 @@ setlocale(LC_ALL, "") } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:36210: \"$ac_link\"") >&5 +if { (eval echo "$as_me:35447: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:36213: \$? = $ac_status" >&5 + echo "$as_me:35450: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:36216: \"$ac_try\"") >&5 + { (eval echo "$as_me:35453: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:36219: \$? = $ac_status" >&5 + echo "$as_me:35456: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_locale=yes else @@ -36228,7 +35465,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:36231: result: $cf_cv_locale" >&5 +echo "$as_me:35468: result: $cf_cv_locale" >&5 echo "${ECHO_T}$cf_cv_locale" >&6 test "$cf_cv_locale" = yes && { cat >>confdefs.h <<\EOF @@ -36236,14 +35473,62 @@ cat >>confdefs.h <<\EOF EOF } -echo "$as_me:36239: checking if NGROUPS is defined" >&5 +for ac_header in sys/param.h limits.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:35479: 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 35485 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:35489: \"$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:35495: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + eval "$as_ac_Header=no" +fi +rm -f conftest.err "conftest.$ac_ext" +fi +echo "$as_me:35514: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then + cat >>confdefs.h <&5 echo $ECHO_N "checking 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 36246 "configure" +#line 35531 "configure" #include "confdefs.h" #if HAVE_SYS_PARAM_H @@ -36262,23 +35547,23 @@ int x = NGROUPS; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:36265: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:35550: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:36268: \$? = $ac_status" >&5 + echo "$as_me:35553: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:36271: \"$ac_try\"") >&5 + { (eval echo "$as_me:35556: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:36274: \$? = $ac_status" >&5 + echo "$as_me:35559: \$? = $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 36281 "configure" +#line 35566 "configure" #include "confdefs.h" #if HAVE_SYS_PARAM_H @@ -36297,16 +35582,16 @@ int x = NGROUPS_MAX } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:36300: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:35585: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:36303: \$? = $ac_status" >&5 + echo "$as_me:35588: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:36306: \"$ac_try\"") >&5 + { (eval echo "$as_me:35591: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:36309: \$? = $ac_status" >&5 + echo "$as_me:35594: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ngroups=NGROUPS_MAX else @@ -36318,7 +35603,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" -echo "$as_me:36321: result: $cf_cv_ngroups" >&5 +echo "$as_me:35606: result: $cf_cv_ngroups" >&5 echo "${ECHO_T}$cf_cv_ngroups" >&6 fi @@ -36339,13 +35624,13 @@ fi for ac_func in strerror do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:36342: checking for $ac_func" >&5 +echo "$as_me:35627: 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 36348 "configure" +#line 35633 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -36376,16 +35661,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:36379: \"$ac_link\"") >&5 +if { (eval echo "$as_me:35664: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:36382: \$? = $ac_status" >&5 + echo "$as_me:35667: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:36385: \"$ac_try\"") >&5 + { (eval echo "$as_me:35670: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:36388: \$? = $ac_status" >&5 + echo "$as_me:35673: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -36395,7 +35680,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:36398: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:35683: 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:35692: 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 36414 "configure" +#line 35699 "configure" #include "confdefs.h" $ac_includes_default @@ -36425,16 +35710,16 @@ int x = (int) sys_nerr; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:36428: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:35713: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:36431: \$? = $ac_status" >&5 + echo "$as_me:35716: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:36434: \"$ac_try\"") >&5 + { (eval echo "$as_me:35719: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:36437: \$? = $ac_status" >&5 + echo "$as_me:35722: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_dcl_sys_nerr=yes else @@ -36445,7 +35730,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:36448: result: $cf_cv_dcl_sys_nerr" >&5 +echo "$as_me:35733: 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 @@ -36460,14 +35745,14 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist -echo "$as_me:36463: checking if external sys_nerr exists" >&5 +echo "$as_me:35748: 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 36470 "configure" +#line 35755 "configure" #include "confdefs.h" #undef sys_nerr @@ -36482,16 +35767,16 @@ sys_nerr = 2 } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:36485: \"$ac_link\"") >&5 +if { (eval echo "$as_me:35770: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:36488: \$? = $ac_status" >&5 + echo "$as_me:35773: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:36491: \"$ac_try\"") >&5 + { (eval echo "$as_me:35776: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:36494: \$? = $ac_status" >&5 + echo "$as_me:35779: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_sys_nerr=yes else @@ -36502,7 +35787,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:36505: result: $cf_cv_have_sys_nerr" >&5 +echo "$as_me:35790: 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 @@ -36515,14 +35800,14 @@ EOF fi -echo "$as_me:36518: checking if external sys_errlist is declared" >&5 +echo "$as_me:35803: 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 36525 "configure" +#line 35810 "configure" #include "confdefs.h" $ac_includes_default @@ -36536,16 +35821,16 @@ int x = (int) sys_errlist; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:36539: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:35824: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:36542: \$? = $ac_status" >&5 + echo "$as_me:35827: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:36545: \"$ac_try\"") >&5 + { (eval echo "$as_me:35830: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:36548: \$? = $ac_status" >&5 + echo "$as_me:35833: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_dcl_sys_errlist=yes else @@ -36556,7 +35841,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:36559: result: $cf_cv_dcl_sys_errlist" >&5 +echo "$as_me:35844: 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 @@ -36571,14 +35856,14 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist -echo "$as_me:36574: checking if external sys_errlist exists" >&5 +echo "$as_me:35859: 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 36581 "configure" +#line 35866 "configure" #include "confdefs.h" #undef sys_errlist @@ -36593,16 +35878,16 @@ sys_errlist = 2 } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:36596: \"$ac_link\"") >&5 +if { (eval echo "$as_me:35881: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:36599: \$? = $ac_status" >&5 + echo "$as_me:35884: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:36602: \"$ac_try\"") >&5 + { (eval echo "$as_me:35887: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:36605: \$? = $ac_status" >&5 + echo "$as_me:35890: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_sys_errlist=yes else @@ -36613,7 +35898,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:36616: result: $cf_cv_have_sys_errlist" >&5 +echo "$as_me:35901: 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 @@ -36632,23 +35917,23 @@ done for ac_header in lastlog.h paths.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:36635: checking for $ac_header" >&5 +echo "$as_me:35920: 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 36641 "configure" +#line 35926 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:36645: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:35930: \"$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:36651: \$? = $ac_status" >&5 + echo "$as_me:35936: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -36667,7 +35952,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:36670: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:35955: 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:35965: 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 36687 "configure" +#line 35972 "configure" #include "confdefs.h" #include @@ -36704,16 +35989,16 @@ static char path[] = _PATH_LASTLOG; (void)path } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:36707: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:35992: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:36710: \$? = $ac_status" >&5 + echo "$as_me:35995: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:36713: \"$ac_try\"") >&5 + { (eval echo "$as_me:35998: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:36716: \$? = $ac_status" >&5 + echo "$as_me:36001: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_path_lastlog="_PATH_LASTLOG" else @@ -36728,14 +36013,14 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:36731: result: $cf_cv_path_lastlog" >&5 +echo "$as_me:36016: 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:36738: checking for utmp implementation" >&5 +echo "$as_me:36023: 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 @@ -36752,7 +36037,7 @@ cf_utmp_includes=" #endif " cat >"conftest.$ac_ext" <<_ACEOF -#line 36755 "configure" +#line 36040 "configure" #include "confdefs.h" $cf_utmp_includes int @@ -36768,16 +36053,16 @@ struct $cf_header x; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:36771: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:36056: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:36774: \$? = $ac_status" >&5 + echo "$as_me:36059: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:36777: \"$ac_try\"") >&5 + { (eval echo "$as_me:36062: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:36780: \$? = $ac_status" >&5 + echo "$as_me:36065: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_utmp=$cf_header break @@ -36786,7 +36071,7 @@ else cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 36789 "configure" +#line 36074 "configure" #include "confdefs.h" $cf_utmp_includes int @@ -36802,16 +36087,16 @@ struct $cf_header x; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:36805: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:36090: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:36808: \$? = $ac_status" >&5 + echo "$as_me:36093: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:36811: \"$ac_try\"") >&5 + { (eval echo "$as_me:36096: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:36814: \$? = $ac_status" >&5 + echo "$as_me:36099: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_utmp=$cf_header break @@ -36826,7 +36111,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:36829: result: $cf_cv_have_utmp" >&5 +echo "$as_me:36114: result: $cf_cv_have_utmp" >&5 echo "${ECHO_T}$cf_cv_have_utmp" >&6 if test "$cf_cv_have_utmp" != no ; then @@ -36841,14 +36126,14 @@ cat >>confdefs.h <<\EOF EOF if test "$cf_cv_have_utmp" != no ; then -echo "$as_me:36844: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5 +echo "$as_me:36129: 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 36851 "configure" +#line 36136 "configure" #include "confdefs.h" #include @@ -36865,16 +36150,16 @@ struct $cf_cv_have_utmp x; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:36868: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:36153: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:36871: \$? = $ac_status" >&5 + echo "$as_me:36156: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:36874: \"$ac_try\"") >&5 + { (eval echo "$as_me:36159: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:36877: \$? = $ac_status" >&5 + echo "$as_me:36162: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_utmp_ut_host=yes else @@ -36886,7 +36171,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:36889: result: $cf_cv_have_utmp_ut_host" >&5 +echo "$as_me:36174: 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 @@ -36896,14 +36181,14 @@ EOF fi if test "$cf_cv_have_utmp" != no ; then -echo "$as_me:36899: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5 +echo "$as_me:36184: 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 36906 "configure" +#line 36191 "configure" #include "confdefs.h" #include @@ -36920,16 +36205,16 @@ struct $cf_cv_have_utmp x; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:36923: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:36208: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:36926: \$? = $ac_status" >&5 + echo "$as_me:36211: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:36929: \"$ac_try\"") >&5 + { (eval echo "$as_me:36214: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:36932: \$? = $ac_status" >&5 + echo "$as_me:36217: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_utmp_ut_syslen=yes else @@ -36941,7 +36226,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:36944: result: $cf_cv_have_utmp_ut_syslen" >&5 +echo "$as_me:36229: 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 @@ -36951,7 +36236,7 @@ EOF fi if test "$cf_cv_have_utmp" != no ; then -echo "$as_me:36954: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5 +echo "$as_me:36239: 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 @@ -36968,7 +36253,7 @@ cf_utmp_includes=" " for cf_header in ut_name ut_user ; do cat >"conftest.$ac_ext" <<_ACEOF -#line 36971 "configure" +#line 36256 "configure" #include "confdefs.h" $cf_utmp_includes int @@ -36984,16 +36269,16 @@ struct $cf_cv_have_utmp x; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:36987: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:36272: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:36990: \$? = $ac_status" >&5 + echo "$as_me:36275: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:36993: \"$ac_try\"") >&5 + { (eval echo "$as_me:36278: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:36996: \$? = $ac_status" >&5 + echo "$as_me:36281: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_utmp_ut_name=$cf_header break @@ -37005,12 +36290,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:37008: result: $cf_cv_have_utmp_ut_name" >&5 +echo "$as_me:36293: result: $cf_cv_have_utmp_ut_name" >&5 echo "${ECHO_T}$cf_cv_have_utmp_ut_name" >&6 case "$cf_cv_have_utmp_ut_name" in (no) - { { echo "$as_me:37013: error: Cannot find declaration for ut.ut_name" >&5 + { { echo "$as_me:36298: 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; }; } ;; @@ -37025,7 +36310,7 @@ esac fi if test "$cf_cv_have_utmp" != no ; then -echo "$as_me:37028: checking for exit-status in $cf_cv_have_utmp" >&5 +echo "$as_me:36313: 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 @@ -37038,7 +36323,7 @@ for cf_result in \ ut_exit.ut_exit do cat >"conftest.$ac_ext" <<_ACEOF -#line 37041 "configure" +#line 36326 "configure" #include "confdefs.h" #include @@ -37055,16 +36340,16 @@ struct $cf_cv_have_utmp x; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:37058: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:36343: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:37061: \$? = $ac_status" >&5 + echo "$as_me:36346: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:37064: \"$ac_try\"") >&5 + { (eval echo "$as_me:36349: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:37067: \$? = $ac_status" >&5 + echo "$as_me:36352: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_utmp_ut_xstatus=$cf_result break @@ -37077,7 +36362,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:37080: result: $cf_cv_have_utmp_ut_xstatus" >&5 +echo "$as_me:36365: 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 @@ -37093,14 +36378,14 @@ fi fi if test "$cf_cv_have_utmp" != no ; then -echo "$as_me:37096: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5 +echo "$as_me:36381: 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 37103 "configure" +#line 36388 "configure" #include "confdefs.h" #include @@ -37117,23 +36402,23 @@ struct $cf_cv_have_utmp x; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:37120: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:36405: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:37123: \$? = $ac_status" >&5 + echo "$as_me:36408: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:37126: \"$ac_try\"") >&5 + { (eval echo "$as_me:36411: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:37129: \$? = $ac_status" >&5 + echo "$as_me:36414: \$? = $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 37136 "configure" +#line 36421 "configure" #include "confdefs.h" #include @@ -37150,16 +36435,16 @@ struct $cf_cv_have_utmp x; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:37153: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:36438: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:37156: \$? = $ac_status" >&5 + echo "$as_me:36441: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:37159: \"$ac_try\"") >&5 + { (eval echo "$as_me:36444: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:37162: \$? = $ac_status" >&5 + echo "$as_me:36447: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_utmp_ut_xtime=define else @@ -37173,7 +36458,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:37176: result: $cf_cv_have_utmp_ut_xtime" >&5 +echo "$as_me:36461: 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 @@ -37192,14 +36477,14 @@ fi fi if test "$cf_cv_have_utmp" != no ; then -echo "$as_me:37195: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5 +echo "$as_me:36480: 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 37202 "configure" +#line 36487 "configure" #include "confdefs.h" #include @@ -37216,16 +36501,16 @@ static struct $cf_cv_have_utmp x; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:37219: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:36504: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:37222: \$? = $ac_status" >&5 + echo "$as_me:36507: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:37225: \"$ac_try\"") >&5 + { (eval echo "$as_me:36510: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:37228: \$? = $ac_status" >&5 + echo "$as_me:36513: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_utmp_ut_session=yes else @@ -37236,7 +36521,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:37239: result: $cf_cv_have_utmp_ut_session" >&5 +echo "$as_me:36524: 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 @@ -37247,7 +36532,7 @@ EOF fi fi -echo "$as_me:37250: checking if $cf_cv_have_utmp is SYSV flavor" >&5 +echo "$as_me:36535: 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 @@ -37255,7 +36540,7 @@ else test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx" cat >"conftest.$ac_ext" <<_ACEOF -#line 37258 "configure" +#line 36543 "configure" #include "confdefs.h" #include @@ -37274,16 +36559,16 @@ struct $cf_cv_have_utmp x; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:37277: \"$ac_link\"") >&5 +if { (eval echo "$as_me:36562: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:37280: \$? = $ac_status" >&5 + echo "$as_me:36565: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:37283: \"$ac_try\"") >&5 + { (eval echo "$as_me:36568: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:37286: \$? = $ac_status" >&5 + echo "$as_me:36571: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_sysv_utmp=yes else @@ -37294,7 +36579,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:37297: result: $cf_cv_sysv_utmp" >&5 +echo "$as_me:36582: result: $cf_cv_sysv_utmp" >&5 echo "${ECHO_T}$cf_cv_sysv_utmp" >&6 test "$cf_cv_sysv_utmp" = yes && cat >>confdefs.h <<\EOF @@ -37303,14 +36588,14 @@ EOF fi -echo "$as_me:37306: checking if external h_errno exists" >&5 +echo "$as_me:36591: 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 37313 "configure" +#line 36598 "configure" #include "confdefs.h" #undef h_errno @@ -37325,16 +36610,16 @@ h_errno = 2 } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:37328: \"$ac_link\"") >&5 +if { (eval echo "$as_me:36613: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:37331: \$? = $ac_status" >&5 + echo "$as_me:36616: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:37334: \"$ac_try\"") >&5 + { (eval echo "$as_me:36619: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:37337: \$? = $ac_status" >&5 + echo "$as_me:36622: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_h_errno=yes else @@ -37345,7 +36630,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:37348: result: $cf_cv_have_h_errno" >&5 +echo "$as_me:36633: 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 @@ -37358,7 +36643,7 @@ EOF fi -echo "$as_me:37361: checking if bibp: URLs should be supported" >&5 +echo "$as_me:36646: 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. @@ -37375,14 +36660,14 @@ else use_bibp_urls=yes fi; -echo "$as_me:37378: result: $use_bibp_urls" >&5 +echo "$as_me:36663: 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:37385: checking if configuration info should be browsable" >&5 +echo "$as_me:36670: 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. @@ -37399,14 +36684,14 @@ else use_config_info=yes fi; -echo "$as_me:37402: result: $use_config_info" >&5 +echo "$as_me:36687: 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:37409: checking if new-style forms-based options screen should be used" >&5 +echo "$as_me:36694: 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. @@ -37423,14 +36708,14 @@ else use_forms_options=yes fi; -echo "$as_me:37426: result: $use_forms_options" >&5 +echo "$as_me:36711: 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:37433: checking if old-style options menu should be used" >&5 +echo "$as_me:36718: 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. @@ -37447,14 +36732,14 @@ else use_menu_options=yes fi; -echo "$as_me:37450: result: $use_menu_options" >&5 +echo "$as_me:36735: 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:37457: checking if sessions code should be used" >&5 +echo "$as_me:36742: 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. @@ -37471,7 +36756,7 @@ else use_sessions=yes fi; -echo "$as_me:37474: result: $use_sessions" >&5 +echo "$as_me:36759: result: $use_sessions" >&5 echo "${ECHO_T}$use_sessions" >&6 if test "$use_sessions" != no ; then @@ -37482,7 +36767,7 @@ EOF EXTRA_OBJS="$EXTRA_OBJS LYSession\$o" fi -echo "$as_me:37485: checking if session-caching code should be used" >&5 +echo "$as_me:36770: 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. @@ -37499,7 +36784,7 @@ else use_session_cache=yes fi; -echo "$as_me:37502: result: $use_session_cache" >&5 +echo "$as_me:36787: result: $use_session_cache" >&5 echo "${ECHO_T}$use_session_cache" >&6 if test "$use_session_cache" != no ; then @@ -37509,7 +36794,7 @@ EOF fi -echo "$as_me:37512: checking if address-list page should be used" >&5 +echo "$as_me:36797: checking if address-list page should be used" >&5 echo $ECHO_N "checking if address-list page should be used... $ECHO_C" >&6 # Check whether --enable-addrlist-page or --disable-addrlist-page was given. @@ -37526,14 +36811,14 @@ else use_addrlist_page=yes fi; -echo "$as_me:37529: result: $use_addrlist_page" >&5 +echo "$as_me:36814: result: $use_addrlist_page" >&5 echo "${ECHO_T}$use_addrlist_page" >&6 test "$use_addrlist_page" != no && cat >>confdefs.h <<\EOF #define USE_ADDRLIST_PAGE 1 EOF -echo "$as_me:37536: checking if support for CJK should be used" >&5 +echo "$as_me:36821: checking if support for CJK should be used" >&5 echo $ECHO_N "checking if support for CJK should be used... $ECHO_C" >&6 # Check whether --enable-cjk or --disable-cjk was given. @@ -37550,7 +36835,7 @@ else use_cjk=yes fi; -echo "$as_me:37553: result: $use_cjk" >&5 +echo "$as_me:36838: result: $use_cjk" >&5 echo "${ECHO_T}$use_cjk" >&6 test "$use_cjk" != no && cat >>confdefs.h <<\EOF @@ -37564,9 +36849,7 @@ if test "${with_libiconv_prefix+set}" = set; then withval="$with_libiconv_prefix" case "$withval" in -(no) - ;; -(yes) +(no|yes) ;; (*) @@ -37600,7 +36883,7 @@ if test -n "$cf_searchpath/include" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 37603 "configure" +#line 36886 "configure" #include "confdefs.h" #include int @@ -37612,16 +36895,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:37615: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:36898: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:37618: \$? = $ac_status" >&5 + echo "$as_me:36901: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:37621: \"$ac_try\"") >&5 + { (eval echo "$as_me:36904: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:37624: \$? = $ac_status" >&5 + echo "$as_me:36907: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -37638,7 +36921,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:37641: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:36924: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -37684,7 +36967,7 @@ if test -n "$cf_searchpath/../include" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 37687 "configure" +#line 36970 "configure" #include "confdefs.h" #include int @@ -37696,16 +36979,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:37699: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:36982: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:37702: \$? = $ac_status" >&5 + echo "$as_me:36985: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:37705: \"$ac_try\"") >&5 + { (eval echo "$as_me:36988: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:37708: \$? = $ac_status" >&5 + echo "$as_me:36991: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -37722,7 +37005,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:37725: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:37008: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -37740,7 +37023,7 @@ echo "${as_me:-configure}:37725: testing adding $cf_add_incdir to include-path . fi else -{ { echo "$as_me:37743: error: cannot find libiconv under $withval" >&5 +{ { echo "$as_me:37026: error: cannot find libiconv under $withval" >&5 echo "$as_me: error: cannot find libiconv under $withval" >&2;} { (exit 1); exit 1; }; } fi @@ -37765,7 +37048,7 @@ if test -n "$cf_searchpath/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:37768: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:37051: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -37794,7 +37077,7 @@ if test -n "$cf_searchpath" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:37797: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:37080: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -37803,18 +37086,22 @@ echo "${as_me:-configure}:37797: testing adding $cf_add_libdir to library-path . fi else -{ { echo "$as_me:37806: error: cannot find libiconv under $withval" >&5 +{ { echo "$as_me:37089: error: cannot find libiconv under $withval" >&5 echo "$as_me: error: cannot find libiconv under $withval" >&2;} { (exit 1); exit 1; }; } fi done + test -n "$verbose" && echo " setting path value for libiconv to $withval" 1>&6 + +echo "${as_me:-configure}:37097: testing setting path value for libiconv to $withval ..." 1>&5 + ;; esac fi; - echo "$as_me:37817: checking for iconv" >&5 + echo "$as_me:37104: 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 @@ -37825,12 +37112,12 @@ else cf_cv_header_path_iconv= cf_cv_library_path_iconv= -echo "${as_me:-configure}:37828: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5 +echo "${as_me:-configure}:37115: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5 cf_save_LIBS="$LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 37833 "configure" +#line 37120 "configure" #include "confdefs.h" #include @@ -37849,16 +37136,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:37852: \"$ac_link\"") >&5 +if { (eval echo "$as_me:37139: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:37855: \$? = $ac_status" >&5 + echo "$as_me:37142: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:37858: \"$ac_try\"") >&5 + { (eval echo "$as_me:37145: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:37861: \$? = $ac_status" >&5 + echo "$as_me:37148: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_iconv=yes @@ -37872,7 +37159,7 @@ cat "conftest.$ac_ext" >&5 LIBS="-liconv $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 37875 "configure" +#line 37162 "configure" #include "confdefs.h" #include @@ -37891,16 +37178,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:37894: \"$ac_link\"") >&5 +if { (eval echo "$as_me:37181: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:37897: \$? = $ac_status" >&5 + echo "$as_me:37184: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:37900: \"$ac_try\"") >&5 + { (eval echo "$as_me:37187: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:37903: \$? = $ac_status" >&5 + echo "$as_me:37190: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_iconv=yes @@ -37917,9 +37204,9 @@ cat "conftest.$ac_ext" >&5 test -n "$verbose" && echo " find linkage for iconv library" 1>&6 -echo "${as_me:-configure}:37920: testing find linkage for iconv library ..." 1>&5 +echo "${as_me:-configure}:37207: testing find linkage for iconv library ..." 1>&5 -echo "${as_me:-configure}:37922: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5 +echo "${as_me:-configure}:37209: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -38010,7 +37297,7 @@ cf_search="$cf_search $cf_header_path_list" if test -d "$cf_cv_header_path_iconv" ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_iconv" 1>&6 -echo "${as_me:-configure}:38013: testing ... testing $cf_cv_header_path_iconv ..." 1>&5 +echo "${as_me:-configure}:37300: testing ... testing $cf_cv_header_path_iconv ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS" @@ -38018,7 +37305,7 @@ echo "${as_me:-configure}:38013: testing ... testing $cf_cv_header_path_iconv .. CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_iconv" cat >"conftest.$ac_ext" <<_ACEOF -#line 38021 "configure" +#line 37308 "configure" #include "confdefs.h" #include @@ -38037,21 +37324,21 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:38040: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:37327: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:38043: \$? = $ac_status" >&5 + echo "$as_me:37330: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:38046: \"$ac_try\"") >&5 + { (eval echo "$as_me:37333: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:38049: \$? = $ac_status" >&5 + echo "$as_me:37336: \$? = $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}:38054: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5 +echo "${as_me:-configure}:37341: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5 cf_cv_find_linkage_iconv=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -38069,7 +37356,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_cv_find_linkage_iconv" = maybe ; then -echo "${as_me:-configure}:38072: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5 +echo "${as_me:-configure}:37359: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -38144,13 +37431,13 @@ cf_search="$cf_library_path_list $cf_search" if test -d "$cf_cv_library_path_iconv" ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_iconv" 1>&6 -echo "${as_me:-configure}:38147: testing ... testing $cf_cv_library_path_iconv ..." 1>&5 +echo "${as_me:-configure}:37434: 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 38153 "configure" +#line 37440 "configure" #include "confdefs.h" #include @@ -38169,21 +37456,21 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:38172: \"$ac_link\"") >&5 +if { (eval echo "$as_me:37459: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:38175: \$? = $ac_status" >&5 + echo "$as_me:37462: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:38178: \"$ac_try\"") >&5 + { (eval echo "$as_me:37465: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:38181: \$? = $ac_status" >&5 + echo "$as_me:37468: \$? = $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}:38186: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5 +echo "${as_me:-configure}:37473: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5 cf_cv_find_linkage_iconv=yes cf_cv_library_file_iconv="-liconv" @@ -38223,7 +37510,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv" fi fi -echo "$as_me:38226: result: $am_cv_func_iconv" >&5 +echo "$as_me:37513: result: $am_cv_func_iconv" >&5 echo "${ECHO_T}$am_cv_func_iconv" >&6 if test "$am_cv_func_iconv" = yes; then @@ -38232,14 +37519,14 @@ cat >>confdefs.h <<\EOF #define HAVE_ICONV 1 EOF - echo "$as_me:38235: checking if the declaration of iconv() needs const." >&5 + echo "$as_me:37522: 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 38242 "configure" +#line 37529 "configure" #include "confdefs.h" #include @@ -38264,16 +37551,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:38267: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:37554: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:38270: \$? = $ac_status" >&5 + echo "$as_me:37557: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:38273: \"$ac_try\"") >&5 + { (eval echo "$as_me:37560: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:38276: \$? = $ac_status" >&5 + echo "$as_me:37563: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then am_cv_proto_iconv_const=no else @@ -38283,7 +37570,7 @@ am_cv_proto_iconv_const=yes fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:38286: result: $am_cv_proto_iconv_const" >&5 +echo "$as_me:37573: 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 @@ -38328,7 +37615,7 @@ if test -n "$cf_cv_header_path_iconv" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 38331 "configure" +#line 37618 "configure" #include "confdefs.h" #include int @@ -38340,16 +37627,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:38343: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:37630: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:38346: \$? = $ac_status" >&5 + echo "$as_me:37633: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:38349: \"$ac_try\"") >&5 + { (eval echo "$as_me:37636: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:38352: \$? = $ac_status" >&5 + echo "$as_me:37639: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -38366,7 +37653,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:38369: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:37656: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -38405,7 +37692,7 @@ if test -n "$cf_cv_library_path_iconv" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:38408: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:37695: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -38419,7 +37706,7 @@ fi if test "x$am_cv_func_iconv" = "xyes" then -echo "$as_me:38422: checking if experimental support for Chinese UTF-8 should be used" >&5 +echo "$as_me:37709: checking if experimental support for Chinese UTF-8 should be used" >&5 echo $ECHO_N "checking if experimental support for Chinese UTF-8 should be used... $ECHO_C" >&6 # Check whether --enable-chinese-utf8 or --disable-chinese-utf8 was given. @@ -38436,7 +37723,7 @@ else use_cn_utf8=yes fi; -echo "$as_me:38439: result: $use_cn_utf8" >&5 +echo "$as_me:37726: result: $use_cn_utf8" >&5 echo "${ECHO_T}$use_cn_utf8" >&6 if test "$use_cn_utf8" != no ; then @@ -38447,7 +37734,7 @@ EOF use_cjk_utf8=yes fi -echo "$as_me:38450: checking if support for Japanese UTF-8 should be used" >&5 +echo "$as_me:37737: checking if support for Japanese UTF-8 should be used" >&5 echo $ECHO_N "checking if support for Japanese UTF-8 should be used... $ECHO_C" >&6 # Check whether --enable-japanese-utf8 or --disable-japanese-utf8 was given. @@ -38464,7 +37751,7 @@ else use_ja_utf8=yes fi; -echo "$as_me:38467: result: $use_ja_utf8" >&5 +echo "$as_me:37754: result: $use_ja_utf8" >&5 echo "${ECHO_T}$use_ja_utf8" >&6 if test "$use_ja_utf8" != no ; then @@ -38485,11 +37772,11 @@ fi else test -n "$verbose" && echo " skipping CJK features which depend on iconv" 1>&6 -echo "${as_me:-configure}:38488: testing skipping CJK features which depend on iconv ..." 1>&5 +echo "${as_me:-configure}:37775: testing skipping CJK features which depend on iconv ..." 1>&5 fi -echo "$as_me:38492: checking if experimental wcwidth/UTF-8 logic should be used" >&5 +echo "$as_me:37779: checking if experimental wcwidth/UTF-8 logic should be used" >&5 echo $ECHO_N "checking if experimental wcwidth/UTF-8 logic should be used... $ECHO_C" >&6 # Check whether --enable-wcwidth-support or --disable-wcwidth-support was given. @@ -38506,7 +37793,7 @@ else use_wcwidth=no fi; -echo "$as_me:38509: result: $use_wcwidth" >&5 +echo "$as_me:37796: result: $use_wcwidth" >&5 echo "${ECHO_T}$use_wcwidth" >&6 test "$use_wcwidth" != no && cat >>confdefs.h <<\EOF @@ -38521,7 +37808,7 @@ case "$cf_cv_screen" in esac if test "$use_dft_colors" != no ; then -echo "$as_me:38524: checking if you want to use default-colors" >&5 +echo "$as_me:37811: 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. @@ -38538,7 +37825,7 @@ else use_dft_colors=no fi; -echo "$as_me:38541: result: $use_dft_colors" >&5 +echo "$as_me:37828: result: $use_dft_colors" >&5 echo "${ECHO_T}$use_dft_colors" >&6 test "$use_dft_colors" = "yes" && cat >>confdefs.h <<\EOF @@ -38547,7 +37834,7 @@ EOF fi -echo "$as_me:38550: checking if experimental keyboard-layout logic should be used" >&5 +echo "$as_me:37837: 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. @@ -38564,14 +37851,14 @@ else use_kbd_layout=no fi; -echo "$as_me:38567: result: $use_kbd_layout" >&5 +echo "$as_me:37854: 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:38574: checking if experimental nested-table logic should be used" >&5 +echo "$as_me:37861: 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. @@ -38588,14 +37875,14 @@ else use_nested_tables=no fi; -echo "$as_me:38591: result: $use_nested_tables" >&5 +echo "$as_me:37878: 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:38598: checking if alternative line-edit bindings should be used" >&5 +echo "$as_me:37885: 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. @@ -38612,14 +37899,14 @@ else use_alt_bindings=yes fi; -echo "$as_me:38615: result: $use_alt_bindings" >&5 +echo "$as_me:37902: result: $use_alt_bindings" >&5 echo "${ECHO_T}$use_alt_bindings" >&6 test "$use_alt_bindings" != no && cat >>confdefs.h <<\EOF #define USE_ALT_BINDINGS 1 EOF -echo "$as_me:38622: checking if ascii case-conversion should be used" >&5 +echo "$as_me:37909: 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. @@ -38636,14 +37923,14 @@ else use_ascii_ctypes=yes fi; -echo "$as_me:38639: result: $use_ascii_ctypes" >&5 +echo "$as_me:37926: 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:38646: checking if you want to use extended HTML DTD logic" >&5 +echo "$as_me:37933: 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. @@ -38660,14 +37947,14 @@ else use_ext_htmldtd=yes fi; -echo "$as_me:38663: result: $use_ext_htmldtd" >&5 +echo "$as_me:37950: 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:38670: checking if file-upload logic should be used" >&5 +echo "$as_me:37957: 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. @@ -38684,14 +37971,14 @@ else use_file_upload=yes fi; -echo "$as_me:38687: result: $use_file_upload" >&5 +echo "$as_me:37974: 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:38694: checking if IDNA support should be used" >&5 +echo "$as_me:37981: 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. @@ -38708,15 +37995,13 @@ else use_idna=yes fi; -echo "$as_me:38711: result: $use_idna" >&5 +echo "$as_me:37998: result: $use_idna" >&5 echo "${ECHO_T}$use_idna" >&6 if test "$use_idna" = yes ; then case "$use_idna" in -(no) - ;; -(yes) +(no|yes) ;; (*) @@ -38750,7 +38035,7 @@ if test -n "$cf_searchpath/include" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 38753 "configure" +#line 38038 "configure" #include "confdefs.h" #include int @@ -38762,16 +38047,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:38765: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:38050: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:38768: \$? = $ac_status" >&5 + echo "$as_me:38053: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:38771: \"$ac_try\"") >&5 + { (eval echo "$as_me:38056: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:38774: \$? = $ac_status" >&5 + echo "$as_me:38059: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -38788,7 +38073,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:38791: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:38076: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -38834,7 +38119,7 @@ if test -n "$cf_searchpath/../include" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 38837 "configure" +#line 38122 "configure" #include "confdefs.h" #include int @@ -38846,16 +38131,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:38849: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:38134: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:38852: \$? = $ac_status" >&5 + echo "$as_me:38137: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:38855: \"$ac_try\"") >&5 + { (eval echo "$as_me:38140: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:38858: \$? = $ac_status" >&5 + echo "$as_me:38143: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -38872,7 +38157,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:38875: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:38160: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -38890,8 +38175,8 @@ echo "${as_me:-configure}:38875: testing adding $cf_add_incdir to include-path . fi else -{ { echo "$as_me:38893: error: cannot find under $use_idna" >&5 -echo "$as_me: error: cannot find under $use_idna" >&2;} +{ { echo "$as_me:38178: error: cannot find idna library under $use_idna" >&5 +echo "$as_me: error: cannot find idna library under $use_idna" >&2;} { (exit 1); exit 1; }; } fi if test -d "$cf_searchpath/lib" ; then @@ -38915,7 +38200,7 @@ if test -n "$cf_searchpath/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:38918: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:38203: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -38944,7 +38229,7 @@ if test -n "$cf_searchpath" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:38947: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:38232: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -38953,12 +38238,16 @@ echo "${as_me:-configure}:38947: testing adding $cf_add_libdir to library-path . fi else -{ { echo "$as_me:38956: error: cannot find under $use_idna" >&5 -echo "$as_me: error: cannot find under $use_idna" >&2;} +{ { echo "$as_me:38241: error: cannot find idna library under $use_idna" >&5 +echo "$as_me: error: cannot find idna library under $use_idna" >&2;} { (exit 1); exit 1; }; } fi done + test -n "$verbose" && echo " setting path value for idna library to $use_idna" 1>&6 + +echo "${as_me:-configure}:38249: testing setting path value for idna library to $use_idna ..." 1>&5 + ;; esac @@ -38967,12 +38256,12 @@ esac cf_cv_header_path_idn2= cf_cv_library_path_idn2= -echo "${as_me:-configure}:38970: testing Starting FIND_LINKAGE(idn2,) ..." 1>&5 +echo "${as_me:-configure}:38259: testing Starting FIND_LINKAGE(idn2,) ..." 1>&5 cf_save_LIBS="$LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 38975 "configure" +#line 38264 "configure" #include "confdefs.h" #include @@ -38991,16 +38280,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:38994: \"$ac_link\"") >&5 +if { (eval echo "$as_me:38283: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:38997: \$? = $ac_status" >&5 + echo "$as_me:38286: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:39000: \"$ac_try\"") >&5 + { (eval echo "$as_me:38289: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:39003: \$? = $ac_status" >&5 + echo "$as_me:38292: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_idn2=yes @@ -39014,7 +38303,7 @@ cat "conftest.$ac_ext" >&5 LIBS="-lidn2 $LIBICONV $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 39017 "configure" +#line 38306 "configure" #include "confdefs.h" #include @@ -39033,16 +38322,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:39036: \"$ac_link\"") >&5 +if { (eval echo "$as_me:38325: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:39039: \$? = $ac_status" >&5 + echo "$as_me:38328: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:39042: \"$ac_try\"") >&5 + { (eval echo "$as_me:38331: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:39045: \$? = $ac_status" >&5 + echo "$as_me:38334: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_idn2=yes @@ -39059,9 +38348,9 @@ cat "conftest.$ac_ext" >&5 test -n "$verbose" && echo " find linkage for idn2 library" 1>&6 -echo "${as_me:-configure}:39062: testing find linkage for idn2 library ..." 1>&5 +echo "${as_me:-configure}:38351: testing find linkage for idn2 library ..." 1>&5 -echo "${as_me:-configure}:39064: testing Searching for headers in FIND_LINKAGE(idn2,) ..." 1>&5 +echo "${as_me:-configure}:38353: testing Searching for headers in FIND_LINKAGE(idn2,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -39152,7 +38441,7 @@ cf_search="$cf_search $cf_header_path_list" if test -d "$cf_cv_header_path_idn2" ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_idn2" 1>&6 -echo "${as_me:-configure}:39155: testing ... testing $cf_cv_header_path_idn2 ..." 1>&5 +echo "${as_me:-configure}:38444: testing ... testing $cf_cv_header_path_idn2 ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS" @@ -39160,7 +38449,7 @@ echo "${as_me:-configure}:39155: testing ... testing $cf_cv_header_path_idn2 ... CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_idn2" cat >"conftest.$ac_ext" <<_ACEOF -#line 39163 "configure" +#line 38452 "configure" #include "confdefs.h" #include @@ -39179,21 +38468,21 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:39182: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:38471: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:39185: \$? = $ac_status" >&5 + echo "$as_me:38474: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:39188: \"$ac_try\"") >&5 + { (eval echo "$as_me:38477: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:39191: \$? = $ac_status" >&5 + echo "$as_me:38480: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then test -n "$verbose" && echo " ... found idn2 headers in $cf_cv_header_path_idn2" 1>&6 -echo "${as_me:-configure}:39196: testing ... found idn2 headers in $cf_cv_header_path_idn2 ..." 1>&5 +echo "${as_me:-configure}:38485: testing ... found idn2 headers in $cf_cv_header_path_idn2 ..." 1>&5 cf_cv_find_linkage_idn2=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -39211,7 +38500,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_cv_find_linkage_idn2" = maybe ; then -echo "${as_me:-configure}:39214: testing Searching for idn2 library in FIND_LINKAGE(idn2,) ..." 1>&5 +echo "${as_me:-configure}:38503: testing Searching for idn2 library in FIND_LINKAGE(idn2,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -39286,13 +38575,13 @@ cf_search="$cf_library_path_list $cf_search" if test -d "$cf_cv_library_path_idn2" ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_idn2" 1>&6 -echo "${as_me:-configure}:39289: testing ... testing $cf_cv_library_path_idn2 ..." 1>&5 +echo "${as_me:-configure}:38578: testing ... testing $cf_cv_library_path_idn2 ..." 1>&5 CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-lidn2 $LIBICONV $cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_idn2" cat >"conftest.$ac_ext" <<_ACEOF -#line 39295 "configure" +#line 38584 "configure" #include "confdefs.h" #include @@ -39311,21 +38600,21 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:39314: \"$ac_link\"") >&5 +if { (eval echo "$as_me:38603: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:39317: \$? = $ac_status" >&5 + echo "$as_me:38606: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:39320: \"$ac_try\"") >&5 + { (eval echo "$as_me:38609: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:39323: \$? = $ac_status" >&5 + echo "$as_me:38612: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then test -n "$verbose" && echo " ... found idn2 library in $cf_cv_library_path_idn2" 1>&6 -echo "${as_me:-configure}:39328: testing ... found idn2 library in $cf_cv_library_path_idn2 ..." 1>&5 +echo "${as_me:-configure}:38617: testing ... found idn2 library in $cf_cv_library_path_idn2 ..." 1>&5 cf_cv_find_linkage_idn2=yes cf_cv_library_file_idn2="-lidn2" @@ -39387,7 +38676,7 @@ if test -n "$cf_cv_header_path_idn2" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 39390 "configure" +#line 38679 "configure" #include "confdefs.h" #include int @@ -39399,16 +38688,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:39402: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:38691: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:39405: \$? = $ac_status" >&5 + echo "$as_me:38694: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:39408: \"$ac_try\"") >&5 + { (eval echo "$as_me:38697: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:39411: \$? = $ac_status" >&5 + echo "$as_me:38700: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -39425,7 +38714,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:39428: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:38717: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -39461,7 +38750,7 @@ if test -n "$cf_cv_library_path_idn2" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:39464: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:38753: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -39488,14 +38777,14 @@ LIBS="$cf_add_libs" else test -n "$verbose" && echo " unsuccessful, will try idn (older)" 1>&6 -echo "${as_me:-configure}:39491: testing unsuccessful, will try idn (older) ..." 1>&5 +echo "${as_me:-configure}:38780: testing unsuccessful, will try idn (older) ..." 1>&5 fi if test "x$cf_cv_find_linkage_idn2" = xyes ; then test -n "$verbose" && echo " found idn2 library" 1>&6 -echo "${as_me:-configure}:39498: testing found idn2 library ..." 1>&5 +echo "${as_me:-configure}:38787: testing found idn2 library ..." 1>&5 cat >>confdefs.h <<\EOF #define USE_IDN2 1 @@ -39508,12 +38797,12 @@ else cf_cv_header_path_idn= cf_cv_library_path_idn= -echo "${as_me:-configure}:39511: testing Starting FIND_LINKAGE(idn,) ..." 1>&5 +echo "${as_me:-configure}:38800: testing Starting FIND_LINKAGE(idn,) ..." 1>&5 cf_save_LIBS="$LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 39516 "configure" +#line 38805 "configure" #include "confdefs.h" #include @@ -39532,16 +38821,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:39535: \"$ac_link\"") >&5 +if { (eval echo "$as_me:38824: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:39538: \$? = $ac_status" >&5 + echo "$as_me:38827: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:39541: \"$ac_try\"") >&5 + { (eval echo "$as_me:38830: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:39544: \$? = $ac_status" >&5 + echo "$as_me:38833: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_idn=yes @@ -39555,7 +38844,7 @@ cat "conftest.$ac_ext" >&5 LIBS="-lidn $LIBICONV $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 39558 "configure" +#line 38847 "configure" #include "confdefs.h" #include @@ -39574,16 +38863,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:39577: \"$ac_link\"") >&5 +if { (eval echo "$as_me:38866: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:39580: \$? = $ac_status" >&5 + echo "$as_me:38869: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:39583: \"$ac_try\"") >&5 + { (eval echo "$as_me:38872: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:39586: \$? = $ac_status" >&5 + echo "$as_me:38875: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_idn=yes @@ -39600,9 +38889,9 @@ cat "conftest.$ac_ext" >&5 test -n "$verbose" && echo " find linkage for idn library" 1>&6 -echo "${as_me:-configure}:39603: testing find linkage for idn library ..." 1>&5 +echo "${as_me:-configure}:38892: testing find linkage for idn library ..." 1>&5 -echo "${as_me:-configure}:39605: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5 +echo "${as_me:-configure}:38894: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -39693,7 +38982,7 @@ cf_search="$cf_search $cf_header_path_list" if test -d "$cf_cv_header_path_idn" ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_idn" 1>&6 -echo "${as_me:-configure}:39696: testing ... testing $cf_cv_header_path_idn ..." 1>&5 +echo "${as_me:-configure}:38985: testing ... testing $cf_cv_header_path_idn ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS" @@ -39701,7 +38990,7 @@ echo "${as_me:-configure}:39696: testing ... testing $cf_cv_header_path_idn ..." CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_idn" cat >"conftest.$ac_ext" <<_ACEOF -#line 39704 "configure" +#line 38993 "configure" #include "confdefs.h" #include @@ -39720,21 +39009,21 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:39723: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:39012: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:39726: \$? = $ac_status" >&5 + echo "$as_me:39015: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:39729: \"$ac_try\"") >&5 + { (eval echo "$as_me:39018: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:39732: \$? = $ac_status" >&5 + echo "$as_me:39021: \$? = $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}:39737: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5 +echo "${as_me:-configure}:39026: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5 cf_cv_find_linkage_idn=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -39752,7 +39041,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_cv_find_linkage_idn" = maybe ; then -echo "${as_me:-configure}:39755: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5 +echo "${as_me:-configure}:39044: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -39827,13 +39116,13 @@ cf_search="$cf_library_path_list $cf_search" if test -d "$cf_cv_library_path_idn" ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_idn" 1>&6 -echo "${as_me:-configure}:39830: testing ... testing $cf_cv_library_path_idn ..." 1>&5 +echo "${as_me:-configure}:39119: testing ... testing $cf_cv_library_path_idn ..." 1>&5 CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-lidn $LIBICONV $cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_idn" cat >"conftest.$ac_ext" <<_ACEOF -#line 39836 "configure" +#line 39125 "configure" #include "confdefs.h" #include @@ -39852,21 +39141,21 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:39855: \"$ac_link\"") >&5 +if { (eval echo "$as_me:39144: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:39858: \$? = $ac_status" >&5 + echo "$as_me:39147: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:39861: \"$ac_try\"") >&5 + { (eval echo "$as_me:39150: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:39864: \$? = $ac_status" >&5 + echo "$as_me:39153: \$? = $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}:39869: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5 +echo "${as_me:-configure}:39158: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5 cf_cv_find_linkage_idn=yes cf_cv_library_file_idn="-lidn" @@ -39928,7 +39217,7 @@ if test -n "$cf_cv_header_path_idn" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 39931 "configure" +#line 39220 "configure" #include "confdefs.h" #include int @@ -39940,16 +39229,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:39943: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:39232: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:39946: \$? = $ac_status" >&5 + echo "$as_me:39235: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:39949: \"$ac_try\"") >&5 + { (eval echo "$as_me:39238: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:39952: \$? = $ac_status" >&5 + echo "$as_me:39241: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -39966,7 +39255,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:39969: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:39258: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -40002,7 +39291,7 @@ if test -n "$cf_cv_library_path_idn" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:40005: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:39294: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -40027,14 +39316,14 @@ done LIBS="$cf_add_libs" else -{ echo "$as_me:40030: WARNING: Cannot find idn library" >&5 +{ echo "$as_me:39319: 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 test -n "$verbose" && echo " found idn library" 1>&6 -echo "${as_me:-configure}:40037: testing found idn library ..." 1>&5 +echo "${as_me:-configure}:39326: testing found idn library ..." 1>&5 cat >>confdefs.h <<\EOF #define USE_IDNA 1 @@ -40045,7 +39334,7 @@ fi fi -echo "$as_me:40048: checking if element-justification logic should be used" >&5 +echo "$as_me:39337: 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. @@ -40062,14 +39351,14 @@ else use_justify_elts=yes fi; -echo "$as_me:40065: result: $use_justify_elts" >&5 +echo "$as_me:39354: 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:40072: checking if partial-display should be used" >&5 +echo "$as_me:39361: 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. @@ -40086,14 +39375,14 @@ else use_partial_display=yes fi; -echo "$as_me:40089: result: $use_partial_display" >&5 +echo "$as_me:39378: 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:40096: checking if persistent-cookie logic should be used" >&5 +echo "$as_me:39385: 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. @@ -40110,14 +39399,14 @@ else use_filed_cookies=yes fi; -echo "$as_me:40113: result: $use_filed_cookies" >&5 +echo "$as_me:39402: 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:40120: checking if html source should be colorized" >&5 +echo "$as_me:39409: 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. @@ -40134,14 +39423,14 @@ else use_prettysrc=yes fi; -echo "$as_me:40137: result: $use_prettysrc" >&5 +echo "$as_me:39426: 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:40144: checking if progress-bar code should be used" >&5 +echo "$as_me:39433: 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. @@ -40158,14 +39447,14 @@ else use_progressbar=yes fi; -echo "$as_me:40161: result: $use_progressbar" >&5 +echo "$as_me:39450: 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:40168: checking if read-progress message should show ETA" >&5 +echo "$as_me:39457: 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. @@ -40182,14 +39471,14 @@ else use_read_eta=yes fi; -echo "$as_me:40185: result: $use_read_eta" >&5 +echo "$as_me:39474: 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:40192: checking if source caching should be used" >&5 +echo "$as_me:39481: 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. @@ -40206,14 +39495,14 @@ else use_source_cache=yes fi; -echo "$as_me:40209: result: $use_source_cache" >&5 +echo "$as_me:39498: 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:40216: checking if scrollbar code should be used" >&5 +echo "$as_me:39505: 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. @@ -40230,10 +39519,10 @@ else use_scrollbar=yes fi; -echo "$as_me:40233: result: $use_scrollbar" >&5 +echo "$as_me:39522: result: $use_scrollbar" >&5 echo "${ECHO_T}$use_scrollbar" >&6 -echo "$as_me:40236: checking if charset-selection logic should be used" >&5 +echo "$as_me:39525: 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. @@ -40250,14 +39539,14 @@ else use_charset_choice=no fi; -echo "$as_me:40253: result: $use_charset_choice" >&5 +echo "$as_me:39542: 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:40260: checking if you want to use external commands" >&5 +echo "$as_me:39549: 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. @@ -40274,7 +39563,7 @@ else use_externs=no fi; -echo "$as_me:40277: result: $use_externs" >&5 +echo "$as_me:39566: result: $use_externs" >&5 echo "${ECHO_T}$use_externs" >&6 if test "$use_externs" != "no" ; then @@ -40285,7 +39574,7 @@ EOF EXTRA_OBJS="$EXTRA_OBJS LYExtern\$o" fi -echo "$as_me:40288: checking if you want to use setfont support" >&5 +echo "$as_me:39577: 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. @@ -40302,7 +39591,7 @@ else use_setfont=no fi; -echo "$as_me:40305: result: $use_setfont" >&5 +echo "$as_me:39594: result: $use_setfont" >&5 echo "${ECHO_T}$use_setfont" >&6 if test "$use_setfont" = yes ; then case "$host_os" in @@ -40313,7 +39602,7 @@ for ac_prog in $SETFONT consolechars setfont 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:40316: checking for $ac_word" >&5 +echo "$as_me:39605: 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 @@ -40330,7 +39619,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_SETFONT="$ac_dir/$ac_word" - echo "$as_me:40333: found $ac_dir/$ac_word" >&5 + echo "$as_me:39622: found $ac_dir/$ac_word" >&5 break fi done @@ -40341,10 +39630,10 @@ fi SETFONT=$ac_cv_path_SETFONT if test -n "$SETFONT"; then - echo "$as_me:40344: result: $SETFONT" >&5 + echo "$as_me:39633: result: $SETFONT" >&5 echo "${ECHO_T}$SETFONT" >&6 else - echo "$as_me:40347: result: no" >&5 + echo "$as_me:39636: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -40403,7 +39692,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "${as_me:-configure}:40406: testing defining path for ${cf_path_prog} ..." 1>&5 +echo "${as_me:-configure}:39695: testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <&6 -echo "${as_me:-configure}:40424: testing Assume $host_os has font-switching ..." 1>&5 +echo "${as_me:-configure}:39713: 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}:40431: testing Assume $host_os has no font-switching ..." 1>&5 +echo "${as_me:-configure}:39720: testing Assume $host_os has no font-switching ..." 1>&5 ;; esac if test -z "$SETFONT" ; then - { echo "$as_me:40436: WARNING: Cannot find a font-setting program" >&5 + { echo "$as_me:39725: WARNING: Cannot find a font-setting program" >&5 echo "$as_me: WARNING: Cannot find a font-setting program" >&2;} elif test "$SETFONT" != unknown ; then @@ -40444,7 +39733,7 @@ EOF fi fi -echo "$as_me:40447: checking if you want cgi-link support" >&5 +echo "$as_me:39736: 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. @@ -40461,10 +39750,10 @@ EOF else enableval=no fi; -echo "$as_me:40464: result: $enableval" >&5 +echo "$as_me:39753: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 -echo "$as_me:40467: checking if you want change-exec support" >&5 +echo "$as_me:39756: 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. @@ -40481,14 +39770,14 @@ else use_change_exec=no fi; -echo "$as_me:40484: result: $use_change_exec" >&5 +echo "$as_me:39773: 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:40491: checking if you want exec-links support" >&5 +echo "$as_me:39780: 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. @@ -40505,14 +39794,14 @@ else use_exec_links=$enableval fi; -echo "$as_me:40508: result: $use_exec_links" >&5 +echo "$as_me:39797: 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:40515: checking if you want exec-scripts support" >&5 +echo "$as_me:39804: 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. @@ -40529,14 +39818,14 @@ else use_exec_scripts=$enableval fi; -echo "$as_me:40532: result: $use_exec_scripts" >&5 +echo "$as_me:39821: 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:40539: checking if you want internal-links feature" >&5 +echo "$as_me:39828: 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. @@ -40553,14 +39842,14 @@ else use_internal_links=no fi; -echo "$as_me:40556: result: $use_internal_links" >&5 +echo "$as_me:39845: result: $use_internal_links" >&5 echo "${ECHO_T}$use_internal_links" >&6 test "$use_internal_links" = yes && cat >>confdefs.h <<\EOF #define TRACK_INTERNAL_LINKS 1 EOF -echo "$as_me:40563: checking if you want to fork NSL requests" >&5 +echo "$as_me:39852: 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. @@ -40577,7 +39866,7 @@ else use_nsl_fork=no fi; -echo "$as_me:40580: result: $use_nsl_fork" >&5 +echo "$as_me:39869: result: $use_nsl_fork" >&5 echo "${ECHO_T}$use_nsl_fork" >&6 if test "$use_nsl_fork" = yes ; then case "$host_os" in @@ -40598,7 +39887,7 @@ EOF esac fi -echo "$as_me:40601: checking if you want to log URL requests via syslog" >&5 +echo "$as_me:39890: 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. @@ -40615,14 +39904,14 @@ else use_syslog=no fi; -echo "$as_me:40618: result: $use_syslog" >&5 +echo "$as_me:39907: 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:40625: checking if you want to underline links" >&5 +echo "$as_me:39914: 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. @@ -40639,7 +39928,7 @@ else use_underline=no fi; -echo "$as_me:40642: result: $use_underline" >&5 +echo "$as_me:39931: result: $use_underline" >&5 echo "${ECHO_T}$use_underline" >&6 test "$use_underline" = yes && cat >>confdefs.h <<\EOF @@ -40651,7 +39940,7 @@ cat >>confdefs.h <<\EOF #define UNDERLINE_LINKS 0 EOF -echo "$as_me:40654: checking if help files should be gzip'ed" >&5 +echo "$as_me:39943: 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. @@ -40668,10 +39957,10 @@ else use_gzip_help=no fi; -echo "$as_me:40671: result: $use_gzip_help" >&5 +echo "$as_me:39960: result: $use_gzip_help" >&5 echo "${ECHO_T}$use_gzip_help" >&6 -echo "$as_me:40674: checking if you want to use libbz2 for decompression of some bzip2 files" >&5 +echo "$as_me:39963: 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. @@ -40681,15 +39970,13 @@ if test "${with_bzlib+set}" = set; then else use_bzlib=yes fi; -echo "$as_me:40684: result: $use_bzlib" >&5 +echo "$as_me:39973: result: $use_bzlib" >&5 echo "${ECHO_T}$use_bzlib" >&6 if test ".$use_bzlib" != ".no" ; then case "$use_bzlib" in -(no) - ;; -(yes) +(no|yes) ;; (*) @@ -40723,7 +40010,7 @@ if test -n "$cf_searchpath/include" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 40726 "configure" +#line 40013 "configure" #include "confdefs.h" #include int @@ -40735,16 +40022,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:40738: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:40025: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:40741: \$? = $ac_status" >&5 + echo "$as_me:40028: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:40744: \"$ac_try\"") >&5 + { (eval echo "$as_me:40031: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:40747: \$? = $ac_status" >&5 + echo "$as_me:40034: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -40761,7 +40048,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:40764: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:40051: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -40807,7 +40094,7 @@ if test -n "$cf_searchpath/../include" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 40810 "configure" +#line 40097 "configure" #include "confdefs.h" #include int @@ -40819,16 +40106,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:40822: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:40109: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:40825: \$? = $ac_status" >&5 + echo "$as_me:40112: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:40828: \"$ac_try\"") >&5 + { (eval echo "$as_me:40115: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:40831: \$? = $ac_status" >&5 + echo "$as_me:40118: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -40845,7 +40132,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:40848: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:40135: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -40863,8 +40150,8 @@ echo "${as_me:-configure}:40848: testing adding $cf_add_incdir to include-path . fi else -{ { echo "$as_me:40866: error: cannot find under $use_bzlib" >&5 -echo "$as_me: error: cannot find under $use_bzlib" >&2;} +{ { echo "$as_me:40153: error: cannot find bzip2 library under $use_bzlib" >&5 +echo "$as_me: error: cannot find bzip2 library under $use_bzlib" >&2;} { (exit 1); exit 1; }; } fi if test -d "$cf_searchpath/lib" ; then @@ -40888,7 +40175,7 @@ if test -n "$cf_searchpath/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:40891: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:40178: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -40917,7 +40204,7 @@ if test -n "$cf_searchpath" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:40920: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:40207: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -40926,12 +40213,16 @@ echo "${as_me:-configure}:40920: testing adding $cf_add_libdir to library-path . fi else -{ { echo "$as_me:40929: error: cannot find under $use_bzlib" >&5 -echo "$as_me: error: cannot find under $use_bzlib" >&2;} +{ { echo "$as_me:40216: error: cannot find bzip2 library under $use_bzlib" >&5 +echo "$as_me: error: cannot find bzip2 library under $use_bzlib" >&2;} { (exit 1); exit 1; }; } fi done + test -n "$verbose" && echo " setting path value for bzip2 library to $use_bzlib" 1>&6 + +echo "${as_me:-configure}:40224: testing setting path value for bzip2 library to $use_bzlib ..." 1>&5 + ;; esac @@ -40940,12 +40231,12 @@ esac cf_cv_header_path_bz2= cf_cv_library_path_bz2= -echo "${as_me:-configure}:40943: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5 +echo "${as_me:-configure}:40234: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5 cf_save_LIBS="$LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 40948 "configure" +#line 40239 "configure" #include "confdefs.h" #include @@ -40962,16 +40253,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:40965: \"$ac_link\"") >&5 +if { (eval echo "$as_me:40256: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:40968: \$? = $ac_status" >&5 + echo "$as_me:40259: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:40971: \"$ac_try\"") >&5 + { (eval echo "$as_me:40262: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:40974: \$? = $ac_status" >&5 + echo "$as_me:40265: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_bz2=yes @@ -40985,7 +40276,7 @@ cat "conftest.$ac_ext" >&5 LIBS="-lbz2 $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 40988 "configure" +#line 40279 "configure" #include "confdefs.h" #include @@ -41002,16 +40293,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:41005: \"$ac_link\"") >&5 +if { (eval echo "$as_me:40296: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:41008: \$? = $ac_status" >&5 + echo "$as_me:40299: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:41011: \"$ac_try\"") >&5 + { (eval echo "$as_me:40302: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:41014: \$? = $ac_status" >&5 + echo "$as_me:40305: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_bz2=yes @@ -41028,9 +40319,9 @@ cat "conftest.$ac_ext" >&5 test -n "$verbose" && echo " find linkage for bz2 library" 1>&6 -echo "${as_me:-configure}:41031: testing find linkage for bz2 library ..." 1>&5 +echo "${as_me:-configure}:40322: testing find linkage for bz2 library ..." 1>&5 -echo "${as_me:-configure}:41033: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5 +echo "${as_me:-configure}:40324: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -41121,7 +40412,7 @@ cf_search="$cf_search $cf_header_path_list" if test -d "$cf_cv_header_path_bz2" ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_bz2" 1>&6 -echo "${as_me:-configure}:41124: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5 +echo "${as_me:-configure}:40415: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS" @@ -41129,7 +40420,7 @@ echo "${as_me:-configure}:41124: testing ... testing $cf_cv_header_path_bz2 ..." CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_bz2" cat >"conftest.$ac_ext" <<_ACEOF -#line 41132 "configure" +#line 40423 "configure" #include "confdefs.h" #include @@ -41146,21 +40437,21 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:41149: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:40440: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:41152: \$? = $ac_status" >&5 + echo "$as_me:40443: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:41155: \"$ac_try\"") >&5 + { (eval echo "$as_me:40446: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:41158: \$? = $ac_status" >&5 + echo "$as_me:40449: \$? = $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}:41163: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5 +echo "${as_me:-configure}:40454: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5 cf_cv_find_linkage_bz2=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -41178,7 +40469,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_cv_find_linkage_bz2" = maybe ; then -echo "${as_me:-configure}:41181: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5 +echo "${as_me:-configure}:40472: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -41186,7 +40477,7 @@ echo "${as_me:-configure}:41181: testing Searching for bz2 library in FIND_LINKA CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-lbz2 $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 41189 "configure" +#line 40480 "configure" #include "confdefs.h" #include @@ -41203,21 +40494,21 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:41206: \"$ac_link\"") >&5 +if { (eval echo "$as_me:40497: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:41209: \$? = $ac_status" >&5 + echo "$as_me:40500: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:41212: \"$ac_try\"") >&5 + { (eval echo "$as_me:40503: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:41215: \$? = $ac_status" >&5 + echo "$as_me:40506: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then test -n "$verbose" && echo " ... found bz2 library in system" 1>&6 -echo "${as_me:-configure}:41220: testing ... found bz2 library in system ..." 1>&5 +echo "${as_me:-configure}:40511: testing ... found bz2 library in system ..." 1>&5 cf_cv_find_linkage_bz2=yes else @@ -41298,13 +40589,13 @@ cf_search="$cf_library_path_list $cf_search" if test -d "$cf_cv_library_path_bz2" ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_bz2" 1>&6 -echo "${as_me:-configure}:41301: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5 +echo "${as_me:-configure}:40592: 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 41307 "configure" +#line 40598 "configure" #include "confdefs.h" #include @@ -41321,21 +40612,21 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:41324: \"$ac_link\"") >&5 +if { (eval echo "$as_me:40615: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:41327: \$? = $ac_status" >&5 + echo "$as_me:40618: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:41330: \"$ac_try\"") >&5 + { (eval echo "$as_me:40621: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:41333: \$? = $ac_status" >&5 + echo "$as_me:40624: \$? = $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}:41338: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5 +echo "${as_me:-configure}:40629: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5 cf_cv_find_linkage_bz2=yes cf_cv_library_file_bz2="-lbz2" @@ -41397,7 +40688,7 @@ if test -n "$cf_cv_header_path_bz2" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 41400 "configure" +#line 40691 "configure" #include "confdefs.h" #include int @@ -41409,16 +40700,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:41412: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:40703: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:41415: \$? = $ac_status" >&5 + echo "$as_me:40706: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:41418: \"$ac_try\"") >&5 + { (eval echo "$as_me:40709: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:41421: \$? = $ac_status" >&5 + echo "$as_me:40712: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -41435,7 +40726,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:41438: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:40729: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -41471,7 +40762,7 @@ if test -n "$cf_cv_library_path_bz2" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:41474: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:40765: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -41496,7 +40787,7 @@ done LIBS="$cf_add_libs" else -{ echo "$as_me:41499: WARNING: Cannot find bz2 library" >&5 +{ echo "$as_me:40790: WARNING: Cannot find bz2 library" >&5 echo "$as_me: WARNING: Cannot find bz2 library" >&2;} fi @@ -41507,7 +40798,7 @@ EOF fi -echo "$as_me:41510: checking if you want to use zlib for decompression of some gzip files" >&5 +echo "$as_me:40801: 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. @@ -41517,15 +40808,13 @@ if test "${with_zlib+set}" = set; then else use_zlib=yes fi; -echo "$as_me:41520: result: $use_zlib" >&5 +echo "$as_me:40811: result: $use_zlib" >&5 echo "${ECHO_T}$use_zlib" >&6 if test ".$use_zlib" != ".no" ; then case "$use_zlib" in -(no) - ;; -(yes) +(no|yes) ;; (*) @@ -41559,7 +40848,7 @@ if test -n "$cf_searchpath/include" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 41562 "configure" +#line 40851 "configure" #include "confdefs.h" #include int @@ -41571,16 +40860,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:41574: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:40863: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:41577: \$? = $ac_status" >&5 + echo "$as_me:40866: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:41580: \"$ac_try\"") >&5 + { (eval echo "$as_me:40869: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:41583: \$? = $ac_status" >&5 + echo "$as_me:40872: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -41597,7 +40886,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:41600: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:40889: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -41643,7 +40932,7 @@ if test -n "$cf_searchpath/../include" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 41646 "configure" +#line 40935 "configure" #include "confdefs.h" #include int @@ -41655,16 +40944,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:41658: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:40947: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:41661: \$? = $ac_status" >&5 + echo "$as_me:40950: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:41664: \"$ac_try\"") >&5 + { (eval echo "$as_me:40953: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:41667: \$? = $ac_status" >&5 + echo "$as_me:40956: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -41681,7 +40970,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:41684: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:40973: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -41699,8 +40988,8 @@ echo "${as_me:-configure}:41684: testing adding $cf_add_incdir to include-path . fi else -{ { echo "$as_me:41702: error: cannot find under $use_zlib" >&5 -echo "$as_me: error: cannot find under $use_zlib" >&2;} +{ { echo "$as_me:40991: error: cannot find zlib under $use_zlib" >&5 +echo "$as_me: error: cannot find zlib under $use_zlib" >&2;} { (exit 1); exit 1; }; } fi if test -d "$cf_searchpath/lib" ; then @@ -41724,7 +41013,7 @@ if test -n "$cf_searchpath/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:41727: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:41016: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -41753,7 +41042,7 @@ if test -n "$cf_searchpath" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:41756: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:41045: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -41762,12 +41051,16 @@ echo "${as_me:-configure}:41756: testing adding $cf_add_libdir to library-path . fi else -{ { echo "$as_me:41765: error: cannot find under $use_zlib" >&5 -echo "$as_me: error: cannot find under $use_zlib" >&2;} +{ { echo "$as_me:41054: error: cannot find zlib under $use_zlib" >&5 +echo "$as_me: error: cannot find zlib under $use_zlib" >&2;} { (exit 1); exit 1; }; } fi done + test -n "$verbose" && echo " setting path value for zlib to $use_zlib" 1>&6 + +echo "${as_me:-configure}:41062: testing setting path value for zlib to $use_zlib ..." 1>&5 + ;; esac @@ -41776,12 +41069,12 @@ esac cf_cv_header_path_z= cf_cv_library_path_z= -echo "${as_me:-configure}:41779: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5 +echo "${as_me:-configure}:41072: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5 cf_save_LIBS="$LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 41784 "configure" +#line 41077 "configure" #include "confdefs.h" #include @@ -41797,16 +41090,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:41800: \"$ac_link\"") >&5 +if { (eval echo "$as_me:41093: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:41803: \$? = $ac_status" >&5 + echo "$as_me:41096: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:41806: \"$ac_try\"") >&5 + { (eval echo "$as_me:41099: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:41809: \$? = $ac_status" >&5 + echo "$as_me:41102: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_z=yes @@ -41820,7 +41113,7 @@ cat "conftest.$ac_ext" >&5 LIBS="-lz $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 41823 "configure" +#line 41116 "configure" #include "confdefs.h" #include @@ -41836,16 +41129,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:41839: \"$ac_link\"") >&5 +if { (eval echo "$as_me:41132: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:41842: \$? = $ac_status" >&5 + echo "$as_me:41135: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:41845: \"$ac_try\"") >&5 + { (eval echo "$as_me:41138: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:41848: \$? = $ac_status" >&5 + echo "$as_me:41141: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_z=yes @@ -41862,9 +41155,9 @@ cat "conftest.$ac_ext" >&5 test -n "$verbose" && echo " find linkage for z library" 1>&6 -echo "${as_me:-configure}:41865: testing find linkage for z library ..." 1>&5 +echo "${as_me:-configure}:41158: testing find linkage for z library ..." 1>&5 -echo "${as_me:-configure}:41867: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5 +echo "${as_me:-configure}:41160: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -41955,7 +41248,7 @@ cf_search="$cf_search $cf_header_path_list" if test -d "$cf_cv_header_path_z" ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_z" 1>&6 -echo "${as_me:-configure}:41958: testing ... testing $cf_cv_header_path_z ..." 1>&5 +echo "${as_me:-configure}:41251: testing ... testing $cf_cv_header_path_z ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS" @@ -41963,7 +41256,7 @@ echo "${as_me:-configure}:41958: testing ... testing $cf_cv_header_path_z ..." 1 CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_z" cat >"conftest.$ac_ext" <<_ACEOF -#line 41966 "configure" +#line 41259 "configure" #include "confdefs.h" #include @@ -41979,21 +41272,21 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:41982: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:41275: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:41985: \$? = $ac_status" >&5 + echo "$as_me:41278: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:41988: \"$ac_try\"") >&5 + { (eval echo "$as_me:41281: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:41991: \$? = $ac_status" >&5 + echo "$as_me:41284: \$? = $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}:41996: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5 +echo "${as_me:-configure}:41289: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5 cf_cv_find_linkage_z=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -42011,7 +41304,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_cv_find_linkage_z" = maybe ; then -echo "${as_me:-configure}:42014: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5 +echo "${as_me:-configure}:41307: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -42019,7 +41312,7 @@ echo "${as_me:-configure}:42014: testing Searching for z library in FIND_LINKAGE CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-lz $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 42022 "configure" +#line 41315 "configure" #include "confdefs.h" #include @@ -42035,21 +41328,21 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:42038: \"$ac_link\"") >&5 +if { (eval echo "$as_me:41331: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:42041: \$? = $ac_status" >&5 + echo "$as_me:41334: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:42044: \"$ac_try\"") >&5 + { (eval echo "$as_me:41337: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:42047: \$? = $ac_status" >&5 + echo "$as_me:41340: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then test -n "$verbose" && echo " ... found z library in system" 1>&6 -echo "${as_me:-configure}:42052: testing ... found z library in system ..." 1>&5 +echo "${as_me:-configure}:41345: testing ... found z library in system ..." 1>&5 cf_cv_find_linkage_z=yes else @@ -42130,13 +41423,13 @@ cf_search="$cf_library_path_list $cf_search" if test -d "$cf_cv_library_path_z" ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_z" 1>&6 -echo "${as_me:-configure}:42133: testing ... testing $cf_cv_library_path_z ..." 1>&5 +echo "${as_me:-configure}:41426: 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 42139 "configure" +#line 41432 "configure" #include "confdefs.h" #include @@ -42152,21 +41445,21 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:42155: \"$ac_link\"") >&5 +if { (eval echo "$as_me:41448: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:42158: \$? = $ac_status" >&5 + echo "$as_me:41451: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:42161: \"$ac_try\"") >&5 + { (eval echo "$as_me:41454: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:42164: \$? = $ac_status" >&5 + echo "$as_me:41457: \$? = $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}:42169: testing ... found z library in $cf_cv_library_path_z ..." 1>&5 +echo "${as_me:-configure}:41462: testing ... found z library in $cf_cv_library_path_z ..." 1>&5 cf_cv_find_linkage_z=yes cf_cv_library_file_z="-lz" @@ -42228,7 +41521,7 @@ if test -n "$cf_cv_header_path_z" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 42231 "configure" +#line 41524 "configure" #include "confdefs.h" #include int @@ -42240,16 +41533,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:42243: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:41536: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:42246: \$? = $ac_status" >&5 + echo "$as_me:41539: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:42249: \"$ac_try\"") >&5 + { (eval echo "$as_me:41542: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:42252: \$? = $ac_status" >&5 + echo "$as_me:41545: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -42266,7 +41559,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:42269: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:41562: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -42302,7 +41595,7 @@ if test -n "$cf_cv_library_path_z" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:42305: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:41598: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -42327,7 +41620,7 @@ done LIBS="$cf_add_libs" else -{ echo "$as_me:42330: WARNING: Cannot find z library" >&5 +{ echo "$as_me:41623: WARNING: Cannot find z library" >&5 echo "$as_me: WARNING: Cannot find z library" >&2;} fi @@ -42336,13 +41629,13 @@ for ac_func in \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:42339: checking for $ac_func" >&5 +echo "$as_me:41632: 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 42345 "configure" +#line 41638 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -42373,16 +41666,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:42376: \"$ac_link\"") >&5 +if { (eval echo "$as_me:41669: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:42379: \$? = $ac_status" >&5 + echo "$as_me:41672: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:42382: \"$ac_try\"") >&5 + { (eval echo "$as_me:41675: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:42385: \$? = $ac_status" >&5 + echo "$as_me:41678: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -42392,7 +41685,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:42395: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:41688: 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:41705: checking if you want to use brotli decompression" >&5 echo $ECHO_N "checking if you want to use brotli decompression... $ECHO_C" >&6 # Check whether --with-brotli or --without-brotli was given. @@ -42419,15 +41712,13 @@ if test "${with_brotli+set}" = set; then else use_brotli=yes fi; -echo "$as_me:42422: result: $use_brotli" >&5 +echo "$as_me:41715: result: $use_brotli" >&5 echo "${ECHO_T}$use_brotli" >&6 if test ".$use_brotli" != ".no" ; then case "$use_brotli" in -(no) - ;; -(yes) +(no|yes) ;; (*) @@ -42461,7 +41752,7 @@ if test -n "$cf_searchpath/include" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 42464 "configure" +#line 41755 "configure" #include "confdefs.h" #include int @@ -42473,16 +41764,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:42476: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:41767: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:42479: \$? = $ac_status" >&5 + echo "$as_me:41770: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:42482: \"$ac_try\"") >&5 + { (eval echo "$as_me:41773: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:42485: \$? = $ac_status" >&5 + echo "$as_me:41776: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -42499,7 +41790,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:42502: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:41793: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -42545,7 +41836,7 @@ if test -n "$cf_searchpath/../include" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 42548 "configure" +#line 41839 "configure" #include "confdefs.h" #include int @@ -42557,16 +41848,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:42560: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:41851: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:42563: \$? = $ac_status" >&5 + echo "$as_me:41854: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:42566: \"$ac_try\"") >&5 + { (eval echo "$as_me:41857: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:42569: \$? = $ac_status" >&5 + echo "$as_me:41860: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -42583,7 +41874,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:42586: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:41877: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -42601,8 +41892,8 @@ echo "${as_me:-configure}:42586: testing adding $cf_add_incdir to include-path . fi else -{ { echo "$as_me:42604: error: cannot find under $use_brotli" >&5 -echo "$as_me: error: cannot find under $use_brotli" >&2;} +{ { echo "$as_me:41895: error: cannot find brotli library under $use_brotli" >&5 +echo "$as_me: error: cannot find brotli library under $use_brotli" >&2;} { (exit 1); exit 1; }; } fi if test -d "$cf_searchpath/lib" ; then @@ -42626,7 +41917,7 @@ if test -n "$cf_searchpath/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:42629: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:41920: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -42655,7 +41946,7 @@ if test -n "$cf_searchpath" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:42658: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:41949: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -42664,12 +41955,16 @@ echo "${as_me:-configure}:42658: testing adding $cf_add_libdir to library-path . fi else -{ { echo "$as_me:42667: error: cannot find under $use_brotli" >&5 -echo "$as_me: error: cannot find under $use_brotli" >&2;} +{ { echo "$as_me:41958: error: cannot find brotli library under $use_brotli" >&5 +echo "$as_me: error: cannot find brotli library under $use_brotli" >&2;} { (exit 1); exit 1; }; } fi done + test -n "$verbose" && echo " setting path value for brotli library to $use_brotli" 1>&6 + +echo "${as_me:-configure}:41966: testing setting path value for brotli library to $use_brotli ..." 1>&5 + ;; esac @@ -42678,12 +41973,12 @@ esac cf_cv_header_path_brotlidec= cf_cv_library_path_brotlidec= -echo "${as_me:-configure}:42681: testing Starting FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5 +echo "${as_me:-configure}:41976: testing Starting FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5 cf_save_LIBS="$LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 42686 "configure" +#line 41981 "configure" #include "confdefs.h" #include @@ -42706,16 +42001,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:42709: \"$ac_link\"") >&5 +if { (eval echo "$as_me:42004: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:42712: \$? = $ac_status" >&5 + echo "$as_me:42007: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:42715: \"$ac_try\"") >&5 + { (eval echo "$as_me:42010: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:42718: \$? = $ac_status" >&5 + echo "$as_me:42013: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_brotlidec=yes @@ -42729,7 +42024,7 @@ cat "conftest.$ac_ext" >&5 LIBS="-lbrotlidec $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 42732 "configure" +#line 42027 "configure" #include "confdefs.h" #include @@ -42752,16 +42047,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:42755: \"$ac_link\"") >&5 +if { (eval echo "$as_me:42050: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:42758: \$? = $ac_status" >&5 + echo "$as_me:42053: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:42761: \"$ac_try\"") >&5 + { (eval echo "$as_me:42056: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:42764: \$? = $ac_status" >&5 + echo "$as_me:42059: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_brotlidec=yes @@ -42778,9 +42073,9 @@ cat "conftest.$ac_ext" >&5 test -n "$verbose" && echo " find linkage for brotlidec library" 1>&6 -echo "${as_me:-configure}:42781: testing find linkage for brotlidec library ..." 1>&5 +echo "${as_me:-configure}:42076: testing find linkage for brotlidec library ..." 1>&5 -echo "${as_me:-configure}:42783: testing Searching for headers in FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5 +echo "${as_me:-configure}:42078: testing Searching for headers in FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -42871,7 +42166,7 @@ cf_search="$cf_search $cf_header_path_list" if test -d "$cf_cv_header_path_brotlidec" ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_brotlidec" 1>&6 -echo "${as_me:-configure}:42874: testing ... testing $cf_cv_header_path_brotlidec ..." 1>&5 +echo "${as_me:-configure}:42169: testing ... testing $cf_cv_header_path_brotlidec ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS" @@ -42879,7 +42174,7 @@ echo "${as_me:-configure}:42874: testing ... testing $cf_cv_header_path_brotlide CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_brotlidec" cat >"conftest.$ac_ext" <<_ACEOF -#line 42882 "configure" +#line 42177 "configure" #include "confdefs.h" #include @@ -42902,21 +42197,21 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:42905: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:42200: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:42908: \$? = $ac_status" >&5 + echo "$as_me:42203: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:42911: \"$ac_try\"") >&5 + { (eval echo "$as_me:42206: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:42914: \$? = $ac_status" >&5 + echo "$as_me:42209: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then test -n "$verbose" && echo " ... found brotlidec headers in $cf_cv_header_path_brotlidec" 1>&6 -echo "${as_me:-configure}:42919: testing ... found brotlidec headers in $cf_cv_header_path_brotlidec ..." 1>&5 +echo "${as_me:-configure}:42214: testing ... found brotlidec headers in $cf_cv_header_path_brotlidec ..." 1>&5 cf_cv_find_linkage_brotlidec=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -42934,7 +42229,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_cv_find_linkage_brotlidec" = maybe ; then -echo "${as_me:-configure}:42937: testing Searching for brotlidec library in FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5 +echo "${as_me:-configure}:42232: testing Searching for brotlidec library in FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -42942,7 +42237,7 @@ echo "${as_me:-configure}:42937: testing Searching for brotlidec library in FIND CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-lbrotlidec $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 42945 "configure" +#line 42240 "configure" #include "confdefs.h" #include @@ -42965,21 +42260,21 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:42968: \"$ac_link\"") >&5 +if { (eval echo "$as_me:42263: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:42971: \$? = $ac_status" >&5 + echo "$as_me:42266: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:42974: \"$ac_try\"") >&5 + { (eval echo "$as_me:42269: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:42977: \$? = $ac_status" >&5 + echo "$as_me:42272: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then test -n "$verbose" && echo " ... found brotlidec library in system" 1>&6 -echo "${as_me:-configure}:42982: testing ... found brotlidec library in system ..." 1>&5 +echo "${as_me:-configure}:42277: testing ... found brotlidec library in system ..." 1>&5 cf_cv_find_linkage_brotlidec=yes else @@ -43060,13 +42355,13 @@ cf_search="$cf_library_path_list $cf_search" if test -d "$cf_cv_library_path_brotlidec" ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_brotlidec" 1>&6 -echo "${as_me:-configure}:43063: testing ... testing $cf_cv_library_path_brotlidec ..." 1>&5 +echo "${as_me:-configure}:42358: testing ... testing $cf_cv_library_path_brotlidec ..." 1>&5 CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-lbrotlidec $cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_brotlidec" cat >"conftest.$ac_ext" <<_ACEOF -#line 43069 "configure" +#line 42364 "configure" #include "confdefs.h" #include @@ -43089,21 +42384,21 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:43092: \"$ac_link\"") >&5 +if { (eval echo "$as_me:42387: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:43095: \$? = $ac_status" >&5 + echo "$as_me:42390: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:43098: \"$ac_try\"") >&5 + { (eval echo "$as_me:42393: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:43101: \$? = $ac_status" >&5 + echo "$as_me:42396: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then test -n "$verbose" && echo " ... found brotlidec library in $cf_cv_library_path_brotlidec" 1>&6 -echo "${as_me:-configure}:43106: testing ... found brotlidec library in $cf_cv_library_path_brotlidec ..." 1>&5 +echo "${as_me:-configure}:42401: testing ... found brotlidec library in $cf_cv_library_path_brotlidec ..." 1>&5 cf_cv_find_linkage_brotlidec=yes cf_cv_library_file_brotlidec="-lbrotlidec" @@ -43165,7 +42460,7 @@ if test -n "$cf_cv_header_path_brotlidec" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 43168 "configure" +#line 42463 "configure" #include "confdefs.h" #include int @@ -43177,16 +42472,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:43180: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:42475: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:43183: \$? = $ac_status" >&5 + echo "$as_me:42478: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:43186: \"$ac_try\"") >&5 + { (eval echo "$as_me:42481: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:43189: \$? = $ac_status" >&5 + echo "$as_me:42484: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -43203,7 +42498,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:43206: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:42501: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -43239,7 +42534,7 @@ if test -n "$cf_cv_library_path_brotlidec" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:43242: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:42537: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -43264,7 +42559,7 @@ done LIBS="$cf_add_libs" else -{ echo "$as_me:43267: WARNING: Cannot find brotlidec library" >&5 +{ echo "$as_me:42562: WARNING: Cannot find brotlidec library" >&5 echo "$as_me: WARNING: Cannot find brotlidec library" >&2;} fi @@ -43275,7 +42570,7 @@ EOF fi -echo "$as_me:43278: checking if you want to exclude FINGER code" >&5 +echo "$as_me:42573: 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. @@ -43292,14 +42587,14 @@ else use_finger=no fi; -echo "$as_me:43295: result: $use_finger" >&5 +echo "$as_me:42590: 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:43302: checking if you want to exclude GOPHER code" >&5 +echo "$as_me:42597: 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. @@ -43316,14 +42611,14 @@ else use_gopher=no fi; -echo "$as_me:43319: result: $use_gopher" >&5 +echo "$as_me:42614: 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:43326: checking if you want to exclude NEWS code" >&5 +echo "$as_me:42621: 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. @@ -43340,14 +42635,14 @@ else use_news=no fi; -echo "$as_me:43343: result: $use_news" >&5 +echo "$as_me:42638: 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:43350: checking if you want to exclude FTP code" >&5 +echo "$as_me:42645: 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. @@ -43364,14 +42659,14 @@ else use_ftp=no fi; -echo "$as_me:43367: result: $use_ftp" >&5 +echo "$as_me:42662: result: $use_ftp" >&5 echo "${ECHO_T}$use_ftp" >&6 test "$use_ftp" != "no" && cat >>confdefs.h <<\EOF #define DISABLE_FTP 1 EOF -echo "$as_me:43374: checking if you want to include WAIS code" >&5 +echo "$as_me:42669: checking if you want to include WAIS code" >&5 echo $ECHO_N "checking if you want to include WAIS code... $ECHO_C" >&6 # Check whether --enable-wais or --disable-wais was given. @@ -43388,13 +42683,13 @@ else use_wais=no fi; -echo "$as_me:43391: result: $use_wais" >&5 +echo "$as_me:42686: result: $use_wais" >&5 echo "${ECHO_T}$use_wais" >&6 MAKE_WAIS="#" if test "$use_wais" != "no" then - echo "$as_me:43397: checking for fs_free in -lwais" >&5 + echo "$as_me:42692: checking for fs_free in -lwais" >&5 echo $ECHO_N "checking for fs_free in -lwais... $ECHO_C" >&6 if test "${ac_cv_lib_wais_fs_free+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -43402,7 +42697,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lwais $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 43405 "configure" +#line 42700 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -43421,16 +42716,16 @@ fs_free (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:43424: \"$ac_link\"") >&5 +if { (eval echo "$as_me:42719: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:43427: \$? = $ac_status" >&5 + echo "$as_me:42722: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:43430: \"$ac_try\"") >&5 + { (eval echo "$as_me:42725: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:43433: \$? = $ac_status" >&5 + echo "$as_me:42728: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_wais_fs_free=yes else @@ -43441,18 +42736,18 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:43444: result: $ac_cv_lib_wais_fs_free" >&5 +echo "$as_me:42739: result: $ac_cv_lib_wais_fs_free" >&5 echo "${ECHO_T}$ac_cv_lib_wais_fs_free" >&6 if test "$ac_cv_lib_wais_fs_free" = yes; then -echo "$as_me:43448: checking if -lm needed for math functions" >&5 +echo "$as_me:42743: checking if -lm needed for math functions" >&5 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6 if test "${cf_cv_need_libm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 43455 "configure" +#line 42750 "configure" #include "confdefs.h" #include @@ -43468,16 +42763,16 @@ double x = rand(); printf("result = %g\\n", sin(x)) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:43471: \"$ac_link\"") >&5 +if { (eval echo "$as_me:42766: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:43474: \$? = $ac_status" >&5 + echo "$as_me:42769: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:43477: \"$ac_try\"") >&5 + { (eval echo "$as_me:42772: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:43480: \$? = $ac_status" >&5 + echo "$as_me:42775: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_need_libm=no else @@ -43487,7 +42782,7 @@ cf_cv_need_libm=yes fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:43490: result: $cf_cv_need_libm" >&5 +echo "$as_me:42785: result: $cf_cv_need_libm" >&5 echo "${ECHO_T}$cf_cv_need_libm" >&6 if test "$cf_cv_need_libm" = yes @@ -43495,14 +42790,14 @@ then cf_save_LIBS="$LIBS" LIBS="$LIBS -lm" - echo "$as_me:43498: checking if -lm is available for math functions" >&5 + echo "$as_me:42793: checking if -lm is available for math functions" >&5 echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6 if test "${cf_cv_have_libm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 43505 "configure" +#line 42800 "configure" #include "confdefs.h" #include @@ -43518,16 +42813,16 @@ double x = rand(); printf("result = %g\\n", sin(x)) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:43521: \"$ac_link\"") >&5 +if { (eval echo "$as_me:42816: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:43524: \$? = $ac_status" >&5 + echo "$as_me:42819: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:43527: \"$ac_try\"") >&5 + { (eval echo "$as_me:42822: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:43530: \$? = $ac_status" >&5 + echo "$as_me:42825: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_libm=yes else @@ -43537,7 +42832,7 @@ cf_cv_have_libm=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:43540: result: $cf_cv_have_libm" >&5 +echo "$as_me:42835: result: $cf_cv_have_libm" >&5 echo "${ECHO_T}$cf_cv_have_libm" >&6 LIBS="$cf_save_LIBS" @@ -43593,23 +42888,23 @@ LIBS="$cf_add_libs" for ac_header in wais.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:43596: checking for $ac_header" >&5 +echo "$as_me:42891: 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 43602 "configure" +#line 42897 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:43606: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:42901: \"$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:43612: \$? = $ac_status" >&5 + echo "$as_me:42907: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -43628,7 +42923,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:43631: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:42926: 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:42939: WARNING: could not find WAIS library" >&5 echo "$as_me: WARNING: could not find WAIS library" >&2;} fi @@ -43649,7 +42944,7 @@ fi # All DirEd functions that were enabled on compilation can be disabled # or modified at run time via DIRED_MENU symbols in lynx.cfg. -echo "$as_me:43652: checking if directory-editor code should be used" >&5 +echo "$as_me:42947: 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. @@ -43666,7 +42961,7 @@ else use_dired=yes fi; -echo "$as_me:43669: result: $use_dired" >&5 +echo "$as_me:42964: result: $use_dired" >&5 echo "${ECHO_T}$use_dired" >&6 if test ".$use_dired" != ".no" ; then @@ -43676,7 +42971,7 @@ cat >>confdefs.h <<\EOF #define DIRED_SUPPORT 1 EOF - echo "$as_me:43679: checking if you wish to allow extracting from archives via DirEd" >&5 + echo "$as_me:42974: 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. @@ -43693,10 +42988,10 @@ EOF else enableval=yes fi; - echo "$as_me:43696: result: $enableval" >&5 + echo "$as_me:42991: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 - echo "$as_me:43699: checking if DirEd mode should override keys" >&5 + echo "$as_me:42994: 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. @@ -43720,10 +43015,10 @@ cat >>confdefs.h <<\EOF EOF fi; - echo "$as_me:43723: result: $enableval" >&5 + echo "$as_me:43018: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 - echo "$as_me:43726: checking if you wish to allow permissions commands via DirEd" >&5 + echo "$as_me:43021: 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. @@ -43747,10 +43042,10 @@ cat >>confdefs.h <<\EOF EOF fi; - echo "$as_me:43750: result: $enableval" >&5 + echo "$as_me:43045: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 - echo "$as_me:43753: checking if you wish to allow executable-permission commands via DirEd" >&5 + echo "$as_me:43048: 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. @@ -43767,10 +43062,10 @@ EOF else enableval=yes fi; - echo "$as_me:43770: result: $enableval" >&5 + echo "$as_me:43065: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 - echo "$as_me:43773: checking if you wish to allow \"tar\" commands from DirEd" >&5 + echo "$as_me:43068: 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. @@ -43794,10 +43089,10 @@ cat >>confdefs.h <<\EOF EOF fi; - echo "$as_me:43797: result: $enableval" >&5 + echo "$as_me:43092: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 - echo "$as_me:43800: checking if you wish to allow \"uudecode\" commands from DirEd" >&5 + echo "$as_me:43095: 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. @@ -43821,10 +43116,10 @@ cat >>confdefs.h <<\EOF EOF fi; - echo "$as_me:43824: result: $enableval" >&5 + echo "$as_me:43119: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 - echo "$as_me:43827: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5 + echo "$as_me:43122: 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. @@ -43848,10 +43143,10 @@ cat >>confdefs.h <<\EOF EOF fi; - echo "$as_me:43851: result: $enableval" >&5 + echo "$as_me:43146: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 - echo "$as_me:43854: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5 + echo "$as_me:43149: 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. @@ -43875,11 +43170,11 @@ cat >>confdefs.h <<\EOF EOF fi; - echo "$as_me:43878: result: $enableval" >&5 + echo "$as_me:43173: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 fi -echo "$as_me:43882: checking if you want long-directory listings" >&5 +echo "$as_me:43177: 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. @@ -43903,10 +43198,10 @@ cat >>confdefs.h <<\EOF EOF fi; -echo "$as_me:43906: result: $enableval" >&5 +echo "$as_me:43201: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 -echo "$as_me:43909: checking if parent-directory references are permitted" >&5 +echo "$as_me:43204: 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. @@ -43923,7 +43218,7 @@ EOF else enableval=yes fi; -echo "$as_me:43926: result: $enableval" >&5 +echo "$as_me:43221: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 test -z "$TELNET" && TELNET="telnet" @@ -43931,7 +43226,7 @@ for ac_prog in $TELNET telnet do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:43934: checking for $ac_word" >&5 +echo "$as_me:43229: 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 @@ -43948,7 +43243,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_TELNET="$ac_dir/$ac_word" - echo "$as_me:43951: found $ac_dir/$ac_word" >&5 + echo "$as_me:43246: found $ac_dir/$ac_word" >&5 break fi done @@ -43959,10 +43254,10 @@ fi TELNET=$ac_cv_path_TELNET if test -n "$TELNET"; then - echo "$as_me:43962: result: $TELNET" >&5 + echo "$as_me:43257: result: $TELNET" >&5 echo "${ECHO_T}$TELNET" >&6 else - echo "$as_me:43965: result: no" >&5 + echo "$as_me:43260: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -44021,7 +43316,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "${as_me:-configure}:44024: testing defining path for ${cf_path_prog} ..." 1>&5 +echo "${as_me:-configure}:43319: testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <&5 +echo "$as_me:43337: 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 @@ -44056,7 +43351,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_TN3270="$ac_dir/$ac_word" - echo "$as_me:44059: found $ac_dir/$ac_word" >&5 + echo "$as_me:43354: found $ac_dir/$ac_word" >&5 break fi done @@ -44067,10 +43362,10 @@ fi TN3270=$ac_cv_path_TN3270 if test -n "$TN3270"; then - echo "$as_me:44070: result: $TN3270" >&5 + echo "$as_me:43365: result: $TN3270" >&5 echo "${ECHO_T}$TN3270" >&6 else - echo "$as_me:44073: result: no" >&5 + echo "$as_me:43368: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -44129,7 +43424,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "${as_me:-configure}:44132: testing defining path for ${cf_path_prog} ..." 1>&5 +echo "${as_me:-configure}:43427: testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <&5 +echo "$as_me:43445: 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 @@ -44164,7 +43459,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_RLOGIN="$ac_dir/$ac_word" - echo "$as_me:44167: found $ac_dir/$ac_word" >&5 + echo "$as_me:43462: found $ac_dir/$ac_word" >&5 break fi done @@ -44175,10 +43470,10 @@ fi RLOGIN=$ac_cv_path_RLOGIN if test -n "$RLOGIN"; then - echo "$as_me:44178: result: $RLOGIN" >&5 + echo "$as_me:43473: result: $RLOGIN" >&5 echo "${ECHO_T}$RLOGIN" >&6 else - echo "$as_me:44181: result: no" >&5 + echo "$as_me:43476: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -44237,7 +43532,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "${as_me:-configure}:44240: testing defining path for ${cf_path_prog} ..." 1>&5 +echo "${as_me:-configure}:43535: testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <&5 +echo "$as_me:43553: 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 @@ -44272,7 +43567,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_MV="$ac_dir/$ac_word" - echo "$as_me:44275: found $ac_dir/$ac_word" >&5 + echo "$as_me:43570: found $ac_dir/$ac_word" >&5 break fi done @@ -44283,10 +43578,10 @@ fi MV=$ac_cv_path_MV if test -n "$MV"; then - echo "$as_me:44286: result: $MV" >&5 + echo "$as_me:43581: result: $MV" >&5 echo "${ECHO_T}$MV" >&6 else - echo "$as_me:44289: result: no" >&5 + echo "$as_me:43584: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -44345,7 +43640,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "${as_me:-configure}:44348: testing defining path for ${cf_path_prog} ..." 1>&5 +echo "${as_me:-configure}:43643: testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <&5 +echo "$as_me:43661: 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 @@ -44380,7 +43675,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_GZIP="$ac_dir/$ac_word" - echo "$as_me:44383: found $ac_dir/$ac_word" >&5 + echo "$as_me:43678: found $ac_dir/$ac_word" >&5 break fi done @@ -44391,10 +43686,10 @@ fi GZIP=$ac_cv_path_GZIP if test -n "$GZIP"; then - echo "$as_me:44394: result: $GZIP" >&5 + echo "$as_me:43689: result: $GZIP" >&5 echo "${ECHO_T}$GZIP" >&6 else - echo "$as_me:44397: result: no" >&5 + echo "$as_me:43692: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -44453,7 +43748,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "${as_me:-configure}:44456: testing defining path for ${cf_path_prog} ..." 1>&5 +echo "${as_me:-configure}:43751: testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <&5 +echo "$as_me:43769: 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 @@ -44488,7 +43783,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_UNCOMPRESS="$ac_dir/$ac_word" - echo "$as_me:44491: found $ac_dir/$ac_word" >&5 + echo "$as_me:43786: found $ac_dir/$ac_word" >&5 break fi done @@ -44499,10 +43794,10 @@ fi UNCOMPRESS=$ac_cv_path_UNCOMPRESS if test -n "$UNCOMPRESS"; then - echo "$as_me:44502: result: $UNCOMPRESS" >&5 + echo "$as_me:43797: result: $UNCOMPRESS" >&5 echo "${ECHO_T}$UNCOMPRESS" >&6 else - echo "$as_me:44505: result: no" >&5 + echo "$as_me:43800: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -44561,7 +43856,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "${as_me:-configure}:44564: testing defining path for ${cf_path_prog} ..." 1>&5 +echo "${as_me:-configure}:43859: testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <&5 +echo "$as_me:43877: 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 @@ -44596,7 +43891,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_UNZIP="$ac_dir/$ac_word" - echo "$as_me:44599: found $ac_dir/$ac_word" >&5 + echo "$as_me:43894: found $ac_dir/$ac_word" >&5 break fi done @@ -44607,10 +43902,10 @@ fi UNZIP=$ac_cv_path_UNZIP if test -n "$UNZIP"; then - echo "$as_me:44610: result: $UNZIP" >&5 + echo "$as_me:43905: result: $UNZIP" >&5 echo "${ECHO_T}$UNZIP" >&6 else - echo "$as_me:44613: result: no" >&5 + echo "$as_me:43908: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -44669,7 +43964,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "${as_me:-configure}:44672: testing defining path for ${cf_path_prog} ..." 1>&5 +echo "${as_me:-configure}:43967: testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <&5 +echo "$as_me:43985: 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 @@ -44704,7 +43999,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_BZIP2="$ac_dir/$ac_word" - echo "$as_me:44707: found $ac_dir/$ac_word" >&5 + echo "$as_me:44002: found $ac_dir/$ac_word" >&5 break fi done @@ -44715,10 +44010,10 @@ fi BZIP2=$ac_cv_path_BZIP2 if test -n "$BZIP2"; then - echo "$as_me:44718: result: $BZIP2" >&5 + echo "$as_me:44013: result: $BZIP2" >&5 echo "${ECHO_T}$BZIP2" >&6 else - echo "$as_me:44721: result: no" >&5 + echo "$as_me:44016: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -44777,7 +44072,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "${as_me:-configure}:44780: testing defining path for ${cf_path_prog} ..." 1>&5 +echo "${as_me:-configure}:44075: testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <&5 +echo "$as_me:44093: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_BROTLI+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -44812,7 +44107,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_BROTLI="$ac_dir/$ac_word" - echo "$as_me:44815: found $ac_dir/$ac_word" >&5 + echo "$as_me:44110: found $ac_dir/$ac_word" >&5 break fi done @@ -44823,10 +44118,10 @@ fi BROTLI=$ac_cv_path_BROTLI if test -n "$BROTLI"; then - echo "$as_me:44826: result: $BROTLI" >&5 + echo "$as_me:44121: result: $BROTLI" >&5 echo "${ECHO_T}$BROTLI" >&6 else - echo "$as_me:44829: result: no" >&5 + echo "$as_me:44124: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -44885,7 +44180,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "${as_me:-configure}:44888: testing defining path for ${cf_path_prog} ..." 1>&5 +echo "${as_me:-configure}:44183: testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <&5 +echo "$as_me:44201: 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 @@ -44920,7 +44215,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_TAR="$ac_dir/$ac_word" - echo "$as_me:44923: found $ac_dir/$ac_word" >&5 + echo "$as_me:44218: found $ac_dir/$ac_word" >&5 break fi done @@ -44931,10 +44226,10 @@ fi TAR=$ac_cv_path_TAR if test -n "$TAR"; then - echo "$as_me:44934: result: $TAR" >&5 + echo "$as_me:44229: result: $TAR" >&5 echo "${ECHO_T}$TAR" >&6 else - echo "$as_me:44937: result: no" >&5 + echo "$as_me:44232: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -44993,7 +44288,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "${as_me:-configure}:44996: testing defining path for ${cf_path_prog} ..." 1>&5 +echo "${as_me:-configure}:44291: testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <&5 +echo "$as_me:44349: 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 @@ -45068,7 +44363,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_COMPRESS="$ac_dir/$ac_word" - echo "$as_me:45071: found $ac_dir/$ac_word" >&5 + echo "$as_me:44366: found $ac_dir/$ac_word" >&5 break fi done @@ -45079,10 +44374,10 @@ fi COMPRESS=$ac_cv_path_COMPRESS if test -n "$COMPRESS"; then - echo "$as_me:45082: result: $COMPRESS" >&5 + echo "$as_me:44377: result: $COMPRESS" >&5 echo "${ECHO_T}$COMPRESS" >&6 else - echo "$as_me:45085: result: no" >&5 + echo "$as_me:44380: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -45141,7 +44436,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "${as_me:-configure}:45144: testing defining path for ${cf_path_prog} ..." 1>&5 +echo "${as_me:-configure}:44439: testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <&5 +echo "$as_me:44457: 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 @@ -45176,7 +44471,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_RM="$ac_dir/$ac_word" - echo "$as_me:45179: found $ac_dir/$ac_word" >&5 + echo "$as_me:44474: found $ac_dir/$ac_word" >&5 break fi done @@ -45187,10 +44482,10 @@ fi RM=$ac_cv_path_RM if test -n "$RM"; then - echo "$as_me:45190: result: $RM" >&5 + echo "$as_me:44485: result: $RM" >&5 echo "${ECHO_T}$RM" >&6 else - echo "$as_me:45193: result: no" >&5 + echo "$as_me:44488: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -45249,7 +44544,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "${as_me:-configure}:45252: testing defining path for ${cf_path_prog} ..." 1>&5 +echo "${as_me:-configure}:44547: testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <&5 +echo "$as_me:44565: 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 @@ -45284,7 +44579,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_UUDECODE="$ac_dir/$ac_word" - echo "$as_me:45287: found $ac_dir/$ac_word" >&5 + echo "$as_me:44582: found $ac_dir/$ac_word" >&5 break fi done @@ -45295,10 +44590,10 @@ fi UUDECODE=$ac_cv_path_UUDECODE if test -n "$UUDECODE"; then - echo "$as_me:45298: result: $UUDECODE" >&5 + echo "$as_me:44593: result: $UUDECODE" >&5 echo "${ECHO_T}$UUDECODE" >&6 else - echo "$as_me:45301: result: no" >&5 + echo "$as_me:44596: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -45357,7 +44652,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "${as_me:-configure}:45360: testing defining path for ${cf_path_prog} ..." 1>&5 +echo "${as_me:-configure}:44655: testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <&5 +echo "$as_me:44673: 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 @@ -45392,7 +44687,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_ZCAT="$ac_dir/$ac_word" - echo "$as_me:45395: found $ac_dir/$ac_word" >&5 + echo "$as_me:44690: found $ac_dir/$ac_word" >&5 break fi done @@ -45403,10 +44698,10 @@ fi ZCAT=$ac_cv_path_ZCAT if test -n "$ZCAT"; then - echo "$as_me:45406: result: $ZCAT" >&5 + echo "$as_me:44701: result: $ZCAT" >&5 echo "${ECHO_T}$ZCAT" >&6 else - echo "$as_me:45409: result: no" >&5 + echo "$as_me:44704: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -45465,7 +44760,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "${as_me:-configure}:45468: testing defining path for ${cf_path_prog} ..." 1>&5 +echo "${as_me:-configure}:44763: testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <&5 +echo "$as_me:44781: 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 @@ -45500,7 +44795,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_ZIP="$ac_dir/$ac_word" - echo "$as_me:45503: found $ac_dir/$ac_word" >&5 + echo "$as_me:44798: found $ac_dir/$ac_word" >&5 break fi done @@ -45511,10 +44806,10 @@ fi ZIP=$ac_cv_path_ZIP if test -n "$ZIP"; then - echo "$as_me:45514: result: $ZIP" >&5 + echo "$as_me:44809: result: $ZIP" >&5 echo "${ECHO_T}$ZIP" >&6 else - echo "$as_me:45517: result: no" >&5 + echo "$as_me:44812: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -45573,7 +44868,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "${as_me:-configure}:45576: testing defining path for ${cf_path_prog} ..." 1>&5 +echo "${as_me:-configure}:44871: testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <&5 +echo "$as_me:44899: 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 @@ -45618,7 +44913,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_INSTALL="$ac_dir/$ac_word" - echo "$as_me:45621: found $ac_dir/$ac_word" >&5 + echo "$as_me:44916: found $ac_dir/$ac_word" >&5 break fi done @@ -45629,10 +44924,10 @@ fi INSTALL=$ac_cv_path_INSTALL if test -n "$INSTALL"; then - echo "$as_me:45632: result: $INSTALL" >&5 + echo "$as_me:44927: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 else - echo "$as_me:45635: result: no" >&5 + echo "$as_me:44930: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -45691,7 +44986,7 @@ IFS="$cf_save_ifs" if test -n "$cf_path_prog" ; then -echo "${as_me:-configure}:45694: testing defining path for ${cf_path_prog} ..." 1>&5 +echo "${as_me:-configure}:44989: testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <&5 +echo "$as_me:45019: checking for initscr in -lpdcurses" >&5 echo $ECHO_N "checking for initscr in -lpdcurses... $ECHO_C" >&6 if test "${ac_cv_lib_pdcurses_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -45729,7 +45024,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lpdcurses $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 45732 "configure" +#line 45027 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -45748,16 +45043,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:45751: \"$ac_link\"") >&5 +if { (eval echo "$as_me:45046: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:45754: \$? = $ac_status" >&5 + echo "$as_me:45049: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:45757: \"$ac_try\"") >&5 + { (eval echo "$as_me:45052: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:45760: \$? = $ac_status" >&5 + echo "$as_me:45055: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_pdcurses_initscr=yes else @@ -45768,7 +45063,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:45771: result: $ac_cv_lib_pdcurses_initscr" >&5 +echo "$as_me:45066: result: $ac_cv_lib_pdcurses_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_pdcurses_initscr" >&6 if test "$ac_cv_lib_pdcurses_initscr" = yes; then @@ -45790,13 +45085,13 @@ LIBS="$cf_add_libs" cf_cv_term_header=no cf_cv_unctrl_header=no - echo "$as_me:45793: checking for winwstr" >&5 + echo "$as_me:45088: checking for winwstr" >&5 echo $ECHO_N "checking for winwstr... $ECHO_C" >&6 if test "${ac_cv_func_winwstr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 45799 "configure" +#line 45094 "configure" #include "confdefs.h" #define winwstr autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -45827,16 +45122,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:45830: \"$ac_link\"") >&5 +if { (eval echo "$as_me:45125: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:45833: \$? = $ac_status" >&5 + echo "$as_me:45128: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:45836: \"$ac_try\"") >&5 + { (eval echo "$as_me:45131: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:45839: \$? = $ac_status" >&5 + echo "$as_me:45134: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_winwstr=yes else @@ -45846,7 +45141,7 @@ ac_cv_func_winwstr=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:45849: result: $ac_cv_func_winwstr" >&5 +echo "$as_me:45144: result: $ac_cv_func_winwstr" >&5 echo "${ECHO_T}$ac_cv_func_winwstr" >&6 if test "$ac_cv_func_winwstr" = yes; then @@ -45856,13 +45151,13 @@ EOF fi - echo "$as_me:45859: checking for pdcurses_dll_iname" >&5 + echo "$as_me:45154: checking for pdcurses_dll_iname" >&5 echo $ECHO_N "checking for pdcurses_dll_iname... $ECHO_C" >&6 if test "${ac_cv_func_pdcurses_dll_iname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 45865 "configure" +#line 45160 "configure" #include "confdefs.h" #define pdcurses_dll_iname autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -45893,16 +45188,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:45896: \"$ac_link\"") >&5 +if { (eval echo "$as_me:45191: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:45899: \$? = $ac_status" >&5 + echo "$as_me:45194: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:45902: \"$ac_try\"") >&5 + { (eval echo "$as_me:45197: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:45905: \$? = $ac_status" >&5 + echo "$as_me:45200: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_pdcurses_dll_iname=yes else @@ -45912,7 +45207,7 @@ ac_cv_func_pdcurses_dll_iname=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:45915: result: $ac_cv_func_pdcurses_dll_iname" >&5 +echo "$as_me:45210: result: $ac_cv_func_pdcurses_dll_iname" >&5 echo "${ECHO_T}$ac_cv_func_pdcurses_dll_iname" >&6 if test "$ac_cv_func_pdcurses_dll_iname" = yes; then @@ -45929,7 +45224,7 @@ fi cf_x_athena=${cf_x_athena:-Xaw} -echo "$as_me:45932: checking if you want to link with Xaw 3d library" >&5 +echo "$as_me:45227: 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= @@ -45940,14 +45235,14 @@ if test "${with_Xaw3d+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=Xaw3d - echo "$as_me:45943: result: yes" >&5 + echo "$as_me:45238: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:45946: result: no" >&5 + echo "$as_me:45241: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:45950: checking if you want to link with Xaw 3d xft library" >&5 +echo "$as_me:45245: checking if you want to link with Xaw 3d xft library" >&5 echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6 withval= @@ -45958,14 +45253,14 @@ if test "${with_Xaw3dxft+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=Xaw3dxft - echo "$as_me:45961: result: yes" >&5 + echo "$as_me:45256: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:45964: result: no" >&5 + echo "$as_me:45259: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:45968: checking if you want to link with neXT Athena library" >&5 +echo "$as_me:45263: 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= @@ -45976,14 +45271,14 @@ if test "${with_neXtaw+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=neXtaw - echo "$as_me:45979: result: yes" >&5 + echo "$as_me:45274: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:45982: result: no" >&5 + echo "$as_me:45277: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:45986: checking if you want to link with Athena-Plus library" >&5 +echo "$as_me:45281: 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= @@ -45994,10 +45289,10 @@ if test "${with_XawPlus+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=XawPlus - echo "$as_me:45997: result: yes" >&5 + echo "$as_me:45292: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:46000: result: no" >&5 + echo "$as_me:45295: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -46017,17 +45312,17 @@ if test "$PKG_CONFIG" != none ; then if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_athena_pkg"; then test -n "$verbose" && echo " found package $cf_athena_pkg" 1>&6 -echo "${as_me:-configure}:46020: testing found package $cf_athena_pkg ..." 1>&5 +echo "${as_me:-configure}:45315: testing found package $cf_athena_pkg ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_athena_pkg" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "$cf_athena_pkg" 2>/dev/null`" test -n "$verbose" && echo " package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:46026: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:45321: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:46030: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:45325: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -46158,20 +45453,20 @@ EOF LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'` test -n "$verbose" && echo " ..trimmed $LIBS" 1>&6 -echo "${as_me:-configure}:46161: testing ..trimmed $LIBS ..." 1>&5 +echo "${as_me:-configure}:45456: testing ..trimmed $LIBS ..." 1>&5 ;; esac done -echo "$as_me:46167: checking for usable $cf_x_athena/Xmu package" >&5 +echo "$as_me:45462: checking for usable $cf_x_athena/Xmu package" >&5 echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6 if test "${cf_cv_xaw_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 46174 "configure" +#line 45469 "configure" #include "confdefs.h" $ac_includes_default @@ -46189,16 +45484,16 @@ int check = XmuCompareISOLatin1("big", "small"); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:46192: \"$ac_link\"") >&5 +if { (eval echo "$as_me:45487: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:46195: \$? = $ac_status" >&5 + echo "$as_me:45490: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:46198: \"$ac_try\"") >&5 + { (eval echo "$as_me:45493: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:46201: \$? = $ac_status" >&5 + echo "$as_me:45496: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xaw_compat=yes else @@ -46208,7 +45503,7 @@ cf_cv_xaw_compat=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:46211: result: $cf_cv_xaw_compat" >&5 +echo "$as_me:45506: result: $cf_cv_xaw_compat" >&5 echo "${ECHO_T}$cf_cv_xaw_compat" >&6 if test "$cf_cv_xaw_compat" = no @@ -46220,7 +45515,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6 (*) test -n "$verbose" && echo " work around broken package" 1>&6 -echo "${as_me:-configure}:46223: testing work around broken package ..." 1>&5 +echo "${as_me:-configure}:45518: testing work around broken package ..." 1>&5 cf_save_xmu="$LIBS" cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^ *//' -e 's/ .*//'` @@ -46228,17 +45523,17 @@ echo "${as_me:-configure}:46223: testing work around broken package ..." 1>&5 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then test -n "$verbose" && echo " found package xmu" 1>&6 -echo "${as_me:-configure}:46231: testing found package xmu ..." 1>&5 +echo "${as_me:-configure}:45526: testing found package xmu ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xmu" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "xmu" 2>/dev/null`" test -n "$verbose" && echo " package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:46237: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:45532: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xmu LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:46241: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:45536: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -46358,12 +45653,12 @@ LIBS="$cf_add_libs" test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:46361: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:45656: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:46366: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:45661: testing ...after $LIBS ..." 1>&5 else cf_pkgconfig_incs= @@ -46371,12 +45666,12 @@ else test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:46374: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:45669: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:46379: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:45674: testing ...after $LIBS ..." 1>&5 fi @@ -46387,7 +45682,7 @@ fi LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'` test -n "$verbose" && echo " ..trimmed $LIBS" 1>&6 -echo "${as_me:-configure}:46390: testing ..trimmed $LIBS ..." 1>&5 +echo "${as_me:-configure}:45685: testing ..trimmed $LIBS ..." 1>&5 ;; esac @@ -46412,17 +45707,17 @@ if test -z "$cf_x_athena_lib" ; then if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then test -n "$verbose" && echo " found package Xext" 1>&6 -echo "${as_me:-configure}:46415: testing found package Xext ..." 1>&5 +echo "${as_me:-configure}:45710: testing found package Xext ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "Xext" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "Xext" 2>/dev/null`" test -n "$verbose" && echo " package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:46421: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:45716: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package Xext LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:46425: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:45720: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -46543,7 +45838,7 @@ else cf_pkgconfig_incs= cf_pkgconfig_libs= - echo "$as_me:46546: checking for XextCreateExtension in -lXext" >&5 + echo "$as_me:45841: 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 @@ -46551,7 +45846,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lXext $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 46554 "configure" +#line 45849 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -46570,16 +45865,16 @@ XextCreateExtension (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:46573: \"$ac_link\"") >&5 +if { (eval echo "$as_me:45868: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:46576: \$? = $ac_status" >&5 + echo "$as_me:45871: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:46579: \"$ac_try\"") >&5 + { (eval echo "$as_me:45874: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:46582: \$? = $ac_status" >&5 + echo "$as_me:45877: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_Xext_XextCreateExtension=yes else @@ -46590,7 +45885,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:46593: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 +echo "$as_me:45888: 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 @@ -46626,17 +45921,17 @@ then if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then test -n "$verbose" && echo " found package x11" 1>&6 -echo "${as_me:-configure}:46629: testing found package x11 ..." 1>&5 +echo "${as_me:-configure}:45924: testing found package x11 ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "x11" 2>/dev/null`" test -n "$verbose" && echo " package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:46635: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:45930: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package x11 LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:46639: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:45934: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -46756,24 +46051,24 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:46759: WARNING: unable to find X11 library" >&5 + { echo "$as_me:46054: WARNING: unable to find X11 library" >&5 echo "$as_me: WARNING: unable to find X11 library" >&2;} fi if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then test -n "$verbose" && echo " found package ice" 1>&6 -echo "${as_me:-configure}:46766: testing found package ice ..." 1>&5 +echo "${as_me:-configure}:46061: testing found package ice ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "ice" 2>/dev/null`" test -n "$verbose" && echo " package ice CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:46772: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:46067: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package ice LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:46776: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:46071: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -46893,24 +46188,24 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:46896: WARNING: unable to find ICE library" >&5 + { echo "$as_me:46191: WARNING: unable to find ICE library" >&5 echo "$as_me: WARNING: unable to find ICE library" >&2;} fi if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then test -n "$verbose" && echo " found package sm" 1>&6 -echo "${as_me:-configure}:46903: testing found package sm ..." 1>&5 +echo "${as_me:-configure}:46198: testing found package sm ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "sm" 2>/dev/null`" test -n "$verbose" && echo " package sm CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:46909: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:46204: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package sm LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:46913: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:46208: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -47030,24 +46325,24 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:47033: WARNING: unable to find SM library" >&5 + { echo "$as_me:46328: WARNING: unable to find SM library" >&5 echo "$as_me: WARNING: unable to find SM library" >&2;} fi if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then test -n "$verbose" && echo " found package xt" 1>&6 -echo "${as_me:-configure}:47040: testing found package xt ..." 1>&5 +echo "${as_me:-configure}:46335: testing found package xt ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xt" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "xt" 2>/dev/null`" test -n "$verbose" && echo " package xt CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:47046: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:46341: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xt LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:47050: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:46345: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -47167,7 +46462,7 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:47170: WARNING: unable to find Xt library" >&5 + { echo "$as_me:46465: WARNING: unable to find Xt library" >&5 echo "$as_me: WARNING: unable to find Xt library" >&2;} fi @@ -47180,17 +46475,17 @@ cf_have_X_LIBS=no if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then test -n "$verbose" && echo " found package xt" 1>&6 -echo "${as_me:-configure}:47183: testing found package xt ..." 1>&5 +echo "${as_me:-configure}:46478: testing found package xt ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xt" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "xt" 2>/dev/null`" test -n "$verbose" && echo " package xt CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:47189: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:46484: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xt LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:47193: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:46488: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -47311,14 +46606,14 @@ LIBS="$cf_add_libs" ;; (*) # we have an "xt" package, but it may omit Xt's dependency on X11 -echo "$as_me:47314: checking for usable X dependency" >&5 +echo "$as_me:46609: checking for usable X dependency" >&5 echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6 if test "${cf_cv_xt_x11_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 47321 "configure" +#line 46616 "configure" #include "confdefs.h" $ac_includes_default @@ -47338,16 +46633,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:47341: \"$ac_link\"") >&5 +if { (eval echo "$as_me:46636: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:47344: \$? = $ac_status" >&5 + echo "$as_me:46639: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:47347: \"$ac_try\"") >&5 + { (eval echo "$as_me:46642: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:47350: \$? = $ac_status" >&5 + echo "$as_me:46645: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xt_x11_compat=yes else @@ -47357,30 +46652,30 @@ cf_cv_xt_x11_compat=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:47360: result: $cf_cv_xt_x11_compat" >&5 +echo "$as_me:46655: result: $cf_cv_xt_x11_compat" >&5 echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6 if test "$cf_cv_xt_x11_compat" = no then test -n "$verbose" && echo " work around broken X11 dependency" 1>&6 -echo "${as_me:-configure}:47366: testing work around broken X11 dependency ..." 1>&5 +echo "${as_me:-configure}:46661: testing work around broken X11 dependency ..." 1>&5 # 2010/11/19 - good enough until a working Xt on Xcb is delivered. if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then test -n "$verbose" && echo " found package x11" 1>&6 -echo "${as_me:-configure}:47373: testing found package x11 ..." 1>&5 +echo "${as_me:-configure}:46668: testing found package x11 ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "x11" 2>/dev/null`" test -n "$verbose" && echo " package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:47379: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:46674: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package x11 LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:47383: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:46678: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -47503,12 +46798,12 @@ else test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:47506: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:46801: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:47511: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:46806: testing ...after $LIBS ..." 1>&5 fi @@ -47516,14 +46811,14 @@ fi ;; esac -echo "$as_me:47519: checking for usable X Toolkit package" >&5 +echo "$as_me:46814: checking for usable X Toolkit package" >&5 echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6 if test "${cf_cv_xt_ice_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 47526 "configure" +#line 46821 "configure" #include "confdefs.h" $ac_includes_default @@ -47539,16 +46834,16 @@ int num = IceConnectionNumber(0); (void) num } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:47542: \"$ac_link\"") >&5 +if { (eval echo "$as_me:46837: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:47545: \$? = $ac_status" >&5 + echo "$as_me:46840: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:47548: \"$ac_try\"") >&5 + { (eval echo "$as_me:46843: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:47551: \$? = $ac_status" >&5 + echo "$as_me:46846: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xt_ice_compat=yes else @@ -47558,7 +46853,7 @@ cf_cv_xt_ice_compat=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:47561: result: $cf_cv_xt_ice_compat" >&5 +echo "$as_me:46856: result: $cf_cv_xt_ice_compat" >&5 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6 if test "$cf_cv_xt_ice_compat" = no @@ -47572,22 +46867,22 @@ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6 (*) test -n "$verbose" && echo " work around broken ICE dependency" 1>&6 -echo "${as_me:-configure}:47575: testing work around broken ICE dependency ..." 1>&5 +echo "${as_me:-configure}:46870: testing work around broken ICE dependency ..." 1>&5 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then test -n "$verbose" && echo " found package ice" 1>&6 -echo "${as_me:-configure}:47580: testing found package ice ..." 1>&5 +echo "${as_me:-configure}:46875: testing found package ice ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "ice" 2>/dev/null`" test -n "$verbose" && echo " package ice CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:47586: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:46881: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package ice LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:47590: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:46885: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -47706,17 +47001,17 @@ LIBS="$cf_add_libs" if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then test -n "$verbose" && echo " found package sm" 1>&6 -echo "${as_me:-configure}:47709: testing found package sm ..." 1>&5 +echo "${as_me:-configure}:47004: testing found package sm ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "sm" 2>/dev/null`" test -n "$verbose" && echo " package sm CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:47715: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:47010: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package sm LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:47719: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:47014: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -47845,12 +47140,12 @@ else test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:47848: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:47143: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:47853: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:47148: testing ...after $LIBS ..." 1>&5 fi @@ -47870,7 +47165,7 @@ else test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me:-configure}:47873: testing checking additions to CFLAGS ..." 1>&5 +echo "${as_me:-configure}:47168: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" cf_check_cppflags="$CPPFLAGS" @@ -47955,7 +47250,7 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:47958: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:47253: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -47965,7 +47260,7 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:47968: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:47263: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -47975,7 +47270,7 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:47978: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:47273: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" @@ -47984,7 +47279,7 @@ fi if test "x$cf_check_cflags" != "x$CFLAGS" ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 47987 "configure" +#line 47282 "configure" #include "confdefs.h" #include int @@ -47996,16 +47291,16 @@ printf("Hello world"); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:47999: \"$ac_link\"") >&5 +if { (eval echo "$as_me:47294: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:48002: \$? = $ac_status" >&5 + echo "$as_me:47297: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:48005: \"$ac_try\"") >&5 + { (eval echo "$as_me:47300: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:48008: \$? = $ac_status" >&5 + echo "$as_me:47303: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -48013,12 +47308,12 @@ else cat "conftest.$ac_ext" >&5 test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 -echo "${as_me:-configure}:48016: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 +echo "${as_me:-configure}:47311: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 -echo "${as_me:-configure}:48021: testing but keeping change to \$CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:47316: testing but keeping change to \$CPPFLAGS ..." 1>&5 fi CFLAGS="$cf_check_cflags" @@ -48026,13 +47321,13 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi - echo "$as_me:48029: checking for XOpenDisplay" >&5 + echo "$as_me:47324: 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 48035 "configure" +#line 47330 "configure" #include "confdefs.h" #define XOpenDisplay autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -48063,16 +47358,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:48066: \"$ac_link\"") >&5 +if { (eval echo "$as_me:47361: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:48069: \$? = $ac_status" >&5 + echo "$as_me:47364: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:48072: \"$ac_try\"") >&5 + { (eval echo "$as_me:47367: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:48075: \$? = $ac_status" >&5 + echo "$as_me:47370: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_XOpenDisplay=yes else @@ -48082,13 +47377,13 @@ ac_cv_func_XOpenDisplay=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:48085: result: $ac_cv_func_XOpenDisplay" >&5 +echo "$as_me:47380: 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:48091: checking for XOpenDisplay in -lX11" >&5 + echo "$as_me:47386: 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 @@ -48096,7 +47391,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 48099 "configure" +#line 47394 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -48115,16 +47410,16 @@ XOpenDisplay (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:48118: \"$ac_link\"") >&5 +if { (eval echo "$as_me:47413: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:48121: \$? = $ac_status" >&5 + echo "$as_me:47416: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:48124: \"$ac_try\"") >&5 + { (eval echo "$as_me:47419: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:48127: \$? = $ac_status" >&5 + echo "$as_me:47422: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_X11_XOpenDisplay=yes else @@ -48135,7 +47430,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:48138: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "$as_me:47433: 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 @@ -48159,13 +47454,13 @@ fi fi - echo "$as_me:48162: checking for XtAppInitialize" >&5 + echo "$as_me:47457: 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 48168 "configure" +#line 47463 "configure" #include "confdefs.h" #define XtAppInitialize autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -48196,16 +47491,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:48199: \"$ac_link\"") >&5 +if { (eval echo "$as_me:47494: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:48202: \$? = $ac_status" >&5 + echo "$as_me:47497: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:48205: \"$ac_try\"") >&5 + { (eval echo "$as_me:47500: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:48208: \$? = $ac_status" >&5 + echo "$as_me:47503: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_XtAppInitialize=yes else @@ -48215,13 +47510,13 @@ ac_cv_func_XtAppInitialize=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:48218: result: $ac_cv_func_XtAppInitialize" >&5 +echo "$as_me:47513: 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:48224: checking for XtAppInitialize in -lXt" >&5 + echo "$as_me:47519: 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 @@ -48229,7 +47524,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lXt $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 48232 "configure" +#line 47527 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -48248,16 +47543,16 @@ XtAppInitialize (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:48251: \"$ac_link\"") >&5 +if { (eval echo "$as_me:47546: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:48254: \$? = $ac_status" >&5 + echo "$as_me:47549: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:48257: \"$ac_try\"") >&5 + { (eval echo "$as_me:47552: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:48260: \$? = $ac_status" >&5 + echo "$as_me:47555: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_Xt_XtAppInitialize=yes else @@ -48268,7 +47563,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:48271: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 +echo "$as_me:47566: 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 @@ -48285,7 +47580,7 @@ fi fi if test "$cf_have_X_LIBS" = no ; then - { echo "$as_me:48288: WARNING: Unable to successfully link X Toolkit library (-lXt) with + { echo "$as_me:47583: 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 @@ -48326,14 +47621,14 @@ done test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_path/include" - echo "$as_me:48329: checking for $cf_test in $cf_path" >&5 + echo "$as_me:47624: 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:48332: checking for $cf_test" >&5 + echo "$as_me:47627: checking for $cf_test" >&5 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6 fi cat >"conftest.$ac_ext" <<_ACEOF -#line 48336 "configure" +#line 47631 "configure" #include "confdefs.h" #include @@ -48347,16 +47642,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:48350: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:47645: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:48353: \$? = $ac_status" >&5 + echo "$as_me:47648: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:48356: \"$ac_try\"") >&5 + { (eval echo "$as_me:47651: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:48359: \$? = $ac_status" >&5 + echo "$as_me:47654: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -48365,7 +47660,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - echo "$as_me:48368: result: $cf_result" >&5 + echo "$as_me:47663: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS" @@ -48381,7 +47676,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_CPPFLAGS" done if test -z "$cf_x_athena_inc" ; then - { echo "$as_me:48384: WARNING: Unable to find Athena header files" >&5 + { echo "$as_me:47679: WARNING: Unable to find Athena header files" >&5 echo "$as_me: WARNING: Unable to find Athena header files" >&2;} elif test "$cf_x_athena_inc" != default ; then @@ -48446,10 +47741,10 @@ for cf_add_1lib in $cf_add_0lib; do done LIBS="$cf_add_libs" - echo "$as_me:48449: checking for $cf_test in $cf_libs" >&5 + echo "$as_me:47744: checking for $cf_test in $cf_libs" >&5 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 48452 "configure" +#line 47747 "configure" #include "confdefs.h" $ac_includes_default @@ -48466,16 +47761,16 @@ $cf_test((XtAppContext) 0) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:48469: \"$ac_link\"") >&5 +if { (eval echo "$as_me:47764: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:48472: \$? = $ac_status" >&5 + echo "$as_me:47767: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:48475: \"$ac_try\"") >&5 + { (eval echo "$as_me:47770: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:48478: \$? = $ac_status" >&5 + echo "$as_me:47773: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -48484,7 +47779,7 @@ cat "conftest.$ac_ext" >&5 cf_result=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:48487: result: $cf_result" >&5 + echo "$as_me:47782: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS" @@ -48501,7 +47796,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_LIBS" done if test -z "$cf_x_athena_lib" ; then - { { echo "$as_me:48504: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 + { { echo "$as_me:47799: 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 @@ -48535,7 +47830,7 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:48538: checking for $ac_word" >&5 +echo "$as_me:47833: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -48550,7 +47845,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog" -echo "$as_me:48553: found $ac_dir/$ac_word" >&5 +echo "$as_me:47848: found $ac_dir/$ac_word" >&5 break done @@ -48558,10 +47853,10 @@ fi fi XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG if test -n "$XCURSES_CONFIG"; then - echo "$as_me:48561: result: $XCURSES_CONFIG" >&5 + echo "$as_me:47856: result: $XCURSES_CONFIG" >&5 echo "${ECHO_T}$XCURSES_CONFIG" >&6 else - echo "$as_me:48564: result: no" >&5 + echo "$as_me:47859: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -48574,7 +47869,7 @@ if test -z "$XCURSES_CONFIG"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:48577: checking for $ac_word" >&5 +echo "$as_me:47872: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -48589,7 +47884,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog" -echo "$as_me:48592: found $ac_dir/$ac_word" >&5 +echo "$as_me:47887: found $ac_dir/$ac_word" >&5 break done @@ -48597,10 +47892,10 @@ fi fi ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG if test -n "$ac_ct_XCURSES_CONFIG"; then - echo "$as_me:48600: result: $ac_ct_XCURSES_CONFIG" >&5 + echo "$as_me:47895: result: $ac_ct_XCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6 else - echo "$as_me:48603: result: no" >&5 + echo "$as_me:47898: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -48735,7 +48030,7 @@ LDFLAGS="$LDFLAGS $X_LIBS" test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me:-configure}:48738: testing checking additions to CFLAGS ..." 1>&5 +echo "${as_me:-configure}:48033: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" cf_check_cppflags="$CPPFLAGS" @@ -48820,7 +48115,7 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:48823: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:48118: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -48830,7 +48125,7 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:48833: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:48128: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -48840,7 +48135,7 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:48843: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:48138: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" @@ -48849,7 +48144,7 @@ fi if test "x$cf_check_cflags" != "x$CFLAGS" ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 48852 "configure" +#line 48147 "configure" #include "confdefs.h" #include int @@ -48861,16 +48156,16 @@ printf("Hello world"); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:48864: \"$ac_link\"") >&5 +if { (eval echo "$as_me:48159: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:48867: \$? = $ac_status" >&5 + echo "$as_me:48162: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:48870: \"$ac_try\"") >&5 + { (eval echo "$as_me:48165: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:48873: \$? = $ac_status" >&5 + echo "$as_me:48168: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -48878,12 +48173,12 @@ else cat "conftest.$ac_ext" >&5 test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 -echo "${as_me:-configure}:48881: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 +echo "${as_me:-configure}:48176: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 -echo "${as_me:-configure}:48886: testing but keeping change to \$CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:48181: testing but keeping change to \$CPPFLAGS ..." 1>&5 fi CFLAGS="$cf_check_cflags" @@ -48891,7 +48186,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:48894: checking for XOpenDisplay in -lX11" >&5 +echo "$as_me:48189: 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 @@ -48899,7 +48194,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 48902 "configure" +#line 48197 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -48918,16 +48213,16 @@ XOpenDisplay (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:48921: \"$ac_link\"") >&5 +if { (eval echo "$as_me:48216: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:48924: \$? = $ac_status" >&5 + echo "$as_me:48219: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:48927: \"$ac_try\"") >&5 + { (eval echo "$as_me:48222: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:48930: \$? = $ac_status" >&5 + echo "$as_me:48225: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_X11_XOpenDisplay=yes else @@ -48938,7 +48233,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:48941: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "$as_me:48236: 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 @@ -48960,7 +48255,7 @@ LIBS="$cf_add_libs" fi -echo "$as_me:48963: checking for XCurses library" >&5 +echo "$as_me:48258: 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 @@ -48983,7 +48278,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 48986 "configure" +#line 48281 "configure" #include "confdefs.h" #include @@ -48998,16 +48293,16 @@ XCursesExit(); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:49001: \"$ac_link\"") >&5 +if { (eval echo "$as_me:48296: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:49004: \$? = $ac_status" >&5 + echo "$as_me:48299: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:49007: \"$ac_try\"") >&5 + { (eval echo "$as_me:48302: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:49010: \$? = $ac_status" >&5 + echo "$as_me:48305: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_lib_XCurses=yes else @@ -49018,7 +48313,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:49021: result: $cf_cv_lib_XCurses" >&5 +echo "$as_me:48316: result: $cf_cv_lib_XCurses" >&5 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6 fi @@ -49033,23 +48328,23 @@ cat >>confdefs.h <<\EOF #define XCURSES 1 EOF - echo "$as_me:49036: checking for xcurses.h" >&5 + echo "$as_me:48331: checking for xcurses.h" >&5 echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6 if test "${ac_cv_header_xcurses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 49042 "configure" +#line 48337 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:49046: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:48341: \"$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:49052: \$? = $ac_status" >&5 + echo "$as_me:48347: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -49068,7 +48363,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:49071: result: $ac_cv_header_xcurses_h" >&5 +echo "$as_me:48366: result: $ac_cv_header_xcurses_h" >&5 echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6 if test "$ac_cv_header_xcurses_h" = yes; then @@ -49079,7 +48374,7 @@ EOF fi else - { { echo "$as_me:49082: error: Cannot link with XCurses" >&5 + { { echo "$as_me:48377: error: Cannot link with XCurses" >&5 echo "$as_me: error: Cannot link with XCurses" >&2;} { (exit 1); exit 1; }; } fi @@ -49088,7 +48383,7 @@ fi esac else -echo "$as_me:49091: checking if we can include termio.h with curses" >&5 +echo "$as_me:48386: 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 @@ -49098,7 +48393,7 @@ else CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H -I. -I${srcdir:-.} -I${srcdir:-.}/src -I${srcdir:-.}/WWW/Library/Implementation" touch lynx_cfg.h cat >"conftest.$ac_ext" <<_ACEOF -#line 49101 "configure" +#line 48396 "configure" #include "confdefs.h" #include @@ -49112,16 +48407,16 @@ putchar(0x0a) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:49115: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:48410: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:49118: \$? = $ac_status" >&5 + echo "$as_me:48413: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:49121: \"$ac_try\"") >&5 + { (eval echo "$as_me:48416: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:49124: \$? = $ac_status" >&5 + echo "$as_me:48419: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_termio_and_curses=yes else @@ -49134,7 +48429,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" rm -f lynx_cfg.h fi -echo "$as_me:49137: result: $cf_cv_termio_and_curses" >&5 +echo "$as_me:48432: result: $cf_cv_termio_and_curses" >&5 echo "${ECHO_T}$cf_cv_termio_and_curses" >&6 test "$cf_cv_termio_and_curses" = yes && @@ -49151,23 +48446,23 @@ if test "$cf_cv_screen" != slang ; then for ac_header in $cf_cv_screen/term.h term.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:49154: checking for $ac_header" >&5 +echo "$as_me:48449: 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 49160 "configure" +#line 48455 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:49164: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:48459: \"$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:49170: \$? = $ac_status" >&5 + echo "$as_me:48465: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -49186,7 +48481,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:49189: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:48484: 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:48496: 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 @@ -49207,7 +48502,7 @@ else for mapname in acs_map _acs_map do cat >"conftest.$ac_ext" <<_ACEOF -#line 49210 "configure" +#line 48505 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -49221,16 +48516,16 @@ chtype x = ${mapname}['l']; ${mapname}['m'] = 0; (void)x } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:49224: \"$ac_link\"") >&5 +if { (eval echo "$as_me:48519: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:49227: \$? = $ac_status" >&5 + echo "$as_me:48522: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:49230: \"$ac_try\"") >&5 + { (eval echo "$as_me:48525: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:49233: \$? = $ac_status" >&5 + echo "$as_me:48528: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_alt_char_set=$mapname break @@ -49244,21 +48539,21 @@ done fi -echo "$as_me:49247: result: $cf_cv_alt_char_set" >&5 +echo "$as_me:48542: 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:48549: 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 49261 "configure" +#line 48556 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -49276,16 +48571,16 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:49279: \"$ac_link\"") >&5 +if { (eval echo "$as_me:48574: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:49282: \$? = $ac_status" >&5 + echo "$as_me:48577: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:49285: \"$ac_try\"") >&5 + { (eval echo "$as_me:48580: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:49288: \$? = $ac_status" >&5 + echo "$as_me:48583: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_fancy_curses=yes else @@ -49297,14 +48592,14 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:49300: result: $cf_cv_fancy_curses" >&5 +echo "$as_me:48595: 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:49307: checking for function curses_version" >&5 +echo "$as_me:48602: 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 @@ -49314,7 +48609,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_curses_version=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 49317 "configure" +#line 48612 "configure" #include "confdefs.h" $ac_includes_default @@ -49330,15 +48625,15 @@ int main(void) _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:49333: \"$ac_link\"") >&5 +if { (eval echo "$as_me:48628: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:49336: \$? = $ac_status" >&5 + echo "$as_me:48631: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:49338: \"$ac_try\"") >&5 + { (eval echo "$as_me:48633: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:49341: \$? = $ac_status" >&5 + echo "$as_me:48636: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_curses_version=yes @@ -49353,7 +48648,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi rm -f core fi -echo "$as_me:49356: result: $cf_cv_func_curses_version" >&5 +echo "$as_me:48651: 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 @@ -49361,14 +48656,14 @@ cat >>confdefs.h <<\EOF EOF if test "$cf_cv_ncurses_version" != no ; then -echo "$as_me:49364: checking for obsolete/broken version of ncurses" >&5 +echo "$as_me:48659: 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 49371 "configure" +#line 48666 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -49387,16 +48682,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:49390: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:48685: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:49393: \$? = $ac_status" >&5 + echo "$as_me:48688: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:49396: \"$ac_try\"") >&5 + { (eval echo "$as_me:48691: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:49399: \$? = $ac_status" >&5 + echo "$as_me:48694: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_broken=no else @@ -49408,10 +48703,10 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:49411: result: $cf_cv_ncurses_broken" >&5 +echo "$as_me:48706: 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:49414: WARNING: hmm... you should get an up-to-date version of ncurses" >&5 + { echo "$as_me:48709: 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 @@ -49421,14 +48716,14 @@ EOF fi fi -echo "$as_me:49424: checking if curses supports color attributes" >&5 +echo "$as_me:48719: 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 49431 "configure" +#line 48726 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -49449,16 +48744,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:49452: \"$ac_link\"") >&5 +if { (eval echo "$as_me:48747: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:49455: \$? = $ac_status" >&5 + echo "$as_me:48750: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:49458: \"$ac_try\"") >&5 + { (eval echo "$as_me:48753: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:49461: \$? = $ac_status" >&5 + echo "$as_me:48756: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_color_curses=yes else @@ -49470,7 +48765,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:49473: result: $cf_cv_color_curses" >&5 +echo "$as_me:48768: result: $cf_cv_color_curses" >&5 echo "${ECHO_T}$cf_cv_color_curses" >&6 if test "$cf_cv_color_curses" = yes ; then @@ -49494,23 +48789,23 @@ sys/termio.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:49497: checking for $ac_header" >&5 +echo "$as_me:48792: 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 49503 "configure" +#line 48798 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:49507: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:48802: \"$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:49513: \$? = $ac_status" >&5 + echo "$as_me:48808: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -49529,7 +48824,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:49532: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:48827: 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:48844: 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 49552 "configure" +#line 48847 "configure" #include "confdefs.h" #include int @@ -49561,16 +48856,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 1); (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:49564: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:48859: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:49567: \$? = $ac_status" >&5 + echo "$as_me:48862: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:49570: \"$ac_try\"") >&5 + { (eval echo "$as_me:48865: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:49573: \$? = $ac_status" >&5 + echo "$as_me:48868: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then termios_bad=no else @@ -49578,7 +48873,7 @@ else cat "conftest.$ac_ext" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 49581 "configure" +#line 48876 "configure" #include "confdefs.h" #define _POSIX_SOURCE @@ -49592,16 +48887,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 2); (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:49595: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:48890: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:49598: \$? = $ac_status" >&5 + echo "$as_me:48893: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:49601: \"$ac_try\"") >&5 + { (eval echo "$as_me:48896: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:49604: \$? = $ac_status" >&5 + echo "$as_me:48899: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then termios_bad=unknown else @@ -49617,12 +48912,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - echo "$as_me:49620: result: $termios_bad" >&5 + echo "$as_me:48915: result: $termios_bad" >&5 echo "${ECHO_T}$termios_bad" >&6 fi fi -echo "$as_me:49625: checking declaration of size-change" >&5 +echo "$as_me:48920: 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 @@ -49643,7 +48938,7 @@ do fi cat >"conftest.$ac_ext" <<_ACEOF -#line 49646 "configure" +#line 48941 "configure" #include "confdefs.h" #include #ifdef HAVE_TERMIOS_H @@ -49693,16 +48988,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:49696: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:48991: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:49699: \$? = $ac_status" >&5 + echo "$as_me:48994: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:49702: \"$ac_try\"") >&5 + { (eval echo "$as_me:48997: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:49705: \$? = $ac_status" >&5 + echo "$as_me:49000: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_sizechange=yes else @@ -49721,7 +49016,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:49724: result: $cf_cv_sizechange" >&5 +echo "$as_me:49019: result: $cf_cv_sizechange" >&5 echo "${ECHO_T}$cf_cv_sizechange" >&6 if test "$cf_cv_sizechange" != no ; then @@ -49739,14 +49034,14 @@ EOF esac fi -echo "$as_me:49742: checking if ttytype is declared in curses library" >&5 +echo "$as_me:49037: 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 49749 "configure" +#line 49044 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -49758,16 +49053,16 @@ char *x = &ttytype[1]; *x = 1 } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:49761: \"$ac_link\"") >&5 +if { (eval echo "$as_me:49056: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:49764: \$? = $ac_status" >&5 + echo "$as_me:49059: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:49767: \"$ac_try\"") >&5 + { (eval echo "$as_me:49062: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:49770: \$? = $ac_status" >&5 + echo "$as_me:49065: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_have_ttytype=yes else @@ -49779,7 +49074,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:49782: result: $cf_cv_have_ttytype" >&5 +echo "$as_me:49077: result: $cf_cv_have_ttytype" >&5 echo "${ECHO_T}$cf_cv_have_ttytype" >&6 test "$cf_cv_have_ttytype" = yes && cat >>confdefs.h <<\EOF @@ -49788,14 +49083,14 @@ EOF if test "$use_wide_curses" = yes ; then -echo "$as_me:49791: checking if curses supports wide characters" >&5 +echo "$as_me:49086: 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 49798 "configure" +#line 49093 "configure" #include "confdefs.h" #include @@ -49814,16 +49109,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:49817: \"$ac_link\"") >&5 +if { (eval echo "$as_me:49112: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:49820: \$? = $ac_status" >&5 + echo "$as_me:49115: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:49823: \"$ac_try\"") >&5 + { (eval echo "$as_me:49118: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:49826: \$? = $ac_status" >&5 + echo "$as_me:49121: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_widec_curses=yes else @@ -49834,7 +49129,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:49837: result: $cf_cv_widec_curses" >&5 +echo "$as_me:49132: result: $cf_cv_widec_curses" >&5 echo "${ECHO_T}$cf_cv_widec_curses" >&6 if test "$cf_cv_widec_curses" = yes ; then @@ -49844,14 +49139,14 @@ cat >>confdefs.h <<\EOF EOF # This is needed on Tru64 5.0 to declare mbstate_t - echo "$as_me:49847: checking if we must include wchar.h to declare mbstate_t" >&5 + echo "$as_me:49142: 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 49854 "configure" +#line 49149 "configure" #include "confdefs.h" #include @@ -49865,23 +49160,23 @@ mbstate_t state; (void)state } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:49868: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:49163: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:49871: \$? = $ac_status" >&5 + echo "$as_me:49166: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:49874: \"$ac_try\"") >&5 + { (eval echo "$as_me:49169: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:49877: \$? = $ac_status" >&5 + echo "$as_me:49172: \$? = $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 49884 "configure" +#line 49179 "configure" #include "confdefs.h" #include @@ -49896,16 +49191,16 @@ mbstate_t state; (void)state } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:49899: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:49194: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:49902: \$? = $ac_status" >&5 + echo "$as_me:49197: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:49905: \"$ac_try\"") >&5 + { (eval echo "$as_me:49200: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:49908: \$? = $ac_status" >&5 + echo "$as_me:49203: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_widec_mbstate=yes else @@ -49917,7 +49212,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:49920: result: $cf_cv_widec_mbstate" >&5 +echo "$as_me:49215: result: $cf_cv_widec_mbstate" >&5 echo "${ECHO_T}$cf_cv_widec_mbstate" >&6 if test "$cf_cv_widec_mbstate" = yes ; then @@ -49940,7 +49235,7 @@ fi fi -echo "$as_me:49943: checking definition to turn on extended curses functions" >&5 +echo "$as_me:49238: checking definition to turn on extended curses functions" >&5 echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6 if test "${cf_cv_need_xopen_extension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -49948,7 +49243,7 @@ else cf_cv_need_xopen_extension=unknown cat >"conftest.$ac_ext" <<_ACEOF -#line 49951 "configure" +#line 49246 "configure" #include "confdefs.h" $ac_includes_default @@ -49981,16 +49276,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:49984: \"$ac_link\"") >&5 +if { (eval echo "$as_me:49279: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:49987: \$? = $ac_status" >&5 + echo "$as_me:49282: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:49990: \"$ac_try\"") >&5 + { (eval echo "$as_me:49285: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:49993: \$? = $ac_status" >&5 + echo "$as_me:49288: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_need_xopen_extension=none else @@ -50000,7 +49295,7 @@ cat "conftest.$ac_ext" >&5 for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR do cat >"conftest.$ac_ext" <<_ACEOF -#line 50003 "configure" +#line 49298 "configure" #include "confdefs.h" #define $cf_try_xopen_extension 1 @@ -50026,16 +49321,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:50029: \"$ac_link\"") >&5 +if { (eval echo "$as_me:49324: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:50032: \$? = $ac_status" >&5 + echo "$as_me:49327: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:50035: \"$ac_try\"") >&5 + { (eval echo "$as_me:49330: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:50038: \$? = $ac_status" >&5 + echo "$as_me:49333: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_need_xopen_extension=$cf_try_xopen_extension; break else @@ -50049,7 +49344,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:50052: result: $cf_cv_need_xopen_extension" >&5 +echo "$as_me:49347: result: $cf_cv_need_xopen_extension" >&5 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6 case "$cf_cv_need_xopen_extension" in @@ -50061,7 +49356,7 @@ case "$cf_cv_need_xopen_extension" in ;; esac -echo "$as_me:50064: checking for term.h" >&5 +echo "$as_me:49359: 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 @@ -50082,7 +49377,7 @@ esac for cf_header in $cf_header_list do cat >"conftest.$ac_ext" <<_ACEOF -#line 50085 "configure" +#line 49380 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -50096,16 +49391,16 @@ WINDOW *x; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:50099: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:49394: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:50102: \$? = $ac_status" >&5 + echo "$as_me:49397: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:50105: \"$ac_try\"") >&5 + { (eval echo "$as_me:49400: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:50108: \$? = $ac_status" >&5 + echo "$as_me:49403: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header=$cf_header break @@ -50124,7 +49419,7 @@ case "$cf_cv_term_header" in for cf_header in ncurses/term.h ncursesw/term.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 50127 "configure" +#line 49422 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -50142,16 +49437,16 @@ WINDOW *x; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:50145: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:49440: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:50148: \$? = $ac_status" >&5 + echo "$as_me:49443: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:50151: \"$ac_try\"") >&5 + { (eval echo "$as_me:49446: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:50154: \$? = $ac_status" >&5 + echo "$as_me:49449: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header=$cf_header break @@ -50166,7 +49461,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" esac fi -echo "$as_me:50169: result: $cf_cv_term_header" >&5 +echo "$as_me:49464: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 case "$cf_cv_term_header" in @@ -50193,7 +49488,7 @@ EOF ;; esac -echo "$as_me:50196: checking for unctrl.h" >&5 +echo "$as_me:49491: checking for unctrl.h" >&5 echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6 if test "${cf_cv_unctrl_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -50214,7 +49509,7 @@ esac for cf_header in $cf_header_list do cat >"conftest.$ac_ext" <<_ACEOF -#line 50217 "configure" +#line 49512 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -50228,16 +49523,16 @@ WINDOW *x; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:50231: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:49526: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:50234: \$? = $ac_status" >&5 + echo "$as_me:49529: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:50237: \"$ac_try\"") >&5 + { (eval echo "$as_me:49532: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:50240: \$? = $ac_status" >&5 + echo "$as_me:49535: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_unctrl_header=$cf_header break @@ -50250,12 +49545,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:50253: result: $cf_cv_unctrl_header" >&5 +echo "$as_me:49548: result: $cf_cv_unctrl_header" >&5 echo "${ECHO_T}$cf_cv_unctrl_header" >&6 case "$cf_cv_unctrl_header" in (no) - { echo "$as_me:50258: WARNING: unctrl.h header not found" >&5 + { echo "$as_me:49553: WARNING: unctrl.h header not found" >&5 echo "$as_me: WARNING: unctrl.h header not found" >&2;} ;; esac @@ -50311,10 +49606,10 @@ do cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - echo "$as_me:50314: checking for ${cf_func}" >&5 + echo "$as_me:49609: checking for ${cf_func}" >&5 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 -echo "${as_me:-configure}:50317: testing ${cf_func} ..." 1>&5 +echo "${as_me:-configure}:49612: testing ${cf_func} ..." 1>&5 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -50323,7 +49618,7 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then cat >"conftest.$ac_ext" <<_ACEOF -#line 50326 "configure" +#line 49621 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -50356,16 +49651,16 @@ if (foo + 1234L > 5678L) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:50359: \"$ac_link\"") >&5 +if { (eval echo "$as_me:49654: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:50362: \$? = $ac_status" >&5 + echo "$as_me:49657: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:50365: \"$ac_try\"") >&5 + { (eval echo "$as_me:49660: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:50368: \$? = $ac_status" >&5 + echo "$as_me:49663: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -50381,7 +49676,7 @@ fi # use the computed/retrieved cache-value: eval 'cf_result=$cf_cv_func_'$cf_func - echo "$as_me:50384: result: $cf_result" >&5 + echo "$as_me:49679: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" != no; then cat >>confdefs.h <&5 +echo "$as_me:49696: 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 50407 "configure" +#line 49702 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -50435,16 +49730,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:50438: \"$ac_link\"") >&5 +if { (eval echo "$as_me:49733: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:50441: \$? = $ac_status" >&5 + echo "$as_me:49736: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:50444: \"$ac_try\"") >&5 + { (eval echo "$as_me:49739: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:50447: \$? = $ac_status" >&5 + echo "$as_me:49742: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -50454,7 +49749,7 @@ eval "$as_ac_var=no" fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:50457: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:49752: 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:49766: 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:50476: error: Configuration does not support color-styles" >&5 + { { echo "$as_me:49771: error: Configuration does not support color-styles" >&5 echo "$as_me: error: Configuration does not support color-styles" >&2;} { (exit 1); exit 1; }; } fi @@ -50481,7 +49776,7 @@ fi if test "$use_scrollbar" != no ; then if test .$cf_cv_fancy_curses != .yes ; then - { echo "$as_me:50484: WARNING: Configuration does not support ACS_xxx definitions" >&5 + { echo "$as_me:49779: WARNING: Configuration does not support ACS_xxx definitions" >&5 echo "$as_me: WARNING: Configuration does not support ACS_xxx definitions" >&2;} else @@ -50494,7 +49789,7 @@ fi # use rpath for libraries in unusual places -echo "$as_me:50497: checking if rpath-hack should be disabled" >&5 +echo "$as_me:49792: checking if rpath-hack should be disabled" >&5 echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6 # Check whether --enable-rpath-hack or --disable-rpath-hack was given. @@ -50512,22 +49807,22 @@ else fi; if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi -echo "$as_me:50515: result: $cf_disable_rpath_hack" >&5 +echo "$as_me:49810: result: $cf_disable_rpath_hack" >&5 echo "${ECHO_T}$cf_disable_rpath_hack" >&6 if test "$enable_rpath_hack" = yes ; then -echo "$as_me:50520: checking for updated LDFLAGS" >&5 +echo "$as_me:49815: 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:50523: result: maybe" >&5 + echo "$as_me:49818: 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:50530: checking for $ac_word" >&5 +echo "$as_me:49825: 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 @@ -50542,7 +49837,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_cf_ldd_prog="$ac_prog" -echo "$as_me:50545: found $ac_dir/$ac_word" >&5 +echo "$as_me:49840: found $ac_dir/$ac_word" >&5 break done @@ -50550,10 +49845,10 @@ fi fi cf_ldd_prog=$ac_cv_prog_cf_ldd_prog if test -n "$cf_ldd_prog"; then - echo "$as_me:50553: result: $cf_ldd_prog" >&5 + echo "$as_me:49848: result: $cf_ldd_prog" >&5 echo "${ECHO_T}$cf_ldd_prog" >&6 else - echo "$as_me:50556: result: no" >&5 + echo "$as_me:49851: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -50567,7 +49862,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no" cf_rpath_oops= cat >"conftest.$ac_ext" <<_ACEOF -#line 50570 "configure" +#line 49865 "configure" #include "confdefs.h" #include int @@ -50579,16 +49874,16 @@ printf("Hello"); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:50582: \"$ac_link\"") >&5 +if { (eval echo "$as_me:49877: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:50585: \$? = $ac_status" >&5 + echo "$as_me:49880: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:50588: \"$ac_try\"") >&5 + { (eval echo "$as_me:49883: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:50591: \$? = $ac_status" >&5 + echo "$as_me:49886: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq` cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq` @@ -50616,7 +49911,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" then test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6 -echo "${as_me:-configure}:50619: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 +echo "${as_me:-configure}:49914: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" break @@ -50628,11 +49923,11 @@ echo "${as_me:-configure}:50619: testing ...adding -L$cf_rpath_dir/lib to LDFLAG test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:50631: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:49926: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:50635: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:49930: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LDFLAGS @@ -50669,7 +49964,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:50672: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:49967: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -50682,11 +49977,11 @@ LDFLAGS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:50685: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:49980: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:50689: testing ...checking LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:49984: testing ...checking LIBS $LIBS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LIBS @@ -50723,7 +50018,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:50726: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:50021: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -50736,14 +50031,14 @@ LIBS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:50739: testing ...checked LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:50034: testing ...checked LIBS $LIBS ..." 1>&5 test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:50743: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:50038: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 else - echo "$as_me:50746: result: no" >&5 + echo "$as_me:50041: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -50858,7 +50153,7 @@ DEFS=-DHAVE_CONFIG_H : "${CONFIG_STATUS=./config.status}" ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:50861: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:50156: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >"$CONFIG_STATUS" <<_ACEOF #! $SHELL @@ -50993,7 +50288,7 @@ EOF cat >>"$CONFIG_STATUS" <>"$CONFIG_STATUS" <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:51042: error: ambiguous option: $1 + { { echo "$as_me:50337: 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;} @@ -51058,7 +50353,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:51061: error: unrecognized option: $1 + -*) { { echo "$as_me:50356: 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;} @@ -51077,7 +50372,7 @@ cat >&5 << _ACEOF ## Running config.status. ## ## ----------------------- ## -This file was extended by $as_me (lynx 2.9.0) 2.52.20231210, executed with +This file was extended by $as_me (lynx 2.9.0g) 2.52.20231210, executed with CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_LINKS = $CONFIG_LINKS @@ -51111,7 +50406,7 @@ do "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "$CONFIG_H" ) CONFIG_HEADERS="$CONFIG_HEADERS $CONFIG_H:config.hin" ;; - *) { { echo "$as_me:51114: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:50409: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -51269,34 +50564,21 @@ s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t s,@HAVE_STDNORETURN_H@,$HAVE_STDNORETURN_H,;t t s,@STDC_NORETURN@,$STDC_NORETURN,;t t s,@MSGINIT@,$MSGINIT,;t t -s,@ALLOCA@,$ALLOCA,;t t -s,@GLIBC21@,$GLIBC21,;t t s,@LIBICONV@,$LIBICONV,;t t s,@USE_NLS@,$USE_NLS,;t t s,@MSGFMT@,$MSGFMT,;t t s,@GMSGFMT@,$GMSGFMT,;t t s,@XGETTEXT@,$XGETTEXT,;t t -s,@INTL_YACC@,$INTL_YACC,;t t -s,@BUILD_INCLUDED_LIBINTL@,$BUILD_INCLUDED_LIBINTL,;t t -s,@USE_INCLUDED_LIBINTL@,$USE_INCLUDED_LIBINTL,;t t s,@CATALOGS@,$CATALOGS,;t t s,@CATOBJEXT@,$CATOBJEXT,;t t s,@GMOFILES@,$GMOFILES,;t t -s,@INTLLIBS@,$INTLLIBS,;t t -s,@INTLOBJS@,$INTLOBJS,;t t s,@POFILES@,$POFILES,;t t -s,@POSUB@,$POSUB,;t t s,@DATADIRNAME@,$DATADIRNAME,;t t s,@INSTOBJEXT@,$INSTOBJEXT,;t t s,@GENCAT@,$GENCAT,;t t -s,@INTL_LIBTOOL_SUFFIX_PREFIX@,$INTL_LIBTOOL_SUFFIX_PREFIX,;t t s,@NLS_TEXTDOMAIN@,$NLS_TEXTDOMAIN,;t t s,@MSG_DIR_MAKE@,$MSG_DIR_MAKE,;t t s,@SUB_MAKEFILE@,$SUB_MAKEFILE,;t t -s,@INTLDIR_MAKE@,$INTLDIR_MAKE,;t t -s,@GT_YES@,$GT_YES,;t t -s,@GT_NO@,$GT_NO,;t t -s,@INTLDIR_CPPFLAGS@,$INTLDIR_CPPFLAGS,;t t s,@NLS_DATADIR@,$NLS_DATADIR,;t t s,@PKG_CONFIG@,$PKG_CONFIG,;t t s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t @@ -51311,6 +50593,7 @@ s,@LYNXCFG_NO_MAKE@,$LYNXCFG_NO_MAKE,;t t s,@LYNXDOC_MAKE@,$LYNXDOC_MAKE,;t t s,@MIME_LIBDIR@,$MIME_LIBDIR,;t t s,@CHARSET_DEFS@,$CHARSET_DEFS,;t t +s,@ALLOCA@,$ALLOCA,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@EXTRA_OBJS@,$EXTRA_OBJS,;t t s,@SETFONT@,$SETFONT,;t t @@ -51476,7 +50759,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:51479: creating $ac_file" >&5 + { echo "$as_me:50762: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -51494,7 +50777,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo "$tmp"/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:51497: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:50780: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo "$f";; @@ -51507,7 +50790,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:51510: error: cannot find input file: $f" >&5 + { { echo "$as_me:50793: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -51523,7 +50806,7 @@ cat >>"$CONFIG_STATUS" <<\EOF if test -n "$ac_seen"; then ac_used=`grep '@datarootdir@' "$ac_item"` if test -z "$ac_used"; then - { echo "$as_me:51526: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:50809: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&2;} @@ -51532,7 +50815,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' "$ac_item"` if test -n "$ac_seen"; then - { echo "$as_me:51535: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:50818: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&2;} @@ -51577,7 +50860,7 @@ cat >>"$CONFIG_STATUS" <<\EOF ac_init=`$EGREP '[ ]*'$ac_name'[ ]*=' "$ac_file"` if test -z "$ac_init"; then ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'` - { echo "$as_me:51580: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:50863: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&5 echo "$as_me: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&2;} @@ -51588,7 +50871,7 @@ $ac_seen" >&2;} $EGREP -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>"$tmp"/out if test -s "$tmp"/out; then ac_seen=`sed -e 's,^,'"$ac_file"':,' < "$tmp"/out` - { echo "$as_me:51591: WARNING: Some variables may not be substituted: + { echo "$as_me:50874: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -51637,7 +50920,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:51640: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:50923: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -51648,7 +50931,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo "$tmp"/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:51651: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:50934: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -51661,7 +50944,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:51664: error: cannot find input file: $f" >&5 + { { echo "$as_me:50947: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -51780,7 +51063,7 @@ cat >>"$CONFIG_STATUS" <<\EOF rm -f "$tmp"/in if test x"$ac_file" != x-; then if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then - { echo "$as_me:51783: $ac_file is unchanged" >&5 + { echo "$as_me:51066: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ diff --git a/configure.in b/configure.in index 2908103..beef487 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -dnl $LynxId: configure.in,v 1.355 2024/01/14 22:24:38 tom Exp $ +dnl $LynxId: configure.in,v 1.368 2024/04/15 20:53:51 tom Exp $ dnl dnl Process this file with autoconf to produce a configure script. dnl @@ -27,10 +27,10 @@ dnl ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF dnl OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. dnl --------------------------------------------------------------------------- dnl -AC_REVISION($Revision: 1.355 $) +AC_REVISION($Revision: 1.368 $) AC_PREREQ(2.52.20231210) -AC_INIT(lynx,2.9.0,lynx-dev@nongnu.org) +AC_INIT(lynx,2.9.1,lynx-dev@nongnu.org) AC_CONFIG_SRCDIR(userdefs.h) @@ -96,6 +96,7 @@ case "$host_os" in esac CF_PROG_CC +AC_C_INLINE CF_PROG_CPP_COMMENTS AC_PROG_LN_S case "$host_os" in @@ -273,6 +274,7 @@ case "$host_os" in -D__WIN32__ \ ) EXTRA_OBJS="$EXTRA_OBJS Xsystem\$o" + AC_CHECK_LIB(ssp,__chk_fail) ;; (msdosdjgpp*) LIBS="$LIBS -lwatt" @@ -342,6 +344,9 @@ case "$host_os" in esac CF_ANSI_CC_REQD +CF_XOPEN_SOURCE(500,199506L) +CF_LARGEFILE +AC_CHECK_DECL(exit) dnl -------------------------------------------------------------------------- dnl -------------------------------------------------------------------------- @@ -349,8 +354,6 @@ dnl -------------------------------------------------------------------------- CF_HELP_MESSAGE( Basic Configuration Options:) -CF_LARGEFILE - dnl -------------------------------------------------------------------------- dnl internationalization macros dnl -------------------------------------------------------------------------- @@ -368,13 +371,6 @@ fi CF_BUNDLED_INTL(makefile,disable) -INTLDIR_CPPFLAGS="#" -if test -z "$INTLDIR_MAKE" ; then - INTLDIR_CPPFLAGS= -fi - -AC_SUBST(INTLDIR_CPPFLAGS) - CF_WITH_PATH(nls-datadir, [ --with-nls-datadir=DIR NLS data, parent of locale], NLS_DATADIR, @@ -403,7 +399,6 @@ fi fi dnl -------------------------------------------------------------------------- -CF_XOPEN_SOURCE(500,199506L) CF_SIGWINCH dnl Collect tests for compiler options into one place @@ -739,7 +734,6 @@ dnl -------------------------------------------------------------------------- dnl Checks for standard headers dnl -------------------------------------------------------------------------- -AC_CHECK_DECL(exit) AC_HEADER_TIME AC_HEADER_DIRENT dnl Don't check for sys/wait.h here since it is covered by another test. diff --git a/lynx.cfg b/lynx.cfg index c92a39c..4b2d4dc 100644 --- a/lynx.cfg +++ b/lynx.cfg @@ -1,10 +1,10 @@ -# $LynxId: lynx.cfg,v 1.335 2024/01/15 11:31:00 tom Exp $ +# $LynxId: lynx.cfg,v 1.350 2024/04/15 20:53:51 tom Exp $ # lynx.cfg file. # The default placement for this file is /usr/local/lib/lynx.cfg (Unix) # or Lynx_Dir:lynx.cfg (VMS) # -# LYNX_VERSION "2.9.0" -# LYNX_DATE "15 Jan 2024" +# LYNX_VERSION "2.9.1" +# LYNX_DATE "15 Apr 2024" # # Definition pairs (configuration settings) are of the form # VARIABLE:DEFINITION diff --git a/lynx.man b/lynx.man index 464078d..ae704a3 100644 --- a/lynx.man +++ b/lynx.man @@ -1,6 +1,6 @@ -.\" $LynxId: lynx.man,v 1.147 2024/01/14 20:53:14 tom Exp $ +.\" $LynxId: lynx.man,v 1.160 2024/04/15 20:53:51 tom Exp $ .\" ************************************************************************** -.TH LYNX 1 2024-01-14 "Lynx 2.9.0" "Lynx \(en the \fItext\fP web browser" +.TH LYNX 1 2024-04-15 "Lynx 2.9.1" "Lynx \(en the \fItext\fP web browser" . .ie \n(.g \{\ .ds `` \(lq @@ -836,7 +836,7 @@ URL may be given as \*(``proxy.example.com\*('', \*(``proxy.example.com:1080\*('', \*(``192.168.0.1\*('', or \*(``192.168.0.1:1080\*('' (and IPv6 notation if so supported). A SOCKS5 proxy may also be specified via the environment variable -.B SOCKS5_PROXY. +.BR SOCKS5_PROXY . This option controls the builtin SOCKS5 support, which is unrelated to the option \fB\-nosocks\fP. .TP diff --git a/samples/mhtml-tool b/samples/mhtml-tool new file mode 100755 index 0000000..aaf7f70 --- /dev/null +++ b/samples/mhtml-tool @@ -0,0 +1,568 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +$| = 1; + +=pod + +=head1 NAME + +B - Unpack a MIME HTML archive + + +=head1 SYNOPSIS + +B unpacks MIME HTML archives that some browsers (such as Opera) +save by default. The file extensions of such archives are ".mht" or ".mhtml". + +The first HTML file in the archive is taken to be the primary web page, the +other contained files for "page requisites" such as images or frames. The +primary web page is written to the output directory (the current directory by +default), the requisites to a subdirectory named after the primary HTML file +name without extension, with "_files" appended. Link URLs in all HTML +files referring to requisites are rewritten to point to the saved files. + + +=head1 OPTIONS + +=over + +=item B<-e> program + +=item B<--exec> program + +Unpack the archive into a temporary directory and execute the given program +in that directory, passing the primary HTML (first text/html entry) of the +archive as a parameter. + +If B<-o> is given, use that directory location with the program. + +If the program is "lynx" or "(e)links(2)", this script uses the "-force-html" +option to help when the entrypoint lacks a ".html" file-suffix. + +=item B<-h> + +=item B<-?> + +=item B<--help> + +Print a brief usage summary. + +=item B<-l> + +=item B<--list> + +List archive contents instead of unpacking. Four columns are output: file +name, MIME type, size and URL. Unavailable entries are replaced by "(?)". + +=item B<-o> I + +=item B<--output> I + +If the argument ends in a slash or is an existing directory, unpack to that +directory instead of current directory. Otherwise the argument is taken as a +path to the file name to write the primary HTML file to. If the output +directory does not exist, it is created. + +=back + + +=head1 SEE ALSO + +https://github.com/ThomasDickey/mhtml-tool + +https://github.com/clapautius/mhtml-tool + +http://www.volkerschatz.com/unix/uware/unmht.html + +=head1 COPYLEFT + +B is Copyright (c) 2012 Volker Schatz. It may be copied and/or +modified under the same terms as Perl. + +B is Copyright (c) 2018 Tudor M. Pristavu. It may be copied and/or +modified under the same terms as Perl. + +B is Copyright (c) 2024 Thomas E. Dickey. It may be copied and/or +modified under the same terms as Perl. + +=cut + +use Cwd; +use File::Path; +use File::Copy; +use File::Glob; +use File::Temp qw/ tempdir /; +use URI; +use MIME::Base64; +use MIME::QuotedPrint; +use HTML::PullParser; +use HTML::Tagset; +use Getopt::Long; + +our $path_limit = 255; +our %shorten_path; + +# RFC 7230 (obsoletes RFC 2616) indicates that URI length is limited by the +# server line-length, which it suggests should be at least 8000 octets. The +# problem is that components of pathnames might be limited to 255 bytes, while +# the URI components can be much longer. As an additional complication, the +# too-long components can be both directory- and file-names, and truncating +# the components can produce collisions. +sub shorten_path { + my $actual = $_[0]; + if ( not defined $shorten_path{$actual} ) { + my @parts = split /\//, $actual; + for my $n ( 0 .. $#parts ) { + $parts[$n] = substr( $parts[$n], 0, $path_limit ); + } + $shorten_path{$actual} = join "/", @parts; + } + return $shorten_path{$actual}; +} + +# URLs can include "&" and other characters which require quoting to use in +# a shell command. We use system() rather than exec() to allow the temporary +# directory to be cleaned up after running lynx. +sub quoted { + my $param = $_[0]; + $param =~ s/'/'\"'\"'/g; + return sprintf( "'%s'", $param ); +} + +# Add approriate ordinal suffix to a number. +# -> Number +# <- String of number with ordinal suffix +sub ordinal { + return $_[0] . "th" if $_[0] > 3 && $_[0] < 20; + my $unitdig = $_[0] % 10; + return $_[0] . "st" if $unitdig == 1; + return $_[0] . "nd" if $unitdig == 2; + return $_[0] . "rd" if $unitdig == 3; + return $_[0] . "th"; +} + +{ + my %taken; + + # Find unique file name. + # -> Preferred file name, or undef + # MHT archive name (as a fallback if no name given) + # <- File name not conflicting with names returned by previous calls, but which + # may exist! + sub unique_name { + my ( $fname, $mhtname ) = @_; + my ( $trunc, $ext ); + + if ( defined $fname ) { + $fname =~ s/^\s+//; + $fname =~ s/\s+$//; + $taken{$fname} = 1, return $fname unless $taken{$fname}; + ( $trunc, $ext ) = $fname =~ /^(.*?)(\.\w+)?$/; + $ext //= ""; + } + else { + $trunc = $mhtname || "unpack"; + $trunc =~ s/\.mht(?:ml?)?$//i; + $ext = ""; + } + for my $suff ( 1 .. 9999 ) { + $fname = "${trunc}_$suff$ext"; + $taken{$fname} = 1, return $fname unless $taken{$fname}; + ++$suff; + } + return undef; + } + +} + +# Output error message and exit with return value 1. +sub abort { + print STDERR "$_[0]\n"; + exit 1; +} + +# Generate output file directories and primary HTML file name depending on +# --output option and primary HTML file name from archive. In case the primary +# HTML file is not the first file in the archive, the secondary files directory +# is renamed or the files moved on the second call, when the primary HTML file +# name is known. +# -> Value of --output option (or undef) +# Primary HTML file name from MHT archive +# Flag indicating if .._files subdirectory should be created +# Hash reference to store resulting paths to +sub mkfiledir { + my ( $outputopt, $firsthtmlname, $needfilesdir, $out ) = @_; + + my $prevfilespath = $$out{filespath}; + $firsthtmlname = "unpackmht-$$" unless defined $firsthtmlname; + if ( !defined $outputopt ) { + $$out{toppath} = "."; + } + elsif ( -d $outputopt || $outputopt =~ m!/$! ) { + $$out{toppath} = $outputopt; + } + else { + ( $$out{toppath}, $firsthtmlname ) = $outputopt =~ m!^(.*/)?([^/]+)$!; + abort "Empty output file name." unless defined $firsthtmlname; + $firsthtmlname .= ".html" unless $firsthtmlname =~ /\./; + $$out{toppath} = "." unless defined $$out{toppath}; + } + $$out{toppath} =~ s!/$!!; + $$out{firstout} = "$$out{toppath}/$firsthtmlname"; + $$out{filesdir} = $firsthtmlname; + $$out{filesdir} =~ s/\.[^.]+$//; + $$out{filesdir} = substr( $$out{filesdir}, 0, $path_limit - 6 ); + $$out{filesdir} .= "_files"; + $$out{filespath} = "$$out{toppath}/$$out{filesdir}"; + + if ( defined $prevfilespath ) { + return unless $prevfilespath ne $$out{filespath}; + return unless -d $prevfilespath; + if ( !-d $$out{filespath} ) { + File::Copy::move( $prevfilespath, $$out{filespath} ) + or abort "Could not rename secondary files directory."; + } + else { + for ( File::Glob::bsd_glob("$prevfilespath/*") ) { + File::Copy::move( $_, $$out{filespath} ) + or abort "Could not move secondary files."; + } + } + } + else { + my $createall = $needfilesdir ? $$out{filespath} : $$out{toppath}; + if ( !-d $createall ) { + File::Path::make_path($createall) + or abort "Could not create output directory $createall."; + } + } +} + +my %opt; +my @optdescr = ( 'exec|e=s', 'output|o=s', 'list|l!', 'help|h|?!', 'debug|d!' ); +my %config; + +my $status = GetOptions( \%opt, @optdescr ); + +if ( !$status || $opt{help} ) { + print < + +By default, mhtml-tool unpacks an MHT archive (an archive type saved by some +browsers) to the current directory. The first HTML file in the archive is +taken for the primary web page, and all other contained files are written to a +directory named after that HTML file. + +Options: +-e, --exec Execute the given program on a temporarily-unpacked archive +-l, --list List archive contents (file name, MIME type, size and URL) +-o, --output Unpack to directory or to file .html + +Use the command "pod2man mhtml-tool > mhtml-tool.1" or +"pod2html mhtml-tool > mhtml-tool.html" to extract the manual. +EOF + exit !$status; +} + +my $origin = getcwd; +my $tempdir = ""; +if ( $opt{exec} and not defined $opt{output} ) { + $tempdir = tempdir( CLEANUP => 1 ); + $opt{output} = $tempdir . "/"; +} + +my $orig_sep = $/; +my $crlf_file = 0; + +# Print a message to stdout (if debug is enabled). +sub debug_msg { + if ( $opt{debug} ) { + print ":debug: $_[0]\n"; + } +} + +# Read next line. Remove line endings (both unix & windows style). +sub read_next_line { + my $cur_line = <>; + chomp $cur_line; + if ( $cur_line =~ /\r$/ ) { + debug_msg("It's a CRLF file") if ( $crlf_file == 0 ); + $crlf_file++; + } + $cur_line =~ s/\r//; + return $cur_line; +} + +# Parse headers. +# Handle multi-line headers (lines starting with spaces are part of a +# multi-line header). +# Read data from <> until the first empty line. +# Set $crlf_file to 1 if it's a CRLF (windoze) file. +sub parse_headers { + my %headers; + my $sep = $/; + $/ = $orig_sep; + my $cur_line = read_next_line; + my $full_line = $cur_line; + + while ( not( $cur_line =~ /^$/ ) ) { + if ( $cur_line =~ /;$/ ) { # if a continued line... + while ( ( $cur_line = read_next_line ) =~ /^\h+/ ) { + $cur_line =~ s/^\h+//; + $full_line = $full_line . " " . $cur_line; + } + if ( $full_line =~ s/^([-\w]+): (.*)$// ) { + $headers{$1} = $2; + debug_msg("(1) New header $1 with value $2"); + } + } + else { + if ( $full_line =~ s/^([-\w]+): (.*)$// ) { + $headers{$1} = $2; + debug_msg("(2) New header $1 with value $2"); + } + } + $cur_line = read_next_line; + $full_line = $cur_line; + } + $/ = $sep; + return %headers; +} + +my %global_headers = parse_headers(); + +abort "Can't find Content-Type header - not a MIME HTML file?" + if ( !defined( $global_headers{'Content-Type'} ) ); +debug_msg("Global Content-Type: $global_headers{'Content-Type'}"); + +my $boundary = ''; +my $endcode = ''; + +# FIXME: - add other possible mime types +# Types implemented so far are: +# Content-Type: multipart/related; boundary="----=_NextPart_01D8BCC9.47C2B260" +# Content-Type: text/html; charset="utf-8" +if ( $global_headers{'Content-Type'} =~ + m!multipart/related;.*\h+boundary="?([^"]*)"?$! ) +{ + $endcode = $boundary = $1; + $endcode =~ s/\s+$//; + if ($crlf_file) { + $/ = "\r\n--$boundary\r\n"; + } + else { + $/ = "\n--$boundary\n"; + } + debug_msg("Boundary: $boundary"); +} +elsif ( $global_headers{'Content-Type'} =~ m!text/html! ) { + $/ = ''; +} +else { + die "Error: Unknown Content-Type: $global_headers{'Content-Type'}\n"; +} + +my %by_url; +my @htmlfiles; +my $fh; + +{ + my $fileind = 1; + my $leading = "--$boundary\n"; + while ( defined( my $data = <> ) ) { + chomp $data; + $data =~ s/\R/\n/g; # handle various other line-endings (windows, mac) + while ( index( $data, $leading ) == 0 ) { + $data = substr( $data, length($leading) ); + } + my %headers; + while ( $data =~ s/^([-\w]+): (.*)\n// ) { + $headers{$1} = $2; + debug_msg("New header $1 with value $2"); + + # read (and ignore atm) lines starting with space (multi-line headers) + while ( $data =~ s/^\h+.*\n// ) { + debug_msg("empty line"); + } + } + if ( scalar(%headers) == 0 ) { + %headers = %global_headers + ; # fallback to the global headers as needed, usually for "text" + } + $data =~ s/^\n//; + $data =~ s/\n--$endcode--\r?\n$/\n/s; + my ( $type, $origname ); + if ( defined( $headers{"Content-Type"} ) ) { + ($type) = $headers{"Content-Type"} =~ /^(\w+\/\w+)\b/; + debug_msg("type=$type"); + } + else { + print "Error: No Content-Type found, skipping chunk\n"; + + # we could print the bad chunk here... + # but it's probably just a "warning" about + # "if you see this your software isn't recognizing a web archive file" + next; + } + if ( defined( $headers{"Content-Type"} ) + && $headers{"Content-Type"} =~ /\bname=([^;]*)/ ) + { + $origname = $1; + ($type) = $headers{"Content-Type"} =~ /^(\w+\/\w+)\b/; + $type //= ""; + } + elsif ( defined( $headers{"Content-Disposition"} ) + && $headers{"Content-Disposition"} =~ /\bfilename=([^;]*)/ ) + { + $origname = $1; + if ( !defined($type) ) { + $type = $origname =~ /\.html?$/i ? "text/html" : ""; + } + } + elsif ( defined( $headers{"Content-Location"} ) ) { + $origname = $headers{"Content-Location"}; + + # for unknown reasons, files generated by IE11 may contain some + # local paths with '\' instead of '/' + if ( $origname =~ m!^file://.*\\! ) { + debug_msg("Windows-style path detected: $origname"); + $origname =~ s!^.*\\!!; + } + $origname =~ s!^.*/!!; + if ( !defined($type) ) { + $type = ""; + } + } + + $origname = "noname" unless defined $origname; + $origname = "noname" if ( $origname eq "" ); + my $fname = unique_name( $origname, $ARGV[0] ); + if ( !defined( $headers{"Content-Transfer-Encoding"} ) ) { + print STDERR "Info: Encoding of ", ordinal($fileind), + " file not found - leaving as-is.\n"; + } + elsif ( $headers{"Content-Transfer-Encoding"} =~ /\bbase64\b/i ) { + $data = MIME::Base64::decode($data); + } + elsif ( + $headers{"Content-Transfer-Encoding"} =~ /\bquoted-printable\b/i ) + { + $data = MIME::QuotedPrint::decode($data); + } + debug_msg("origname=$origname; fname=$fname; type=$type"); + debug_msg( "Content-Type: " . $headers{"Content-Type"} ); + debug_msg( "Data size: " . length($data) ); + if ( $opt{list} ) { + $origname =~ s/\s+$// if defined $origname; + my $size = length($data); + print $fname // "(?)", "\t", $type || "(?)", "\t$size\t", + $headers{"Content-Location"} // "(?)", "\n"; + next; + } + $headers{fname} = $fname; + if ( $headers{"Content-Location"} ) { + $headers{url} = $headers{"Content-Location"}; + $headers{url} =~ s/\s+$//; + $by_url{ $headers{url} } = \%headers; + debug_msg("Content-Location: $headers{url}"); + } + else { + debug_msg("?? no location"); + } + if ( $type eq "text/html" ) { + $headers{data} = $data; + if ( scalar @htmlfiles == 0 ) { # first html file must have a name + if ( !$headers{fname} ) { + $headers{fname} = "index.html"; + } + } + push @htmlfiles, \%headers; + debug_msg("New html file in list: $headers{fname}"); + } + else { + mkfiledir( $opt{output}, $htmlfiles[0]->{fname}, 1, \%config ); + $fname = shorten_path "$config{filespath}/$fname"; + open $fh, ">$fname" or abort "Could not create file $fname."; + print $fh $data; + close $fh; + } + } + continue { + debug_msg(""); + ++$fileind; + } +} + +if ( $opt{list} ) { + exit(0); +} + +mkfiledir( $opt{output}, $htmlfiles[0]->{fname}, 0, \%config ); + +my $entrypoint = "."; +my $filesprefix = $config{filesdir} . "/"; +my $outname = $config{firstout}; +print "primary html output name: $outname\n"; + +for my $html (@htmlfiles) { + my $linksubst = ""; + my $p = HTML::PullParser->new( + doc => \$html->{data}, + "start" => 'text, attr, tagname', + "text" => 'text', + "end" => 'text' + ); + while ( defined( my $tok = $p->get_token() ) ) { + my $linkary; + my @linkattrs; + if ( ref( $tok->[1] ) + && ( $linkary = $HTML::Tagset::linkElements{ $tok->[2] } ) + && ( @linkattrs = grep $tok->[1]->{$_}, @$linkary ) ) + { + for my $attr (@linkattrs) { + my $uri = URI->new( $tok->[1]->{$attr} ); + next unless defined $uri; + next unless defined $html->{url}; + $uri = $uri->abs( $html->{url} ); + $tok->[1]->{$attr} = + "$filesprefix" . $by_url{ $uri->as_string() }->{fname} + if $by_url{ $uri->as_string() }; + } + delete $tok->[1]->{"/"}; + $linksubst .= + "<$tok->[2] " + . join( " ", + map( "$_=\"$tok->[1]->{$_}\"", keys %{ $tok->[1] } ) ) + . ">"; + } + else { + $linksubst .= $tok->[0]; + } + } + $outname = "$config{filespath}/$html->{fname}" unless defined $outname; + $outname = shorten_path $outname; + open $fh, ">$outname" or abort "Could not create file $outname."; + print $fh $linksubst; + close $fh; + $entrypoint = $outname if ( $entrypoint eq "." ); + + # for all except the first HTML file: + $filesprefix = ""; + $outname = undef; +} + +if ( $tempdir ne "" ) { + chdir $tempdir; + my $enforce = ""; + $enforce = "-force-html" + if ( $entrypoint ne "." + and $entrypoint !~ /\.htm(l)?$/ + and $opt{exec} =~ /(lynx|((e)?links(2)?))/ ); + system( sprintf( "%s %s %s", $opt{exec}, $enforce, quoted $entrypoint ) ); + chdir $origin; +} + +1; diff --git a/src/GridText.c b/src/GridText.c index 806a053..419f6ee 100644 --- a/src/GridText.c +++ b/src/GridText.c @@ -1,5 +1,5 @@ /* - * $LynxId: GridText.c,v 1.347 2024/01/15 19:11:55 Gisle.Vanem Exp $ + * $LynxId: GridText.c,v 1.349 2024/04/11 20:24:32 tom Exp $ * * Character grid hypertext object * =============================== @@ -6002,7 +6002,7 @@ static void HText_trimHightext(HText *text, int final, int stop_before) { - int cur_line, cur_shift; + int cur_line; TextAnchor *anchor_ptr; TextAnchor *prev_a = NULL; HTLine *line_ptr; @@ -6097,7 +6097,6 @@ static void HText_trimHightext(HText *text, anchor_ptr->number, anchor_ptr->extent)); - cur_shift = 0; /* * Strip off any spaces or SpecialAttrChars at the beginning, * if they exist, but only on HYPERTEXT_ANCHORS. @@ -6108,7 +6107,6 @@ static void HText_trimHightext(HText *text, IsSpecialAttrChar(ch)) { anchor_ptr->line_pos++; anchor_ptr->extent--; - cur_shift++; ch = UCH(line_ptr->data[anchor_ptr->line_pos]); } } @@ -7107,7 +7105,7 @@ void HTCheckFnameForCompression(char **fname, char *fn = *fname; char *dot = NULL; char *cp = NULL; - const char *suffix = ""; + const char *suffix; CompressFileType method; CompressFileType second; @@ -11127,7 +11125,7 @@ int HText_SubmitForm(FormInfo * submit_item, DocInfo *doc, char *escaped1 = NULL; char *escaped2 = NULL; char *last_textarea_name = NULL; - const char *name_used = ""; + const char *name_used; char *previous_blanks = NULL; const char *val_used = ""; int anchor_count = 0; @@ -13167,7 +13165,7 @@ static char *readEditedFile(char *ed_temp) return ebuf; } -static int finish_ExtEditForm(LinkInfo * form_link, TextAnchor *start_anchor, +static int finish_ExtEditForm(LinkInfo *form_link, TextAnchor *start_anchor, char *ed_temp, int orig_cnt) { @@ -13401,7 +13399,7 @@ static int finish_ExtEditForm(LinkInfo * form_link, TextAnchor *start_anchor, * * --KED 02/01/99 */ -int HText_EditTextArea(LinkInfo * form_link) +int HText_EditTextArea(LinkInfo *form_link) { char *ed_temp; FILE *fp; @@ -13494,7 +13492,7 @@ int HText_EditTextArea(LinkInfo * form_link) /* * Similar to HText_EditTextArea, but assume a single-line text field -TD */ -void HText_EditTextField(LinkInfo * form_link) +void HText_EditTextField(LinkInfo *form_link) { char *ed_temp; FILE *fp; @@ -13556,7 +13554,7 @@ void HText_EditTextField(LinkInfo * form_link) * * --KED 02/14/99 */ -void HText_ExpandTextarea(LinkInfo * form_link, int newlines) +void HText_ExpandTextarea(LinkInfo *form_link, int newlines) { TextAnchor *anchor_ptr; TextAnchor *end_anchor = NULL; @@ -13639,7 +13637,7 @@ void HText_ExpandTextarea(LinkInfo * form_link, int newlines) * * --KED 02/21/99 */ -int HText_InsertFile(LinkInfo * form_link) +int HText_InsertFile(LinkInfo *form_link) { struct stat stat_info; size_t size; diff --git a/src/HTFWriter.c b/src/HTFWriter.c index 06a669a..b07aa92 100644 --- a/src/HTFWriter.c +++ b/src/HTFWriter.c @@ -1,5 +1,5 @@ /* - * $LynxId: HTFWriter.c,v 1.125 2023/11/05 23:46:45 tom Exp $ + * $LynxId: HTFWriter.c,v 1.126 2024/04/11 20:21:33 tom Exp $ * * FILE WRITER HTFWrite.h * =========== @@ -1121,7 +1121,7 @@ HTStream *HTCompressed(HTPresentation *pres, Pnow = (HTPresentation *) HTList_objectAt(HTPresentations, i); if (!strcasecomp(Pnow->rep->name, anchor->content_type) && Pnow->rep_out == WWW_PRESENT) { - const char *program = ""; + const char *program; /* * Pick the best presentation. User-defined mappings are at the diff --git a/src/LYBookmark.c b/src/LYBookmark.c index ee88cf9..fd77823 100644 --- a/src/LYBookmark.c +++ b/src/LYBookmark.c @@ -1,5 +1,5 @@ /* - * $LynxId: LYBookmark.c,v 1.88 2023/01/07 16:09:53 tom Exp $ + * $LynxId: LYBookmark.c,v 1.92 2024/03/21 07:34:18 tom Exp $ */ #include #include @@ -202,6 +202,159 @@ static char *title_convert8bit(const char *Title); #define ftruncate(fd, len) _chsize(fd, len) #endif +static const char *visible_char(int ch) +{ + static char result[8]; + + if (ch < 32) { + sprintf(result, "^%c", ch | '@'); + } else if (ch == 32) { + strcpy(result, "SP"); + } else if (ch < 127) { + sprintf(result, "%c", ch); + } else if (ch == 127) { + strcpy(result, "DEL"); + } else { + sprintf(result, "\\%03o", ch & 0xff); + } + return result; +} + +typedef enum { + scanUnknown /* markup which we do not care about */ + ,scanHeadOL + ,scanHeadUL + ,scanTailOL + ,scanTailUL + ,scanTailBody + ,scanTailHtml + ,scanIgnore /* whitespace */ +} SCAN_TRAILING; + +#define SCAN_LEN 10 /* longest interesting tag is 6 characters */ + +/* + * Scan the bookmark file data, looking for a trailing "" or "". + * Keep track of "
    and "
      ", and allow for comments. + */ +static int scan_trailing(FILE *ofp, + FILE *ifp, + char chunk[SCAN_LEN], + int *matched, + int *comment, + SCAN_TRAILING * scanned) +{ + /* *INDENT-OFF* */ + static const struct { + SCAN_TRAILING code; + const char name[SCAN_LEN]; + } table[] = { + { scanHeadOL, "
        " }, + { scanHeadUL, "
          " }, + { scanTailOL, "
      " }, + { scanTailUL, "
" }, + { scanTailBody, "" }, + { scanTailHtml, "" }, + }; + /* *INDENT-ON* */ + + int status = FALSE; + int ch = fgetc(ifp); + + *scanned = scanUnknown; + if (!feof(ifp) && !ferror(ifp)) { + int uc = TOUPPER(ch); + int keep = FALSE; + + if (isspace(UCH(uc))) + *scanned = scanIgnore; + + switch (uc) { + case '<': + if (!*comment) { + *matched = 0; + keep = TRUE; + } + break; + case '!': + if (!*comment && *matched == 1) { + keep = TRUE; + } else + CTRACE((tfp, "...comment %d matched %d\n", *comment, *matched)); + break; + case '-': + if (*comment) { + /* look for "-->" */ + if (*matched == 0 || (*matched == 1 && chunk[0] == '-')) + keep = TRUE; + } else { + /* look for "" */ + if ((*matched == 1 || *matched == 2) && chunk[0] == '-') { + *comment = FALSE; + keep = TRUE; + } + } else { + keep = TRUE; + } + break; + default: + if (isalpha(uc) || uc == '/') { + keep = !*comment; + } else { + keep = FALSE; + } + break; + } + + if (keep) { + if (*matched < (SCAN_LEN - 2)) { + chunk[*matched] = (char) uc; + *matched += 1; + if (uc == '>') { + unsigned n; + + chunk[*matched] = 0; + for (n = 0; n < TABLESIZE(table); ++n) { + if (!strcmp(chunk, table[n].name)) { + *scanned = table[n].code; + CTRACE2(TRACE_SGML, (tfp, "...matched '%s'\n", + chunk)); + break; + } + } + } + } else { + *matched = 0; + } + } else { + *matched = 0; + } + chunk[*matched] = 0; + + CTRACE2(TRACE_SGML, (tfp, "%s %s%s:%d:%s\n", + keep ? "KEEP" : "SKIP", + *comment ? "*" : "", + visible_char(uc), *matched, chunk)); + + fputc(ch, ofp); + status = TRUE; + } + return status; +} + /* * Adds a link to a bookmark file, creating the file if it doesn't already * exist, and making sure that no_cache is set for a pre-existing, cached file, @@ -217,6 +370,7 @@ void save_bookmark_link(const char *address, char filename_buffer[LY_MAXPATH]; char *Address = NULL; char *Title = NULL; + char *trailing_tag = NULL; int i, c; bstring *string_data = NULL; bstring *tmp_data = NULL; @@ -366,30 +520,123 @@ void save_bookmark_link(const char *address, StrAllocCopy(Address, address); LYEntify(&Address, FALSE); + /* + * Copy the existing bookmark file to a temporary file, to allow update. + */ if (!first_time) { BOOLEAN empty_file = TRUE; FILE *bp = tmpfile(); - char *buffer = NULL; + char chunk[SCAN_LEN]; + int ch; + int offset_Chr = 0; + int offset_Tag = 0; + int limit_Edit = -1; + int last_OL = -1; + int last_UL = -1; + int count_OL = 0; + int count_UL = 0; + int matched = 0; + int comment = FALSE; + char found_tag[scanIgnore + 1]; + SCAN_TRAILING scanned = scanUnknown; rewind(fp); - while (LYSafeGets(&buffer, fp)) { + memset(found_tag, 0, sizeof(found_tag)); + while (scan_trailing(bp, fp, chunk, &matched, &comment, &scanned)) { empty_file = FALSE; - if (LYstrstr(buffer, "")) + + /* remember where the most recent tag starts */ + if (matched == 0) + offset_Tag = offset_Chr; + + found_tag[scanned] = TRUE; + switch (scanned) { + case scanUnknown: + case scanIgnore: + break; + case scanHeadOL: + ++count_OL; + break; + case scanHeadUL: + ++count_UL; + break; + case scanTailOL: + count_OL--; + last_OL = offset_Tag; break; - fprintf(bp, "%s", buffer); + case scanTailUL: + count_UL--; + last_UL = offset_Tag; + break; + case scanTailBody: + case scanTailHtml: + if (limit_Edit < 0) + limit_Edit = offset_Tag; + break; + } + + ++offset_Chr; } fflush(bp); rewind(bp); + /* if no BODY/HTML tag ends the file, treat it as the whole file */ + if (limit_Edit < 0) + limit_Edit = offset_Chr; + + /* if the last UL/OL offsets differ, at least one is valid */ + if (last_UL > last_OL) { + if (limit_Edit > last_UL) + limit_Edit = last_UL; + } else if (last_OL > last_UL) { + if (limit_Edit > last_OL) + limit_Edit = last_OL; + } else { + /* the initial file uses an ordered list; users may edit */ + if (count_UL > count_OL) + StrAllocCopy(trailing_tag, ""); + else + StrAllocCopy(trailing_tag, ""); + } + + if (TRACE) { + CTRACE((tfp, "Existing file length %d, insert at %d\n", + offset_Chr, limit_Edit)); + if (limit_Edit == last_UL) { + CTRACE((tfp, "...insert before last : %d\n", last_UL)); + } else if (limit_Edit == last_OL) { + CTRACE((tfp, "...insert before last : %d\n", last_OL)); + } else if (trailing_tag != NULL) { + CTRACE((tfp, "...append with %s\n", trailing_tag)); + } + } + rewind(fp); - ftruncate(fileno(fp), 0); + if (ftruncate(fileno(fp), 0) == -1) { + CTRACE((tfp, "%s: %s\n", filename_buffer, strerror(errno))); + } - while (LYSafeGets(&buffer, bp)) { - fprintf(fp, "%s", buffer); + offset_Chr = 0; + while ((ch = fgetc(bp)) != EOF && !ferror(bp)) { + if (offset_Chr <= limit_Edit) + fputc(ch, fp); + else { + char buffer[2]; + + buffer[0] = (char) ch; + buffer[1] = 0; + StrAllocCat(trailing_tag, buffer); + } + ++offset_Chr; } fclose(bp); + if (!found_tag[scanTailBody]) + StrAllocCat(trailing_tag, ""); + if (!found_tag[scanTailHtml]) + StrAllocCat(trailing_tag, ""); + if (empty_file) first_time = TRUE; } @@ -447,8 +694,10 @@ Note: if you edit this file manually\n\ fprintf(fp, "%s %s%s\n", Address, TimeString, Title); } else { fprintf(fp, "
  • %s
    • \n", Address, Title); - fprintf(fp, "\n"); + if (trailing_tag != NULL) + fputs(trailing_tag, fp); } + free(trailing_tag); LYCloseOutput(fp); SetDefaultMode(O_BINARY); @@ -1029,6 +1278,7 @@ static BOOLEAN havevisible(const char *Title) unsigned char c; long unicode; + UCTransToUni(0, -1); /* reset internal state */ for (; *p; p++) { c = UCH(TOASCII(*p)); if (c > 32 && c < 127) { diff --git a/src/LYCharSets.c b/src/LYCharSets.c index 94b7a04..f5f1633 100644 --- a/src/LYCharSets.c +++ b/src/LYCharSets.c @@ -1,5 +1,5 @@ /* - * $LynxId: LYCharSets.c,v 1.71 2021/06/29 22:01:12 tom Exp $ + * $LynxId: LYCharSets.c,v 1.74 2024/03/15 16:15:07 tom Exp $ */ #include #include @@ -605,34 +605,15 @@ static void HTMLSetDisplayCharsetMatchLocale(int i) * We have no intention to pass CJK via UCTransChar if that happened. * Let someone from CJK correct this if necessary. */ - DisplayCharsetMatchLocale = TRUE; /* old-style */ - return; - - } else if (strncasecomp(LYCharSet_UC[i].MIMEname, "cp", 2) || - strncasecomp(LYCharSet_UC[i].MIMEname, "windows", 7)) { - /* - * Assume dos/windows displays usually on remote terminal, hence it - * rarely matches locale. (In fact, MS Windows codepoints locale are - * never seen on UNIX). - */ - match = FALSE; + match = TRUE; /* old-style */ + } else if (!strncasecomp(LYCharSet_UC[i].MIMEname, "cp", 2) || + !strncasecomp(LYCharSet_UC[i].MIMEname, "windows", 7)) { + match = FALSE; /* Windows locale is never seen on UNIX */ } else { - match = TRUE; /* guess, but see below */ - -#if !defined(LOCALE) - if (LYCharSet_UC[i].enc != UCT_ENC_UTF8) - /* - * Leave true for utf-8 display - the code doesn't deal very well - * with this case. - kw - */ - match = FALSE; +#if defined(LOCALE) + match = !UCForce8bitTOUPPER; /* disable locale (from lynx.cfg) */ #else - if (UCForce8bitTOUPPER) { - /* - * Force disable locale (from lynx.cfg) - */ - match = FALSE; - } + match = (LYCharSet_UC[i].enc == UCT_ENC_UTF8); #endif } diff --git a/src/LYIcon.rc b/src/LYIcon.rc index 001af56..3076d34 100644 --- a/src/LYIcon.rc +++ b/src/LYIcon.rc @@ -1,12 +1,12 @@ -// $LynxId: LYIcon.rc,v 1.57 2024/01/07 11:13:00 tom Exp $ +// $LynxId: LYIcon.rc,v 1.66 2024/04/15 20:53:51 tom Exp $ #include 100 ICON "../samples/lynx.ico" VS_VERSION_INFO VERSIONINFO -FILEVERSION 2,9,0,1013 -PRODUCTVERSION 2,9,0,1013 +FILEVERSION 2,9,1,0 +PRODUCTVERSION 2,9,1,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -19,12 +19,12 @@ BEGIN BEGIN VALUE "CompanyName", "https://invisible-island.net/lynx" VALUE "FileDescription", "Lynx - web browser" - VALUE "FileVersion", "2.9.0.1013" + VALUE "FileVersion", "2.9.1.0" VALUE "InternalName", "Lynx" VALUE "LegalCopyright", "©1997-2024 Thomas E. Dickey" VALUE "OriginalFilename", "lynx.exe" VALUE "ProductName", "Lynx - web browser" - VALUE "ProductVersion", "2.9.0.1013" + VALUE "ProductVersion", "2.9.1.0" END END BLOCK "VarFileInfo" diff --git a/src/LYMain.c b/src/LYMain.c index ab48cae..1d52bb6 100644 --- a/src/LYMain.c +++ b/src/LYMain.c @@ -1,5 +1,5 @@ /* - * $LynxId: LYMain.c,v 1.300 2024/01/07 15:31:25 tom Exp $ + * $LynxId: LYMain.c,v 1.301 2024/03/17 23:10:41 tom Exp $ */ #include #include @@ -1003,7 +1003,7 @@ static void append_ssl_version(char **target, /* Set the text message domain. */ void LYSetTextDomain(void) { -#if defined(HAVE_LIBINTL_H) || defined(HAVE_LIBGETTEXT_H) +#if defined(HAVE_LIBINTL_H) const char *cp; if ((cp = LYGetEnv("LYNX_LOCALEDIR")) == 0) { @@ -1221,6 +1221,7 @@ int main(int argc, * Zero the links and history struct arrays. */ memset((void *) links, 0, sizeof(LinkInfo) * MAXLINKS); + LYAllocHistory(8); /* * Zero the MultiBookmark arrays. diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c index 55be205..b5c7ab8 100644 --- a/src/LYMainLoop.c +++ b/src/LYMainLoop.c @@ -1,5 +1,5 @@ /* - * $LynxId: LYMainLoop.c,v 1.254 2024/01/15 19:10:04 Gisle.Vanem Exp $ + * $LynxId: LYMainLoop.c,v 1.256 2024/04/11 21:53:34 tom Exp $ */ #include #include @@ -177,7 +177,7 @@ HTAtom *WWW_SOURCE = 0; static void exit_immediately_with_error_message(int state, int first_file); static void status_link(const char *curlink_name, int show_more, int show_indx); -static void show_main_statusline(const LinkInfo curlink, int for_what); +static void show_main_statusline(const LinkInfo *curlink, int for_what); static void form_noviceline(int); static int are_different(DocInfo *doc1, DocInfo *doc2); @@ -1061,7 +1061,7 @@ static int handle_LYK_ACTIVATE(int *c, F_TEXTLIKE(links[curdoc.link].l_form->type)) { textinput_activated = TRUE; - show_main_statusline(links[curdoc.link], FOR_INPUT); + show_main_statusline(&links[curdoc.link], FOR_INPUT); textfields_need_activation = textfields_activation_option; return 0; @@ -6769,8 +6769,8 @@ int mainloop(void) * If help is not on the screen, then put a message on the screen to * tell the user other misc info. */ - if (!show_help && curdoc.link >= 0) { - show_main_statusline(links[curdoc.link], + if (!show_help) { + show_main_statusline(curdoc.link >= 0 ? &links[curdoc.link] : NULL, ((curlink_is_editable && textinput_activated) ? FOR_INPUT @@ -7109,13 +7109,13 @@ int mainloop(void) #ifdef TEXTFIELDS_MAY_NEED_ACTIVATION if (textfields_need_activation) { - show_main_statusline(links[curdoc.link], FOR_PANEL); + show_main_statusline(&links[curdoc.link], FOR_PANEL); #ifdef INACTIVE_INPUT_STYLE_VH textinput_redrawn = FALSE; #endif } else #endif - show_main_statusline(links[curdoc.link], FOR_INPUT); + show_main_statusline(&links[curdoc.link], FOR_INPUT); } else if (more_text) { HTInfoMsg(MOREHELP); } else { @@ -7745,6 +7745,8 @@ int mainloop(void) if (handle_LYK_LINEWRAP_TOGGLE(&cmd, &refresh_screen)) goto new_cmd; break; +#else + (void) key_count; #endif #ifdef USE_MAXSCREEN_TOGGLE @@ -7930,7 +7932,7 @@ void HTAddGotoURL(char *url) * When help is not on the screen, put a message on the screen to tell the user * other misc info. */ -static void show_main_statusline(const LinkInfo curlink, +static void show_main_statusline(const LinkInfo *curlink, int for_what) { /* @@ -7954,16 +7956,16 @@ static void show_main_statusline(const LinkInfo curlink, } else if (lynx_mode == FORMS_LYNX_MODE && nlinks > 0) { #else #ifdef NORMAL_NON_FORM_LINK_STATUSLINES_FOR_ALL_USER_MODES - } else if (lynx_mode == FORMS_LYNX_MODE && nlinks > 0 && - !(curlink.type & WWW_LINK_TYPE)) { + } else if (lynx_mode == FORMS_LYNX_MODE && nlinks > 0 && curlink && + !(curlink->type & WWW_LINK_TYPE)) { #else - } else if (lynx_mode == FORMS_LYNX_MODE && nlinks > 0 && + } else if (lynx_mode == FORMS_LYNX_MODE && nlinks > 0 && curlink && !((user_mode == ADVANCED_MODE || user_mode == MINIMAL_MODE) && - (curlink.type & WWW_LINK_TYPE))) { + (curlink->type & WWW_LINK_TYPE))) { #endif /* NORMAL_NON_FORM_LINK_STATUSLINES_FOR_ALL_USER_MODES */ #endif /* INDICATE_FORMS_MODE_FOR_ALL_LINKS_ON_PAGE */ - if (curlink.type == WWW_FORM_LINK_TYPE) { - show_formlink_statusline(curlink.l_form, for_what); + if (curlink->type == WWW_FORM_LINK_TYPE) { + show_formlink_statusline(curlink->l_form, for_what); } else { statusline(NORMAL_LINK_MESSAGE); } @@ -7980,18 +7982,18 @@ static void show_main_statusline(const LinkInfo curlink, lynx_stop_reverse(); } - } else if ((user_mode == ADVANCED_MODE) && nlinks > 0) { + } else if ((user_mode == ADVANCED_MODE) && nlinks > 0 && curlink) { /* * Show the URL or, for some internal links, the fragment */ char *cp = NULL; - if (curlink.type == WWW_INTERN_LINK_TYPE && - !isLYNXIMGMAP(curlink.lname)) { - cp = findPoundSelector(curlink.lname); + if (curlink->type == WWW_INTERN_LINK_TYPE && + !isLYNXIMGMAP(curlink->lname)) { + cp = findPoundSelector(curlink->lname); } if (!cp) - cp = curlink.lname; + cp = curlink->lname; status_link(cp, more_text, is_www_index); } else if ((user_mode == MINIMAL_MODE) && nlinks > 0) { /* @@ -8037,7 +8039,7 @@ static void show_main_statusline(const LinkInfo curlink, void repaint_main_statusline(int for_what) { if (curdoc.link >= 0 && curdoc.link < nlinks) - show_main_statusline(links[curdoc.link], for_what); + show_main_statusline(&links[curdoc.link], for_what); } static void form_noviceline(int disabled) diff --git a/src/LYReadCFG.c b/src/LYReadCFG.c index e4ab796..24efbf5 100644 --- a/src/LYReadCFG.c +++ b/src/LYReadCFG.c @@ -1,5 +1,5 @@ /* - * $LynxId: LYReadCFG.c,v 1.200 2021/07/29 22:52:55 tom Exp $ + * $LynxId: LYReadCFG.c,v 1.201 2024/03/17 23:04:33 tom Exp $ */ #ifndef NO_RULES #include @@ -1406,7 +1406,7 @@ static int screen_size_fun(char *value) } #endif -#if defined(HAVE_LIBINTL_H) || defined(HAVE_LIBGETTEXT_H) +#if defined(HAVE_LIBINTL_H) static int message_language_fun(char *value) { char *tmp = NULL; @@ -1621,7 +1621,7 @@ static Config_Type Config_Table [] = PARSE_INT(RC_MAX_COOKIES_GLOBAL, max_cookies_global), PARSE_INT(RC_MAX_URI_SIZE, max_uri_size), PARSE_TIM(RC_MESSAGESECS, MessageSecs), -#if defined(HAVE_LIBINTL_H) || defined(HAVE_LIBGETTEXT_H) +#if defined(HAVE_LIBINTL_H) PARSE_FUN(RC_MESSAGE_LANGUAGE, message_language_fun), #endif PARSE_SET(RC_MINIMAL_COMMENTS, minimal_comments), diff --git a/src/TRSTable.c b/src/TRSTable.c index 4123596..1d7a4ec 100644 --- a/src/TRSTable.c +++ b/src/TRSTable.c @@ -1,5 +1,5 @@ /* - * $LynxId: TRSTable.c,v 1.43 2023/11/10 01:01:54 tom Exp $ + * $LynxId: TRSTable.c,v 1.45 2024/04/11 20:41:16 tom Exp $ * Simple table object * =================== * Authors @@ -205,9 +205,10 @@ static int Stbl_finishRowInTable(STable_info *me); static const char *cellstate_s(cellstate_t state) { - const char *result = "?"; + const char *result; /* *INDENT-OFF* */ switch (state) { + default: case CS_invalid: result = "CS_invalid"; break; case CS__new: result = "CS__new"; break; case CS__0new: result = "CS__0new"; break; diff --git a/src/chrtrans/README.tables b/src/chrtrans/README.tables index 14431da..911d795 100644 --- a/src/chrtrans/README.tables +++ b/src/chrtrans/README.tables @@ -71,6 +71,6 @@ Lynx, a `make clean' should not be necessary if you have *only* made changes to the files in src/chrtrans. On VMS, add entries for new tables to build-chrtrans.com, but you can update the particular file with build-header.com, then use the top directory's build.com and -answer 'n' to it's prompts about whether to update the WWWlibrary +answer 'n' to its prompts about whether to update the WWW library and chrtrans modules. diff --git a/src/makefile.in b/src/makefile.in index 5246226..add3faa 100644 --- a/src/makefile.in +++ b/src/makefile.in @@ -1,4 +1,4 @@ -# $LynxId: makefile.in,v 1.77 2021/02/28 15:56:53 tom Exp $ +# $LynxId: makefile.in,v 1.80 2024/04/03 23:50:55 tom Exp $ # template-makefile for Lynx src directory SHELL = @CONFIG_SHELL@ @@ -10,7 +10,7 @@ datarootdir = @datarootdir@ exec_prefix = @exec_prefix@ top_srcdir = @top_srcdir@ srcdir = @srcdir@ -VPATH = .:$(srcdir) +VPATH = $(srcdir) top_builddir = .. @@ -53,9 +53,6 @@ WAISLIB = # FIXME: set in parent makefile WWWINC = WWW/Library/Implementation WWWLIB = $(top_builddir)/WWW/Library/Implementation/libwww.a -INTLLIB = @INTLLIBS@ -INTLDIR_CPPFLAGS= @INTLDIR_CPPFLAGS@-I$(top_srcdir)/intl - CPP_OPTS = $(DEFS) $(CHARSET_DEFS) \ -DLOCALEDIR=\"$(localedir)\" \ -I. \ @@ -65,7 +62,7 @@ CPP_OPTS = $(DEFS) $(CHARSET_DEFS) \ -I$(top_srcdir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/$(WWWINC) \ - $(INTLDIR_CPPFLAGS) $(SITE_DEFS) $(CPPFLAGS) + $(SITE_DEFS) $(CPPFLAGS) CC_OPTS = $(CFLAGS) $(CPP_OPTS) LINT = @LINT@ @@ -107,7 +104,7 @@ all: lynx$x lynx$x: message $(top_builddir)/LYHelp.h $(OBJS) $(WWWLIB) @echo "Linking and creating Lynx executable" - $(CC) $(CC_OPTS) $(LDFLAGS) -o $@ $(OBJS) $(WWWLIB) $(LIBS) $(INTLLIB) + $(CC) $(CC_OPTS) $(LDFLAGS) -o $@ $(OBJS) $(WWWLIB) $(LIBS) @echo "Copying Lynx executable into top-level directory" rm -f $(top_builddir)/$@ cp $@ $(top_builddir)/ diff --git a/userdefs.h b/userdefs.h index 0c50d59..4fe6455 100644 --- a/userdefs.h +++ b/userdefs.h @@ -1,5 +1,5 @@ /* - * $LynxId: userdefs.h,v 1.373 2024/01/15 11:31:22 tom Exp $ + * $LynxId: userdefs.h,v 1.388 2024/04/15 20:53:51 tom Exp $ * * Lynx - Hypertext navigation system * @@ -1451,10 +1451,10 @@ */ #define LYNX_NAME "Lynx" -#define LYNX_VERSION "2.9.0" +#define LYNX_VERSION "2.9.1" #define LYNX_WWW_HOME "https://lynx.invisible-island.net/" #define LYNX_WWW_DIST "https://lynx.invisible-island.net/current/" -#define LYNX_DATE "15 Jan 2024" +#define LYNX_DATE "15 Apr 2024" #ifdef UNICODE #define W32_STRING(s) L##s -- cgit v1.2.3