Commit 3b3aaa7e authored by Axel Beckert's avatar Axel Beckert

Imported Upstream version 2.8.8dev.1

parent 637dd09a
-- $LynxId: CHANGES,v 1.422 2009/07/05 23:24:39 tom Exp $
-- $LynxId: CHANGES,v 1.438 2009/08/27 23:27:42 tom Exp $
===============================================================================
Changes since Lynx 2.8 release
===============================================================================
2009-08-28 (2.8.8dev.1)
* add <sys/types.h> include in socklen_t configure check, from OpenBSD CVS
* eliminate UCPutUtf8ToBuffer() - redundant -TD
* use memset's to simplify some initialization in HTML.c, extending a change
made in 2.8.7dev.10 (prompted by issue in OpenBSD) -TD
* add optional support for IDNA using GNU libidn (Debian #352596) -TD
* ignore LEFT-TO-RIGHT-MARK (U+200E) in HTML files (Debian #408835) -TD
* correct check for return-value from gnutls_certificate_verify_peers2(), which
in conjunction with unclean internals of gnutls caused caused some sites to
be treated as if they were version-1 X.509 CAs (Debian #231609,
Ubuntu 293708) -TD
* revise dired-mode's modify_tagged() function, correcting and extending the
source-paths to validate against the target path. Before, lynx's current
working directory was used to validate against target path, i.e., when moving
all tagged files to a new location. Lynx's check to ensure that
source/target paths are distinct prevented users from moving tagged files to
the current directory (report by Jasper) -TD
* change compiled-in default for SYSLOG_REQUESTED_URLS to false (prompted by
Debian #537907) -TD
* adjust ifdef in change_sug_filename() so that paths containing square
brackets are trimmed on VMS only (report by Gaute Strokkenes) -TD
* amend change to ifdef in LYMain.c (from 2.8.7dev.14), since it prevents build
on NetBSD, whose libintl.h does not include locale.h (report by Thomas
Klausner) -TD
* modify configure macro CF_GCC_ATTRIBUTES to make it more self-contained -TD
* improve configure check for _XOPEN_SOURCE for HPUX 11 to ensure mbstate_t is
declared -TD
* update config.guess (2009-08-19), config.sub (2009-08-19)
2009-07-05 (2.8.7rel.1)
* update metrics for 2.8.7 release.
* fix ifdef'ing for cfg_bad_html (report by Gabor Z Papp) -TD
......
......@@ -297,6 +297,12 @@ II. Compile instructions -- UNIX
--disable-gopher (define DISABLE_GOPHER)
Do not compile-in code used to connect to GOPHER servers.
--disable-idna
By default, the configure script searches for the GNU idn library,
which lets lynx translated URLs which are in UTF-8 to ASCII. The
latter is needed for most network accesses. Use this option to
suppress the feature, e.g., to reduce size.
--disable-included-msgs
Do not use included messages, for i18n support. If NLS support is
requested, the configure script will otherwise use the messages in the
......@@ -1371,4 +1377,4 @@ VIII. Acknowledgment
-- 1999/04/24 - H. Nelson <lynx-admin@irm.nara.kindai.ac.jp>
-- vile:txtmode
-- $LynxId: INSTALLATION,v 1.106 2008/12/31 21:37:07 tom Exp $
-- $LynxId: INSTALLATION,v 1.107 2009/08/27 21:00:43 tom Exp $
; version used for Inno Setup files.
; $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$
#define LYNX_VERSION "2.8.7rel.1"
#define LYNX_VERSION "2.8.8dev.1"
#define MyAppName "Lynx"
#define MyAppPublisher "Thomas E Dickey"
......
/*
* $LynxId: HTParse.c,v 1.51 2009/01/03 01:11:14 tom Exp $
* $LynxId: HTParse.c,v 1.52 2009/08/27 18:43:30 tom Exp $
*
* Parse HyperText Document Address HTParse.c
* ================================
......@@ -21,6 +21,10 @@
#endif /* __MINGW32__ */
#endif
#ifdef USE_IDNA
#include <idna.h>
#endif
#define HEX_ESCAPE '%'
struct struct_parts {
......@@ -234,6 +238,58 @@ char *HTParsePort(char *host, int *portp)
return result;
}
#ifdef USE_IDNA
static int hex_decode(int ch)
{
int result = 0;
if (ch >= '0' && ch <= '9')
result = (ch - '0');
else if (ch >= 'a' && ch <= 'f')
result = (ch - 'a') + 10;
else if (ch >= 'A' && ch <= 'F')
result = (ch - 'A') + 10;
return result;
}
/*
* Convert in-place the given hostname to IDNA form. That requires up to 64
* characters, and we've allowed for that, with MIN_PARSE.
*/
static void convert_to_idna(char *host)
{
char *buffer = malloc(strlen(host) + 1);
char *output = NULL;
char *src, *dst;
int code;
if (buffer != 0) {
for (dst = buffer, src = host; *src != '\0'; ++dst) {
int ch = *src++;
if (ch == HEX_ESCAPE) {
int hi = hex_decode(*src++);
int lo = hex_decode(*src++);
*dst = (hi << 4) | lo;
} else {
*dst = ch;
}
}
*dst = '\0';
code = idna_to_ascii_8z(buffer, &output, IDNA_USE_STD3_ASCII_RULES);
if (code == IDNA_SUCCESS) {
strcpy(host, output);
free(output);
}
free(buffer);
}
}
#define MIN_PARSE 80
#else
#define MIN_PARSE 8
#endif
/* Parse a Name relative to another name. HTParse()
* --------------------------------------
*
......@@ -288,7 +344,7 @@ char *HTParse(const char *aName,
*/
len1 = strlen(aName) + 1;
len2 = strlen(relatedName) + 1;
len = len1 + len2 + 8; /* Lots of space: more than enough */
len = len1 + len2 + MIN_PARSE; /* Lots of space: more than enough */
result = tail = (char *) LYalloca(len * 2 + len1 + len2);
if (result == NULL) {
......@@ -381,12 +437,14 @@ char *HTParse(const char *aName,
* Handle the host field.
*/
if (wanted & PARSE_HOST) {
char *host;
if (given.host || related.host) {
if (wanted & PARSE_PUNCTUATION) {
*tail++ = '/';
*tail++ = '/';
}
strcpy(tail, given.host ? given.host : related.host);
strcpy(host = tail, given.host ? given.host : related.host);
#define CLEAN_URLS
#ifdef CLEAN_URLS
/*
......@@ -446,6 +504,13 @@ char *HTParse(const char *aName,
}
}
}
#ifdef USE_IDNA
/*
* Depending on locale-support, we could have a literal UTF-8
* string as a host name, or a URL-encoded form of that.
*/
convert_to_idna(host);
#endif
#endif /* CLEAN_URLS */
}
}
......@@ -631,7 +696,7 @@ char *HTParse(const char *aName,
q[0] = q[-2];
--q;
}
p[0] = '%';
p[0] = HEX_ESCAPE;
p[1] = '2';
p[2] = '0';
} while ((p = strchr(result, ' ')) != 0);
......
/*
* $LynxId: HTTP.c,v 1.108 2009/05/22 00:47:41 tom Exp $
* $LynxId: HTTP.c,v 1.110 2009/08/27 00:56:00 tom Exp $
*
* HyperText Tranfer Protocol - Client implementation HTTP.c
* ==========================
......@@ -721,7 +721,7 @@ static int HTLoadHTTP(const char *arg,
}
#ifdef USE_GNUTLS_INCL
ret = gnutls_certificate_verify_peers2(handle->gnutls_state, &tls_status);
if ((ret < 0) || tls_status) {
if (ret < 0) {
int flag_continue = 1;
char *msg2;
......
/*
* $LynxId: SGML.c,v 1.131 2009/05/30 11:21:28 tom Exp $
* $LynxId: SGML.c,v 1.132 2009/08/27 10:29:27 tom Exp $
*
* General SGML Parser code SGML.c
* ========================
......@@ -1668,6 +1668,9 @@ static void SGML_character(HTStream *context, char c_in)
if (clong < 256) {
c = ((char) (clong & 0xff));
}
/* lynx does not use left-to-right */
if (clong == 0x200e)
return;
goto top1;
} else {
/*
......
dnl $LynxId: aclocal.m4,v 1.141 2009/02/01 20:26:46 tom Exp $
dnl $LynxId: aclocal.m4,v 1.143 2009/08/27 20:25:03 tom Exp $
dnl Macros for auto-configure script.
dnl by T.E.Dickey <dickey@invisible-island.net>
dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
dnl and Philippe De Muyter <phdm@macqel.be>
dnl
dnl Created: 1997/1/28
dnl Updated: 2009/2/1
dnl Updated: 2009/8/25
dnl
dnl The autoconf used in Lynx development is GNU autoconf 2.13 or 2.52, patched
dnl by Thomas Dickey. See your local GNU archives, and this URL:
......@@ -992,7 +992,7 @@ ifelse($3,,[ :]dnl
])dnl
])])dnl
dnl ---------------------------------------------------------------------------
dnl CF_AR_FLAGS version: 3 updated: 2009/01/07 19:36:13
dnl CF_AR_FLAGS version: 4 updated: 2009/02/07 13:42:23
dnl -----------
dnl Check for suitable "ar" (archiver) options for updating an archive.
AC_DEFUN([CF_AR_FLAGS],[
......@@ -1022,7 +1022,6 @@ EOF
done
rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
])
test -z "$ARFLAGS" && ARFLAGS=$cf_cv_ar_flags
AC_SUBST(ARFLAGS,$cf_cv_ar_flags)
])
......@@ -1580,7 +1579,7 @@ CF_CURSES_HEADER
CF_TERM_HEADER
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_CURSES_FUNCS version: 13 updated: 2007/04/28 09:15:55
dnl CF_CURSES_FUNCS version: 14 updated: 2009/07/16 19:34:55
dnl ---------------
dnl Curses-functions are a little complicated, since a lot of them are macros.
AC_DEFUN([CF_CURSES_FUNCS],
......@@ -1596,24 +1595,7 @@ do
AC_CACHE_VAL(cf_cv_func_$cf_func,[
eval cf_result='$ac_cv_func_'$cf_func
if test ".$cf_result" != ".no"; then
AC_TRY_LINK([
#ifdef HAVE_XCURSES
#include <xcurses.h>
char * XCursesProgramName = "test";
#else
#include <${cf_cv_ncurses_header-curses.h}>
#if defined(NCURSES_VERSION) && defined(HAVE_NCURSESW_TERM_H)
#include <ncursesw/term.h>
#else
#if defined(NCURSES_VERSION) && defined(HAVE_NCURSES_TERM_H)
#include <ncurses/term.h>
#else
#ifdef HAVE_TERM_H
#include <term.h>
#endif
#endif
#endif
#endif],
AC_TRY_LINK(CF__CURSES_HEAD,
[
#ifndef ${cf_func}
long foo = (long)(&${cf_func});
......@@ -2506,7 +2488,7 @@ if test $cf_cv_type_unionwait = yes; then
fi
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_GCC_ATTRIBUTES version: 11 updated: 2007/07/29 09:55:12
dnl CF_GCC_ATTRIBUTES version: 13 updated: 2009/08/11 20:19:56
dnl -----------------
dnl Test for availability of useful gcc __attribute__ directives to quiet
dnl compiler warnings. Though useful, not all are supported -- and contrary
......@@ -2552,26 +2534,61 @@ extern void oops(char *,...) GCC_PRINTFLIKE(1,2) GCC_NORETURN;
extern void foo(void) GCC_NORETURN;
int main(int argc GCC_UNUSED, char *argv[[]] GCC_UNUSED) { return 0; }
EOF
cf_printf_attribute=no
cf_scanf_attribute=no
for cf_attribute in scanf printf unused noreturn
do
CF_UPPER(cf_ATTRIBUTE,$cf_attribute)
cf_directive="__attribute__(($cf_attribute))"
echo "checking for $CC $cf_directive" 1>&AC_FD_CC
case $cf_attribute in
scanf|printf)
cat >conftest.h <<EOF
case $cf_attribute in #(vi
printf) #(vi
cf_printf_attribute=yes
cat >conftest.h <<EOF
#define GCC_$cf_ATTRIBUTE 1
EOF
;;
*)
cat >conftest.h <<EOF
scanf) #(vi
cf_scanf_attribute=yes
cat >conftest.h <<EOF
#define GCC_$cf_ATTRIBUTE 1
EOF
;;
*) #(vi
cat >conftest.h <<EOF
#define GCC_$cf_ATTRIBUTE $cf_directive
EOF
;;
esac
if AC_TRY_EVAL(ac_compile); then
test -n "$verbose" && AC_MSG_RESULT(... $cf_attribute)
cat conftest.h >>confdefs.h
case $cf_attribute in #(vi
printf) #(vi
if test "$cf_printf_attribute" = no ; then
cat >>confdefs.h <<EOF
#define GCC_PRINTFLIKE(fmt,var) /* nothing */
EOF
else
cat >>confdefs.h <<EOF
#define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var)))
EOF
fi
;;
scanf) #(vi
if test "$cf_scanf_attribute" = no ; then
cat >>confdefs.h <<EOF
#define GCC_SCANFLIKE(fmt,var) /* nothing */
EOF
else
cat >>confdefs.h <<EOF
#define GCC_SCANFLIKE(fmt,var) __attribute__((format(scanf,fmt,var)))
EOF
fi
;;
esac
fi
done
else
......@@ -5482,6 +5499,26 @@ if test "$with_dmalloc" = yes ; then
fi
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_WITH_IDNA version: 2 updated: 2009/08/27 16:24:24
dnl ------------
dnl Check for libidn, use it if found.
dnl
dnl $1 = optional path for headers/library
AC_DEFUN([CF_WITH_IDNA],[
CF_ADD_OPTIONAL_PATH($1)
CF_FIND_LINKAGE([
#include <stdio.h>
#include <idna.h>
],[
char *output = 0;
int code = idna_to_ascii_8z("name", &output, IDNA_USE_STD3_ASCII_RULES);
],idn,[
AC_DEFINE(USE_IDNA)
LIBS="-lidn $LIBS"
])
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_WITH_PATH version: 8 updated: 2007/05/13 13:16:35
dnl ------------
dnl Wrapper for AC_ARG_WITH to ensure that user supplies a pathname, not just
......@@ -5546,7 +5583,7 @@ AC_TRY_LINK([
test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_XOPEN_SOURCE version: 28 updated: 2008/12/27 12:30:03
dnl CF_XOPEN_SOURCE version: 29 updated: 2009/07/16 21:07:04
dnl ---------------
dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
dnl or adapt to the vendor's definitions to get equivalent functionality,
......@@ -5574,6 +5611,9 @@ freebsd*|dragonfly*) #(vi
cf_XOPEN_SOURCE=600
CPPFLAGS="$CPPFLAGS -D_BSD_TYPES -D__BSD_VISIBLE -D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
;;
hpux11*) #(vi
CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE=500"
;;
hpux*) #(vi
CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE"
;;
......@@ -5820,6 +5860,26 @@ to makefile.])
fi
])dnl
dnl ---------------------------------------------------------------------------
dnl CF__CURSES_HEAD version: 1 updated: 2009/07/16 19:32:31
dnl ---------------
dnl Define a reusable chunk which includes <curses.h> and <term.h> when they
dnl are both available.
define([CF__CURSES_HEAD],[
#ifdef HAVE_XCURSES
#include <xcurses.h>
char * XCursesProgramName = "test";
#else
#include <${cf_cv_ncurses_header-curses.h}>
#if defined(NCURSES_VERSION) && defined(HAVE_NCURSESW_TERM_H)
#include <ncursesw/term.h>
#elif defined(NCURSES_VERSION) && defined(HAVE_NCURSES_TERM_H)
#include <ncurses/term.h>
#elif defined(HAVE_TERM_H)
#include <term.h>
#endif
#endif
])
dnl ---------------------------------------------------------------------------
dnl CF__ICONV_BODY version: 2 updated: 2007/07/26 17:35:47
dnl --------------
dnl Test-code needed for iconv compile-checks
......
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
# Free Software Foundation, Inc.
timestamp='2008-12-19'
timestamp='2009-08-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
......@@ -27,16 +27,16 @@ timestamp='2008-12-19'
# the same distribution terms that you use for the rest of that program.
# Originally written by Per Bothner <per@bothner.com>.
# Please send patches to <config-patches@gnu.org>. Submit a context
# diff and a properly formatted ChangeLog entry.
# Originally written by Per Bothner. Please send patches (context
# diff format) to <config-patches@gnu.org> and include a ChangeLog
# entry.
#
# This script attempts to guess a canonical system name similar to
# config.sub. If it succeeds, it prints the system name on stdout, and
# exits with 0. Otherwise, it exits with 1.
#
# The plan is that this can be called by configure scripts if you
# don't specify an explicit build system type.
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
me=`echo "$0" | sed -e 's,.*/,,'`
......@@ -170,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep __ELF__ >/dev/null
| grep -q __ELF__
then
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
# Return netbsd for either. FIX?
......@@ -324,6 +324,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
case `/usr/bin/uname -p` in
sparc) echo sparc-icl-nx7; exit ;;
esac ;;
s390x:SunOS:*:*)
echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
......@@ -653,7 +656,7 @@ EOF
# => hppa64-hp-hpux11.23
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
grep __LP64__ >/dev/null
grep -q __LP64__
then
HP_ARCH="hppa2.0w"
else
......@@ -819,6 +822,9 @@ EOF
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
8664:Windows_NT:*)
echo x86_64-pc-mks
exit ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
......@@ -879,40 +885,17 @@ EOF
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
mips:Linux:*:*)
mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#undef CPU
#undef mips
#undef mipsel
#undef ${UNAME_MACHINE}
#undef ${UNAME_MACHINE}el
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
CPU=mipsel
CPU=${UNAME_MACHINE}el
#else
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
CPU=mips
#else
CPU=
#endif
#endif
EOF
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
/^CPU/{
s: ::g
p
}'`"
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
mips64:Linux:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#undef CPU
#undef mips64
#undef mips64el
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
CPU=mips64el
#else
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
CPU=mips64
CPU=${UNAME_MACHINE}
#else
CPU=
#endif
......@@ -944,7 +927,7 @@ EOF
EV67) UNAME_MACHINE=alphaev67 ;;
EV68*) UNAME_MACHINE=alphaev68 ;;
esac
objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
objdump --private-headers /bin/sh | grep -q ld.so.1
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
exit ;;
......@@ -998,14 +981,6 @@ EOF
elf32-i386)
TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
;;
a.out-i386-linux)
echo "${UNAME_MACHINE}-pc-linux-gnuaout"
exit ;;
"")
# Either a pre-BFD a.out linker (linux-gnuoldld) or
# one that does not give us useful --help.
echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
exit ;;
esac
# Determine whether the default compiler is a.out or elf
eval $set_cc_for_build
......@@ -1071,7 +1046,7 @@ EOF
i*86:syllable:*:*)
echo ${UNAME_MACHINE}-pc-syllable
exit ;;
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
exit ;;
i*86:*DOS:*:*)
......@@ -1115,8 +1090,11 @@ EOF
pc:*:*:*)
# Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about
# the processor, so we play safe by assuming i386.
echo i386-pc-msdosdjgpp
# the processor, so we play safe by assuming i586.
# Note: whatever this is, it MUST be the same as what config.sub
# prints for the "djgpp" host, or else GDB configury will decide that
# this is a cross-build.
echo i586-pc-msdosdjgpp
exit ;;
Intel:Mach:3*:*)
echo i386-pc-mach3
......@@ -1176,7 +1154,7 @@ EOF
rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
exit ;;
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
echo powerpc-unknown-lynxos${UNAME_RELEASE}
exit ;;
SM[BE]S:UNIX_SV:*:*)
......@@ -1350,6 +1328,9 @@ EOF
i*86:rdos:*:*)
echo ${UNAME_MACHINE}-pc-rdos
exit ;;
i*86:AROS:*:*)
echo ${UNAME_MACHINE}-pc-aros
exit ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
......
/*
* $LynxId: config.hin,v 1.112 2009/03/09 22:43:29 Doug.Kaufman Exp $
* $LynxId: config.hin,v 1.113 2009/08/27 19:24:45 tom Exp $
* vile:cmode
*
* The configure script translates "config.hin" into "lynx_cfg.h"
......@@ -256,6 +256,7 @@
#undef USE_FILE_UPLOAD /* CF_ARG_ENABLE(file-upload) */
#undef USE_GNUTLS_FUNCS /* CF_GNUTLS */
#undef USE_GNUTLS_INCL /* CF_GNUTLS */
#undef USE_IDNA /* CF_ARG_DISABLE(idna) */
#undef USE_LOCALE_CHARSET /* CF_ARG_ENABLE(locale-charset) */
#undef USE_OPENSSL_INCL /* CF_SSL */
#undef USE_PERSISTENT_COOKIES /* CF_ARG_ENABLE(persistent-cookies) */
......
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
# Free Software Foundation, Inc.
timestamp='2008-12-11'
timestamp='2009-08-19'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
......@@ -32,13 +32,16 @@ timestamp='2008-12-11'
# Please send patches to <config-patches@gnu.org>. Submit a context
# diff and a properly formatted ChangeLog entry.
# diff and a properly formatted GNU ChangeLog entry.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
# If it is invalid, we print an error message on stderr and exit with code 1.
# Otherwise, we print the canonical config type on stdout and succeed.
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
# that are meaningful with *any* GNU software.
......@@ -122,6 +125,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
......@@ -148,10 +152,13 @@ case $os in
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-apple | -axis | -knuth | -cray)
-apple | -axis | -knuth | -cray | -microblaze)
os=
basic_machine=$1
;;
-bluegene*)
os=-cnk
;;
-sim | -cisco | -oki | -wec | -winbond)
os=
basic_machine=$1
......@@ -271,6 +278,7 @@ case $basic_machine in
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
| moxie \
| mt \
| msp430 \
| nios | nios2 \
......@@ -335,7 +343,7 @@ case $basic_machine in
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
......@@ -445,6 +453,10 @@ case $basic_machine in
basic_machine=m68k-apollo
os=-bsd
;;
aros)
basic_machine=i386-pc
os=-aros
;;
aux)
basic_machine=m68k-apple
os=-aux
......@@ -461,6 +473,10 @@ case $basic_machine in
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
bluegene*)
basic_machine=powerpc-ibm
os=-cnk
;;
c90)
basic_machine=c90-cray
os=-unicos
......@@ -713,6 +729,9 @@ case $basic_machine in
basic_machine=ns32k-utek
os=-sysv
;;
microblaze)
basic_machine=microblaze-xilinx
;;
mingw32)
basic_machine=i386-pc
os=-mingw32
......@@ -1254,10 +1273,11 @@ case $os in
# Each alternative MUST END IN A *, to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
| -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* \
| -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
......@@ -1606,7 +1626,7 @@ case $basic_machine in
-sunos*)
vendor=sun
;;
-aix*)
-cnk*|-aix*)
vendor=ibm
;;
-beos*)
......
This diff is collapsed.
dnl $LynxId: configure.in,v 1.191 2009/04/12 12:45:06 tom Exp $
dnl $LynxId: configure.in,v 1.200 2009/08/27 22:37:02 tom Exp $
dnl
dnl Process this file with autoconf to produce a configure script.
dnl
......@@ -29,7 +29,7 @@ dnl ---------------------------------------------------------------------------
dnl
dnl ask PRCS to plug-in the project-version for the configure-script.
dnl $Format: "AC_REVISION($ProjectVersion$)"$
AC_REVISION(2.8.7rel.1)
AC_REVISION(2.8.8dev.1)
# Save the original $CFLAGS so we can distinguish whether the user set those
# in the environment, or whether autoconf added -O and -g options:
......@@ -62,7 +62,7 @@ AC_ARG_WITH(system-type,
PACKAGE=lynx
dnl ask PRCS to plug-in the project-version for the packages.
# $Format: "VERSION=$ProjectVersion$"$
VERSION=2.8.7rel.1
VERSION=2.8.8dev.1
AC_SUBST(PACKAGE)
AC_SUBST(VERSION)
......@@ -752,7 +752,10 @@ AC_TYPE_OFF_T
AC_TYPE_PID_T